Update to otel 1.1.0 (#52)

Author: anuraaga

dependencyManagement/build.gradle.kts

@@ -33,7 +33,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.google.protobuf:protobuf-bom:3.15.6",
   "com.linecorp.armeria:armeria-bom:1.5.0",
   "io.grpc:grpc-bom:1.36.0",
-  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "1.0.1-alpha" else "1.1.0-alpha-SNAPSHOT"}",
+  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "1.1.0-alpha" else "1.2.0-alpha-SNAPSHOT"}",
   "org.apache.logging.log4j:log4j-bom:2.14.1",
   "org.junit:junit-bom:5.7.1",
   "org.springframework.boot:spring-boot-dependencies:2.4.3",
@@ -66,7 +66,7 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.3",
   "com.squareup.okhttp3:okhttp:4.9.1",
-  "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.0.1" else "1.1.0-SNAPSHOT"}",
+  "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.1.0" else "1.2.0-SNAPSHOT"}",
   "net.bytebuddy:byte-buddy:1.10.22"
 )
 

gradle.properties

@@ -0,0 +1,4 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+
+org.gradle.priority=low

instrumentation/log4j-2.13.2/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/log4j_2_13_2/AwsXrayLog4jInstrumentationModule.java

@@ -55,7 +55,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   public static class EmptyTypeInstrumentation implements TypeInstrumentation {
     @Override
-    public ElementMatcher<? super TypeDescription> typeMatcher() {
+    public ElementMatcher<TypeDescription> typeMatcher() {
       // we cannot use ContextDataProvider here because one of the classes that we inject implements
       // this interface, causing the interface to be loaded while it's being transformed, which
       // leads

instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLogbackInstrumentationModule.java

@@ -33,7 +33,7 @@ public List<TypeInstrumentation> typeInstrumentations() {
   }
 
   @Override
-  public Map<String, String> contextStore() {
+  public Map<String, String> getMuzzleContextStoreClasses() {
     return Collections.singletonMap(
         "ch.qos.logback.classic.spi.ILoggingEvent", Span.class.getName());
   }

instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java

@@ -46,7 +46,7 @@ public ElementMatcher<ClassLoader> classLoaderOptimization() {
   }
 
   @Override
-  public ElementMatcher<? super TypeDescription> typeMatcher() {
+  public ElementMatcher<TypeDescription> typeMatcher() {
     return implementsInterface(named("ch.qos.logback.classic.spi.ILoggingEvent"));
   }
 

sample-apps/spark-awssdkv1/src/main/java/com/amazon/sampleapp/MetricEmitter.java

@@ -1,6 +1,6 @@
 package com.amazon.sampleapp;
 
-import io.opentelemetry.api.metrics.GlobalMetricsProvider;
+import io.opentelemetry.api.metrics.GlobalMeterProvider;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.LongSumObserver;
 import io.opentelemetry.api.metrics.LongUpDownCounter;
@@ -39,7 +39,7 @@ public class MetricEmitter {
   String statusCodeValue = "";
 
   public MetricEmitter() {
-    Meter meter = GlobalMetricsProvider.getMeter("aws-otel", "1.0");
+    Meter meter = GlobalMeterProvider.getMeter("aws-otel", "1.0");
 
     // give a instanceId appending to the metricname so that we can check the metric for each round
     // of integ-test

sample-apps/spark/src/main/java/com/amazon/sampleapp/MetricEmitter.java

@@ -1,6 +1,6 @@
 package com.amazon.sampleapp;
 
-import io.opentelemetry.api.metrics.GlobalMetricsProvider;
+import io.opentelemetry.api.metrics.GlobalMeterProvider;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.LongSumObserver;
 import io.opentelemetry.api.metrics.LongUpDownCounter;
@@ -39,7 +39,7 @@ public class MetricEmitter {
   String statusCodeValue = "";
 
   public MetricEmitter() {
-    Meter meter = GlobalMetricsProvider.getMeter("aws-otel", "1.0");
+    Meter meter = GlobalMeterProvider.getMeter("aws-otel", "1.0");
 
     // give a instanceId appending to the metricname so that we can check the metric for each round
     // of integ-test

sample-apps/springboot/src/main/java/com/amazon/sampleapp/MetricEmitter.java

@@ -1,6 +1,6 @@
 package com.amazon.sampleapp;
 
-import io.opentelemetry.api.metrics.GlobalMetricsProvider;
+import io.opentelemetry.api.metrics.GlobalMeterProvider;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.LongSumObserver;
 import io.opentelemetry.api.metrics.LongUpDownCounter;
@@ -39,7 +39,7 @@ public class MetricEmitter {
   String statusCodeValue = "";
 
   public MetricEmitter() {
-    Meter meter = GlobalMetricsProvider.getMeter("aws-otel", "1.0");
+    Meter meter = GlobalMeterProvider.getMeter("aws-otel", "1.0");
 
     // give a instanceId appending to the metricname so that we can check the metric for each round
     // of integ-test