Upgrate OTEL to 1.1.0

Makefile

@@ -17,7 +17,7 @@ smoke-test:
 muzzle:
 	# daemon was causing failure "java.lang.IllegalStateException: Could not locate class file for"
     # for injecting helper classes from the same packages as instrumentations
-	./gradlew muzzle --no-daemon
+	./gradlew assemble muzzle --no-daemon
 
 .PHONY: docker
 docker: assemble

build.gradle.kts

@@ -31,9 +31,9 @@ subprojects {
     description = "Hypertrace OpenTelemetry Javaagent"
 
     extra.set("versions", mapOf(
-            "opentelemetry" to "1.0.1",
-            "opentelemetry_java_agent" to "1.0.1-alpha",
-            "opentelemetry_java_agent_all" to "1.0.1",
+            "opentelemetry" to "1.1.0",
+            "opentelemetry_java_agent" to "1.1.0-alpha",
+            "opentelemetry_java_agent_all" to "1.1.0",
             "byte_buddy" to "1.10.18",
                 "slf4j" to "1.7.30"
     ))

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientObjectRegistry.java

@@ -18,13 +18,13 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.javaagent.instrumentation.api.WeakMap;
+import io.opentelemetry.instrumentation.api.caching.Cache;
 import org.apache.http.HttpEntity;
 
 public class ApacheHttpClientObjectRegistry {
 
-  public static final WeakMap<HttpEntity, SpanAndAttributeKey> entityToSpan =
-      WeakMap.Provider.newWeakMap();
+  public static final Cache<HttpEntity, SpanAndAttributeKey> entityToSpan =
+      Cache.newBuilder().setWeakKeys().build();
 
   public static class SpanAndAttributeKey {
     public final Span span;

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/HttpEntityInstrumentation.java

@@ -48,7 +48,7 @@
 public class HttpEntityInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return implementsInterface(named("org.apache.http.HttpEntity"));
   }
 
@@ -138,13 +138,15 @@ public static void enter(
     public static void exit(
         @Advice.This HttpEntity thizz, @Advice.Argument(0) OutputStream outputStream) {
       SpanAndAttributeKey spanAndAttributeKey =
-          ApacheHttpClientObjectRegistry.entityToSpan.remove(thizz);
+          ApacheHttpClientObjectRegistry.entityToSpan.get(thizz);
+      ApacheHttpClientObjectRegistry.entityToSpan.remove(thizz);
       if (spanAndAttributeKey == null) {
         return;
       }
 
       BoundedByteArrayOutputStream bufferedOutStream =
-          GlobalObjectRegistry.outputStreamToBufferMap.remove(outputStream);
+          GlobalObjectRegistry.outputStreamToBufferMap.get(outputStream);
+      GlobalObjectRegistry.outputStreamToBufferMap.remove(outputStream);
       try {
         String requestBody = bufferedOutStream.toStringWithSuppliedCharset();
         spanAndAttributeKey.span.setAttribute(spanAndAttributeKey.attributeKey, requestBody);

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/readall/ApacheClientReadAllInstrumentationModule.java

@@ -221,7 +221,7 @@ public static void exit(@Return Object response) {
 
   static class HttpEntityInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return implementsInterface(named("org.apache.http.HttpEntity"));
     }
 

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/readall/InputStreamReadAllInstrumentationModule.java

@@ -68,7 +68,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   static class InputStreamInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return safeHasSuperType(namedOneOf("java.io.InputStream"));
     }
 

instrumentation/build.gradle.kts

@@ -63,7 +63,7 @@ tasks {
         relocate("org.checkerframework", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.com.checkerframework")
         relocate("org.yaml", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.org.yaml")
 
-        relocate("com.blogspot.mydailyjava", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.com.blogspot.mydailyjava")
+        relocate("com.blogspot.mydailyjava.weaklockfree", "io.opentelemetry.instrumentation.api.internal.shaded.weaklockfree")
 
         exclude("**/module-info.class")
 

instrumentation/grpc-1.5/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_5/NettyHttp2HeadersInstrumentationModule.java

@@ -69,7 +69,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
    */
   class NettyUtilsInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return failSafe(named("io.grpc.netty.Utils"));
     }
 

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

@@ -70,7 +70,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   static class InputStreamInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return extendsClass(named(InputStream.class.getName()))
           .and(not(safeHasSuperType(named("javax.servlet.ServletInputStream"))));
     }

instrumentation/java-streams/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/java/outputstream/OutputStreamInstrumentationModule.java

@@ -64,7 +64,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   static class OutputStreamInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return extendsClass(named(OutputStream.class.getName()));
     }
 

instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentationModule.java

@@ -75,11 +75,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
         .and(not(hasClassesNamed("javax.servlet.AsyncEvent", "javax.servlet.AsyncListener")));
   }
 
-  @Override
-  public Map<String, String> contextStore() {
-    return singletonMap("javax.servlet.ServletResponse", Integer.class.getName());
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new Servlet2BodyInstrumentation());

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

@@ -66,7 +66,7 @@ public ElementMatcher<ClassLoader> classLoaderOptimization() {
   }
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.Servlet"));
   }
 

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

@@ -24,14 +24,7 @@
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-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;
-import org.hypertrace.agent.core.instrumentation.buffer.CharBufferSpanPair;
 
 @AutoService(InstrumentationModule.class)
 public class Servlet31NoWrappingInstrumentationModule extends InstrumentationModule {
@@ -54,19 +47,4 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new ServletResponseInstrumentation(),
         new ServletOutputStreamInstrumentation());
   }
-
-  @Override
-  protected Map<String, String> contextStore() {
-    Map<String, String> context = new HashMap<>();
-    // capture request body
-    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", SpanAndObjectPair.class.getName());
-    context.put("javax.servlet.ServletOutputStream", BoundedByteArrayOutputStream.class.getName());
-    context.put("java.io.PrintWriter", BoundedCharArrayWriter.class.getName());
-    return context;
-  }
 }

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

@@ -41,7 +41,7 @@
 public class ServletInputStreamInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("javax.servlet.ServletInputStream"));
   }
 

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

