From 0070148b3424db5b11be257b1e086cf8ba59ed0b Mon Sep 17 00:00:00 2001 From: siyuniu-ms <123212536+siyuniu-ms@users.noreply.github.com> Date: Tue, 13 Jun 2023 09:52:55 -0700 Subject: [PATCH] Snippet Injection Files Restructure (#8701) --- .../servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts | 1 + .../servlet/v3_0/snippet/SnippetServletOutputStreamTest.java | 2 +- .../servlet/v3_0/Servlet3OutputStreamWriteBytesAdvice.java | 2 +- .../v3_0/Servlet3OutputStreamWriteBytesAndOffsetAdvice.java | 2 +- .../servlet/v3_0/Servlet3OutputStreamWriteIntAdvice.java | 2 +- .../v3_0/snippet/Servlet3SnippetInjectingResponseWrapper.java | 2 +- .../servlet/v3_0/snippet/ServletOutputStreamInjectionState.java | 2 +- .../servlet/servlet-5.0/javaagent-unit-tests/build.gradle.kts | 1 + .../servlet/v5_0/snippet/SnippetServletOutputStreamTest.java | 2 +- .../servlet/v5_0/Servlet5OutputStreamWriteBytesAdvice.java | 2 +- .../v5_0/Servlet5OutputStreamWriteBytesAndOffsetAdvice.java | 2 +- .../servlet/v5_0/Servlet5OutputStreamWriteIntAdvice.java | 2 +- .../v5_0/snippet/Servlet5SnippetInjectingResponseWrapper.java | 2 +- .../servlet/v5_0/snippet/ServletOutputStreamInjectionState.java | 2 +- .../javaagent/bootstrap/servlet}/InjectionState.java | 2 +- .../bootstrap/servlet}/SnippetInjectingResponseWrapper.java | 2 +- .../servlet/snippet/OutputStreamSnippetInjectionHelper.java | 1 + .../servlet/snippet/SnippetInjectingPrintWriter.java | 2 ++ 18 files changed, 19 insertions(+), 14 deletions(-) rename instrumentation/servlet/servlet-common/{javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet => bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet}/InjectionState.java (96%) rename instrumentation/servlet/servlet-common/{javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet => bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet}/SnippetInjectingResponseWrapper.java (80%) diff --git a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts index c6f646595e..bcf2f331fa 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts +++ b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/build.gradle.kts @@ -5,4 +5,5 @@ plugins { dependencies { testImplementation("javax.servlet:javax.servlet-api:3.0.1") testImplementation(project(":instrumentation:servlet:servlet-3.0:javaagent")) + testImplementation(project(":instrumentation:servlet:servlet-common:bootstrap")) } diff --git a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java index c1d712572a..10ee6f1499 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java +++ b/instrumentation/servlet/servlet-3.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetServletOutputStreamTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.snippet.OutputStreamSnippetInjectionHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; 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 bf524211a4..71d66b1080 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 @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState; import java.io.IOException; import javax.servlet.ServletOutputStream; 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 22ed7cfc16..14d81d5781 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 @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState; import java.io.IOException; import javax.servlet.ServletOutputStream; 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 151e386211..fc3421e06f 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 @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState; import java.io.IOException; import javax.servlet.ServletOutputStream; diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Servlet3SnippetInjectingResponseWrapper.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Servlet3SnippetInjectingResponseWrapper.java index d45b27648b..51432cd3d3 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Servlet3SnippetInjectingResponseWrapper.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/Servlet3SnippetInjectingResponseWrapper.java @@ -8,8 +8,8 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet; import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.ServletOutputStreamInjectionState.initializeInjectionStateIfNeeded; import static java.util.logging.Level.FINE; +import io.opentelemetry.javaagent.bootstrap.servlet.SnippetInjectingResponseWrapper; import io.opentelemetry.javaagent.instrumentation.servlet.snippet.SnippetInjectingPrintWriter; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.SnippetInjectingResponseWrapper; import java.io.IOException; import java.io.PrintWriter; import java.lang.invoke.MethodHandle; diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java index 26f338a123..ee476188ad 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/snippet/ServletOutputStreamInjectionState.java @@ -6,7 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import javax.annotation.Nullable; import javax.servlet.ServletOutputStream; diff --git a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/build.gradle.kts b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/build.gradle.kts index f7df7d5f4b..752f1df233 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/build.gradle.kts +++ b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/build.gradle.kts @@ -5,4 +5,5 @@ plugins { dependencies { testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0") testImplementation(project(":instrumentation:servlet:servlet-5.0:javaagent")) + testImplementation(project(":instrumentation:servlet:servlet-common:bootstrap")) } diff --git a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java index 5d43251693..29a25b646a 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java +++ b/instrumentation/servlet/servlet-5.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/SnippetServletOutputStreamTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.snippet.OutputStreamSnippetInjectionHelper; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAdvice.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAdvice.java index ba83897750..31966cf58c 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAdvice.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAdvice.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet.ServletOutputStreamInjectionState; import jakarta.servlet.ServletOutputStream; import java.io.IOException; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAndOffsetAdvice.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAndOffsetAdvice.java index e272afa3c5..8f2e901b72 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAndOffsetAdvice.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteBytesAndOffsetAdvice.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet.ServletOutputStreamInjectionState; import jakarta.servlet.ServletOutputStream; import java.io.IOException; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteIntAdvice.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteIntAdvice.java index fc478b9451..1480edb5b1 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteIntAdvice.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/Servlet5OutputStreamWriteIntAdvice.java @@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0; import static io.opentelemetry.javaagent.instrumentation.servlet.v5_0.Servlet5Singletons.getSnippetInjectionHelper; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet.ServletOutputStreamInjectionState; import jakarta.servlet.ServletOutputStream; import java.io.IOException; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/Servlet5SnippetInjectingResponseWrapper.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/Servlet5SnippetInjectingResponseWrapper.java index 6c420de975..d0ef8d42e3 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/Servlet5SnippetInjectingResponseWrapper.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/Servlet5SnippetInjectingResponseWrapper.java @@ -8,8 +8,8 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet; import static io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet.ServletOutputStreamInjectionState.initializeInjectionStateIfNeeded; import static java.util.logging.Level.FINE; +import io.opentelemetry.javaagent.bootstrap.servlet.SnippetInjectingResponseWrapper; import io.opentelemetry.javaagent.instrumentation.servlet.snippet.SnippetInjectingPrintWriter; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.SnippetInjectingResponseWrapper; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; diff --git a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/ServletOutputStreamInjectionState.java b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/ServletOutputStreamInjectionState.java index 407b63b5bb..4281a2fc85 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/ServletOutputStreamInjectionState.java +++ b/instrumentation/servlet/servlet-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/snippet/ServletOutputStreamInjectionState.java @@ -6,7 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.snippet; import io.opentelemetry.instrumentation.api.util.VirtualField; -import io.opentelemetry.javaagent.instrumentation.servlet.snippet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import jakarta.servlet.ServletOutputStream; import javax.annotation.Nullable; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/InjectionState.java b/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/InjectionState.java similarity index 96% rename from instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/InjectionState.java rename to instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/InjectionState.java index 78ada6e57e..7986357696 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/InjectionState.java +++ b/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/InjectionState.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.servlet.snippet; +package io.opentelemetry.javaagent.bootstrap.servlet; // this is shared by both ServletOutputStream and PrintWriter injection public class InjectionState { diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingResponseWrapper.java b/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/SnippetInjectingResponseWrapper.java similarity index 80% rename from instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingResponseWrapper.java rename to instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/SnippetInjectingResponseWrapper.java index bce927bea8..c8a3a60ae2 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingResponseWrapper.java +++ b/instrumentation/servlet/servlet-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/servlet/SnippetInjectingResponseWrapper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.servlet.snippet; +package io.opentelemetry.javaagent.bootstrap.servlet; public interface SnippetInjectingResponseWrapper { diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/OutputStreamSnippetInjectionHelper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/OutputStreamSnippetInjectionHelper.java index 2ac8fb839a..6f0bf37619 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/OutputStreamSnippetInjectionHelper.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/OutputStreamSnippetInjectionHelper.java @@ -7,6 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.servlet.snippet; import static java.util.logging.Level.FINE; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingPrintWriter.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingPrintWriter.java index bbbce62714..f3cd1b5076 100644 --- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingPrintWriter.java +++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/snippet/SnippetInjectingPrintWriter.java @@ -5,6 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.servlet.snippet; +import io.opentelemetry.javaagent.bootstrap.servlet.InjectionState; +import io.opentelemetry.javaagent.bootstrap.servlet.SnippetInjectingResponseWrapper; import java.io.PrintWriter; public class SnippetInjectingPrintWriter extends PrintWriter {