implemented new sigv4 exporter

Author: liustve

awsagentprovider/build.gradle.kts

@@ -55,6 +55,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
   testImplementation("com.google.guava:guava")
   testRuntimeOnly("io.opentelemetry:opentelemetry-exporter-otlp-common")
+  testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
 
   compileOnly("com.google.code.findbugs:jsr305:3.0.2")
   testImplementation("org.mockito:mockito-core:5.14.2")

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

@@ -17,18 +17,15 @@
 
 import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler;
 import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.export.MemoryMode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Supplier;
 import javax.annotation.concurrent.Immutable;
 import org.slf4j.Logger;
@@ -52,18 +49,32 @@ public class OtlpAwsSpanExporter implements SpanExporter {
   private static final String SERVICE_NAME = "xray";
   private static final Logger logger = LoggerFactory.getLogger(OtlpAwsSpanExporter.class);
 
-  private final SpanExporter parentExporter;
+  private final OtlpHttpSpanExporterBuilder parentExporterBuilder;
+  private final OtlpHttpSpanExporter parentExporter;
   private final String awsRegion;
   private final String endpoint;
   private Collection<SpanData> spanData;
 
+  public OtlpAwsSpanExporter(String endpoint) {
+    this(null, endpoint);
+  }
+
   public OtlpAwsSpanExporter(OtlpHttpSpanExporter parentExporter, String endpoint) {
-    this.parentExporter =
-        parentExporter.toBuilder()
+    OtlpHttpSpanExporterBuilder defaultExporterBuilder =
+        OtlpHttpSpanExporter.builder()
             .setMemoryMode(MemoryMode.IMMUTABLE_DATA)
             .setEndpoint(endpoint)
-            .setHeaders(new SigV4AuthHeaderSupplier())
-            .build();
+            .setHeaders(new SigV4AuthHeaderSupplier());
+
+    this.parentExporterBuilder =
+        parentExporter == null
+            ? defaultExporterBuilder
+            : parentExporter.toBuilder()
+                .setMemoryMode(MemoryMode.IMMUTABLE_DATA)
+                .setEndpoint(endpoint)
+                .setHeaders(new SigV4AuthHeaderSupplier());
+
+    this.parentExporter = this.parentExporterBuilder.build();
 
     this.awsRegion = endpoint.split("\\.")[1];
     this.endpoint = endpoint;
@@ -93,7 +104,10 @@ public CompletableResultCode shutdown() {
 
   @Override
   public String toString() {
-    return this.parentExporter.toString();
+    StringJoiner joiner = new StringJoiner(", ", "OtlpAwsSpanExporter{", "}");
+    joiner.add(this.parentExporterBuilder.toString());
+    joiner.add("memoryMode=" + MemoryMode.IMMUTABLE_DATA);
+    return joiner.toString();
   }
 
   private final class SigV4AuthHeaderSupplier implements Supplier<Map<String, String>> {

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

@@ -19,6 +19,9 @@
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.when;
 
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
+import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.net.URI;
 import java.util.List;
@@ -71,9 +74,12 @@ public class OtlpAwsSpanExporterTest {
 
   private MockedStatic<DefaultCredentialsProvider> mockDefaultCredentialsProvider;
   private MockedStatic<AwsV4HttpSigner> mockAwsV4HttpSigner;
+  private MockedStatic<OtlpHttpSpanExporter> otlpSpanExporterMock;
 
   @Mock private DefaultCredentialsProvider credentialsProvider;
   @Mock private AwsV4HttpSigner signer;
+  @Mock private OtlpHttpSpanExporterBuilder mockBuilder;
+  @Mock private OtlpHttpSpanExporter mockExporter;
 
   private ArgumentCaptor<Supplier<Map<String, String>>> headersCaptor;
 
@@ -87,14 +93,24 @@ void setup() {
     this.mockAwsV4HttpSigner = mockStatic(AwsV4HttpSigner.class);
     this.mockAwsV4HttpSigner.when(AwsV4HttpSigner::create).thenReturn(this.signer);
 
+    this.otlpSpanExporterMock = mockStatic(OtlpHttpSpanExporter.class);
+
     this.headersCaptor = ArgumentCaptor.forClass(Supplier.class);
+
+    when(OtlpHttpSpanExporter.builder()).thenReturn(mockBuilder);
+    when(this.mockBuilder.setEndpoint(any())).thenReturn(mockBuilder);
+    when(this.mockBuilder.setMemoryMode(any())).thenReturn(mockBuilder);
+    when(this.mockBuilder.setHeaders(headersCaptor.capture())).thenReturn(mockBuilder);
+    when(this.mockBuilder.build()).thenReturn(mockExporter);
+    when(this.mockExporter.export(any())).thenReturn(CompletableResultCode.ofSuccess());
   }
 
   @AfterEach
   void afterEach() {
     reset(this.signer, this.credentialsProvider);
     this.mockDefaultCredentialsProvider.close();
     this.mockAwsV4HttpSigner.close();
+    this.otlpSpanExporterMock.close();
   }
 
   @Test