restore auto-configuration-propagator feature

Author: ezhang6811

aws-distro-opentelemetry-node-autoinstrumentation/package.json

@@ -103,6 +103,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/auto-configuration-propagators": "0.3.2",
     "@opentelemetry/auto-instrumentations-node": "0.56.0",
     "@opentelemetry/core": "1.30.1",
     "@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts

@@ -3,15 +3,13 @@
 // Modifications Copyright The OpenTelemetry Authors. Licensed under the Apache License 2.0 License.
 
 import { TextMapPropagator, diag } from '@opentelemetry/api';
+import { getPropagator } from '@opentelemetry/auto-configuration-propagators';
 import { getResourceDetectors as getResourceDetectorsFromEnv } from '@opentelemetry/auto-instrumentations-node';
 import {
-  CompositePropagator,
   ENVIRONMENT,
   TracesSamplerValues,
   getEnv,
   getEnvWithoutDefaults,
-  W3CBaggagePropagator,
-  W3CTraceContextPropagator,
 } from '@opentelemetry/core';
 import { OTLPMetricExporter as OTLPGrpcOTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
 import {
@@ -24,8 +22,6 @@ import { OTLPTraceExporter as OTLPProtoTraceExporter } from '@opentelemetry/expo
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
 import { AWSXRayIdGenerator } from '@opentelemetry/id-generator-aws-xray';
 import { Instrumentation } from '@opentelemetry/instrumentation';
-import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
-import { AWSXRayLambdaPropagator } from '@opentelemetry/propagator-aws-xray-lambda';
 import { awsEc2DetectorSync, awsEcsDetectorSync, awsEksDetectorSync } from '@opentelemetry/resource-detector-aws';
 import {
   Detector,
@@ -85,12 +81,6 @@ const FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX = 'T1U';
 // which will reduce the chance of UDP package size is larger than 64KB
 const LAMBDA_SPAN_EXPORT_BATCH_SIZE = 10;
 
-const propagatorMap = new Map<string, () => TextMapPropagator>([
-  ['tracecontext', () => new W3CTraceContextPropagator()],
-  ['baggage', () => new W3CBaggagePropagator()],
-  ['xray', () => new AWSXRayPropagator()],
-  ['xray-lambda', () => new AWSXRayLambdaPropagator()],
-]);
 /**
  * Aws Application Signals Config Provider creates a configuration object that can be provided to
  * the OTel NodeJS SDK for Auto Instrumentation with Application Signals Functionality.
@@ -179,7 +169,7 @@ export class AwsOpentelemetryConfigurator {
     this.resource = autoResource;
 
     this.instrumentations = instrumentations;
-    this.propagator = this.getPropagator();
+    this.propagator = getPropagator();
 
     // TODO: Consider removing AWSXRayIdGenerator as it is not needed
     // Similarly to Java, always use AWS X-Ray Id Generator
@@ -206,32 +196,6 @@ export class AwsOpentelemetryConfigurator {
     return autoResource;
   }
 
-  private getPropagator(): TextMapPropagator {
-    if (process.env.OTEL_PROPAGATORS == null || process.env.OTEL_PROPAGATORS.trim() === '') {
-      return new CompositePropagator({
-        propagators: [new W3CTraceContextPropagator(), new W3CBaggagePropagator()],
-      });
-    }
-    const propagatorsFromEnv = Array.from(
-      new Set(process.env.OTEL_PROPAGATORS?.split(',').map(value => value.toLowerCase().trim()))
-    );
-    const propagators = propagatorsFromEnv.flatMap(propagatorName => {
-      if (propagatorName === 'none') {
-        diag.info(
-          'Not selecting any propagator for value "none" specified in the environment variable OTEL_PROPAGATORS'
-        );
-        return [];
-      }
-      const propagatorFactoryFunction = propagatorMap.get(propagatorName);
-      if (propagatorFactoryFunction == null) {
-        diag.warn(`Invalid propagator "${propagatorName}" specified in the environment variable OTEL_PROPAGATORS`);
-        return [];
-      }
-      return propagatorFactoryFunction();
-    });
-    return new CompositePropagator({ propagators });
-  }
-
   public configure(): Partial<NodeSDKConfiguration> {
     // config.autoDetectResources is set to False, as the resources are detected and added to the
     // resource ahead of time. The resource is needed to be populated ahead of time instead of letting