chore(resource-detector-gcp): update semconv usage to ATTR_ exports (#3060)

Refs: #2377

Author: trentm

packages/resource-detector-gcp/package.json

@@ -64,7 +64,6 @@
   "dependencies": {
     "@opentelemetry/core": "^2.0.0",
     "@opentelemetry/resources": "^2.0.0",
-    "@opentelemetry/semantic-conventions": "^1.27.0",
     "gcp-metadata": "^6.0.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/resource-detector-gcp#readme",

packages/resource-detector-gcp/src/detectors/GcpDetector.ts

@@ -18,25 +18,25 @@
 import { context } from '@opentelemetry/api';
 import { suppressTracing } from '@opentelemetry/core';
 import {
-  CLOUDPLATFORMVALUES_GCP_APP_ENGINE,
-  CLOUDPLATFORMVALUES_GCP_CLOUD_FUNCTIONS,
-  CLOUDPLATFORMVALUES_GCP_CLOUD_RUN,
-  CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE,
-  CLOUDPLATFORMVALUES_GCP_KUBERNETES_ENGINE,
-  CLOUDPROVIDERVALUES_GCP,
-  SEMRESATTRS_CLOUD_ACCOUNT_ID,
-  SEMRESATTRS_CLOUD_AVAILABILITY_ZONE,
-  SEMRESATTRS_CLOUD_PLATFORM,
-  SEMRESATTRS_CLOUD_PROVIDER,
-  SEMRESATTRS_CLOUD_REGION,
-  SEMRESATTRS_FAAS_INSTANCE,
-  SEMRESATTRS_FAAS_NAME,
-  SEMRESATTRS_FAAS_VERSION,
-  SEMRESATTRS_HOST_ID,
-  SEMRESATTRS_HOST_NAME,
-  SEMRESATTRS_HOST_TYPE,
-  SEMRESATTRS_K8S_CLUSTER_NAME,
-} from '@opentelemetry/semantic-conventions';
+  CLOUD_PLATFORM_VALUE_GCP_APP_ENGINE,
+  CLOUD_PLATFORM_VALUE_GCP_CLOUD_FUNCTIONS,
+  CLOUD_PLATFORM_VALUE_GCP_CLOUD_RUN,
+  CLOUD_PLATFORM_VALUE_GCP_COMPUTE_ENGINE,
+  CLOUD_PLATFORM_VALUE_GCP_KUBERNETES_ENGINE,
+  CLOUD_PROVIDER_VALUE_GCP,
+  ATTR_CLOUD_ACCOUNT_ID,
+  ATTR_CLOUD_AVAILABILITY_ZONE,
+  ATTR_CLOUD_PLATFORM,
+  ATTR_CLOUD_PROVIDER,
+  ATTR_CLOUD_REGION,
+  ATTR_FAAS_INSTANCE,
+  ATTR_FAAS_NAME,
+  ATTR_FAAS_VERSION,
+  ATTR_HOST_ID,
+  ATTR_HOST_NAME,
+  ATTR_HOST_TYPE,
+  ATTR_K8S_CLUSTER_NAME,
+} from '../semconv';
 
 import { AttributeValue, Attributes } from '@opentelemetry/api';
 import {
@@ -54,18 +54,18 @@ import * as gce from './gce';
 import * as gke from './gke';
 
 const ATTRIBUTE_NAMES = [
-  SEMRESATTRS_CLOUD_PLATFORM,
-  SEMRESATTRS_CLOUD_AVAILABILITY_ZONE,
-  SEMRESATTRS_CLOUD_REGION,
-  SEMRESATTRS_K8S_CLUSTER_NAME,
-  SEMRESATTRS_HOST_TYPE,
-  SEMRESATTRS_HOST_ID,
-  SEMRESATTRS_HOST_NAME,
-  SEMRESATTRS_CLOUD_PROVIDER,
-  SEMRESATTRS_CLOUD_ACCOUNT_ID,
-  SEMRESATTRS_FAAS_NAME,
-  SEMRESATTRS_FAAS_VERSION,
-  SEMRESATTRS_FAAS_INSTANCE,
+  ATTR_CLOUD_PLATFORM,
+  ATTR_CLOUD_AVAILABILITY_ZONE,
+  ATTR_CLOUD_REGION,
+  ATTR_K8S_CLUSTER_NAME,
+  ATTR_HOST_TYPE,
+  ATTR_HOST_ID,
+  ATTR_HOST_NAME,
+  ATTR_CLOUD_PROVIDER,
+  ATTR_CLOUD_ACCOUNT_ID,
+  ATTR_FAAS_NAME,
+  ATTR_FAAS_VERSION,
+  ATTR_FAAS_INSTANCE,
 ] as const;
 
 // Ensure that all resource keys are accounted for in ATTRIBUTE_NAMES
@@ -104,12 +104,12 @@ async function gkeResource(): Promise<Resource> {
   ]);
 
   return await makeResource({
-    [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_GCP_KUBERNETES_ENGINE,
+    [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_GCP_KUBERNETES_ENGINE,
     [zoneOrRegion.type === 'zone'
-      ? SEMRESATTRS_CLOUD_AVAILABILITY_ZONE
-      : SEMRESATTRS_CLOUD_REGION]: zoneOrRegion.value,
-    [SEMRESATTRS_K8S_CLUSTER_NAME]: k8sClusterName,
-    [SEMRESATTRS_HOST_ID]: hostId,
+      ? ATTR_CLOUD_AVAILABILITY_ZONE
+      : ATTR_CLOUD_REGION]: zoneOrRegion.value,
+    [ATTR_K8S_CLUSTER_NAME]: k8sClusterName,
+    [ATTR_HOST_ID]: hostId,
   });
 }
 
@@ -123,11 +123,11 @@ async function cloudRunResource(): Promise<Resource> {
     ]);
 
   return await makeResource({
-    [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_GCP_CLOUD_RUN,
-    [SEMRESATTRS_FAAS_NAME]: faasName,
-    [SEMRESATTRS_FAAS_VERSION]: faasVersion,
-    [SEMRESATTRS_FAAS_INSTANCE]: faasInstance,
-    [SEMRESATTRS_CLOUD_REGION]: faasCloudRegion,
+    [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_GCP_CLOUD_RUN,
+    [ATTR_FAAS_NAME]: faasName,
+    [ATTR_FAAS_VERSION]: faasVersion,
+    [ATTR_FAAS_INSTANCE]: faasInstance,
+    [ATTR_CLOUD_REGION]: faasCloudRegion,
   });
 }
 
@@ -141,11 +141,11 @@ async function cloudFunctionsResource(): Promise<Resource> {
     ]);
 
   return await makeResource({
-    [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_GCP_CLOUD_FUNCTIONS,
-    [SEMRESATTRS_FAAS_NAME]: faasName,
-    [SEMRESATTRS_FAAS_VERSION]: faasVersion,
-    [SEMRESATTRS_FAAS_INSTANCE]: faasInstance,
-    [SEMRESATTRS_CLOUD_REGION]: faasCloudRegion,
+    [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_GCP_CLOUD_FUNCTIONS,
+    [ATTR_FAAS_NAME]: faasName,
+    [ATTR_FAAS_VERSION]: faasVersion,
+    [ATTR_FAAS_INSTANCE]: faasInstance,
+    [ATTR_CLOUD_REGION]: faasCloudRegion,
   });
 }
 
@@ -166,12 +166,12 @@ async function gaeResource(): Promise<Resource> {
   ]);
 
   return await makeResource({
-    [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_GCP_APP_ENGINE,
-    [SEMRESATTRS_FAAS_NAME]: faasName,
-    [SEMRESATTRS_FAAS_VERSION]: faasVersion,
-    [SEMRESATTRS_FAAS_INSTANCE]: faasInstance,
-    [SEMRESATTRS_CLOUD_AVAILABILITY_ZONE]: zone,
-    [SEMRESATTRS_CLOUD_REGION]: region,
+    [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_GCP_APP_ENGINE,
+    [ATTR_FAAS_NAME]: faasName,
+    [ATTR_FAAS_VERSION]: faasVersion,
+    [ATTR_FAAS_INSTANCE]: faasInstance,
+    [ATTR_CLOUD_AVAILABILITY_ZONE]: zone,
+    [ATTR_CLOUD_REGION]: region,
   });
 }
 
@@ -184,21 +184,21 @@ async function gceResource(): Promise<Resource> {
   ]);
 
   return await makeResource({
-    [SEMRESATTRS_CLOUD_PLATFORM]: CLOUDPLATFORMVALUES_GCP_COMPUTE_ENGINE,
-    [SEMRESATTRS_CLOUD_AVAILABILITY_ZONE]: zoneAndRegion.zone,
-    [SEMRESATTRS_CLOUD_REGION]: zoneAndRegion.region,
-    [SEMRESATTRS_HOST_TYPE]: hostType,
-    [SEMRESATTRS_HOST_ID]: hostId,
-    [SEMRESATTRS_HOST_NAME]: hostName,
+    [ATTR_CLOUD_PLATFORM]: CLOUD_PLATFORM_VALUE_GCP_COMPUTE_ENGINE,
+    [ATTR_CLOUD_AVAILABILITY_ZONE]: zoneAndRegion.zone,
+    [ATTR_CLOUD_REGION]: zoneAndRegion.region,
+    [ATTR_HOST_TYPE]: hostType,
+    [ATTR_HOST_ID]: hostId,
+    [ATTR_HOST_NAME]: hostName,
   });
 }
 
 async function makeResource(attrs: GcpResourceAttributes): Promise<Resource> {
   const project = await metadata.project<string>('project-id');
 
   return resourceFromAttributes({
-    [SEMRESATTRS_CLOUD_PROVIDER]: CLOUDPROVIDERVALUES_GCP,
-    [SEMRESATTRS_CLOUD_ACCOUNT_ID]: project,
+    [ATTR_CLOUD_PROVIDER]: CLOUD_PROVIDER_VALUE_GCP,
+    [ATTR_CLOUD_ACCOUNT_ID]: project,
     ...attrs,
   } satisfies GcpResourceAttributes);
 }