Remove almost all VirtualField#computeIfNull() usages (#4313)

instrumentation/netty/netty-3.8/javaagent/build.gradle.kts

@@ -18,6 +18,9 @@ muzzle {
 }
 
 dependencies {
+  compileOnly("com.google.auto.value:auto-value-annotations")
+  annotationProcessor("com.google.auto.value:auto-value")
+
   compileOnly("io.netty:netty:3.8.0.Final")
 
   testLibrary("io.netty:netty:3.8.0.Final")

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/ChannelFutureListenerInstrumentation.java

@@ -59,17 +59,19 @@ public class ChannelFutureListenerInstrumentation implements TypeInstrumentation
         return null;
       }
 
-      VirtualField<Channel, ChannelTraceContext> virtualField =
+      VirtualField<Channel, NettyConnectionContext> virtualField =
-          VirtualField.find(Channel.class, ChannelTraceContext.class);
+          VirtualField.find(Channel.class, NettyConnectionContext.class);
 
-      ChannelTraceContext channelTraceContext =
+      NettyConnectionContext connectionContext = virtualField.get(future.getChannel());
-          virtualField.computeIfNull(future.getChannel(), ChannelTraceContext.FACTORY);
+      if (connectionContext == null) {
-      Context parentContext = channelTraceContext.getConnectionContext();
+        return null;
+      }
+      Context parentContext = connectionContext.get();
       if (parentContext == null) {
         return null;
       }
       Scope parentScope = parentContext.makeCurrent();
-      if (channelTraceContext.createConnectionSpan()) {
+      if (connectionContext.createConnectionSpan()) {
         tracer().connectionFailure(parentContext, future.getChannel(), cause);
       }
       return parentScope;

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/ChannelTraceContext.java

@@ -1,83 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.javaagent.instrumentation.netty.v3_8;
-
-import io.opentelemetry.context.Context;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-public class ChannelTraceContext {
-
-  public static final Supplier<ChannelTraceContext> FACTORY = ChannelTraceContext::new;
-
-  private Context connectionContext;
-  private Context clientParentContext;
-  private Context context;
-  private boolean connectionSpanCreated;
-
-  public Context getConnectionContext() {
-    return connectionContext;
-  }
-
-  public void setConnectionContext(Context connectionContext) {
-    this.connectionContext = connectionContext;
-  }
-
-  public Context getClientParentContext() {
-    return clientParentContext;
-  }
-
-  public void setClientParentContext(Context clientParentContext) {
-    this.clientParentContext = clientParentContext;
-  }
-
-  public Context getContext() {
-    return context;
-  }
-
-  public void setContext(Context context) {
-    this.context = context;
-  }
-
-  public boolean createConnectionSpan() {
-    if (connectionSpanCreated) {
-      return false;
-    }
-    connectionSpanCreated = true;
-    return true;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof ChannelTraceContext)) {
-      return false;
-    }
-    ChannelTraceContext other = (ChannelTraceContext) obj;
-    return Objects.equals(connectionContext, other.connectionContext)
-        && Objects.equals(clientParentContext, other.clientParentContext)
-        && Objects.equals(context, other.context);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(connectionContext, clientParentContext, context);
-  }
-
-  @Override
-  public String toString() {
-    return "ChannelTraceContext{"
-        + "connectionContext="
-        + connectionContext
-        + ", clientParentContext="
-        + clientParentContext
-        + ", context="
-        + context
-        + '}';
-  }
-}

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyChannelInstrumentation.java

