add bridging for 1.47 api

Author: laurit

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

@@ -120,11 +120,18 @@ private static ApplicationMeterFactory getMeterFactory(String className) {
   }
 
   private static ApplicationLoggerFactory getLoggerFactory() {
-    // this class is defined in opentelemetry-api-1.42
+    // this class is defined in opentelemetry-api-1.47
     ApplicationLoggerFactory loggerFactory =
         getLoggerFactory(
-            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.incubator.logs.ApplicationLoggerFactory142Incubator");
+            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs.ApplicationLoggerFactory147Incubator");
     if (loggerFactory == null) {
+      // this class is defined in opentelemetry-api-1.42
+      loggerFactory =
+          getLoggerFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.incubator.logs.ApplicationLoggerFactory142Incubator");
+    }
+    if (loggerFactory == null) {
+      // this class is defined in opentelemetry-api-1.42
       loggerFactory =
           getLoggerFactory(
               "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLoggerFactory142");
@@ -147,10 +154,16 @@ private static ApplicationLoggerFactory getLoggerFactory(String className) {
   }
 
   private static ApplicationTracerFactory getTracerFactory() {
-    // this class is defined in opentelemetry-api-1.40
+    // this class is defined in opentelemetry-api-1.47
     ApplicationTracerFactory tracerFactory =
         getTracerFactory(
-            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.trace.ApplicationTracerFactory140Incubator");
+            "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.trace.ApplicationTracerFactory147Incubator");
+    if (tracerFactory == null) {
+      // this class is defined in opentelemetry-api-1.40
+      tracerFactory =
+          getTracerFactory(
+              "io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.trace.ApplicationTracerFactory140Incubator");
+    }
     if (tracerFactory == null) {
       tracerFactory = new ApplicationTracerFactory127();
     }

instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java

@@ -24,8 +24,11 @@ public OpenTelemetryApiIncubatorInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // EventLogger was removed in 1.47, including it here prevents the instrumentation from applying
+    // to 1.47
     return hasClassesNamed(
-        "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram");
+        "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogram",
+        "io.opentelemetry.api.incubator.events.EventLogger");
   }
 
   @Override

instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_40/incubator/trace/ApplicationSpanBuilder140Incubator.java

@@ -27,12 +27,12 @@
 import java.util.function.BiConsumer;
 import javax.annotation.Nullable;
 
-final class ApplicationSpanBuilder140Incubator extends ApplicationSpanBuilder
+public final class ApplicationSpanBuilder140Incubator extends ApplicationSpanBuilder
     implements ExtendedSpanBuilder {
 
   private final io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder agentBuilder;
 
-  ApplicationSpanBuilder140Incubator(io.opentelemetry.api.trace.SpanBuilder agentBuilder) {
+  public ApplicationSpanBuilder140Incubator(io.opentelemetry.api.trace.SpanBuilder agentBuilder) {
     super(agentBuilder);
     this.agentBuilder = (io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder) agentBuilder;
   }

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java

@@ -24,7 +24,11 @@ public OpenTelemetryApiIncubatorInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
+    // EventLogger was removed in 1.47, including it here prevents the instrumentation from applying
+    // to 1.47
+    return hasClassesNamed(
+        "application.io.opentelemetry.api.incubator.logs.ExtendedLogger",
+        "io.opentelemetry.api.incubator.events.EventLogger");
   }
 
   @Override

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogRecordBuilder142.java

@@ -7,6 +7,7 @@
 
 import application.io.opentelemetry.api.logs.LogRecordBuilder;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_40.incubator.logs.ApplicationLogger140Incubator;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLogRecordBuilder142;
 
 class ApplicationLogger142Incubator extends ApplicationLogger140Incubator {
 

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/logs/ApplicationLogger142Incubator.java

@@ -13,12 +13,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class ApplicationLogRecordBuilder142 extends ApplicationLogRecordBuilder
+public class ApplicationLogRecordBuilder142 extends ApplicationLogRecordBuilder
     implements LogRecordBuilder {
 
   private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder;
 
-  ApplicationLogRecordBuilder142(io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) {
+  public ApplicationLogRecordBuilder142(
+      io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder) {
     super(agentLogRecordBuilder);
     this.agentLogRecordBuilder = agentLogRecordBuilder;
   }

instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/logs/ApplicationLogRecordBuilder142.java

@@ -0,0 +1,22 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+dependencies {
+  compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "v1_47"))
+  compileOnly("io.opentelemetry:opentelemetry-api-incubator")
+
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
+  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))
+
+  testImplementation("io.opentelemetry:opentelemetry-api-incubator")
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.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.47", "opentelemetry-api-incubator-1.47");
+  }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
+  }
+
+  @Override
+  public List<TypeInstrumentation> typeInstrumentations() {
+    return singletonList(new OpenTelemetryIncubatorInstrumentation());
+  }
+
+  @Override
+  public String getModuleGroup() {
+    return "opentelemetry-api-bridge";
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.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_40.incubator.metrics.ApplicationMeterFactory140Incubator;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs.ApplicationLoggerFactory147Incubator;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.trace.ApplicationTracerFactory147Incubator;
+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 ApplicationLoggerFactory147Incubator is
+      // recognized as helper class and injected into class loader
+      ApplicationLoggerFactory147Incubator.class.getName();
+      // 1.40 instrumentation does not apply on 1.47, we include only the metrics part here
+      ApplicationMeterFactory140Incubator.class.getName();
+      ApplicationTracerFactory147Incubator.class.getName();
+    }
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryIncubatorInstrumentation.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs;
+
+import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
+import io.opentelemetry.api.logs.LogRecordBuilder;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_42.logs.ApplicationLogRecordBuilder142;
+
+public class ApplicationLogRecordBuilder147Incubator extends ApplicationLogRecordBuilder142
+    implements ExtendedLogRecordBuilder {
+
+  private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder;
+
+  ApplicationLogRecordBuilder147Incubator(LogRecordBuilder agentLogRecordBuilder) {
+    super(agentLogRecordBuilder);
+    this.agentLogRecordBuilder = agentLogRecordBuilder;
+  }
+
+  @Override
+  public ExtendedLogRecordBuilder setEventName(String eventName) {
+    ((io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder) agentLogRecordBuilder)
+        .setEventName(eventName);
+    return this;
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogRecordBuilder147Incubator.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs;
+
+import application.io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
+import application.io.opentelemetry.api.incubator.logs.ExtendedLogger;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger;
+
+class ApplicationLogger147Incubator extends ApplicationLogger implements ExtendedLogger {
+
+  private final io.opentelemetry.api.logs.Logger agentLogger;
+
+  ApplicationLogger147Incubator(io.opentelemetry.api.logs.Logger agentLogger) {
+    super(agentLogger);
+    this.agentLogger = agentLogger;
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return ((io.opentelemetry.api.incubator.logs.ExtendedLogger) agentLogger).isEnabled();
+  }
+
+  @Override
+  public ExtendedLogRecordBuilder logRecordBuilder() {
+    return new ApplicationLogRecordBuilder147Incubator(agentLogger.logRecordBuilder());
+  }
+}

instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/logs/ApplicationLogger147Incubator.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_47.incubator.logs;
+
+import io.opentelemetry.api.logs.Logger;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLogger;
+import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27.logs.ApplicationLoggerFactory;
+
+// this class is used from opentelemetry-api-1.27.0 via reflection
+public class ApplicationLoggerFactory147Incubator implements ApplicationLoggerFactory {
+
+  @Override
+  public ApplicationLogger newLogger(Logger agentLogger) {
+    return new ApplicationLogger147Incubator(agentLogger);
+  }
+}