add ExtendedOpenTelemetry

Author: zeitlinger

instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/ApplicationOpenTelemetry127.java

@@ -22,7 +22,7 @@
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_4.trace.ApplicationTracerProvider14;
 import java.lang.reflect.InvocationTargetException;
 
-public final class ApplicationOpenTelemetry127 implements OpenTelemetry {
+public class ApplicationOpenTelemetry127 implements OpenTelemetry {
 
   // Accessed with reflection
   @SuppressWarnings("unused")
@@ -34,7 +34,7 @@ public final class ApplicationOpenTelemetry127 implements OpenTelemetry {
   private final LoggerProvider applicationLoggerProvider;
 
   @SuppressWarnings("UnnecessarilyFullyQualified")
-  private ApplicationOpenTelemetry127() {
+  protected ApplicationOpenTelemetry127() {
     io.opentelemetry.api.OpenTelemetry agentOpenTelemetry =
         io.opentelemetry.api.GlobalOpenTelemetry.get();
     applicationTracerProvider =

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+dependencies {
+  compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_55"))
+  compileOnly("io.opentelemetry:opentelemetry-api-incubator")
+
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent"))
+
+  testImplementation("io.opentelemetry:opentelemetry-api-incubator")
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/ApplicationOpenTelemetry155Incubator.java

@@ -0,0 +1,19 @@
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator;
+
+import application.io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
+import application.io.opentelemetry.api.incubator.config.ConfigProvider;
+
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.ApplicationOpenTelemetry127;
+
+public class ApplicationOpenTelemetry155Incubator extends ApplicationOpenTelemetry127
+    implements ExtendedOpenTelemetry {
+
+  io.opentelemetry.api.incubator.ExtendedOpenTelemetry extendedOpenTelemetry =
+      (io.opentelemetry.api.incubator.ExtendedOpenTelemetry)
+          io.opentelemetry.api.GlobalOpenTelemetry.get();
+
+  @Override
+  public ConfigProvider getConfigProvider() {
+    return extendedOpenTelemetry.getConfigProvider();
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.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 io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
+import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
+
+@AutoService(InstrumentationModule.class)
+public class OpenTelemetryApiIncubatorInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
+  public OpenTelemetryApiIncubatorInstrumentationModule() {
+    super("opentelemetry-api", "opentelemetry-api-1.55", "opentelemetry-api-incubator-1.55");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed(
+        "application.io.opentelemetry.api.common.Value",
+        "io.opentelemetry.api.incubator.ExtendedOpenTelemetry");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new OpenTelemetryIncubatorInstrumentation());
+  }
+
+  @Override
+  public String getModuleGroup() {
+    return "opentelemetry-api-bridge";
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/OpenTelemetryIncubatorInstrumentation.java

@@ -0,0 +1,38 @@
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator;/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+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_52.incubator.logs.ApplicationLoggerFactory152Incubator;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+
+public class OpenTelemetryIncubatorInstrumentation implements TypeInstrumentation {
+
+  @Override
+  public ElementMatcher<TypeDescription> typeMatcher() {
+    return named("application.io.opentelemetry.api.GlobalOpenTelemetry");
+  }
+
+  @Override
+  public void transform(TypeTransformer transformer) {
+    transformer.applyAdviceToMethod(
+        none(), OpenTelemetryIncubatorInstrumentation.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 ApplicationLoggerFactory152Incubator is
+      // recognized as helper class and injected into class loader
+      ApplicationLoggerFactory152Incubator.class.getName();
+    }
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/config/ApplicationConfigProvider155Incubator.java

@@ -0,0 +1,13 @@
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config;
+
+import application.io.opentelemetry.api.incubator.config.ConfigProvider;
+import application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import javax.annotation.Nullable;
+
+public class ApplicationConfigProvider155Incubator implements ConfigProvider {
+  @Nullable
+  @Override
+  public DeclarativeConfigProperties getInstrumentationConfig() {
+    return null;
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/config/ApplicationDeclarativeConfigProperties155Incubator.java

@@ -0,0 +1,6 @@
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_55.incubator.config;
+
+import application.io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+
+public class ApplicationDeclarativeConfigProperties155Incubator implements
+    DeclarativeConfigProperties {}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/metadata.yaml

@@ -0,0 +1 @@
+classification: internal

javaagent/build.gradle.kts

@@ -90,6 +90,7 @@ dependencies {
   baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.52:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.55:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-api:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent"))
   baseJavaagentLibs(project(":instrumentation:executors:javaagent"))

opentelemetry-api-shaded-for-instrumenting/build.gradle.kts

@@ -93,6 +93,13 @@ val v1_52Deps by configurations.creating {
   exclude("io.opentelemetry", "opentelemetry-bom")
   exclude("io.opentelemetry", "opentelemetry-bom-alpha")
 }
+val v1_55Deps by configurations.creating {
+  isCanBeResolved = true
+  isCanBeConsumed = false
+  // exclude the bom added by dependencyManagement
+  exclude("io.opentelemetry", "opentelemetry-bom")
+  exclude("io.opentelemetry", "opentelemetry-bom-alpha")
+}
 // configuration for publishing the shadowed artifact
 val v1_10 by configurations.creating {
   isCanBeConsumed = true
@@ -142,6 +149,10 @@ val v1_52 by configurations.creating {
   isCanBeConsumed = true
   isCanBeResolved = false
 }
+val v1_55 by configurations.creating {
+  isCanBeConsumed = true
+  isCanBeResolved = false
+}
 
 dependencies {
   latestDeps("io.opentelemetry:opentelemetry-api")
@@ -223,6 +234,11 @@ dependencies {
         strictly("1.52.0-alpha")
       }
     }
+    v1_55Deps("io.opentelemetry:$it") {
+      version {
+        strictly("1.55.0-alpha")
+      }
+    }
   }
 }
 
@@ -286,6 +302,10 @@ tasks {
     configurations = listOf(v1_52Deps)
     archiveClassifier.set("v1_52")
   }
+  val v1_55Shadow by registering(ShadowJar::class) {
+    configurations = listOf(v1_55Deps)
+    archiveClassifier.set("v1_55")
+  }
 
   artifacts {
     add(v1_10.name, v1_10Shadow)
@@ -300,5 +320,6 @@ tasks {
     add(v1_47.name, v1_47Shadow)
     add(v1_50.name, v1_50Shadow)
     add(v1_52.name, v1_52Shadow)
+    add(v1_55.name, v1_55Shadow)
   }
 }