Cleanup

Author: anuraaga

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

@@ -53,8 +53,7 @@ static boolean isBedrockRuntimeRequest(SdkRequest request) {
   static String getModelId(SdkRequest request) {
     if (request instanceof ConverseRequest) {
       return ((ConverseRequest) request).modelId();
-    }
-    if (request instanceof ConverseStreamRequest) {
+    } else if (request instanceof ConverseStreamRequest) {
       return ((ConverseStreamRequest) request).modelId();
     }
     return null;
@@ -65,8 +64,7 @@ static Long getMaxTokens(SdkRequest request) {
     InferenceConfiguration config = null;
     if (request instanceof ConverseRequest) {
       config = ((ConverseRequest) request).inferenceConfig();
-    }
-    if (request instanceof ConverseStreamRequest) {
+    } else if (request instanceof ConverseStreamRequest) {
       config = ((ConverseStreamRequest) request).inferenceConfig();
     }
     if (config != null) {
@@ -80,8 +78,7 @@ static Double getTemperature(SdkRequest request) {
     InferenceConfiguration config = null;
     if (request instanceof ConverseRequest) {
       config = ((ConverseRequest) request).inferenceConfig();
-    }
-    if (request instanceof ConverseStreamRequest) {
+    } else if (request instanceof ConverseStreamRequest) {
       config = ((ConverseStreamRequest) request).inferenceConfig();
     }
     if (config != null) {
@@ -95,8 +92,7 @@ static Double getTopP(SdkRequest request) {
     InferenceConfiguration config = null;
     if (request instanceof ConverseRequest) {
       config = ((ConverseRequest) request).inferenceConfig();
-    }
-    if (request instanceof ConverseStreamRequest) {
+    } else if (request instanceof ConverseStreamRequest) {
       config = ((ConverseStreamRequest) request).inferenceConfig();
     }
     if (config != null) {
@@ -110,8 +106,7 @@ static List<String> getStopSequences(SdkRequest request) {
     InferenceConfiguration config = null;
     if (request instanceof ConverseRequest) {
       config = ((ConverseRequest) request).inferenceConfig();
-    }
-    if (request instanceof ConverseStreamRequest) {
+    } else if (request instanceof ConverseStreamRequest) {
       config = ((ConverseStreamRequest) request).inferenceConfig();
     }
     if (config != null) {
@@ -128,11 +123,12 @@ static List<String> getStopReasons(Response response) {
       if (reason != null) {
         return Collections.singletonList(reason.toString());
       }
-    }
-    TracingConverseStreamResponseHandler streamHandler =
-        TracingConverseStreamResponseHandler.fromContext(response.otelContext());
-    if (streamHandler != null) {
-      return streamHandler.stopReasons;
+    } else {
+      TracingConverseStreamResponseHandler streamHandler =
+          TracingConverseStreamResponseHandler.fromContext(response.otelContext());
+      if (streamHandler != null) {
+        return streamHandler.stopReasons;
+      }
     }
     return null;
   }
@@ -143,11 +139,12 @@ static Long getUsageInputTokens(Response response) {
     TokenUsage usage = null;
     if (sdkResponse instanceof ConverseResponse) {
       usage = ((ConverseResponse) sdkResponse).usage();
-    }
-    TracingConverseStreamResponseHandler streamHandler =
-        TracingConverseStreamResponseHandler.fromContext(response.otelContext());
-    if (streamHandler != null) {
-      usage = streamHandler.usage;
+    } else {
+      TracingConverseStreamResponseHandler streamHandler =
+          TracingConverseStreamResponseHandler.fromContext(response.otelContext());
+      if (streamHandler != null) {
+        usage = streamHandler.usage;
+      }
     }
     if (usage != null) {
       return integerToLong(usage.inputTokens());
@@ -161,11 +158,12 @@ static Long getUsageOutputTokens(Response response) {
     TokenUsage usage = null;
     if (sdkResponse instanceof ConverseResponse) {
       usage = ((ConverseResponse) sdkResponse).usage();
-    }
-    TracingConverseStreamResponseHandler streamHandler =
-        TracingConverseStreamResponseHandler.fromContext(response.otelContext());
-    if (streamHandler != null) {
-      usage = streamHandler.usage;
+    } else {
+      TracingConverseStreamResponseHandler streamHandler =
+          TracingConverseStreamResponseHandler.fromContext(response.otelContext());
+      if (streamHandler != null) {
+        usage = streamHandler.usage;
+      }
     }
     if (usage != null) {
       return integerToLong(usage.outputTokens());