@@ -44,7 +44,7 @@
 public class ServletRequestInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("javax.servlet.ServletRequest"));
   }
 

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

@@ -40,7 +40,7 @@
 public class ServletOutputStreamInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("javax.servlet.ServletOutputStream"));
   }
 

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

@@ -51,7 +51,7 @@
 public class ServletResponseInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("javax.servlet.ServletResponse"));
   }
 

instrumentation/servlet/servlet-3.0-no-wrapping/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/request/ServletInputStreamContextAccessInstrumentationModule.java

@@ -44,7 +44,7 @@ public ServletInputStreamContextAccessInstrumentationModule() {
   }
 
   @Override
-  protected Map<String, String> contextStore() {
+  protected Map<String, String> getMuzzleContextStoreClasses() {
     Map<String, String> context = new HashMap<>();
     context.put("javax.servlet.ServletInputStream", ByteBufferSpanPair.class.getName());
     return context;
@@ -58,7 +58,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   class InputStreamTriggerInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.ServletStreamContextAccess");
     }
 

instrumentation/servlet/servlet-3.0-no-wrapping/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/nowrapping/response/ServletOutputStreamContextAccessInstrumentationModule.java

@@ -43,7 +43,7 @@ public ServletOutputStreamContextAccessInstrumentationModule() {
   }
 
   @Override
-  protected Map<String, String> contextStore() {
+  protected Map<String, String> getMuzzleContextStoreClasses() {
     Map<String, String> context = new HashMap<>();
     context.put("javax.servlet.ServletOutputStream", BoundedByteArrayOutputStream.class.getName());
     return context;
@@ -57,7 +57,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   class OutputStreamTriggerInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.ServletStreamContextAccess");
     }
 

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentationModule.java

@@ -88,7 +88,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   private static class Servlet30BodyInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.http.HttpServlet"));
     }
 

instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v3_1/Servlet31BodyInstrumentationModule.java

@@ -78,7 +78,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   private static final class Servlet31BodyInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return safeHasSuperType(namedOneOf("javax.servlet.Filter", "javax.servlet.http.HttpServlet"));
     }
 

