Skip to content
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.

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

Provide ability to add HTTP server response headers, with Tomcat implementation #7990

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Tomcat 7/10 implementation for response customizer
  • Loading branch information
agoallikmaa committed Mar 7, 2023
commit 3751a48835f3ec47431c1944c8452ab088611e3c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.tomcat.v10_0;

import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseMutator;
import org.apache.coyote.Response;

public class Tomcat10ResponseMutator implements HttpServerResponseMutator<Response> {
public static final Tomcat10ResponseMutator INSTANCE = new Tomcat10ResponseMutator();

private Tomcat10ResponseMutator() {}

@Override
public void appendHeader(Response response, String name, String value) {
response.addHeader(name, value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import net.bytebuddy.asm.Advice;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
Expand All @@ -32,6 +33,9 @@ public static void onEnter(
context = helper().start(parentContext, request);

scope = context.makeCurrent();

HttpServerResponseCustomizerHolder.getCustomizer()
.onStart(context, response, Tomcat10ResponseMutator.INSTANCE);
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ class TomcatHandlerTest extends HttpServerTest<Tomcat> implements AgentTestTrait
return "/app"
}

@Override
boolean hasResponseCustomizer(ServerEndpoint endpoint) {
true
}

@Override
boolean testCapturedRequestParameters() {
true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.tomcat.v7_0;

import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseMutator;
import org.apache.coyote.Response;

public class Tomcat7ResponseMutator implements HttpServerResponseMutator<Response> {
public static final Tomcat7ResponseMutator INSTANCE = new Tomcat7ResponseMutator();

private Tomcat7ResponseMutator() {}

@Override
public void appendHeader(Response response, String name, String value) {
response.addHeader(name, value);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseCustomizerHolder;
import net.bytebuddy.asm.Advice;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
Expand All @@ -32,6 +33,9 @@ public static void onEnter(
context = helper().start(parentContext, request);

scope = context.makeCurrent();

HttpServerResponseCustomizerHolder.getCustomizer()
.onStart(context, response, Tomcat7ResponseMutator.INSTANCE);
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ class TomcatHandlerTest extends HttpServerTest<Tomcat> implements AgentTestTrait
return "/app"
}

@Override
boolean hasResponseCustomizer(ServerEndpoint endpoint) {
true
}

@Override
boolean testCapturedRequestParameters() {
true
Expand Down