Review fixes for aws-sdk-2.2:library

Automated code review of instrumentation/aws-sdk/aws-sdk-2.2/library.

Author: otelbot[bot]

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkTelemetryBuilder.java

@@ -98,8 +98,8 @@ public AwsSdkTelemetryBuilder setRecordIndividualHttpError(boolean recordIndivid
    * #setUseConfiguredPropagatorForMessaging(boolean)}
    */
   @CanIgnoreReturnValue
-  AwsSdkTelemetryBuilder setUseXrayPropagator(boolean useMessagingPropagator) {
-    this.useXrayPropagator = useMessagingPropagator;
+  AwsSdkTelemetryBuilder setUseXrayPropagator(boolean useXrayPropagator) {
+    this.useXrayPropagator = useXrayPropagator;
     return this;
   }
 

instrumentation/aws-sdk/aws-sdk-2.2/library/src/testBedrockRuntime/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/Aws2BedrockRuntimeTest.java

@@ -33,7 +33,6 @@
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -403,8 +402,7 @@ void testConverseToolCallNoMessageContent() {
   }
 
   @Test
-  void testConverseToolCallStreamNoMessageContent()
-      throws InterruptedException, ExecutionException {
+  void testConverseToolCallStreamNoMessageContent() {
     BedrockRuntimeAsyncClientBuilder builder = BedrockRuntimeAsyncClient.builder();
     AwsSdkTelemetry telemetry =
         AwsSdkTelemetry.builder(testing.getOpenTelemetry())
@@ -472,7 +470,7 @@ void testConverseToolCallStreamNoMessageContent()
                 .toolConfig(currentWeatherToolConfig())
                 .build(),
             responseHandler)
-        .get();
+        .join();
 
     if (currentToolArgs.length() > 0 && !responseChunksTools.isEmpty()) {
       JsonNode node = JsonNode.parser().parse(currentToolArgs.toString());
@@ -650,7 +648,7 @@ void testConverseToolCallStreamNoMessageContent()
                 .toolConfig(currentWeatherToolConfig())
                 .build(),
             responseHandler1)
-        .get();
+        .join();
 
     assertThat(String.join("", responseChunks))
         .contains(
@@ -1191,8 +1189,7 @@ void testInvokeModelToolCallAmazonNovaNoMessageContent() {
   }
 
   @Test
-  void testInvokeModelWithResponseStreamToolCallAmazonNovaNoMessageContent()
-      throws InterruptedException, ExecutionException {
+  void testInvokeModelWithResponseStreamToolCallAmazonNovaNoMessageContent() {
     BedrockRuntimeAsyncClientBuilder builder = BedrockRuntimeAsyncClient.builder();
     AwsSdkTelemetry telemetry =
         AwsSdkTelemetry.builder(testing.getOpenTelemetry())
@@ -1337,7 +1334,7 @@ public void accept(PayloadPart chunk) {
                     .build())
             .build();
 
-    client.invokeModelWithResponseStream(request0, responseHandler0).get();
+    client.invokeModelWithResponseStream(request0, responseHandler0).join();
 
     String seattleToolUseId0 = "";
     String sanFranciscoToolUseId0 = "";
@@ -1557,7 +1554,7 @@ public void accept(PayloadPart chunk) {
                     .build())
             .build();
 
-    client.invokeModelWithResponseStream(request1, responseHandler1).get();
+    client.invokeModelWithResponseStream(request1, responseHandler1).join();
 
     assertThat(text.toString())
         .contains(
@@ -2027,8 +2024,7 @@ void testInvokeModelToolCallAnthropicClaudeNoMessageContent() {
   }
 
   @Test
-  void testInvokeModelWithResponseStreamToolCallAnthropicClaudeNoMessageContent()
-      throws InterruptedException, ExecutionException {
+  void testInvokeModelWithResponseStreamToolCallAnthropicClaudeNoMessageContent() {
     BedrockRuntimeAsyncClientBuilder builder = BedrockRuntimeAsyncClient.builder();
     AwsSdkTelemetry telemetry =
         AwsSdkTelemetry.builder(testing.getOpenTelemetry())
@@ -2176,7 +2172,7 @@ public void accept(PayloadPart chunk) {
                     .build())
             .build();
 
-    client.invokeModelWithResponseStream(request0, responseHandler0).get();
+    client.invokeModelWithResponseStream(request0, responseHandler0).join();
 
     String seattleToolUseId0 = "";
     String sanFranciscoToolUseId0 = "";
@@ -2370,7 +2366,7 @@ public void accept(PayloadPart chunk) {
                     .build())
             .build();
 
-    client.invokeModelWithResponseStream(request1, responseHandler1).get();
+    client.invokeModelWithResponseStream(request1, responseHandler1).join();
 
     assertThat(text.toString())
         .contains(