Update otel version to 1.1.0

custom/src/main/java/com/splunk/opentelemetry/micrometer/MicrometerInstaller.java

@@ -30,9 +30,9 @@
 @AutoService(ComponentInstaller.class)
 public class MicrometerInstaller implements ComponentInstaller {
   @Override
-  public void beforeByteBuddyAgent() {
+  public void beforeByteBuddyAgent(Config config) {
     Resource resource = OpenTelemetrySdkAutoConfiguration.getResource();
-    SplunkMetricsConfig splunkMetricsConfig = new SplunkMetricsConfig(Config.get(), resource);
+    SplunkMetricsConfig splunkMetricsConfig = new SplunkMetricsConfig(config, resource);
 
     if (splunkMetricsConfig.enabled()) {
       GlobalMetricsTags.set(new GlobalTagsBuilder(resource).build());

custom/src/main/java/com/splunk/opentelemetry/resource/ResourceAttributesToSystemProperties.java

@@ -19,6 +19,7 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.common.AttributeType;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.spi.ComponentInstaller;
 import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
 
@@ -32,10 +33,10 @@
 public class ResourceAttributesToSystemProperties implements ComponentInstaller {
 
   @Override
-  public void beforeByteBuddyAgent() {}
+  public void beforeByteBuddyAgent(Config config) {}
 
   @Override
-  public void afterByteBuddyAgent() {
+  public void afterByteBuddyAgent(Config config) {
     Attributes attributes = OpenTelemetrySdkAutoConfiguration.getResource().getAttributes();
     attributes.forEach(
         (k, v) -> {

custom/src/test/java/com/splunk/opentelemetry/jaeger/JaegerThriftSpanExporterFactoryTest.java

@@ -49,7 +49,7 @@ class JaegerThriftSpanExporterFactoryTest {
 
   @BeforeAll
   static void startServer() throws Exception {
-    port = PortUtils.randomOpenPort();
+    port = PortUtils.findOpenPort();
     server = new Server(port);
     for (var connector : server.getConnectors()) {
       connector.setHost("localhost");

gradle/dependencies.gradle

@@ -2,10 +2,10 @@ boolean snapshot = findProperty("snapshot") == 'yes'
 
 ext {
   versions = [
-      opentelemetry              : snapshot ? "1.1.0-SNAPSHOT" : "1.0.0",
-      opentelemetryAlpha         : snapshot ? "1.1.0-alpha-SNAPSHOT" : "1.0.0-alpha",
-      opentelemetryJavaagent     : snapshot ? "1.1.0-SNAPSHOT" : '1.0.0',
-      opentelemetryJavaagentAlpha: snapshot ? "1.1.0-alpha-SNAPSHOT" : '1.0.0-alpha',
+      opentelemetry              : snapshot ? "1.2.0-SNAPSHOT" : "1.1.0",
+      opentelemetryAlpha         : snapshot ? "1.2.0-alpha-SNAPSHOT" : "1.1.0-alpha",
+      opentelemetryJavaagent     : snapshot ? "1.2.0-SNAPSHOT" : '1.1.0',
+      opentelemetryJavaagentAlpha: snapshot ? "1.2.0-alpha-SNAPSHOT" : '1.1.0-alpha',
       mockito                    : '3.8.0',
       jupiter                    : '5.7.1',
       micrometer                 : '1.6.4'

instrumentation/commons-dbcp2/src/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java

@@ -62,7 +62,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   private static class BasicDataSourceInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.apache.commons.dbcp2.BasicDataSource");
     }
 

instrumentation/glassfish/src/main/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java

@@ -53,7 +53,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("com.sun.appserv.server.util.Version");
     }
 

instrumentation/jetty/src/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java

@@ -54,7 +54,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.eclipse.jetty.server.Server");
     }
 

instrumentation/jvm-metrics/src/main/java/com/splunk/opentelemetry/jvmmetrics/JvmMetricsInstaller.java

@@ -32,9 +32,9 @@
 @AutoService(ComponentInstaller.class)
 public class JvmMetricsInstaller implements ComponentInstaller {
   @Override
-  public void afterByteBuddyAgent() {
+  public void afterByteBuddyAgent(Config config) {
     boolean metricsRegistryPresent = !Metrics.globalRegistry.getRegistries().isEmpty();
-    if (!Config.get().isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) {
+    if (!config.isInstrumentationEnabled(singleton("jvm-metrics"), metricsRegistryPresent)) {
       return;
     }
 

instrumentation/liberty/src/main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java

@@ -17,7 +17,9 @@
 package com.splunk.opentelemetry.middleware;
 
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
-import static net.bytebuddy.matcher.ElementMatchers.*;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.ibm.ws.kernel.productinfo.ProductInfo;
@@ -52,7 +54,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("com.ibm.ws.kernel.boot.internal.KernelBootstrap");
     }
 

instrumentation/netty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java

@@ -61,8 +61,9 @@ protected boolean defaultEnabled() {
     return super.defaultEnabled() && ServerTimingHeader.shouldEmitServerTimingHeader();
   }
 
+  // we don't have muzzle in our distro
   @Override
-  public Map<String, String> contextStore() {
+  public Map<String, String> getMuzzleContextStoreClasses() {
     return Collections.singletonMap(
         "org.jboss.netty.channel.Channel", ChannelTraceContext.class.getName());
   }

instrumentation/netty-3.8/src/test/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationTest.java

@@ -64,7 +64,7 @@ class NettyInstrumentationTest {
 
   @BeforeAll
   static void startServer() {
-    port = PortUtils.randomOpenPort();
+    port = PortUtils.findOpenPort();
 
     server = new ServerBootstrap(new NioServerSocketChannelFactory());
     server.setPipelineFactory(

instrumentation/netty-4.0/src/test/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationTest.java

@@ -64,7 +64,7 @@ public class NettyInstrumentationTest {
 
   @BeforeAll
   static void startServer() throws InterruptedException {
-    port = PortUtils.randomOpenPort();
+    port = PortUtils.findOpenPort();
     server = new NioEventLoopGroup();
 
     new ServerBootstrap()

instrumentation/servlet-3-testing/src/test/java/com/splunk/opentelemetry/servlet/Servlet3InstrumentationTest.java

@@ -61,7 +61,7 @@ class Servlet3InstrumentationTest {
 
   @BeforeAll
   static void startServer() throws Exception {
-    port = PortUtils.randomOpenPort();
+    port = PortUtils.findOpenPort();
     server = new Server(port);
     for (var connector : server.getConnectors()) {
       connector.setHost("localhost");

instrumentation/servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java

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

instrumentation/servlet/src/test/java/com/splunk/opentelemetry/servlet/ServletInstrumentationTest.java

@@ -60,7 +60,7 @@ class ServletInstrumentationTest {
 
   @BeforeAll
   static void startServer() throws Exception {
-    port = PortUtils.randomOpenPort();
+    port = PortUtils.findOpenPort();
     server = new Server(port);
     for (var connector : server.getConnectors()) {
       connector.setHost("localhost");

instrumentation/tomcat/src/main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java

@@ -55,7 +55,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.apache.catalina.startup.Catalina");
     }
 

instrumentation/tomee/src/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java

@@ -47,7 +47,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.apache.tomee.catalina.ServerListener");
     }
 

instrumentation/weblogic/src/main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java

@@ -66,7 +66,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   private static class MiddlewareInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("weblogic.servlet.internal.WebAppServletContext$ServletInvocationAction");
     }
 

instrumentation/wildfly/src/main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java

@@ -54,7 +54,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public static class Instrumentation implements TypeInstrumentation {
 
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       return named("org.jboss.as.server.ServerEnvironment");
     }
 

smoke-tests/src/test/java/com/splunk/opentelemetry/JBossEapSmokeTest.java

@@ -18,7 +18,6 @@
 
 import com.splunk.opentelemetry.helper.TestImage;
 import java.io.IOException;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -43,18 +42,6 @@ private static Stream<Arguments> jboss() {
         .stream();
   }
 
-  // TODO: this method can be removed after upstream javaagent 1.1.0 release
-  // openj9 JDK8 does not have JFR classes, which causes all ComponentInstallers to run
-  // synchronously, not after LogManager is loaded - see
-  // AgentInstaller#installComponentsAfterByteBuddy()
-  // micrometer's JvmGcMetrics references (indirectly) NotificationBroadcasterSupport which uses
-  // ClassLogger which uses JUL and this causes JVM LogManager to load before the JBoss one
-  // AFAIK only openj9 (IBM) JDK 8 has this problem, all other JDKs don't use JUL in MBeans
-  @Override
-  protected Map<String, String> getExtraEnv() {
-    return Map.of("SPLUNK_METRICS_ENABLED", "false");
-  }
-
   @ParameterizedTest(name = "[{index}] {0}")
   @MethodSource("jboss")
   void jbossSmokeTest(TestImage image, ExpectedServerAttributes expectedServerAttributes)

smoke-tests/src/test/java/com/splunk/opentelemetry/WildFlySmokeTest.java

@@ -18,7 +18,6 @@
 
 import com.splunk.opentelemetry.helper.TestImage;
 import java.io.IOException;
-import java.util.Map;
 import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -44,18 +43,6 @@ private static Stream<Arguments> supportedConfigurations() {
         .stream();
   }
 
-  // TODO: this method can be removed after upstream javaagent 1.1.0 release
-  // openj9 JDK8 does not have JFR classes, which causes all ComponentInstallers to run
-  // synchronously, not after LogManager is loaded - see
-  // AgentInstaller#installComponentsAfterByteBuddy()
-  // micrometer's JvmGcMetrics references (indirectly) NotificationBroadcasterSupport which uses
-  // ClassLogger which uses JUL and this causes JVM LogManager to load before the JBoss one
-  // AFAIK only openj9 (IBM) JDK 8 has this problem, all other JDKs don't use JUL in MBeans
-  @Override
-  protected Map<String, String> getExtraEnv() {
-    return Map.of("SPLUNK_METRICS_ENABLED", "false");
-  }
-
   @ParameterizedTest(name = "[{index}] {0}")
   @MethodSource("supportedConfigurations")
   void wildflySmokeTest(TestImage image, ExpectedServerAttributes expectedServerAttributes)

testing/agent-metrics/build.gradle

@@ -12,6 +12,7 @@ dependencies {
   annotationProcessor deps.autoservice
   compileOnly deps.autoservice
 
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}")
   compileOnly("io.micrometer:micrometer-core:${versions.micrometer}")
 }

testing/agent-metrics/src/main/java/com/splunk/opentelemetry/testing/TestMicrometerInstaller.java

@@ -19,12 +19,13 @@
 import com.google.auto.service.AutoService;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.spi.ComponentInstaller;
 
 @AutoService(ComponentInstaller.class)
 public class TestMicrometerInstaller implements ComponentInstaller {
   @Override
-  public void beforeByteBuddyAgent() {
+  public void beforeByteBuddyAgent(Config config) {
     Metrics.addRegistry(new SimpleMeterRegistry());
   }
 }