Merge 93f6316 into 2e789b0

GoogleCloudPlatform · Oct 5, 2023 · a2e4e8d · a2e4e8d
2 parents 2e789b0 + 93f6316
commit a2e4e8d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/packages/opentelemetry-resource-util/src/detector/detector.ts b/packages/opentelemetry-resource-util/src/detector/detector.ts
@@ -66,37 +66,35 @@ async function gkeResource(): Promise<Resource> {
 }
 
 async function cloudRunResource(): Promise<Resource> {
-  const [faasName, faasVersion, faasInstance, faasCloudRegion] =
-    await Promise.all([
-      faas.faasName(),
-      faas.faasVersion(),
-      faas.faasInstance(),
-      faas.faasCloudRegion(),
-    ]);
+  const [faasName, faasVersion, faasId, faasCloudRegion] = await Promise.all([
+    faas.faasName(),
+    faas.faasVersion(),
+    faas.faasId(),
+    faas.faasCloudRegion(),
+  ]);
 
   return await makeResource({
     [Semconv.CLOUD_PLATFORM]: CloudPlatformValues.GCP_CLOUD_RUN,
     [Semconv.FAAS_NAME]: faasName,
     [Semconv.FAAS_VERSION]: faasVersion,
-    [Semconv.FAAS_INSTANCE]: faasInstance,
+    [Semconv.FAAS_ID]: faasId,
     [Semconv.CLOUD_REGION]: faasCloudRegion,
   });
 }
 
 async function cloudFunctionsResource(): Promise<Resource> {
-  const [faasName, faasVersion, faasInstance, faasCloudRegion] =
-    await Promise.all([
-      faas.faasName(),
-      faas.faasVersion(),
-      faas.faasInstance(),
-      faas.faasCloudRegion(),
-    ]);
+  const [faasName, faasVersion, faasId, faasCloudRegion] = await Promise.all([
+    faas.faasName(),
+    faas.faasVersion(),
+    faas.faasId(),
+    faas.faasCloudRegion(),
+  ]);
 
   return await makeResource({
     [Semconv.CLOUD_PLATFORM]: CloudPlatformValues.GCP_CLOUD_FUNCTIONS,
     [Semconv.FAAS_NAME]: faasName,
     [Semconv.FAAS_VERSION]: faasVersion,
-    [Semconv.FAAS_INSTANCE]: faasInstance,
+    [Semconv.FAAS_ID]: faasId,
     [Semconv.CLOUD_REGION]: faasCloudRegion,
   });
 }
@@ -111,7 +109,7 @@ async function gaeResource(): Promise<Resource> {
   } else {
     ({zone, region} = await gce.availabilityZoneAndRegion());
   }
-  const [faasName, faasVersion, faasInstance] = await Promise.all([
+  const [faasName, faasVersion, faasId] = await Promise.all([
     gae.serviceName(),
     gae.serviceVersion(),
     gae.serviceInstance(),
@@ -121,7 +119,7 @@ async function gaeResource(): Promise<Resource> {
     [Semconv.CLOUD_PLATFORM]: CloudPlatformValues.GCP_APP_ENGINE,
     [Semconv.FAAS_NAME]: faasName,
     [Semconv.FAAS_VERSION]: faasVersion,
-    [Semconv.FAAS_INSTANCE]: faasInstance,
+    [Semconv.FAAS_ID]: faasId,
     [Semconv.CLOUD_AVAILABILITY_ZONE]: zone,
     [Semconv.CLOUD_REGION]: region,
   });

diff --git a/packages/opentelemetry-resource-util/src/detector/faas.ts b/packages/opentelemetry-resource-util/src/detector/faas.ts
@@ -55,7 +55,7 @@ export async function faasVersion(): Promise<string> {
  * onCloudRun()} or {@link onCloudFunctions()} is true before calling this, or it may throw
  * exceptions.
  */
-export async function faasInstance(): Promise<string> {
+export async function faasId(): Promise<string> {
   // May be a bignumber.js BigNumber which can just be converted with toString(). See
   // https://github.com/googleapis/gcp-metadata#take-care-with-large-number-valued-properties
   const id = await metadata.instance<number | Object>(ID_METADATA_ATTR);

diff --git a/packages/opentelemetry-resource-util/test/detector/detector.test.ts b/packages/opentelemetry-resource-util/test/detector/detector.test.ts
@@ -125,7 +125,7 @@ describe('GcpDetector', () => {
       'cloud.platform': 'gcp_cloud_run',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': '12345',
+      'faas.id': '12345',
       'faas.name': 'fake-service',
       'faas.version': 'fake-revision',
     });
@@ -148,7 +148,7 @@ describe('GcpDetector', () => {
       'cloud.platform': 'gcp_cloud_functions',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': '12345',
+      'faas.id': '12345',
       'faas.name': 'fake-service',
       'faas.version': 'fake-revision',
     });
@@ -171,7 +171,7 @@ describe('GcpDetector', () => {
       'cloud.platform': 'gcp_app_engine',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': 'fake-instance',
+      'faas.id': 'fake-instance',
       'faas.name': 'fake-service',
       'faas.version': 'fake-version',
     });
@@ -192,7 +192,7 @@ describe('GcpDetector', () => {
       'cloud.platform': 'gcp_app_engine',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': 'fake-instance',
+      'faas.id': 'fake-instance',
       'faas.name': 'fake-service',
       'faas.version': 'fake-version',
     });
@@ -320,7 +320,7 @@ describe('GcpDetectorSync', () => {
       'cloud.platform': 'gcp_cloud_run',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': '12345',
+      'faas.id': '12345',
       'faas.name': 'fake-service',
       'faas.version': 'fake-revision',
     });
@@ -344,7 +344,7 @@ describe('GcpDetectorSync', () => {
       'cloud.platform': 'gcp_cloud_functions',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': '12345',
+      'faas.id': '12345',
       'faas.name': 'fake-service',
       'faas.version': 'fake-revision',
     });
@@ -368,7 +368,7 @@ describe('GcpDetectorSync', () => {
       'cloud.platform': 'gcp_app_engine',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': 'fake-instance',
+      'faas.id': 'fake-instance',
       'faas.name': 'fake-service',
       'faas.version': 'fake-version',
     });
@@ -390,7 +390,7 @@ describe('GcpDetectorSync', () => {
       'cloud.platform': 'gcp_app_engine',
       'cloud.provider': 'gcp',
       'cloud.region': 'us-east4',
-      'faas.instance': 'fake-instance',
+      'faas.id': 'fake-instance',
       'faas.name': 'fake-service',
       'faas.version': 'fake-version',
     });

diff --git a/packages/opentelemetry-resource-util/test/detector/faas.test.ts b/packages/opentelemetry-resource-util/test/detector/faas.test.ts
@@ -67,7 +67,7 @@ describe('FaaS (Cloud Run/Functions)', () => {
     it('as a number', async () => {
       metadataStub.instance.withArgs('id').resolves(12345);
 
-      const faasInstance = await faas.faasInstance();
+      const faasInstance = await faas.faasId();
       assert.strictEqual(faasInstance, '12345');
     });
 
@@ -76,7 +76,7 @@ describe('FaaS (Cloud Run/Functions)', () => {
         .withArgs('id')
         .resolves(new BigNumber('2459451723172637654'));
 
-      const faasInstance = await faas.faasInstance();
+      const faasInstance = await faas.faasId();
       assert.strictEqual(faasInstance, '2459451723172637654');
     });
   });