From 175c2f4421fadcadfff5c435710a78eb9973bb21 Mon Sep 17 00:00:00 2001 From: siyuniu-ms Date: Mon, 27 Feb 2023 13:48:38 -0800 Subject: [PATCH] change naming and util test --- .../servlet/v3_0/snippet/TestUtil.java | 13 +++++++------ .../servlet/v3_0/Servlet3Advice.java | 4 ++-- .../v3_0/Servlet3OutputStreamWriteBytesAdvice.java | 4 ++-- ...rvlet3OutputStreamWriteBytesAndOffsetAdvice.java | 4 ++-- .../v3_0/Servlet3OutputStreamWriteIntAdvice.java | 4 ++-- ....java => ServletOutputStreamInjectionState.java} | 4 ++-- .../snippet/SnippetInjectingResponseWrapper.java | 2 +- .../service/ServletOutputStreamInstrumentation.java | 3 +-- 8 files changed, 19 insertions(+), 19 deletions(-) rename instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/{Injection.java => ServletOutputStreamInjectionState.java} (91%) diff --git a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java index bf194e779f5e..2eb691e7276e 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/TestUtil.java +++ b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java index a28e7b58d169..11a238eae558 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java index d17e8e551224..8cf67e5166ae 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java index e2c0a1823f42..563693e795ad 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java index d78696517077..a1e140376998 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Injection.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java similarity index 91% rename from instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Injection.java rename to instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java index 2ee7578f2600..d1d01f9f81f3 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Injection.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/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 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/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java index 860c81c0141d..2b2499a7cbeb 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/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/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/service/ServletOutputStreamInstrumentation.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/service/ServletOutputStreamInstrumentation.java index a545f3874b7a..631d4f372770 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/common/service/ServletOutputStreamInstrumentation.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/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 classLoaderOptimization() { @Override public ElementMatcher typeMatcher() { - return hasSuperType(namedOneOf(basePackageName + ".ServletOutputStream")); + return hasSuperType(named(basePackageName + ".ServletOutputStream")); } @Override