added copier constructor

Author: liustve

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

@@ -72,7 +72,7 @@ public class AwsApplicationSignalsCustomizerProvider
     implements AutoConfigurationCustomizerProvider {
   static final String AWS_LAMBDA_FUNCTION_NAME_CONFIG = "AWS_LAMBDA_FUNCTION_NAME";
   private static final String XRAY_OTLP_ENDPOINT_PATTERN =
-      "https://xray\\.([a-z0-9-]+)\\.amazonaws\\.com/v1/traces$";
+      "^https://xray\\.([a-z0-9-]+)\\.amazonaws\\.com/v1/traces$";
 
   private static final Duration DEFAULT_METRIC_EXPORT_INTERVAL = Duration.ofMinutes(1);
   private static final Logger logger =
@@ -307,7 +307,9 @@ private SpanExporter customizeSpanExporter(
     else if (spanExporter instanceof OtlpHttpSpanExporter
         && isXrayOtlpEndpoint(System.getenv(OTEL_EXPORTER_OTLP_TRACES_ENDPOINT_CONFIG))) {
       spanExporter =
-          new OtlpAwsSpanExporter(System.getenv(OTEL_EXPORTER_OTLP_TRACES_ENDPOINT_CONFIG));
+          new OtlpAwsSpanExporter(
+              (OtlpHttpSpanExporter) spanExporter,
+              System.getenv(OTEL_EXPORTER_OTLP_TRACES_ENDPOINT_CONFIG));
     }
 
     if (isApplicationSignalsEnabled(configProps)) {

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/OtlpAwsSpanExporter.java

@@ -20,9 +20,14 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 import javax.annotation.concurrent.Immutable;
 import org.slf4j.Logger;
@@ -38,13 +43,12 @@
 /**
  * This exporter extends the functionality of the OtlpHttpSpanExporter to allow spans to be exported
  * to the XRay OTLP endpoint https://xray.[AWSRegion].amazonaws.com/v1/traces. Utilizes the AWSSDK
- * library to sign and directly inject SigV4 Authentication to the exported request's headers.
- * https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPEndpoint.html
+ * library to sign and directly inject SigV4 Authentication to the exported request's headers. <a
+ * href="https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-OTLPEndpoint.html">...</a>
  */
 @Immutable
 public class OtlpAwsSpanExporter implements SpanExporter {
   private static final Logger logger = LoggerFactory.getLogger(OtlpAwsSpanExporter.class);
-  private static final AwsV4HttpSigner signer = AwsV4HttpSigner.create();
 
   private final OtlpHttpSpanExporter parentExporter;
   private final String awsRegion;
@@ -63,6 +67,18 @@ public OtlpAwsSpanExporter(String endpoint) {
     this.spanData = new ArrayList<>();
   }
 
+  public OtlpAwsSpanExporter(OtlpHttpSpanExporter parentExporter, String endpoint) {
+    this.parentExporter =
+        parentExporter.toBuilder()
+            .setEndpoint(endpoint)
+            .setHeaders(new SigV4AuthHeaderSupplier())
+            .build();
+
+    this.awsRegion = endpoint.split("\\.")[1];
+    this.endpoint = endpoint;
+    this.spanData = new ArrayList<>();
+  }
+
   /**
    * Overrides the upstream implementation of export. All behaviors are the same except if the
    * endpoint is an XRay OTLP endpoint, we will sign the request with SigV4 in headers before
@@ -108,14 +124,15 @@ public Map<String, String> get() {
         AwsCredentials credentials = DefaultCredentialsProvider.create().resolveCredentials();
 
         SignedRequest signedRequest =
-            signer.sign(
-                b ->
-                    b.identity(credentials)
-                        .request(httpRequest)
-                        .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, "xray")
-                        .putProperty(
-                            AwsV4HttpSigner.REGION_NAME, OtlpAwsSpanExporter.this.awsRegion)
-                        .payload(() -> new ByteArrayInputStream(encodedSpans.toByteArray())));
+            AwsV4HttpSigner.create()
+                .sign(
+                    b ->
+                        b.identity(credentials)
+                            .request(httpRequest)
+                            .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, "xray")
+                            .putProperty(
+                                AwsV4HttpSigner.REGION_NAME, OtlpAwsSpanExporter.this.awsRegion)
+                            .payload(() -> new ByteArrayInputStream(encodedSpans.toByteArray())));
 
         Map<String, String> result = new HashMap<>();
 

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/OtlpAwsSpanExporterTest.java

@@ -67,8 +67,8 @@ public class OtlpAwsSpanExporterTest {
                   .method(SdkHttpMethod.POST)
                   .uri(URI.create(OTLP_CW_ENDPOINT))
                   .putHeader(AUTHORIZATION_HEADER, EXPECTED_AUTH_HEADER)
-                  .putHeader("X-Amz-Date", EXPECTED_AUTH_X_AMZ_DATE)
-                  .putHeader("X-Amz-Security-Token", EXPECTED_AUTH_SECURITY_TOKEN)
+                  .putHeader(X_AMZ_DATE_HEADER, EXPECTED_AUTH_X_AMZ_DATE)
+                  .putHeader(X_AMZ_SECURITY_TOKEN_HEADER, EXPECTED_AUTH_SECURITY_TOKEN)
                   .build())
           .build();
 
@@ -115,12 +115,11 @@ void afterEach() {
   @Test
   void testAwsSpanExporterAddsSigV4Headers() {
 
+    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
     when(this.credentialsProvider.resolveCredentials()).thenReturn(this.credentials);
     when(this.signer.sign((Consumer<Builder<AwsCredentialsIdentity>>) any()))
         .thenReturn(this.signedRequest);
 
-    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
-
     exporter.export(List.of());
 
     Map<String, String> headers = this.headersCaptor.getValue().get();
@@ -134,6 +133,44 @@ void testAwsSpanExporterAddsSigV4Headers() {
     assertEquals(EXPECTED_AUTH_SECURITY_TOKEN, headers.get(X_AMZ_SECURITY_TOKEN_HEADER));
   }
 
+  @Test
+  void testAwsSpanExporterExportCorrectlyAddsDifferentSigV4Headers() {
+    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
+
+    for (int i = 0; i < 10; i += 1) {
+      String newAuthHeader = EXPECTED_AUTH_HEADER + i;
+      String newXAmzDate = EXPECTED_AUTH_X_AMZ_DATE + i;
+      String newXAmzSecurityToken = EXPECTED_AUTH_SECURITY_TOKEN + i;
+
+      SignedRequest newSignedRequest =
+          SignedRequest.builder()
+              .request(
+                  SdkHttpFullRequest.builder()
+                      .method(SdkHttpMethod.POST)
+                      .uri(URI.create(OTLP_CW_ENDPOINT))
+                      .putHeader(AUTHORIZATION_HEADER, newAuthHeader)
+                      .putHeader(X_AMZ_DATE_HEADER, newXAmzDate)
+                      .putHeader(X_AMZ_SECURITY_TOKEN_HEADER, newXAmzSecurityToken)
+                      .build())
+              .build();
+
+      when(this.credentialsProvider.resolveCredentials()).thenReturn(this.credentials);
+      doReturn(newSignedRequest).when(this.signer).sign(any(Consumer.class));
+
+      exporter.export(List.of());
+
+      Map<String, String> headers = this.headersCaptor.getValue().get();
+
+      assertTrue(headers.containsKey(X_AMZ_DATE_HEADER));
+      assertTrue(headers.containsKey(AUTHORIZATION_HEADER));
+      assertTrue(headers.containsKey(X_AMZ_SECURITY_TOKEN_HEADER));
+
+      assertEquals(newAuthHeader, headers.get(AUTHORIZATION_HEADER));
+      assertEquals(newXAmzDate, headers.get(X_AMZ_DATE_HEADER));
+      assertEquals(newXAmzSecurityToken, headers.get(X_AMZ_SECURITY_TOKEN_HEADER));
+    }
+  }
+
   @Test
   void testAwsSpanExporterDoesNotAddSigV4HeadersIfFailureToRetrieveCredentials() {