feat(auto-instrumentation-node): add options for serviceinstance (#…

…2158) Signed-off-by: maryliag <marylia.gutierrez@grafana.com>
open-telemetry · Apr 29, 2024 · 379b757 · 379b757
1 parent 394bb93
commit 379b757
Show file tree

Hide file tree

Showing 5 changed files with 576 additions and 9 deletions.
diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md
@@ -50,7 +50,7 @@ export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="https://your-endpoint"
 export OTEL_EXPORTER_OTLP_HEADERS="x-api-key=your-api-key"
 export OTEL_EXPORTER_OTLP_TRACES_HEADERS="x-api-key=your-api-key"
 export OTEL_RESOURCE_ATTRIBUTES="service.namespace=my-namespace"
-export OTEL_NODE_RESOURCE_DETECTORS="env,host,os"
+export OTEL_NODE_RESOURCE_DETECTORS="env,host,os,serviceinstace"
 export OTEL_SERVICE_NAME="client"
 export NODE_OPTIONS="--require @opentelemetry/auto-instrumentations-node/register"
 node app.js
@@ -62,6 +62,7 @@ By default, all SDK resource detectors are used, but you can use the environment
 - `host`
 - `os`
 - `process`
+- `serviceinstance`
 - `container`
 - `alibaba`
 - `aws`

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -92,7 +92,7 @@
     "@opentelemetry/resource-detector-azure": "^0.2.6",
     "@opentelemetry/resource-detector-container": "^0.3.9",
     "@opentelemetry/resource-detector-gcp": "^0.29.9",
-    "@opentelemetry/resources": "^1.12.0",
+    "@opentelemetry/resources": "^1.24.0",
     "@opentelemetry/sdk-node": "^0.51.0"
   },
   "files": [

diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -72,6 +72,7 @@ import {
   hostDetectorSync,
   osDetectorSync,
   processDetectorSync,
+  serviceInstanceIdDetectorSync,
 } from '@opentelemetry/resources';
 import {
   azureAppServiceDetector,
@@ -83,6 +84,7 @@ const RESOURCE_DETECTOR_CONTAINER = 'container';
 const RESOURCE_DETECTOR_ENVIRONMENT = 'env';
 const RESOURCE_DETECTOR_HOST = 'host';
 const RESOURCE_DETECTOR_OS = 'os';
+const RESOURCE_DETECTOR_SERVICE_INSTANCE_ID = 'serviceinstance';
 const RESOURCE_DETECTOR_PROCESS = 'process';
 const RESOURCE_DETECTOR_ALIBABA = 'alibaba';
 const RESOURCE_DETECTOR_AWS = 'aws';
@@ -208,6 +210,7 @@ export function getResourceDetectorsFromEnv(): Array<Detector | DetectorSync> {
     [RESOURCE_DETECTOR_ENVIRONMENT, envDetectorSync],
     [RESOURCE_DETECTOR_HOST, hostDetectorSync],
     [RESOURCE_DETECTOR_OS, osDetectorSync],
+    [RESOURCE_DETECTOR_SERVICE_INSTANCE_ID, serviceInstanceIdDetectorSync],
     [RESOURCE_DETECTOR_PROCESS, processDetectorSync],
     [RESOURCE_DETECTOR_ALIBABA, alibabaCloudEcsDetector],
     [RESOURCE_DETECTOR_GCP, gcpDetector],

diff --git a/metapackages/auto-instrumentations-node/test/utils.test.ts b/metapackages/auto-instrumentations-node/test/utils.test.ts
@@ -114,25 +114,28 @@ describe('utils', () => {
 
   describe('getResourceDetectorsFromEnv', () => {
     it('should return all resource detectors by default', () => {
-      assert.equal(getResourceDetectorsFromEnv().length, 15);
+      assert.equal(getResourceDetectorsFromEnv().length, 16);
     });
 
     it('should return all resource detectors when OTEL_NODE_RESOURCE_DETECTORS contains "all"', () => {
       process.env.OTEL_NODE_RESOURCE_DETECTORS = 'all';
-
-      assert.equal(getResourceDetectorsFromEnv().length, 15);
+      assert.equal(getResourceDetectorsFromEnv().length, 16);
 
       delete process.env.OTEL_NODE_RESOURCE_DETECTORS;
     });
 
     it('should return specific resource detectors depending on OTEL_NODE_RESOURCE_DETECTORS', () => {
-      process.env.OTEL_NODE_RESOURCE_DETECTORS = 'env,host';
+      process.env.OTEL_NODE_RESOURCE_DETECTORS = 'env,host,serviceinstance';
 
       const resourceDetectors = getResourceDetectorsFromEnv();
 
-      assert.equal(resourceDetectors.length, 2);
+      assert.equal(resourceDetectors.length, 3);
       assert.equal(resourceDetectors[0].constructor.name, 'EnvDetectorSync');
       assert.equal(resourceDetectors[1].constructor.name, 'HostDetectorSync');
+      assert.equal(
+        resourceDetectors[2].constructor.name,
+        'ServiceInstanceIdDetectorSync'
+      );
 
       delete process.env.OTEL_NODE_RESOURCE_DETECTORS;
     });