fix spotless

DataDog · Nov 4, 2024 · 85bd34a · 85bd34a
1 parent 09766b9
commit 85bd34a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 37 deletions.
diff --git a/.../java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/.../java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
@@ -155,18 +155,18 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class UriRequestAdvice {
     @Advice.OnMethodEnter()
     public static AgentScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) {
-      try{
+      try {
         return HelperMethods.doMethodEnter(request);
       } catch (BlockingException e) {
-      HelperMethods.onBlockingRequest();
-      // re-throw blocking exceptions
-      throw e;
-    } catch (Throwable e) {
-      // suppress anything else
-      ExceptionLogger.LOGGER.debug(
-          "datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientInstrumentation", e);
-      return null;
-    }
+        HelperMethods.onBlockingRequest();
+        // re-throw blocking exceptions
+        throw e;
+      } catch (Throwable e) {
+        // suppress anything else
+        ExceptionLogger.LOGGER.debug(
+            "datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientInstrumentation", e);
+        return null;
+      }
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -190,11 +190,12 @@ public static AgentScope methodEnter(
                 readOnly = false)
             Object handler) {
 
-      try{
+      try {
         final AgentScope scope = HelperMethods.doMethodEnter(request);
         // Wrap the handler so we capture the status code
         if (null != scope && handler instanceof ResponseHandler) {
-          handler = new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler);
+          handler =
+              new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler);
         }
         return scope;
       } catch (BlockingException e) {
@@ -207,7 +208,6 @@ public static AgentScope methodEnter(
             "datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientInstrumentation", e);
         return null;
       }
-
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -223,22 +223,22 @@ public static class RequestAdvice {
     @Advice.OnMethodEnter()
     public static AgentScope methodEnter(
         @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) {
-      try{
+      try {
         if (request instanceof HttpUriRequest) {
           return HelperMethods.doMethodEnter((HttpUriRequest) request);
         } else {
           return HelperMethods.doMethodEnter(host, request);
         }
       } catch (BlockingException e) {
-      HelperMethods.onBlockingRequest();
-      // re-throw blocking exceptions
-      throw e;
-    } catch (Throwable e) {
-       // suppress anything else
+        HelperMethods.onBlockingRequest();
+        // re-throw blocking exceptions
+        throw e;
+      } catch (Throwable e) {
+        // suppress anything else
         ExceptionLogger.LOGGER.debug(
-          "datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientInstrumentation", e);
-      return null;
-    }
+            "datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientInstrumentation", e);
+        return null;
+      }
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -262,7 +262,7 @@ public static AgentScope methodEnter(
                 typing = Assigner.Typing.DYNAMIC,
                 readOnly = false)
             Object handler) {
-      try{
+      try {
         final AgentScope scope;
         if (request instanceof HttpUriRequest) {
           scope = HelperMethods.doMethodEnter((HttpUriRequest) request);
@@ -271,7 +271,8 @@ public static AgentScope methodEnter(
         }
         // Wrap the handler so we capture the status code
         if (null != scope && handler instanceof ResponseHandler) {
-          handler = new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler);
+          handler =
+              new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler);
         }
         return scope;
       } catch (BlockingException e) {

diff --git a/...pclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/...pclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java
@@ -74,7 +74,7 @@ public static void doMethodExit(
     }
   }
 
-  public static void onBlockingRequest(){
+  public static void onBlockingRequest() {
     CallDepthThreadLocalMap.reset(HttpClient.class);
   }
 }
diff --git a/...java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/...java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java
@@ -117,7 +117,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class RequestAdvice {
     @Advice.OnMethodEnter()
     public static AgentScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) {
-      try{
+      try {
         return HelperMethods.doMethodEnter(request);
       } catch (BlockingException e) {
         HelperMethods.onBlockingRequest();
@@ -145,8 +145,8 @@ public static class HostRequestAdvice {
     public static AgentScope methodEnter(
         @Advice.Argument(0) final HttpHost host,
         @Advice.Argument(1) final ClassicHttpRequest request) {
-      try{
-        return HelperMethods.doMethodEnter(host,request);
+      try {
+        return HelperMethods.doMethodEnter(host, request);
       } catch (BlockingException e) {
         HelperMethods.onBlockingRequest();
         // re-throw blocking exceptions
@@ -181,7 +181,7 @@ public static AgentScope methodEnter(
                 typing = Assigner.Typing.DYNAMIC,
                 readOnly = false)
             Object handler) {
-      try{
+      try {
         final AgentScope scope = HelperMethods.doMethodEnter(host, request);
         // Wrap the handler so we capture the status code
         if (null != scope && handler instanceof HttpClientResponseHandler) {

diff --git a/...client-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/...client-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java
@@ -74,7 +74,7 @@ public static void doMethodExit(
     }
   }
 
-  public static void onBlockingRequest(){
+  public static void onBlockingRequest() {
     CallDepthThreadLocalMap.reset(HttpClient.class);
   }
 }
diff --git a/...ava/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/...ava/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java
@@ -12,11 +12,11 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
 import com.google.auto.service.AutoService;
-import datadog.trace.bootstrap.ExceptionLogger;
 import datadog.appsec.api.blocking.BlockingException;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import datadog.trace.bootstrap.ExceptionLogger;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
@@ -58,7 +58,7 @@ public static class ExecAdvice {
     @Advice.OnMethodEnter()
     public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) {
 
-      try{
+      try {
         final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class);
         if (callDepth > 0) {
           return null;
@@ -81,7 +81,8 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe
         throw e;
       } catch (Throwable e) {
         // suppress anything else
-        ExceptionLogger.LOGGER.debug("datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientInstrumentation", e);
+        ExceptionLogger.LOGGER.debug(
+            "datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientInstrumentation", e);
         return null;
       }
     }

diff --git a/...http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/...http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java
@@ -5,8 +5,8 @@
 import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.DECORATE;
 
 import datadog.appsec.api.blocking.BlockingException;
-import datadog.trace.bootstrap.ExceptionLogger;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
+import datadog.trace.bootstrap.ExceptionLogger;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
@@ -21,8 +21,9 @@ public class SendAsyncAdvice {
   public static AgentScope methodEnter(
       @Advice.Argument(value = 0) final HttpRequest httpRequest,
       @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler<?> bodyHandler) {
-    try{
-      // Here we avoid having the advice applied twice in case we have nested call of this intercepted
+    try {
+      // Here we avoid having the advice applied twice in case we have nested call of this
+      // intercepted
       // method.
       // In this particular case, in HttpClientImpl the send method is calling sendAsync under the
       // hood and we do not want to instrument twice.
@@ -50,7 +51,6 @@ public static AgentScope methodEnter(
       ExceptionLogger.LOGGER.debug("datadog.trace.instrumentation.httpclient.SendAsyncAdvice", e);
       return null;
     }
-
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)