Merge from main.

aws-observability · Dec 12, 2024 · ab5ee9a · ab5ee9a
1 parent bb3555c
commit ab5ee9a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...c/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java b/...c/test/java/software/amazon/opentelemetry/appsignals/test/awssdk/base/AwsSdkBaseTest.java
@@ -279,8 +279,7 @@ private void assertSemanticConventionsAttributes(
       String address,
       int port,
       String url,
-      int statusCode,
-      String awsSpanKind) {
+      int statusCode) {
     assertThat(attributesList)
         .satisfiesOnlyOnce(assertAttribute(SemanticConventionsConstants.RPC_METHOD, method))
         .satisfiesOnlyOnce(assertAttribute(SemanticConventionsConstants.RPC_SERVICE, service))
@@ -321,14 +320,12 @@ private void assertSpanClientAttributes(
       String method,
       String type,
       String identifier,
+      String cloudformationIdentifier,
       String address,
       int port,
       String url,
       int statusCode,
       List<ThrowingConsumer<KeyValue>> extraAssertions) {
-    LOGGER.info("assertSpanClientAttributes!!!!!!: ");
-
-    LOGGER.info("Spans!!!!!!: " + spans);
 
     assertSpanAttributes(
         spans,
@@ -342,6 +339,7 @@ private void assertSpanClientAttributes(
         method,
         type,
         identifier,
+        cloudformationIdentifier,
         address,
         port,
         url,
@@ -359,6 +357,7 @@ private void assertSpanProducerAttributes(
       String method,
       String type,
       String identifier,
+      String cloudformationIdentifier,
       String address,
       int port,
       String url,
@@ -376,6 +375,7 @@ private void assertSpanProducerAttributes(
         method,
         type,
         identifier,
+        cloudformationIdentifier,
         address,
         port,
         url,
@@ -424,6 +424,7 @@ private void assertSpanAttributes(
       String method,
       String type,
       String identifier,
+      String cloudformationIdentifier,
       String address,
       int port,
       String url,
@@ -438,7 +439,7 @@ private void assertSpanAttributes(
               assertThat(span.getKind()).isEqualTo(spanKind);
               assertThat(span.getName()).isEqualTo(spanName);
               assertSemanticConventionsAttributes(
-                  spanAttributes, rpcService, method, address, port, url, statusCode, awsSpanKind);
+                  spanAttributes, rpcService, method, address, port, url, statusCode);
               assertAwsAttributes(
                   spanAttributes,
                   localService,