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

Enable http pipelining test on Grizzly #8411

Merged
merged 2 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.grizzly;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;

import io.opentelemetry.context.Scope;
import io.opentelemetry.javaagent.bootstrap.CallDepth;
import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.glassfish.grizzly.filterchain.FilterChainContext;

public class FilterChainContextInstrumentation implements TypeInstrumentation {
@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return named("org.glassfish.grizzly.filterchain.FilterChainContext");
}

@Override
public void transform(TypeTransformer transformer) {
transformer.applyAdviceToMethod(
named("resume").and(takesArguments(0)),
FilterChainContextInstrumentation.class.getName() + "$ResumeAdvice");
transformer.applyAdviceToMethod(
named("write"), FilterChainContextInstrumentation.class.getName() + "$WriteAdvice");
}

@SuppressWarnings("unused")
public static class ResumeAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope onEnter() {
return Java8BytecodeBridge.rootContext().makeCurrent();
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void onExit(@Advice.Enter Scope scope) {
if (scope != null) {
scope.close();
}
}
}

@SuppressWarnings("unused")
public static class WriteAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(@Advice.Local("otelCallDepth") CallDepth callDepth) {
callDepth = CallDepth.forClass(FilterChainContext.class);
callDepth.getAndIncrement();
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void onExit(
@Advice.This FilterChainContext filterChainContext,
@Advice.Local("otelCallDepth") CallDepth callDepth) {
// When exiting the outermost call to write clear context & request from filter chain context.
// Write makes a copy of the current filter chain context and passes it on. In older versions
// new and old filter chain context share the attributes, but in newer versions the attributes
// are also copied. We need to remove the attributes here to ensure that the next request
// starts with clean state, failing to do so causes http pipelining test to fail with the
// latest deps.
if (callDepth.decrementAndGet() == 0) {
GrizzlyStateStorage.removeContext(filterChainContext);
GrizzlyStateStorage.removeRequest(filterChainContext);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
new FilterInstrumentation(),
new HttpCodecFilterInstrumentation(),
new HttpServerFilterInstrumentation(),
new HttpHandlerInstrumentation());
new HttpHandlerInstrumentation(),
new FilterChainContextInstrumentation());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ class GrizzlyAsyncTest extends GrizzlyTest {
false
}

@Override
boolean testHttpPipelining() {
false
}

@Override
boolean verifyServerSpanEndTime() {
// server spans are ended inside of the JAX-RS controller spans
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ class GrizzlyFilterchainServerTest extends HttpServerTest<HttpServer> implements
false
}

@Override
boolean testHttpPipelining() {
false
}

@Override
boolean verifyServerSpanEndTime() {
// server spans are ended inside of the controller spans
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ class GrizzlyTest extends HttpServerTest<HttpServer> implements AgentTestTrait {
false
}

@Override
boolean testHttpPipelining() {
false
}

static class SimpleExceptionMapper implements ExceptionMapper<Throwable> {

@Override
Expand Down