Update the OpenTelemetry SDK version to 1.38.0 (#11335)

open-telemetry · May 17, 2024 · 16e8cf9 · 16e8cf9
1 parent f15c3b9
commit 16e8cf9
Show file tree

Hide file tree

Showing 55 changed files with 850 additions and 195 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelSdkVersion = "1.37.0"
+val otelSdkVersion = "1.38.0"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars

diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -27,7 +27,7 @@ subprojects {
   ext {
     versions = [
       // this line is managed by .github/scripts/update-sdk-version.sh
-      opentelemetrySdk           : "1.37.0",
+      opentelemetrySdk           : "1.38.0",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "1.33.2",

diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -23,7 +23,7 @@ version '1.0'
 ext {
   versions = [
     // this line is managed by .github/scripts/update-sdk-version.sh
-    opentelemetrySdk           : "1.37.0",
+    opentelemetrySdk           : "1.38.0",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "1.33.2",

diff --git a/...lemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java b/...lemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java
@@ -63,10 +63,22 @@ public ContextPropagators getPropagators() {
   }
 
   private static ApplicationMeterFactory getMeterFactory() {
-    // this class is defined in opentelemetry-api-1.37
+    // this class is defined in opentelemetry-api-1.38
     ApplicationMeterFactory meterFactory =
         getMeterFactory(
-            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137Incubator");
+            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.incubator.metrics.ApplicationMeterFactory138Incubator");
+    if (meterFactory == null) {
+      // this class is defined in opentelemetry-api-1.38
+      meterFactory =
+          getMeterFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_38.metrics.ApplicationMeterFactory138");
+    }
+    if (meterFactory == null) {
+      // this class is defined in opentelemetry-api-1.37
+      meterFactory =
+          getMeterFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137");
+    }
     if (meterFactory == null) {
       // this class is defined in opentelemetry-api-1.32
       meterFactory =
@@ -83,7 +95,7 @@ private static ApplicationMeterFactory getMeterFactory() {
       // this class is defined in opentelemetry-api-1.31
       meterFactory =
           getMeterFactory(
-              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeterFactory131");
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeterFactory131");
     }
     if (meterFactory == null) {
       meterFactory = new ApplicationMeterFactory115();

diff --git a/...penTelemetryApiInstrumentationModule.java → ...penTelemetryApiInstrumentationModule.java b/...penTelemetryApiInstrumentationModule.java → ...penTelemetryApiInstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
   public OpenTelemetryApiInstrumentationModule() {
-    super("opentelemetry-api", "opentelemetry-api-1.31");
+    super("opentelemetry-api", "opentelemetry-api-1.31", "opentelemetry-api-incubator-1.31");
   }
 
   @Override

diff --git a/...i/v1_31/OpenTelemetryInstrumentation.java → ...cubator/OpenTelemetryInstrumentation.java b/...i/v1_31/OpenTelemetryInstrumentation.java → ...cubator/OpenTelemetryInstrumentation.java
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeterFactory131;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeterFactory131;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;

diff --git a/...s/ApplicationDoubleCounterBuilder131.java → ...s/ApplicationDoubleCounterBuilder131.java b/...s/ApplicationDoubleCounterBuilder131.java → ...s/ApplicationDoubleCounterBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder;

diff --git a/...ics/ApplicationDoubleGaugeBuilder131.java → ...ics/ApplicationDoubleGaugeBuilder131.java b/...ics/ApplicationDoubleGaugeBuilder131.java → ...ics/ApplicationDoubleGaugeBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.common.Attributes;
@@ -31,8 +31,7 @@ public LongGaugeBuilder ofLongs() {
 
   @Override
   public DoubleGauge build() {
-    io.opentelemetry.api.incubator.metrics.DoubleGauge agentDoubleGauge =
-        ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder).build();
+    io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build();
     return new DoubleGauge() {
 
       @Override

diff --git a/...ApplicationDoubleHistogramBuilder131.java → ...ApplicationDoubleHistogramBuilder131.java b/...ApplicationDoubleHistogramBuilder131.java → ...ApplicationDoubleHistogramBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.metrics.LongHistogramBuilder;

diff --git a/...icationDoubleUpDownCounterBuilder131.java → ...icationDoubleUpDownCounterBuilder131.java b/...icationDoubleUpDownCounterBuilder131.java → ...icationDoubleUpDownCounterBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder;

diff --git a/...ics/ApplicationLongCounterBuilder131.java → ...ics/ApplicationLongCounterBuilder131.java b/...ics/ApplicationLongCounterBuilder131.java → ...ics/ApplicationLongCounterBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.metrics.DoubleCounterBuilder;

diff --git a/...trics/ApplicationLongGaugeBuilder131.java → ...trics/ApplicationLongGaugeBuilder131.java b/...trics/ApplicationLongGaugeBuilder131.java → ...trics/ApplicationLongGaugeBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.common.Attributes;
@@ -25,8 +25,7 @@ final class ApplicationLongGaugeBuilder131 extends ApplicationLongGaugeBuilder
 
   @Override
   public LongGauge build() {
-    io.opentelemetry.api.incubator.metrics.LongGauge agentLongGauge =
-        ((io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder) agentBuilder).build();
+    io.opentelemetry.api.metrics.LongGauge agentLongGauge = agentBuilder.build();
     return new LongGauge() {
       @Override
       public void set(long value) {

diff --git a/...s/ApplicationLongHistogramBuilder131.java → ...s/ApplicationLongHistogramBuilder131.java b/...s/ApplicationLongHistogramBuilder131.java → ...s/ApplicationLongHistogramBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder;

diff --git a/...plicationLongUpDownCounterBuilder131.java → ...plicationLongUpDownCounterBuilder131.java b/...plicationLongUpDownCounterBuilder131.java → ...plicationLongUpDownCounterBuilder131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;

diff --git a/...pi/v1_31/metrics/ApplicationMeter131.java → ...ncubator/metrics/ApplicationMeter131.java b/...pi/v1_31/metrics/ApplicationMeter131.java → ...ncubator/metrics/ApplicationMeter131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import application.io.opentelemetry.api.metrics.DoubleGaugeBuilder;
 import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;

diff --git a/...1/metrics/ApplicationMeterFactory131.java → ...r/metrics/ApplicationMeterFactory131.java b/...1/metrics/ApplicationMeterFactory131.java → ...r/metrics/ApplicationMeterFactory131.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics;
 
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeter;

diff --git a/...nstrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java b/...nstrumentation/opentelemetryapi/v1_32/incubator/metrics/ApplicationMeter132Incubator.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_32.incubator.metrics;
 
 import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
-import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.metrics.ApplicationMeter131;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_31.incubator.metrics.ApplicationMeter131;
 
 class ApplicationMeter132Incubator extends ApplicationMeter131 {
 

diff --git a/...lemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java b/...lemetry/javaagent/instrumentation/opentelemetryapi/v1_32/metrics/ApplicationMeter132.java
@@ -8,11 +8,11 @@
 import application.io.opentelemetry.api.metrics.DoubleHistogramBuilder;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15.metrics.ApplicationMeter115;
 
-class ApplicationMeter132 extends ApplicationMeter115 {
+public class ApplicationMeter132 extends ApplicationMeter115 {
 
   private final io.opentelemetry.api.metrics.Meter agentMeter;
 
-  ApplicationMeter132(io.opentelemetry.api.metrics.Meter agentMeter) {
+  public ApplicationMeter132(io.opentelemetry.api.metrics.Meter agentMeter) {
     super(agentMeter);
     this.agentMeter = agentMeter;
   }

diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/build.gradle.kts
@@ -19,6 +19,17 @@ configurations.configureEach {
   if (name.endsWith("testRuntimeClasspath", true) || name.endsWith("testCompileClasspath", true)) {
     resolutionStrategy {
       force("io.opentelemetry:opentelemetry-api:1.37.0")
+      force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
+    }
+    if (name.startsWith("incubatorTest")) {
+      resolutionStrategy {
+        force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
+      }
+    } else if (name.startsWith("oldAndNewIncubatorTest")) {
+      resolutionStrategy {
+        force("io.opentelemetry:opentelemetry-api-incubator:1.37.0-alpha")
+        force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
+      }
     }
   }
 }

diff --git a/...strumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java b/...strumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryApiInstrumentationModule.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator;
+
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static java.util.Collections.singletonList;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(InstrumentationModule.class)
+public class OpenTelemetryApiInstrumentationModule extends InstrumentationModule {
+  public OpenTelemetryApiInstrumentationModule() {
+    super("opentelemetry-api", "opentelemetry-api-1.37", "opentelemetry-api-incubator-1.37");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // skip instrumentation when opentelemetry-api-incubator is not present
+    return hasClassesNamed("application.io.opentelemetry.api.incubator.metrics.DoubleGauge");
+  }
+
+  @Override
+  public boolean isIndyModule() {
+    return false;
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new OpenTelemetryInstrumentation());
+  }
+}
diff --git a/...aagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryInstrumentation.java b/...aagent/instrumentation/opentelemetryapi/v1_37/incubator/OpenTelemetryInstrumentation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator;
+
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.none;
+
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics.ApplicationMeterFactory137;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class OpenTelemetryInstrumentation implements TypeInstrumentation {
+
+  @Override
+  public ElementMatcher<TypeDescription> typeMatcher() {
+    return named("application.io.opentelemetry.api.GlobalOpenTelemetry");
+  }
+
+  @Override
+  public void transform(TypeTransformer transformer) {
+    transformer.applyAdviceToMethod(
+        none(), OpenTelemetryInstrumentation.class.getName() + "$InitAdvice");
+  }
+
+  @SuppressWarnings({"ReturnValueIgnored", "unused"})
+  public static class InitAdvice {
+    @Advice.OnMethodEnter
+    public static void init() {
+      // the sole purpose of this advice is to ensure that ApplicationMeterFactory137
+      // is recognized as helper class and injected into class loader
+      ApplicationMeterFactory137.class.getName();
+    }
+  }
+}
diff --git a/...s/ApplicationDoubleCounterBuilder137.java → ...s/ApplicationDoubleCounterBuilder137.java b/...s/ApplicationDoubleCounterBuilder137.java → ...s/ApplicationDoubleCounterBuilder137.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder;

diff --git a/...ics/ApplicationDoubleGaugeBuilder137.java → ...ics/ApplicationDoubleGaugeBuilder137.java b/...ics/ApplicationDoubleGaugeBuilder137.java → ...ics/ApplicationDoubleGaugeBuilder137.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.common.Attributes;
@@ -31,8 +31,7 @@ public LongGaugeBuilder ofLongs() {
 
   @Override
   public DoubleGauge build() {
-    io.opentelemetry.api.incubator.metrics.DoubleGauge agentDoubleGauge =
-        ((io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder) agentBuilder).build();
+    io.opentelemetry.api.metrics.DoubleGauge agentDoubleGauge = agentBuilder.build();
     return new DoubleGauge() {
 
       @Override

diff --git a/...ApplicationDoubleHistogramBuilder137.java → ...ApplicationDoubleHistogramBuilder137.java b/...ApplicationDoubleHistogramBuilder137.java → ...ApplicationDoubleHistogramBuilder137.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.metrics;
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_37.incubator.metrics;
 
 import application.io.opentelemetry.api.common.AttributeKey;
 import application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;