last update

Author: siyuniums

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java

@@ -26,6 +26,6 @@ public static boolean methodEnter(
     // if handleWrite return true, then it means the injection has happened and the 'write'
     // manipulate is done. the function would return false then, meaning skip the original write
     // function
-    return !handleWrite(state, servletOutputStream, (byte) write);
+    return !handleWrite(state, servletOutputStream, write);
   }
 }

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Injection.java

@@ -15,11 +15,13 @@ public class Injection {
   public static void initializeInjectionStateIfNeeded(
       ServletOutputStream servletOutputStream, SnippetInjectingResponseWrapper wrapper) {
     InjectionState state = virtualField.get(servletOutputStream);
+    if (!wrapper.isContentTypeTextHtml()) {
+      virtualField.set(servletOutputStream, null);
+      return;
+    }
     if (state == null || state.getWrapper() != wrapper) {
       state = new InjectionState(wrapper);
-      if (wrapper.isContentTypeTextHtml()) {
-        virtualField.set(servletOutputStream, state);
-      }
+      virtualField.set(servletOutputStream, state);
     }
   }
 

instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java

@@ -21,13 +21,13 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 
 public class SnippetInjectingResponseWrapper extends HttpServletResponseWrapper {
+  private static final Logger logger = Logger.getLogger(HttpServletResponseWrapper.class.getName());
   public static final String FAKE_SNIPPET_HEADER = "FAKE_SNIPPET_HEADER";
   private static final String SNIPPET = SnippetHolder.getSnippet();
   private static final int SNIPPET_LENGTH = SNIPPET.length();
+  @Nullable private static final MethodHandle setContentLengthLongHandler = getMethodHandle();
 
-  private static final Logger logger = Logger.getLogger(HttpServletResponseWrapper.class.getName());
   private SnippetInjectingPrintWriter snippetInjectingPrintWriter = null;
-  @Nullable private static final MethodHandle setContentLengthLongHandler = getMethodHandle();
 
   public SnippetInjectingResponseWrapper(HttpServletResponse response) {
     super(response);

instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/SnippetHolder.java

@@ -6,8 +6,6 @@
 package io.opentelemetry.javaagent.bootstrap.servlet;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import javax.annotation.Nullable;
 
 public class SnippetHolder {
 
@@ -21,12 +19,7 @@ public static String getSnippet() {
     return snippet;
   }
 
-  public static byte[] getSnippetBytes(@Nullable String encoding)
-      throws UnsupportedEncodingException {
-    if (encoding != null) {
-      return snippet.getBytes(encoding);
-    } else {
-      return snippet.getBytes(Charset.defaultCharset());
-    }
+  public static byte[] getSnippetBytes(String encoding) throws UnsupportedEncodingException {
+    return snippet.getBytes(encoding);
   }
 }