Merge pull request #5 from hypertrace/main

pull main

Author: shashank11p

build.gradle.kts

@@ -28,8 +28,8 @@ subprojects {
     description = "Hypertrace OpenTelemetry Javaagent"
 
     extra.set("versions", mapOf(
-            "opentelemetry" to "0.14.1",
-            "opentelemetry_java_agent" to "0.14.0",
+            "opentelemetry" to "0.15.0",
+            "opentelemetry_java_agent" to "0.15.1",
             "byte_buddy" to "1.10.18"
     ))
 

instrumentation/build.gradle.kts

@@ -79,8 +79,10 @@ tasks {
 
         // relocate OpenTelemetry API
         relocate("io.opentelemetry.api", "io.opentelemetry.javaagent.shaded.io.opentelemetry.api")
+        relocate("io.opentelemetry.semconv", "io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv")
         relocate("io.opentelemetry.spi", "io.opentelemetry.javaagent.shaded.io.opentelemetry.spi")
         relocate("io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context")
+        relocate("io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin")
         relocate ("io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation")
     }
 }

instrumentation/grpc-1.5/build.gradle.kts

@@ -55,21 +55,38 @@ protobuf {
 }
 
 val versions: Map<String, String> by extra
+val grpcVersion = "1.5.0"
 
 dependencies {
     api("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-grpc-1.5:${versions["opentelemetry_java_agent"]}")
     api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.5:${versions["opentelemetry_java_agent"]}")
 
-    compileOnly("io.grpc:grpc-core:1.5.0")
-    compileOnly("io.grpc:grpc-protobuf:1.5.0")
-    compileOnly("io.grpc:grpc-stub:1.5.0")
-    compileOnly("io.grpc:grpc-netty:1.5.0")
+    compileOnly("io.grpc:grpc-core:${grpcVersion}")
+    compileOnly("io.grpc:grpc-protobuf:${grpcVersion}")
+    compileOnly("io.grpc:grpc-stub:${grpcVersion}")
+    compileOnly("io.grpc:grpc-netty:${grpcVersion}")
 
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
     testImplementation(project(":testing-common"))
-    testImplementation("io.grpc:grpc-core:1.5.0")
-    testImplementation("io.grpc:grpc-protobuf:1.5.0")
-    testImplementation("io.grpc:grpc-stub:1.5.0")
-    testImplementation("io.grpc:grpc-netty:1.5.0")
+    testImplementation("io.grpc:grpc-core:${grpcVersion}") {
+        version {
+            strictly(grpcVersion)
+        }
+    }
+    testImplementation("io.grpc:grpc-protobuf:${grpcVersion}") {
+        version {
+            strictly(grpcVersion)
+        }
+    }
+    testImplementation("io.grpc:grpc-stub:${grpcVersion}") {
+        version {
+            strictly(grpcVersion)
+        }
+    }
+    testImplementation("io.grpc:grpc-netty:${grpcVersion}") {
+        version {
+            strictly(grpcVersion)
+        }
+    }
 }

instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/inputstream/InputStreamUtils.java

@@ -147,11 +147,13 @@ public static void available(InputStream inputStream, int available) {
     }
     SpanAndBuffer spanAndBuffer =
         GlobalObjectRegistry.inputStreamToSpanAndBufferMap.get(inputStream);
-    InputStreamUtils.addBody(
-        spanAndBuffer.span,
-        spanAndBuffer.attributeKey,
-        spanAndBuffer.byteArrayBuffer,
-        spanAndBuffer.charset);
-    GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
+    if (spanAndBuffer != null) {
+      InputStreamUtils.addBody(
+          spanAndBuffer.span,
+          spanAndBuffer.attributeKey,
+          spanAndBuffer.byteArrayBuffer,
+          spanAndBuffer.charset);
+      GlobalObjectRegistry.inputStreamToSpanAndBufferMap.remove(inputStream);
+    }
   }
 }

instrumentation/netty/netty-4.0/build.gradle.kts

@@ -40,11 +40,48 @@ afterEvaluate{
 }
 
 val versions: Map<String, String> by extra