@@ -50,15 +50,16 @@ public class NettyChannelInstrumentation implements TypeInstrumentation {
     public static void onEnter(@Advice.This Channel channel) {
       Context context = Java8BytecodeBridge.currentContext();
       Span span = Java8BytecodeBridge.spanFromContext(context);
-      if (span.getSpanContext().isValid()) {
+      if (!span.getSpanContext().isValid()) {
-        VirtualField<Channel, ChannelTraceContext> virtualField =
+        return;
-            VirtualField.find(Channel.class, ChannelTraceContext.class);
-
-        if (virtualField.computeIfNull(channel, ChannelTraceContext.FACTORY).getConnectionContext()
-            == null) {
-          virtualField.get(channel).setConnectionContext(context);
-        }
       }
+
+      VirtualField<Channel, NettyConnectionContext> virtualField =
+          VirtualField.find(Channel.class, NettyConnectionContext.class);
+      if (virtualField.get(channel) != null) {
+        return;
+      }
+      virtualField.set(channel, new NettyConnectionContext(context));
     }
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyChannelPipelineInstrumentation.java

@@ -12,7 +12,6 @@ import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
-import io.opentelemetry.instrumentation.api.field.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.api.CallDepth;
@@ -25,7 +24,6 @@ import io.opentelemetry.javaagent.instrumentation.netty.v3_8.server.HttpServerTr
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.http.HttpClientCodec;
@@ -67,35 +65,28 @@ public class NettyChannelPipelineInstrumentation implements TypeInstrumentation
    * currently implemented.
    */
   public static class ChannelPipelineAdviceUtil {
-    public static void wrapHandler(
+    public static void wrapHandler(ChannelPipeline pipeline, ChannelHandler handler) {
-        VirtualField<Channel, ChannelTraceContext> virtualField,
-        ChannelPipeline pipeline,
-        ChannelHandler handler) {
       // Server pipeline handlers
       if (handler instanceof HttpServerCodec) {
-        pipeline.addLast(
+        pipeline.addLast(HttpServerTracingHandler.class.getName(), new HttpServerTracingHandler());
-            HttpServerTracingHandler.class.getName(), new HttpServerTracingHandler(virtualField));
       } else if (handler instanceof HttpRequestDecoder) {
         pipeline.addLast(
-            HttpServerRequestTracingHandler.class.getName(),
+            HttpServerRequestTracingHandler.class.getName(), new HttpServerRequestTracingHandler());
-            new HttpServerRequestTracingHandler(virtualField));
       } else if (handler instanceof HttpResponseEncoder) {
         pipeline.addLast(
             HttpServerResponseTracingHandler.class.getName(),
-            new HttpServerResponseTracingHandler(virtualField));
+            new HttpServerResponseTracingHandler());
       } else
       // Client pipeline handlers
       if (handler instanceof HttpClientCodec) {
-        pipeline.addLast(
+        pipeline.addLast(HttpClientTracingHandler.class.getName(), new HttpClientTracingHandler());
-            HttpClientTracingHandler.class.getName(), new HttpClientTracingHandler(virtualField));
       } else if (handler instanceof HttpRequestEncoder) {
         pipeline.addLast(
-            HttpClientRequestTracingHandler.class.getName(),
+            HttpClientRequestTracingHandler.class.getName(), new HttpClientRequestTracingHandler());
-            new HttpClientRequestTracingHandler(virtualField));
       } else if (handler instanceof HttpResponseDecoder) {
         pipeline.addLast(
             HttpClientResponseTracingHandler.class.getName(),
-            new HttpClientResponseTracingHandler(virtualField));
+            new HttpClientResponseTracingHandler());
       }
     }
   }
@@ -127,10 +118,7 @@ public class NettyChannelPipelineInstrumentation implements TypeInstrumentation
         return;
       }
 
-      VirtualField<Channel, ChannelTraceContext> virtualField =
+      ChannelPipelineAdviceUtil.wrapHandler(pipeline, handler);
-          VirtualField.find(Channel.class, ChannelTraceContext.class);
-
-      ChannelPipelineAdviceUtil.wrapHandler(virtualField, pipeline, handler);
     }
   }
 
@@ -161,10 +149,7 @@ public class NettyChannelPipelineInstrumentation implements TypeInstrumentation
         return;
       }
 
