change naming and util test

open-telemetry · Feb 27, 2023 · 175c2f4 · 175c2f4
1 parent 0aa85b0
commit 175c2f4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/...c/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java b/...c/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java
@@ -5,19 +5,16 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 
 public class TestUtil {
 
  public static byte[] readFileBytes(String resourceName, Charset charsetName) throws IOException {
- return readFile(resourceName).getBytes(charsetName);
- }
-
- public static String readFile(String resourceName) throws IOException {
  InputStream in =
  SnippetPrintWriterTest.class.getClassLoader().getResourceAsStream(resourceName);
  ByteArrayOutputStream result = new ByteArrayOutputStream();
@@ -26,7 +23,11 @@ public static String readFile(String resourceName) throws IOException {
  while ((length = in.read(buffer)) != -1) {
  result.write(buffer, 0, length);
  }
- return result.toString(StandardCharsets.UTF_8.name());
+ return result.toByteArray();
+ }
+
+ public static String readFile(String resourceName) throws IOException {
+ return new String(readFileBytes(resourceName, UTF_8), UTF_8);
  }
 
  private TestUtil() {}

diff --git a/...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java b/...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
 import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.helper;
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.SnippetInjectingResponseWrapper.FAKE_SNIPPET_HEADER;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
@@ -45,7 +44,8 @@ public static void onEnter(
 
  String snippet = ExperimentalSnippetHolder.getSnippet();
  if (!snippet.isEmpty()
- && !((HttpServletResponse) response).containsHeader(FAKE_SNIPPET_HEADER)) {
+ && !((HttpServletResponse) response)
+ .containsHeader(SnippetInjectingResponseWrapper.FAKE_SNIPPET_HEADER)) {
  response = new SnippetInjectingResponseWrapper((HttpServletResponse) response, snippet);
  }
  callDepth = CallDepth.forClass(AppServerBridge.getCallDepthKey());

diff --git a/...elemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java b/...elemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
 import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper;
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.Injection.getInjectionState;
 
 import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.InjectionState;
+import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState;
 import java.io.IOException;
 import javax.servlet.ServletOutputStream;
 import net.bytebuddy.asm.Advice;
@@ -19,7 +19,7 @@ public class Servlet3OutputStreamWriteBytesAdvice {
  public static boolean methodEnter(
  @Advice.This ServletOutputStream servletOutputStream, @Advice.Argument(0) byte[] write)
  throws IOException {
- InjectionState state = getInjectionState(servletOutputStream);
+ InjectionState state = ServletOutputStreamInjectionState.getInjectionState(servletOutputStream);
  if (state == null) {
  return true;
  }

diff --git a/...javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java b/...javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
 import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper;
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.Injection.getInjectionState;
 
 import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.InjectionState;
+import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState;
 import java.io.IOException;
 import javax.servlet.ServletOutputStream;
 import net.bytebuddy.asm.Advice;
@@ -21,7 +21,7 @@ public static boolean methodEnter(
  @Advice.Argument(value = 1) int off,
  @Advice.Argument(value = 2) int len)
  throws IOException {
- InjectionState state = getInjectionState(servletOutputStream);
+ InjectionState state = ServletOutputStreamInjectionState.getInjectionState(servletOutputStream);
  if (state == null) {
  return true;
  }

diff --git a/...ntelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java b/...ntelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
 import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper;
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.Injection.getInjectionState;
 
 import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.InjectionState;
+import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState;
 import java.io.IOException;
 import javax.servlet.ServletOutputStream;
 import net.bytebuddy.asm.Advice;
@@ -19,7 +19,7 @@ public class Servlet3OutputStreamWriteIntAdvice {
  public static boolean methodEnter(
  @Advice.This ServletOutputStream servletOutputStream, @Advice.Argument(0) int write)
  throws IOException {
- InjectionState state = getInjectionState(servletOutputStream);
+ InjectionState state = ServletOutputStreamInjectionState.getInjectionState(servletOutputStream);
  if (state == null) {
  return true;
  }

diff --git a/...ation/servlet/v3_0/snippet/Injection.java → ...et/ServletOutputStreamInjectionState.java b/...ation/servlet/v3_0/snippet/Injection.java → ...et/ServletOutputStreamInjectionState.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import javax.servlet.ServletOutputStream;
 
-public class Injection {
+public class ServletOutputStreamInjectionState {
 
  private static final VirtualField<ServletOutputStream, InjectionState> virtualField =
  VirtualField.find(ServletOutputStream.class, InjectionState.class);
@@ -30,5 +30,5 @@ public static InjectionState getInjectionState(ServletOutputStream servletOutput
  return virtualField.get(servletOutputStream);
  }
 
- private Injection() {}
+ private ServletOutputStreamInjectionState() {}
 }
diff --git a/...metry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java b/...metry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet;
 
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.Injection.initializeInjectionStateIfNeeded;
+import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState.initializeInjectionStateIfNeeded;
 import static java.util.logging.Level.FINE;
 
 import java.io.IOException;

diff --git a/.../javaagent/instrumentation/servlet/common/service/ServletOutputStreamInstrumentation.java b/.../javaagent/instrumentation/servlet/common/service/ServletOutputStreamInstrumentation.java
@@ -9,7 +9,6 @@
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
-import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
@@ -42,7 +41,7 @@ public ElementMatcher<ClassLoader> classLoaderOptimization() {
 
  @Override
  public ElementMatcher<TypeDescription> typeMatcher() {
- return hasSuperType(namedOneOf(basePackageName + ".ServletOutputStream"));
+ return hasSuperType(named(basePackageName + ".ServletOutputStream"));
  }
 
  @Override