Skip to content

Fix snippet injection test #8390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2023
Merged

Fix snippet injection test #8390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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.Servlet3Singletons.helper;

import io.opentelemetry.context.Context;
Expand All @@ -13,7 +14,6 @@
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.AppServerBridge;
import io.opentelemetry.javaagent.bootstrap.servlet.ExperimentalSnippetHolder;
import io.opentelemetry.javaagent.bootstrap.servlet.MappingResolver;
import io.opentelemetry.javaagent.instrumentation.servlet.ServletRequestContext;
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.snippet.SnippetInjectingResponseWrapper;
Expand Down Expand Up @@ -43,7 +43,7 @@ public static void onEnter(
}
HttpServletRequest httpServletRequest = (HttpServletRequest) request;

String snippet = ExperimentalSnippetHolder.getSnippet();
String snippet = getSnippetInjectionHelper().getSnippet();
if (!snippet.isEmpty()
&& !((HttpServletResponse) response)
.containsHeader(SnippetInjectingResponseWrapper.FAKE_SNIPPET_HEADER)) {
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public final class Servlet3Singletons {
ResponseInstrumenterFactory.createInstrumenter(INSTRUMENTATION_NAME);

private static final OutputStreamSnippetInjectionHelper SNIPPET_INJECTION_HELPER =
new OutputStreamSnippetInjectionHelper(ExperimentalSnippetHolder.getSnippet());
new OutputStreamSnippetInjectionHelper(() -> ExperimentalSnippetHolder.getSnippet());

public static ServletHelper<HttpServletRequest, HttpServletResponse> helper() {
return HELPER;
Expand Down
17 changes: 13 additions & 4 deletions ...ry/javaagent/instrumentation/servlet/v3_0/snippet/OutputStreamSnippetInjectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,26 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.function.Supplier;
import java.util.logging.Logger;

public class OutputStreamSnippetInjectionHelper {

private static final Logger logger =
Logger.getLogger(OutputStreamSnippetInjectionHelper.class.getName());

private final String snippet;
private final Supplier<String> snippetSupplier;

public OutputStreamSnippetInjectionHelper(String snippet) {
this.snippet = snippet;
this(() -> snippet);
}

public OutputStreamSnippetInjectionHelper(Supplier<String> snippetSupplier) {
this.snippetSupplier = snippetSupplier;
}

public String getSnippet() {
return snippetSupplier.get();
}

/**
Expand Down Expand Up @@ -53,7 +62,7 @@ public boolean handleWrite(
}
byte[] snippetBytes;
try {
snippetBytes = snippet.getBytes(state.getCharacterEncoding());
snippetBytes = snippetSupplier.get().getBytes(state.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
logger.log(FINE, "UnsupportedEncodingException", e);
return false;
Expand All @@ -79,7 +88,7 @@ public boolean handleWrite(InjectionState state, OutputStream out, int b) throws
}
byte[] snippetBytes;
try {
snippetBytes = snippet.getBytes(state.getCharacterEncoding());
snippetBytes = snippetSupplier.get().getBytes(state.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
logger.log(FINE, "UnsupportedEncodingException", e);
return false;
Expand Down
1 change: 0 additions & 1 deletion ...metry/javaagent/instrumentation/servlet/v3_0/snippet/SnippetInjectingResponseWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ private static MethodHandle findSetContentLengthLongMethod() {
MethodType.methodType(void.class),
SnippetInjectingResponseWrapper.class);
} catch (NoSuchMethodException | IllegalAccessException e) {
logger.log(FINE, "SnippetInjectingResponseWrapper setContentLengthLong", e);
return null;
}
}
Expand Down