-      VirtualField<Channel, ChannelTraceContext> virtualField =
+      ChannelPipelineAdviceUtil.wrapHandler(pipeline, handler);
-          VirtualField.find(Channel.class, ChannelTraceContext.class);
-
-      ChannelPipelineAdviceUtil.wrapHandler(virtualField, pipeline, handler);
     }
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyConnectionContext.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.netty.v3_8;
+
+import io.opentelemetry.context.Context;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class NettyConnectionContext {
+  private Context connectionContext;
+  private boolean connectionSpanCreated;
+
+  public NettyConnectionContext(Context connectionContext) {
+    this.connectionContext = connectionContext;
+  }
+
+  @Nullable
+  public Context get() {
+    return connectionContext;
+  }
+
+  @Nullable
+  public Context remove() {
+    Context context = this.connectionContext;
+    connectionContext = null;
+    return context;
+  }
+
+  public boolean createConnectionSpan() {
+    if (connectionSpanCreated) {
+      return false;
+    }
+    connectionSpanCreated = true;
+    return true;
+  }
+}

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyRequestContexts.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.netty.v3_8;
+
+import com.google.auto.value.AutoValue;
+import io.opentelemetry.context.Context;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+@AutoValue
+public abstract class NettyRequestContexts {
+
+  public static NettyRequestContexts create(@Nullable Context parentContext, Context context) {
+    return new AutoValue_NettyRequestContexts(parentContext, context);
+  }
+
+  @Nullable
+  public abstract Context parentContext();
+
+  public abstract Context context();
+}

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientRequestTracingHandler.java

@@ -10,7 +10,8 @@ import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.client.Netty
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
+import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyConnectionContext;
+import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequestContexts;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.MessageEvent;
@@ -19,11 +20,10 @@ import org.jboss.netty.handler.codec.http.HttpRequest;
 
 public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHandler {
 
-  private final VirtualField<Channel, ChannelTraceContext> virtualField;
+  private static final VirtualField<Channel, NettyConnectionContext> connectionContextField =
-
+      VirtualField.find(Channel.class, NettyConnectionContext.class);
-  public HttpClientRequestTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
+  private static final VirtualField<Channel, NettyRequestContexts> requestContextsField =
-    this.virtualField = virtualField;
+      VirtualField.find(Channel.class, NettyRequestContexts.class);
-  }
 
   @Override
   public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) {
@@ -33,13 +33,12 @@ public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHand
       return;
     }
 
-    ChannelTraceContext channelTraceContext =
+    Context parentContext = null;
-        virtualField.computeIfNull(ctx.getChannel(), ChannelTraceContext.FACTORY);
+    NettyConnectionContext connectionContext = connectionContextField.get(ctx.getChannel());
-
+    if (connectionContext != null) {
-    Context parentContext = channelTraceContext.getConnectionContext();
+      parentContext = connectionContext.remove();
-    if (parentContext != null) {
+    }
-      channelTraceContext.setConnectionContext(null);
+    if (parentContext == null) {
-    } else {
       parentContext = Context.current();
     }
 
@@ -49,8 +48,7 @@ public class HttpClientRequestTracingHandler extends SimpleChannelDownstreamHand
     }
 
     Context context = tracer().startSpan(parentContext, ctx, (HttpRequest) message);
