Merge branch 'main' into convert-groovy-cache-provider

Author: zeitlinger

instrumentation/hibernate/hibernate-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionFactoryInstrumentation.java

@@ -45,7 +45,8 @@ public void transform(TypeTransformer transformer) {
                     namedOneOf(
                         "org.hibernate.Session",
                         "org.hibernate.StatelessSession",
-                        "org.hibernate.internal.SessionImpl"))),
+                        "org.hibernate.internal.SessionImpl",
+                        "org.hibernate.engine.spi.SessionImplementor"))),
         SessionFactoryInstrumentation.class.getName() + "$SessionFactoryAdvice");
   }
 

instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts

@@ -46,6 +46,8 @@ dependencies {
 
   implementation(project(":instrumentation:logback:logback-appender-1.0:library"))
 
+  testInstrumentation(project(":instrumentation:logback:logback-mdc-1.0:javaagent"))
+
   testImplementation("org.awaitility:awaitility")
 }
 

instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
@@ -167,6 +168,15 @@ private static void test(
                       satisfies(
                           EXCEPTION_STACKTRACE, v -> v.contains(LogbackTest.class.getName()))));
             }
+            if (withParent) {
+              SpanContext spanContext = testing.spans().get(0).getSpanContext();
+              attributeAsserts.addAll(
+                  Arrays.asList(
+                      equalTo(AttributeKey.stringKey("trace_id"), spanContext.getTraceId()),
+                      equalTo(AttributeKey.stringKey("span_id"), spanContext.getSpanId()),
+                      equalTo(
+                          AttributeKey.stringKey("trace_flags"), TraceFlags.getSampled().asHex())));
+            }
             logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
           });
     } else {

instrumentation/logback/logback-appender-1.0/library/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/internal/LoggingEventMapperTest.java

@@ -17,7 +17,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledInNativeImage;
 
+@DisabledInNativeImage // conflict with Mockito
 class LoggingEventMapperTest {
 
   @Test

instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java

@@ -29,4 +29,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
   public boolean isIndyReady() {
     return true;
   }
+
+  @Override
+  public int order() {
+    // run before logback appender instrumentation so that the appender instrumentation can observe
+    // the attributes added to the mdc by this instrumentation
+    return -1;
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProvider.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.tooling;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
+
+/** Adds span logging exporter for debug mode */
+@AutoService(DeclarativeConfigurationCustomizerProvider.class)
+public class SpanLoggingCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
+
+  @Override
+  public void customize(DeclarativeConfigurationCustomizer customizer) {
+    customizer.addModelCustomizer(
+        model -> {
+          maybeEnableLoggingExporter(model);
+          return model;
+        });
+  }
+
+  private static void maybeEnableLoggingExporter(OpenTelemetryConfigurationModel model) {
+    // read from system properties as it's an early init property and the config bridge is not
+    // available here
+    if (!ConfigPropertiesUtil.getBoolean("otel.javaagent.debug", false)) {
+      return;
+    }
+    // don't install another instance if the user has already explicitly requested it.
+    if (loggingExporterIsAlreadyConfigured(model)) {
+      return;
+    }
+    TracerProviderModel tracerProvider = model.getTracerProvider();
+    if (tracerProvider == null) {
+      tracerProvider = new TracerProviderModel();
+      model.withTracerProvider(tracerProvider);
+    }
+    SpanProcessorModel processor =
+        new SpanProcessorModel()
+            .withSimple(
+                new SimpleSpanProcessorModel()
+                    .withExporter(new SpanExporterModel().withConsole(new ConsoleExporterModel())));
+    tracerProvider.getProcessors().add(processor);
+  }
+
+  private static boolean loggingExporterIsAlreadyConfigured(OpenTelemetryConfigurationModel model) {
+    TracerProviderModel tracerProvider = model.getTracerProvider();
+    if (tracerProvider == null) {
+      return false;
+    }
+    for (SpanProcessorModel processor : tracerProvider.getProcessors()) {
+      SimpleSpanProcessorModel simple = processor.getSimple();
+      if (simple == null) {
+        continue;
+      }
+      SpanExporterModel exporter = simple.getExporter();
+      if (exporter == null) {
+        continue;
+      }
+      if (exporter.getConsole() != null) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/SpanLoggingCustomizerProviderTest.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.tooling;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junitpioneer.jupiter.ClearSystemProperty;
+
+class SpanLoggingCustomizerProviderTest {
+
+  @ParameterizedTest
+  @CsvSource({
+    "true, false, true",
+    "false, false, false",
+    ", false, false", // empty value means property is not set
+    "invalid, false, false",
+    "true, true, true",
+  })
+  @ClearSystemProperty(key = "otel.javaagent.debug")
+  void addSpanLoggingExporter(String propertyValue, boolean alreadyAdded, boolean expected) {
+    if (propertyValue != null) {
+      System.setProperty("otel.javaagent.debug", propertyValue);
+    }
+    String yaml =
+        alreadyAdded
+            ? "file_format: \"1.0-rc.1\"\n"
+                + "tracer_provider:\n"
+                + "  processors:\n"
+                + "    - simple:\n"
+                + "        exporter:\n"
+                + "          console: {}\n"
+            : "file_format: \"1.0-rc.1\"\n";
+
+    OpenTelemetryConfigurationModel model =
+        applyCustomizer(
+            DeclarativeConfiguration.parse(
+                new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8))),
+            new SpanLoggingCustomizerProvider());
+
+    String console = "ConsoleExporterModel";
+    if (expected) {
+      assertThat(model.toString()).containsOnlyOnce(console);
+    } else {
+      assertThat(model.toString()).doesNotContain(console);
+    }
+  }
+
+  private static OpenTelemetryConfigurationModel applyCustomizer(
+      OpenTelemetryConfigurationModel model, SpanLoggingCustomizerProvider provider) {
+    List<Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel>> customizers =
+        new ArrayList<>();
+    provider.customize(c -> customizers.add(c));
+    for (Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel> customizer :
+        customizers) {
+      model = customizer.apply(model);
+    }
+    return model;
+  }
+}

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestExporterCustomizerProvider.java

@@ -26,6 +26,12 @@
 import java.util.List;
 
 public class TestExporterCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
+
+  @Override
+  public int order() {
+    return Integer.MIN_VALUE; // run before other customizers that might add exporters
+  }
+
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
     if (TestSpanExporterComponentProvider.getSpanExporter() == null) {

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestExporterCustomizerProvider.java

@@ -30,6 +30,12 @@
 @AutoService(DeclarativeConfigurationCustomizerProvider.class)
 public class AgentTestExporterCustomizerProvider
     implements DeclarativeConfigurationCustomizerProvider {
+
+  @Override
+  public int order() {
+    return Integer.MIN_VALUE; // run before other customizers that might add exporters
+  }
+
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
     TestExportersUtil.initTestExporters();