Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-rmi2

Author: SylvainJuge

.github/workflows/issue-management-stale-action.yml

@@ -47,9 +47,9 @@ jobs:
           exempt-issue-labels: "needs author feedback"
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          days-before-stale: 365
-          days-before-close: 0
-          close-issue-label: stale
+          days-before-issue-stale: 365
+          days-before-issue-close: 0
+          stale-issue-label: stale
           close-issue-message: >
             Since there has been no activity on this enhancement for the past year we are closing it to help maintain our backlog.
             Anyone who would like to work on it is still welcome to do so, and we can re-open it at that time.

benchmark-overhead/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
   testImplementation("org.testcontainers:postgresql:1.21.3")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.9.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.1.0")
+    classpath("com.squareup.okhttp3:okhttp:5.2.0")
   }
 }
 

examples/distro/instrumentation/servlet-3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.1.0"
+  testImplementation "com.squareup.okhttp3:okhttp:5.2.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"

examples/distro/smoke-tests/build.gradle

@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 

examples/extension/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:1.21.3")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.1")
-  testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
+  testImplementation("com.squareup.okhttp3:okhttp:5.2.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
 

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;
+  }
 }