instrumentation/servlet/servlet-rw/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/reader/BufferedReaderInstrumentation.java

@@ -41,7 +41,7 @@
 public class BufferedReaderInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("java.io.BufferedReader")).or(named("java.io.BufferedReader"));
   }
 

instrumentation/servlet/servlet-rw/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/reader/BufferedReaderInstrumentationModule.java

@@ -21,8 +21,6 @@
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import org.hypertrace.agent.core.instrumentation.buffer.CharBufferSpanPair;
 
 /**
  * Instrumentation module for {@link java.io.BufferedReader}. It must be be defined in a separate
@@ -36,11 +34,6 @@ public BufferedReaderInstrumentationModule() {
     super("bufferedreader", "servlet", "servlet-3", "ht", "servlet-no-wrapping");
   }
 
-  @Override
-  protected Map<String, String> contextStore() {
-    return Collections.singletonMap("java.io.BufferedReader", CharBufferSpanPair.class.getName());
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new BufferedReaderInstrumentation());

instrumentation/servlet/servlet-rw/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/writer/PrintWriterInstrumentation.java

@@ -40,7 +40,7 @@
 public class PrintWriterInstrumentation implements TypeInstrumentation {
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return safeHasSuperType(named("java.io.PrintWriter")).or(named("java.io.PrintWriter"));
   }
 

instrumentation/servlet/servlet-rw/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/writer/PrintWriterInstrumentationModule.java

@@ -21,8 +21,6 @@
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import org.hypertrace.agent.core.instrumentation.buffer.BoundedCharArrayWriter;
 
 @AutoService(InstrumentationModule.class)
 public class PrintWriterInstrumentationModule extends InstrumentationModule {
@@ -31,11 +29,6 @@ public PrintWriterInstrumentationModule() {
     super("printwriter", "servlet", "servlet-3", "ht", "servlet-no-wrapping");
   }
 
-  @Override
-  protected Map<String, String> contextStore() {
-    return Collections.singletonMap("java.io.PrintWriter", BoundedCharArrayWriter.class.getName());
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new PrintWriterInstrumentation());

instrumentation/servlet/servlet-rw/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/reader/BufferedReaderContextAccessInstrumentationModule.java

@@ -41,7 +41,7 @@ public BufferedReaderContextAccessInstrumentationModule() {
   }
 
   @Override
-  protected Map<String, String> contextStore() {
+  protected Map<String, String> getMuzzleContextStoreClasses() {
     return Collections.singletonMap("java.io.BufferedReader", CharBufferSpanPair.class.getName());
   }
 
@@ -53,7 +53,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   class BufferedReaderTriggerInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.BufferedReaderPrintWriterContextAccess");
     }
 

instrumentation/servlet/servlet-rw/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/rw/writer/PrintWriterContextAccessInstrumentationModule.java

@@ -43,7 +43,7 @@ public PrintWriterContextAccessInstrumentationModule() {
   }
 
   @Override
-  protected Map<String, String> contextStore() {
+  protected Map<String, String> getMuzzleContextStoreClasses() {
     return Collections.singletonMap("java.io.PrintWriter", BoundedCharArrayWriter.class.getName());
   }
 
@@ -55,7 +55,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   class PrintWriterTriggerInstrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.BufferedReaderPrintWriterContextAccess");
     }
 

instrumentation/struts-2.3/build.gradle.kts

@@ -1,15 +1,6 @@
 plugins {
     `java-library`
     id("io.opentelemetry.instrumentation.auto-instrumentation")
-    muzzle
-}
-
-muzzle {
-    pass {
-        group = "org.apache.struts"
-        module = "struts2-core"
-        versions = "[2.3.1,)"
-    }
 }
 
 val versions: Map<String, String> by extra

instrumentation/vertx-web-3.0/build.gradle.kts

@@ -2,15 +2,6 @@ plugins {
     `java-library`
     id("net.bytebuddy.byte-buddy")
     id("io.opentelemetry.instrumentation.auto-instrumentation")
-    muzzle
-}
-
-muzzle {
-    pass {
-        group = "io.vertx"
-        module = "vertx-web"
-        versions = "[3.0.0,)"
-    }
 }
 
 afterEvaluate{