remove b3 and jaeger propagator transitive dependencies

Author: ezhang6811

aws-distro-opentelemetry-node-autoinstrumentation/install-externals.sh

@@ -24,8 +24,7 @@
     "clean": "rimraf build/*",
     "compile:tsc": "tsc -p .",
     "compile:webpack": "webpack",
-    "compile": "npm run compile:webpack && npm run install-externals",
-    "install-externals": "./install-externals.sh",
+    "compile": "npm run compile:webpack",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "create-version": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
@@ -104,7 +103,6 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/auto-configuration-propagators": "0.3.0",
     "@opentelemetry/auto-instrumentations-node": "0.50.0",
     "@opentelemetry/core": "1.26.0",
     "@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0",
@@ -116,6 +114,7 @@
     "@opentelemetry/instrumentation-aws-sdk": "0.44.0",
     "@opentelemetry/otlp-transformer": "0.53.0",
     "@opentelemetry/propagator-aws-xray": "1.26.0",
+    "@opentelemetry/propagator-aws-xray-lambda": "^0.53.2",
     "@opentelemetry/resource-detector-aws": "1.12.0",
     "@opentelemetry/resources": "1.26.0",
     "@opentelemetry/sdk-metrics": "1.26.0",

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

@@ -3,9 +3,8 @@
 // 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 { ENVIRONMENT, TracesSamplerValues, getEnv, getEnvWithoutDefaults } from '@opentelemetry/core';
+import { CompositePropagator, ENVIRONMENT, TracesSamplerValues, getEnv, getEnvWithoutDefaults, W3CBaggagePropagator, W3CTraceContextPropagator } from '@opentelemetry/core';
 import { OTLPMetricExporter as OTLPGrpcOTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
 import {
   AggregationTemporalityPreference,
@@ -17,6 +16,8 @@ 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,
@@ -75,6 +76,13 @@ const FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX = 'T1U';
 // Follow Python SDK Impl to set the max span batch size
 // 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.
@@ -163,7 +171,7 @@ export class AwsOpentelemetryConfigurator {
     this.resource = autoResource;
 
     this.instrumentations = instrumentations;
-    this.propagator = getPropagator();
+    this.propagator = this.getPropagator();
 
     // TODO: Consider removing AWSXRayIdGenerator as it is not needed
     // Similarly to Java, always use AWS X-Ray Id Generator
@@ -190,6 +198,44 @@ 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

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

@@ -5,9 +5,6 @@ module.exports = {
   target: 'node',
   mode: 'production',
   externalsPresets: { node: true },
-  externals: [
-    'import-in-the-middle',
-  ],
   output: {
     path: path.resolve('./build/src'),
     filename: 'register.js',