-    channelTraceContext.setContext(context);
+    requestContextsField.set(ctx.getChannel(), NettyRequestContexts.create(parentContext, context));
-    channelTraceContext.setClientParentContext(parentContext);
 
     try (Scope ignored = context.makeCurrent()) {
       ctx.sendDownstream(event);

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientResponseTracingHandler.java

@@ -7,10 +7,9 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.client;
 
 import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.client.NettyHttpClientTracer.tracer;
 
-import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
+import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequestContexts;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.MessageEvent;
@@ -19,34 +18,24 @@ import org.jboss.netty.handler.codec.http.HttpResponse;
 
 public class HttpClientResponseTracingHandler extends SimpleChannelUpstreamHandler {
 
-  private final VirtualField<Channel, ChannelTraceContext> virtualField;
+  private static final VirtualField<Channel, NettyRequestContexts> requestContextsField =
-
+      VirtualField.find(Channel.class, NettyRequestContexts.class);
-  public HttpClientResponseTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
-    this.virtualField = virtualField;
-  }
 
   @Override
   public void messageReceived(ChannelHandlerContext ctx, MessageEvent msg) {
-    ChannelTraceContext channelTraceContext =
+    NettyRequestContexts requestContexts = requestContextsField.get(ctx.getChannel());
-        virtualField.computeIfNull(ctx.getChannel(), ChannelTraceContext.FACTORY);
 
-    Context context = channelTraceContext.getContext();
+    if (requestContexts == null || requestContexts.parentContext() == null) {
-    if (context == null) {
       ctx.sendUpstream(msg);
       return;
     }
 
     if (msg.getMessage() instanceof HttpResponse) {
-      tracer().end(context, (HttpResponse) msg.getMessage());
+      tracer().end(requestContexts.context(), (HttpResponse) msg.getMessage());
     }
 
     // We want the callback in the scope of the parent, not the client span
-    Context parentContext = channelTraceContext.getClientParentContext();
+    try (Scope ignored = requestContexts.parentContext().makeCurrent()) {
-    if (parentContext != null) {
-      try (Scope ignored = parentContext.makeCurrent()) {
-        ctx.sendUpstream(msg);
-      }
-    } else {
       ctx.sendUpstream(msg);
     }
   }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/HttpClientTracingHandler.java

@@ -5,18 +5,13 @@
 
 package io.opentelemetry.javaagent.instrumentation.netty.v3_8.client;
 
-import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.CombinedSimpleChannelHandler;
-import org.jboss.netty.channel.Channel;
 
 public class HttpClientTracingHandler
     extends CombinedSimpleChannelHandler<
         HttpClientResponseTracingHandler, HttpClientRequestTracingHandler> {
 
-  public HttpClientTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
+  public HttpClientTracingHandler() {
-    super(
+    super(new HttpClientResponseTracingHandler(), new HttpClientRequestTracingHandler());
-        new HttpClientResponseTracingHandler(virtualField),
-        new HttpClientRequestTracingHandler(virtualField));
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerRequestTracingHandler.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.server.Netty
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
+import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequestContexts;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.MessageEvent;
@@ -19,24 +19,18 @@ import org.jboss.netty.handler.codec.http.HttpRequest;
 
 public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandler {
 
-  private final VirtualField<Channel, ChannelTraceContext> virtualField;
+  private static final VirtualField<Channel, NettyRequestContexts> requestContextsField =
-
+      VirtualField.find(Channel.class, NettyRequestContexts.class);
-  public HttpServerRequestTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
-    this.virtualField = virtualField;
-  }
 
   @Override
   public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) {
-    ChannelTraceContext channelTraceContext =
-        virtualField.computeIfNull(ctx.getChannel(), ChannelTraceContext.FACTORY);
-
     Object message = event.getMessage();
     if (!(message instanceof HttpRequest)) {
-      Context serverContext = tracer().getServerContext(channelTraceContext);
+      NettyRequestContexts requestContexts = requestContextsField.get(ctx.getChannel());
-      if (serverContext == null) {
+      if (requestContexts == null) {
         ctx.sendUpstream(event);
       } else {
-        try (Scope ignored = serverContext.makeCurrent()) {
+        try (Scope ignored = requestContexts.context().makeCurrent()) {
           ctx.sendUpstream(event);
         }
       }
@@ -46,9 +40,9 @@ public class HttpServerRequestTracingHandler extends SimpleChannelUpstreamHandle
     HttpRequest request = (HttpRequest) message;
 
     Context context =
-        tracer()
+        tracer().startSpan(request, ctx.getChannel(), null, "HTTP " + request.getMethod());
-            .startSpan(
+    requestContextsField.set(ctx.getChannel(), NettyRequestContexts.create(null, context));
-                request, ctx.getChannel(), channelTraceContext, "HTTP " + request.getMethod());
+
     try (Scope ignored = context.makeCurrent()) {
       ctx.sendUpstream(event);
       // the span is ended normally in HttpServerResponseTracingHandler

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerResponseTracingHandler.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.javaagent.instrumentation.netty.v3_8.server.Netty
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
+import io.opentelemetry.javaagent.instrumentation.netty.v3_8.NettyRequestContexts;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.MessageEvent;
@@ -19,29 +19,25 @@ import org.jboss.netty.handler.codec.http.HttpResponse;
 
 public class HttpServerResponseTracingHandler extends SimpleChannelDownstreamHandler {
 
-  private final VirtualField<Channel, ChannelTraceContext> virtualField;
+  private static final VirtualField<Channel, NettyRequestContexts> requestContextsField =
-
+      VirtualField.find(Channel.class, NettyRequestContexts.class);
-  public HttpServerResponseTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
-    this.virtualField = virtualField;
-  }
 
   @Override
   public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) {
-    ChannelTraceContext channelTraceContext =
+    NettyRequestContexts requestContexts = requestContextsField.get(ctx.getChannel());
-        virtualField.computeIfNull(ctx.getChannel(), ChannelTraceContext.FACTORY);
 
-    Context context = tracer().getServerContext(channelTraceContext);
+    if (requestContexts == null || !(msg.getMessage() instanceof HttpResponse)) {
-    if (context == null || !(msg.getMessage() instanceof HttpResponse)) {
       ctx.sendDownstream(msg);
       return;
     }
 
+    Context context = requestContexts.context();
     try (Scope ignored = context.makeCurrent()) {
       ctx.sendDownstream(msg);
+      tracer().end(context, (HttpResponse) msg.getMessage());
     } catch (Throwable throwable) {
       tracer().endExceptionally(context, throwable);
       throw throwable;
     }
-    tracer().end(context, (HttpResponse) msg.getMessage());
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/HttpServerTracingHandler.java

@@ -5,18 +5,13 @@
 
 package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server;
 
-import io.opentelemetry.instrumentation.api.field.VirtualField;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.util.CombinedSimpleChannelHandler;
-import org.jboss.netty.channel.Channel;
 
 public class HttpServerTracingHandler
     extends CombinedSimpleChannelHandler<
         HttpServerRequestTracingHandler, HttpServerResponseTracingHandler> {
 
-  public HttpServerTracingHandler(VirtualField<Channel, ChannelTraceContext> virtualField) {
+  public HttpServerTracingHandler() {
-    super(
+    super(new HttpServerRequestTracingHandler(), new HttpServerResponseTracingHandler());
-        new HttpServerRequestTracingHandler(virtualField),
-        new HttpServerResponseTracingHandler(virtualField));
   }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java

@@ -10,7 +10,6 @@ import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
-import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -19,7 +18,7 @@ import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
 public class NettyHttpServerTracer
-    extends HttpServerTracer<HttpRequest, HttpResponse, Channel, ChannelTraceContext> {
+    extends HttpServerTracer<HttpRequest, HttpResponse, Channel, Void> {
   private static final NettyHttpServerTracer TRACER = new NettyHttpServerTracer();
 
   public static NettyHttpServerTracer tracer() {
@@ -42,13 +41,11 @@ public class NettyHttpServerTracer
   }
 
   @Override
-  protected void attachServerContext(Context context, ChannelTraceContext channelTraceContext) {
+  protected void attachServerContext(Context context, Void unused) {}
-    channelTraceContext.setContext(context);
-  }
 
   @Override
-  public Context getServerContext(ChannelTraceContext channelTraceContext) {
+  public Context getServerContext(Void unused) {
-    return channelTraceContext.getContext();
+    return null;
   }
 
   @Override