Merge branch 'main' into replace-image

Author: pxaws

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

@@ -256,14 +256,13 @@ export class AwsOpentelemetryConfigurator {
 
     // Register BatchUnsampledSpanProcessor to export unsampled traces in Lambda
     // when Application Signals enabled
-    if (isLambdaEnvironment()) {
+    if (isLambdaEnvironment() && !hasCustomOtlpTraceEndpoint()) {
+      const udpSpanExporter = new OTLPUdpSpanExporter(getXrayDaemonEndpoint(), FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX);
+      const configuredExporter = AwsMetricAttributesSpanExporterBuilder.create(udpSpanExporter, resource).build();
       spanProcessors.push(
-        new AwsBatchUnsampledSpanProcessor(
-          new OTLPUdpSpanExporter(getXrayDaemonEndpoint(), FORMAT_OTEL_UNSAMPLED_TRACES_BINARY_PREFIX),
-          {
-            maxExportBatchSize: getSpanExportBatchSize(),
-          }
-        )
+        new AwsBatchUnsampledSpanProcessor(configuredExporter, {
+          maxExportBatchSize: getSpanExportBatchSize(),
+        })
       );
       diag.info('Enabled batch unsampled span processor for Lambda environment.');
     }

aws-distro-opentelemetry-node-autoinstrumentation/test/aws-batch-unsampled-span-processor.test.ts

@@ -457,6 +457,7 @@ describe('AwsBatchUnsampledSpanProcessor', () => {
       const processor = new AwsBatchUnsampledSpanProcessor(exporter, {
         maxExportBatchSize: 5,
         maxQueueSize: 6,
+        exportTimeoutMillis: 1000,
       });
       const totalSpans = 50;
       for (let i = 0; i < totalSpans; i++) {

aws-distro-opentelemetry-node-autoinstrumentation/test/sampler/aws-xray-remote-sampler.test.ts

@@ -88,6 +88,9 @@ describe('AwsXrayRemoteSampler', () => {
       ).toEqual(SamplingDecision.NOT_RECORD);
 
       setTimeout(() => {
+        // restore function
+        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
+
         expect(
           sampler.shouldSample(context.active(), '1234', 'name', SpanKind.CLIENT, { abc: '1234' }, []).decision
         ).toEqual(SamplingDecision.RECORD_AND_SAMPLED);
@@ -98,8 +101,6 @@ describe('AwsXrayRemoteSampler', () => {
           sampler.shouldSample(context.active(), '1234', 'name', SpanKind.CLIENT, { abc: '1234' }, []).decision
         ).toEqual(SamplingDecision.RECORD_AND_SAMPLED);
 
-        // reset function
-        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
         done();
       }, 300);
     }, 10);
@@ -139,10 +140,12 @@ describe('AwsXrayRemoteSampler', () => {
             sampled++;
           }
         }
+
+        // restore function
+        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
+
         expect((sampler as any)._root._root.ruleCache.ruleAppliers[0].reservoirSampler.quota).toEqual(100000);
         expect(sampled).toEqual(100000);
-        // reset function
-        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
         done();
       }, 2000);
     }, 100);
@@ -184,13 +187,13 @@ describe('AwsXrayRemoteSampler', () => {
             sampled++;
           }
         }
-        expect(sampled).toEqual(100);
-        // reset function
-        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
         clock.restore();
+        // restore function
+        (_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
+        expect(sampled).toEqual(100);
         done();
       }, 2000);
-    }, 100);
+    }, 300);
   });
 
   it('generates valid ClientId', () => {