remove dependency on 'commons-io:commons-io' and refactor

Author: pxaws

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts

@@ -10,7 +10,6 @@ muzzle {
     // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
-    extraDependency("commons-io:commons-io:2.13.0")
 
     excludeInstrumentationName("aws-sdk-2.2-sqs")
     excludeInstrumentationName("aws-sdk-2.2-sns")
@@ -26,7 +25,6 @@ muzzle {
     // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
-    extraDependency("commons-io:commons-io:2.13.0")
 
     // "fail" asserts that *all* the instrumentation modules fail to load, but the core one is
     // actually expected to succeed, so exclude it from checks.
@@ -43,7 +41,6 @@ muzzle {
     // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
-    extraDependency("commons-io:commons-io:2.13.0")
 
     excludeInstrumentationName("aws-sdk-2.2-sns")
 
@@ -58,7 +55,6 @@ muzzle {
     // Used by all SDK services, the only case it isn't is an SDK extension such as a custom HTTP
     // client, which is not target of instrumentation anyways.
     extraDependency("software.amazon.awssdk:protocol-core")
-    extraDependency("commons-io:commons-io:2.13.0")
 
     excludeInstrumentationName("aws-sdk-2.2-sqs")
 

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
 
 dependencies {
   implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
-  implementation("commons-io:commons-io")
 
   library("software.amazon.awssdk:aws-core:2.2.0")
   library("software.amazon.awssdk:sqs:2.2.0")

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

@@ -16,15 +16,14 @@
 import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.SemanticAttributes;
-import java.io.IOException;
+import java.io.BufferedReader;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Optional;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.apache.commons.io.IOUtils;
 import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
 import software.amazon.awssdk.awscore.AwsResponse;
 import software.amazon.awssdk.core.ClientType;
@@ -57,7 +56,6 @@ final class TracingExecutionInterceptor implements ExecutionInterceptor {
   private final Instrumenter<ExecutionAttributes, SdkHttpResponse> requestInstrumenter;
   private final Instrumenter<ExecutionAttributes, SdkHttpResponse> consumerInstrumenter;
   private final boolean captureExperimentalSpanAttributes;
-  private static final Logger logger = Logger.getLogger(PluginImplUtil.class.getName());
 
   static final AttributeKey<String> HTTP_ERROR_MSG =
       AttributeKey.stringKey("aws.http.error_message");
@@ -308,10 +306,13 @@ private void onSdkResponse(
   @Override
   public void afterTransmission(
       Context.AfterTransmission context, ExecutionAttributes executionAttributes) {
-    if (!recordIndividualHttpError) {
-      return;
+    if (recordIndividualHttpError) {
+      extractHttpErrorAsEvent(context, executionAttributes);
     }
+  }
 
+  private static void extractHttpErrorAsEvent(
+      Context.AfterTransmission context, ExecutionAttributes executionAttributes) {
     io.opentelemetry.context.Context otelContext = getContext(executionAttributes);
     if (otelContext != null) {
       Span span = Span.fromContext(otelContext);
@@ -322,18 +323,18 @@ public void afterTransmission(
         // we want to record the error message from http response
         Optional<InputStream> responseBody = context.responseBody();
         if (responseBody.isPresent()) {
-          try {
-            String errorMsg = IOUtils.toString(responseBody.get(), StandardCharsets.UTF_8);
-            Attributes attributes =
-                Attributes.of(
-                    SemanticAttributes.HTTP_RESPONSE_STATUS_CODE,
-                    Long.valueOf(errorCode),
-                    HTTP_ERROR_MSG,
-                    errorMsg);
-            span.addEvent(HTTP_FAILURE_EVENT, attributes);
-          } catch (IOException ex) {
-            logger.log(Level.FINE, "Failed to read the response", ex);
-          }
+          String errorMsg =
+              new BufferedReader(
+                      new InputStreamReader(responseBody.get(), Charset.defaultCharset()))
+                  .lines()
+                  .collect(Collectors.joining("\n"));
+          Attributes attributes =
+              Attributes.of(
+                  SemanticAttributes.HTTP_RESPONSE_STATUS_CODE,
+                  Long.valueOf(errorCode),
+                  HTTP_ERROR_MSG,
+                  errorMsg);
+          span.addEvent(HTTP_FAILURE_EVENT, attributes);
         }
       }
     }