+// version used by async-http-client:2.0.9
+val nettyVersion = "4.0.38.Final"
 
 dependencies {
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.0:${versions["opentelemetry_java_agent"]}")
 
-    implementation("io.netty:netty-codec-http:4.0.0.Final")
+    compileOnly("io.netty:netty-codec-http:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+
+    testImplementation("io.netty:netty-codec-http:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+    testImplementation("io.netty:netty-transport:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+    testImplementation("io.netty:netty-common:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+    testImplementation("io.netty:netty-codec:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+    testImplementation("io.netty:netty-handler:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
+    testImplementation("io.netty:netty-buffer:${nettyVersion}") {
+        version {
+            strictly(nettyVersion)
+        }
+    }
 
     testImplementation(project(":testing-common"))
     testImplementation("org.asynchttpclient:async-http-client:2.0.9")

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyInstrumentationModule.java

@@ -16,11 +16,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_0;
 
+import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static net.bytebuddy.matcher.ElementMatchers.not;
+
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Arrays;
 import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class NettyInstrumentationModule extends InstrumentationModule {
@@ -34,6 +38,13 @@ public int getOrder() {
     return -1;
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Class added in 4.1.0 and not in 4.0.56 to avoid resolving this instrumentation completely
+    // when using 4.1.
+    return not(hasClassesNamed("io.netty.handler.codec.http.CombinedHttpHeaders"));
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Arrays.asList(new NettyChannelPipelineInstrumentation());

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyInstrumentationModule.java

@@ -16,11 +16,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.hypertrace.netty.v4_1;
 
+import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Arrays;
 import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class NettyInstrumentationModule extends InstrumentationModule {
@@ -34,6 +37,13 @@ public int getOrder() {
     return -1;
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Class added in 4.1.0 and not in 4.0.56 to avoid resolving this instrumentation completely
+    // when using 4.0.
+    return hasClassesNamed("io.netty.handler.codec.http.CombinedHttpHeaders");
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Arrays.asList(new NettyChannelPipelineInstrumentation());

instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/BodyCaptureAsyncListener.java

@@ -18,8 +18,6 @@
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.javaagent.instrumentation.api.ContextStore;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.request.RequestStreamReaderHolder;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.response.ResponseStreamWriterHolder;
 import java.io.BufferedReader;
 import java.io.PrintWriter;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -34,6 +32,7 @@
 import org.hypertrace.agent.config.Config.AgentConfig;
 import org.hypertrace.agent.core.config.HypertraceConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
+import org.hypertrace.agent.core.instrumentation.SpanAndObjectPair;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedCharArrayWriter;
 import org.hypertrace.agent.core.instrumentation.buffer.ByteBufferSpanPair;
@@ -45,11 +44,11 @@ public class BodyCaptureAsyncListener implements AsyncListener {
   private final AtomicBoolean responseHandled;
   private final Span span;
 
-  private final ContextStore<HttpServletResponse, ResponseStreamWriterHolder> responseContextStore;
+  private final ContextStore<HttpServletResponse, SpanAndObjectPair> responseContextStore;
   private final ContextStore<ServletOutputStream, BoundedByteArrayOutputStream> streamContextStore;
   private final ContextStore<PrintWriter, BoundedCharArrayWriter> writerContextStore;
 
-  private final ContextStore<HttpServletRequest, RequestStreamReaderHolder> requestContextStore;
+  private final ContextStore<HttpServletRequest, SpanAndObjectPair> requestContextStore;
   private final ContextStore<ServletInputStream, ByteBufferSpanPair> inputStreamContextStore;
   private final ContextStore<BufferedReader, CharBufferSpanPair> readerContextStore;
 
@@ -58,10 +57,10 @@ public class BodyCaptureAsyncListener implements AsyncListener {
   public BodyCaptureAsyncListener(
       AtomicBoolean responseHandled,
       Span span,
-      ContextStore<HttpServletResponse, ResponseStreamWriterHolder> responseContextStore,
+      ContextStore<HttpServletResponse, SpanAndObjectPair> responseContextStore,
       ContextStore<ServletOutputStream, BoundedByteArrayOutputStream> streamContextStore,
       ContextStore<PrintWriter, BoundedCharArrayWriter> writerContextStore,
-      ContextStore<HttpServletRequest, RequestStreamReaderHolder> requestContextStore,
+      ContextStore<HttpServletRequest, SpanAndObjectPair> requestContextStore,
       ContextStore<ServletInputStream, ByteBufferSpanPair> inputStreamContextStore,
       ContextStore<BufferedReader, CharBufferSpanPair> readerContextStore) {
     this.responseHandled = responseHandled;

instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentation.java

@@ -17,6 +17,7 @@
 package io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping;
 
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;
+import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -28,8 +29,6 @@
 import io.opentelemetry.javaagent.instrumentation.api.ContextStore;
 import io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.request.RequestStreamReaderHolder;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.response.ResponseStreamWriterHolder;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.io.BufferedReader;
 import java.io.PrintWriter;
@@ -51,6 +50,7 @@
 import org.hypertrace.agent.config.Config.AgentConfig;
 import org.hypertrace.agent.core.config.HypertraceConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
+import org.hypertrace.agent.core.instrumentation.SpanAndObjectPair;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedCharArrayWriter;
 import org.hypertrace.agent.core.instrumentation.buffer.ByteBufferSpanPair;
@@ -60,9 +60,14 @@
 
 public class Servlet31NoWrappingInstrumentation implements TypeInstrumentation {
 
+  @Override
+  public ElementMatcher<ClassLoader> classLoaderOptimization() {
+    return hasClassesNamed("javax.servlet.Filter");
+  }
+
   @Override
   public ElementMatcher<? super TypeDescription> typeMatcher() {
-    return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.http.HttpServlet"));
+    return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.Servlet"));
   }
 
   @Override
@@ -103,8 +108,8 @@ public static boolean start(
           && ContentTypeUtils.shouldCapture(contentType)) {
         // The HttpServletRequest instrumentation uses this to
         // enable the instrumentation
-        InstrumentationContext.get(HttpServletRequest.class, RequestStreamReaderHolder.class)
-            .put(httpRequest, new RequestStreamReaderHolder(currentSpan));
+        InstrumentationContext.get(HttpServletRequest.class, SpanAndObjectPair.class)
+            .put(httpRequest, new SpanAndObjectPair(currentSpan));
       }
 
       Utils.addSessionId(currentSpan, httpRequest);
@@ -152,18 +157,17 @@ public static void exit(
       HttpServletRequest httpRequest = (HttpServletRequest) request;
       AgentConfig agentConfig = HypertraceConfig.get();
 
+      // response context to capture body and clear the context
+      ContextStore<HttpServletResponse, SpanAndObjectPair> responseContextStore =
+          InstrumentationContext.get(HttpServletResponse.class, SpanAndObjectPair.class);
       ContextStore<ServletOutputStream, BoundedByteArrayOutputStream> outputStreamContextStore =
           InstrumentationContext.get(ServletOutputStream.class, BoundedByteArrayOutputStream.class);
       ContextStore<PrintWriter, BoundedCharArrayWriter> writerContextStore =
           InstrumentationContext.get(PrintWriter.class, BoundedCharArrayWriter.class);
 
-      // response context to capture body and clear the context
-      ContextStore<HttpServletResponse, ResponseStreamWriterHolder> responseContextStore =
-          InstrumentationContext.get(HttpServletResponse.class, ResponseStreamWriterHolder.class);
-
       // request context to clear body buffer
-      ContextStore<HttpServletRequest, RequestStreamReaderHolder> requestContextStore =
-          InstrumentationContext.get(HttpServletRequest.class, RequestStreamReaderHolder.class);
+      ContextStore<HttpServletRequest, SpanAndObjectPair> requestContextStore =
+          InstrumentationContext.get(HttpServletRequest.class, SpanAndObjectPair.class);
       ContextStore<ServletInputStream, ByteBufferSpanPair> inputStreamContextStore =
           InstrumentationContext.get(ServletInputStream.class, ByteBufferSpanPair.class);
       ContextStore<BufferedReader, CharBufferSpanPair> readerContextStore =

instrumentation/servlet/servlet-3.0-no-wrapping/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/Servlet31NoWrappingInstrumentationModule.java

@@ -19,10 +19,8 @@
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.request.RequestStreamReaderHolder;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.request.ServletInputStreamInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.request.ServletRequestInstrumentation;
-import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.response.ResponseStreamWriterHolder;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.response.ServletOutputStreamInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.servlet.v3_0.nowrapping.response.ServletResponseInstrumentation;
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
@@ -32,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.hypertrace.agent.core.instrumentation.SpanAndObjectPair;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedCharArrayWriter;
 import org.hypertrace.agent.core.instrumentation.buffer.ByteBufferSpanPair;
@@ -68,13 +67,12 @@ public List<TypeInstrumentation> typeInstrumentations() {
   protected Map<String, String> contextStore() {
     Map<String, String> context = new HashMap<>();
     // capture request body
-    context.put("javax.servlet.http.HttpServletRequest", RequestStreamReaderHolder.class.getName());
+    context.put("javax.servlet.http.HttpServletRequest", SpanAndObjectPair.class.getName());
     context.put("javax.servlet.ServletInputStream", ByteBufferSpanPair.class.getName());
     context.put("java.io.BufferedReader", CharBufferSpanPair.class.getName());
 
     // capture response body
-    context.put(
-        "javax.servlet.http.HttpServletResponse", ResponseStreamWriterHolder.class.getName());
+    context.put("javax.servlet.http.HttpServletResponse", SpanAndObjectPair.class.getName());
     context.put("javax.servlet.ServletOutputStream", BoundedByteArrayOutputStream.class.getName());
     context.put("java.io.PrintWriter", BoundedCharArrayWriter.class.getName());
     return context;