cleaning up code

Author: liustve

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

@@ -48,6 +48,7 @@
  */
 @Immutable
 public class OtlpAwsSpanExporter implements SpanExporter {
+  private static final String SERVICE_NAME = "xray";
   private static final Logger logger = LoggerFactory.getLogger(OtlpAwsSpanExporter.class);
 
   private final OtlpHttpSpanExporter parentExporter;
@@ -129,7 +130,7 @@ public Map<String, String> get() {
                     b ->
                         b.identity(credentials)
                             .request(httpRequest)
-                            .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, "xray")
+                            .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, SERVICE_NAME)
                             .putProperty(
                                 AwsV4HttpSigner.REGION_NAME, OtlpAwsSpanExporter.this.awsRegion)
                             .payload(() -> new ByteArrayInputStream(encodedSpans.toByteArray())));

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

@@ -49,7 +49,7 @@
 
 @ExtendWith(MockitoExtension.class)
 public class OtlpAwsSpanExporterTest {
-  private static final String OTLP_CW_ENDPOINT = "https://xray.us-east-1.amazonaws.com/v1/traces";
+  private static final String XRAY_OTLP_ENDPOINT = "https://xray.us-east-1.amazonaws.com/v1/traces";
   private static final String AUTHORIZATION_HEADER = "Authorization";
   private static final String X_AMZ_DATE_HEADER = "X-Amz-Date";
   private static final String X_AMZ_SECURITY_TOKEN_HEADER = "X-Amz-Security-Token";
@@ -65,7 +65,7 @@ public class OtlpAwsSpanExporterTest {
           .request(
               SdkHttpFullRequest.builder()
                   .method(SdkHttpMethod.POST)
-                  .uri(URI.create(OTLP_CW_ENDPOINT))
+                  .uri(URI.create(XRAY_OTLP_ENDPOINT))
                   .putHeader(AUTHORIZATION_HEADER, EXPECTED_AUTH_HEADER)
                   .putHeader(X_AMZ_DATE_HEADER, EXPECTED_AUTH_X_AMZ_DATE)
                   .putHeader(X_AMZ_SECURITY_TOKEN_HEADER, EXPECTED_AUTH_SECURITY_TOKEN)
@@ -115,7 +115,7 @@ void afterEach() {
   @Test
   void testAwsSpanExporterAddsSigV4Headers() {
 
-    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
+    SpanExporter exporter = new OtlpAwsSpanExporter(XRAY_OTLP_ENDPOINT);
     when(this.credentialsProvider.resolveCredentials()).thenReturn(this.credentials);
     when(this.signer.sign((Consumer<Builder<AwsCredentialsIdentity>>) any()))
         .thenReturn(this.signedRequest);
@@ -135,7 +135,7 @@ void testAwsSpanExporterAddsSigV4Headers() {
 
   @Test
   void testAwsSpanExporterExportCorrectlyAddsDifferentSigV4Headers() {
-    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
+    SpanExporter exporter = new OtlpAwsSpanExporter(XRAY_OTLP_ENDPOINT);
 
     for (int i = 0; i < 10; i += 1) {
       String newAuthHeader = EXPECTED_AUTH_HEADER + i;
@@ -147,7 +147,7 @@ void testAwsSpanExporterExportCorrectlyAddsDifferentSigV4Headers() {
               .request(
                   SdkHttpFullRequest.builder()
                       .method(SdkHttpMethod.POST)
-                      .uri(URI.create(OTLP_CW_ENDPOINT))
+                      .uri(URI.create(XRAY_OTLP_ENDPOINT))
                       .putHeader(AUTHORIZATION_HEADER, newAuthHeader)
                       .putHeader(X_AMZ_DATE_HEADER, newXAmzDate)
                       .putHeader(X_AMZ_SECURITY_TOKEN_HEADER, newXAmzSecurityToken)
@@ -177,7 +177,7 @@ void testAwsSpanExporterDoesNotAddSigV4HeadersIfFailureToRetrieveCredentials() {
     when(this.credentialsProvider.resolveCredentials())
         .thenThrow(SdkClientException.builder().message("bad credentials").build());
 
-    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
+    SpanExporter exporter = new OtlpAwsSpanExporter(XRAY_OTLP_ENDPOINT);
 
     exporter.export(List.of());
 
@@ -198,7 +198,7 @@ void testAwsSpanExporterDoesNotAddSigV4HeadersIfFailureToSignHeaders() {
     when(this.signer.sign((Consumer<Builder<AwsCredentialsIdentity>>) any()))
         .thenThrow(SdkClientException.builder().message("bad signature").build());
 
-    SpanExporter exporter = new OtlpAwsSpanExporter(OTLP_CW_ENDPOINT);
+    SpanExporter exporter = new OtlpAwsSpanExporter(XRAY_OTLP_ENDPOINT);
 
     exporter.export(List.of());