apply review

Author: amarziali

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java

@@ -99,6 +99,9 @@ public void onFrameEnd(final HandlerContext handlerContext) {
       return;
     }
     final AgentSpan wsSpan = handlerContext.getWebsocketSpan();
+    if (wsSpan == null) {
+      return;
+    }
     try {
       final long startTime = handlerContext.getFirstFrameTimestamp();
       if (startTime > 0) {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/websocket/HandlerContext.java

@@ -2,8 +2,11 @@
 
 import datadog.trace.api.time.SystemTimeSource;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class HandlerContext {
+  final Logger LOGGER = LoggerFactory.getLogger(HandlerContext.class);
 
   private final AgentSpan handshakeSpan;
   private AgentSpan websocketSpan;
@@ -92,7 +95,11 @@ public void recordChunkData(Object data, boolean partialDelivery) {
           if (partialDelivery && sz == 0) {
             msgChunks--; // if we receive an empty frame with the fin bit don't count it as a chunk
           }
-        } catch (Throwable ignored) {
+        } catch (Throwable t) {
+          LOGGER.debug(
+              "Unable to calculate websocket message size for data type {}",
+              data.getClass().getName(),
+              t);
         }
       }
     }

dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java

@@ -99,7 +99,6 @@ public void typeAdvice(TypeTransformer transformer) {
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(takesNoArguments().and(named("handle")), packageName + ".HandleAdvice");
     transformer.applyAdvice(named("recycle").and(takesNoArguments()), packageName + ".ResetAdvice");
-    transformer.applyAdvice(named("onCompleted"), packageName + ".OnCompletedAdvice");
 
     if (appSecNotFullyDisabled) {
       transformer.applyAdvice(

dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/OnCompletedAdvice.java

@@ -68,7 +68,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
 
     @Override
     void start() {
-      app.setDefaultProperties(["server.port"                                   : 0, "server.context-path": "/$servletContext",
+      app.setDefaultProperties(["server.port": 0, "server.context-path": "/$servletContext",
         "spring.mvc.throw-exception-if-no-handler-found": false,
         "spring.web.resources.add-mappings"             : false])
       context = app.run()

dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy

@@ -139,6 +139,7 @@ dependencies {
 project.afterEvaluate {
   tasks.withType(Test).configureEach {
     if (javaLauncher.get().metadata.languageVersion.asInt() >= 16) {
+      // to avoid java.lang.IllegalAccessException: class org.apache.tomcat.util.compat.JreCompat cannot access a member of class java.io.FileSystem (in module java.base) with modifiers "static final"
       jvmArgs += ['--add-opens', 'java.base/java.io=ALL-UNNAMED']
     }
   }

dd-java-agent/instrumentation/tomcat-5.5/build.gradle

@@ -1,4 +1 @@
 apply from: "$rootDir/gradle/java.gradle"
-
-dependencies {
-}