Merge branch 'open-telemetry:main' into main

hilmarf · web-flow · commit acd7d4df341d · 2026-02-24T04:09:15.000+01:00
diff --git a/.github/workflows/benchmark-tags.yml b/.github/workflows/benchmark-tags.yml
@@ -13,7 +13,7 @@ jobs:
     name: Benchmark SDK
     runs-on: oracle-bare-metal-64cpu-512gb-x86-64
     container:
-      image: ubuntu:24.04@sha256:cd1dba651b3080c3686ecf4e3c4220f026b521fb76978881737d24f200828b2b
+      image: ubuntu:24.04@sha256:d1e2e92c075e5ca139d51a140fff46f84315c0fdce203eab2807c7e495eff4f9
     timeout-minutes: 20 # since there is only a single bare metal runner across all repos
     strategy:
       fail-fast: false
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -15,7 +15,7 @@ jobs:
     name: Benchmark SDK
     runs-on: oracle-bare-metal-64cpu-512gb-x86-64
     container:
-      image: ubuntu:24.04@sha256:cd1dba651b3080c3686ecf4e3c4220f026b521fb76978881737d24f200828b2b
+      image: ubuntu:24.04@sha256:d1e2e92c075e5ca139d51a140fff46f84315c0fdce203eab2807c7e495eff4f9
     timeout-minutes: 20 # since there is only a single bare metal runner across all repos
     steps:
       - name: Install Git
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
         uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the latest Kotlin support
@@ -62,6 +62,6 @@ jobs:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -43,6 +43,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           sarif_file: results.sarif
diff --git a/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java b/api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.java
@@ -210,6 +210,14 @@ default LogRecordBuilder setEventName(String eventName) {
     return this;
   }
 
+  /**
+   * Set {@code exception.type}, {@code exception.message}, and {@code exception.stacktrace}
+   * attributes based on the {@code throwable}.
+   */
+  default LogRecordBuilder setException(Throwable throwable) {
+    return this;
+  }
+
   /** Emit the log record. */
   void emit();
 }
diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java
@@ -133,6 +133,7 @@ default ExtendedLogRecordBuilder setAllAttributes(ExtendedAttributes attributes)
    */
   <T> ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey<T> key, T value);
 
-  /** Set standard {@code exception.*} attributes based on the {@code throwable}. */
+  /** {@inheritDoc} */
+  @Override
   ExtendedLogRecordBuilder setException(Throwable throwable);
 }
diff --git a/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultLoggerTest.java b/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultLoggerTest.java
@@ -63,6 +63,7 @@ void buildAndEmit() {
                     .setBody(Value.of("body"))
                     .setAttribute(AttributeKey.stringKey("key1"), "value1")
                     .setAllAttributes(Attributes.builder().put("key2", "value2").build())
+                    .setException(new RuntimeException("error"))
                     .emit())
         .doesNotThrowAnyException();
   }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -26,7 +26,7 @@ val DEPENDENCY_BOMS = listOf(
   // (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged
   // by FOSSA for containing EPL-licensed)
 
-  "com.fasterxml.jackson:jackson-bom:2.21.0",
+  "com.fasterxml.jackson:jackson-bom:2.21.1",
   "com.google.guava:guava-bom:33.5.0-jre",
   "com.google.protobuf:protobuf-bom:4.33.5",
   "com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
@@ -69,7 +69,7 @@ val DEPENDENCIES = listOf(
   "io.prometheus:prometheus-metrics-exposition-formats-no-protobuf:${prometheusServerVersion}",
   "javax.annotation:javax.annotation-api:1.3.2",
   "com.github.stefanbirkner:system-rules:1.19.0",
-  "com.google.api.grpc:proto-google-common-protos:2.65.1",
+  "com.google.api.grpc:proto-google-common-protos:2.66.0",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",
@@ -81,7 +81,7 @@ val DEPENDENCIES = listOf(
   "io.github.netmikey.logunit:logunit-jul:2.0.0",
   "io.jaegertracing:jaeger-client:1.8.1",
   "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.54.0-alpha",
-  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.39.0-alpha",
+  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.40.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha",
   "io.opentracing:opentracing-api:0.33.0",
   "io.opentracing:opentracing-noop:0.33.0",
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-api.txt
@@ -1,4 +1,7 @@
 Comparing source compatibility of opentelemetry-api-1.60.0-SNAPSHOT.jar against opentelemetry-api-1.59.0.jar
+***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.logs.LogRecordBuilder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.api.logs.LogRecordBuilder setException(java.lang.Throwable)
 ***  MODIFIED INTERFACE: PUBLIC ABSTRACT io.opentelemetry.api.trace.TraceFlags  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.api.trace.TraceFlagsBuilder builder()
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-testing.txt
@@ -1,2 +1,4 @@
 Comparing source compatibility of opentelemetry-sdk-testing-1.60.0-SNAPSHOT.jar against opentelemetry-sdk-testing-1.59.0.jar
-No changes.
+***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.testing.assertj.LogRecordDataAssert  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.testing.assertj.LogRecordDataAssert hasException(java.lang.Throwable)
diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java
@@ -39,17 +39,7 @@ public ExtendedSdkLogRecordBuilder setEventName(String eventName) {
 
   @Override
   public ExtendedSdkLogRecordBuilder setException(Throwable throwable) {
-    if (throwable == null) {
-      return this;
-    }
-
-    loggerSharedState
-        .getExceptionAttributeResolver()
-        .setExceptionAttributes(
-            this::setExceptionAttribute,
-            throwable,
-            loggerSharedState.getLogLimits().getMaxAttributeValueLength());
-
+    super.setException(throwable);
     return this;
   }
 
@@ -145,11 +135,8 @@ protected ReadWriteLogRecord createLogRecord(Context context, long observedTimes
         extendedAttributes);
   }
 
-  /**
-   * Sets an exception-derived attribute only if it hasn't already been set by the user. This
-   * ensures user-set attributes take precedence over exception-derived attributes.
-   */
-  private <T> void setExceptionAttribute(AttributeKey<T> key, @Nullable T value) {
+  @Override
+  protected <T> void setExceptionAttribute(AttributeKey<T> key, @Nullable T value) {
     if (key == null || key.getKey().isEmpty() || value == null) {
       return;
     }
diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java
@@ -105,6 +105,22 @@ public SdkLogRecordBuilder setBody(Value<?> value) {
     return this;
   }
 
+  @Override
+  public SdkLogRecordBuilder setException(Throwable throwable) {
+    if (throwable == null) {
+      return this;
+    }
+
+    loggerSharedState
+        .getExceptionAttributeResolver()
+        .setExceptionAttributes(
+            this::setExceptionAttribute,
+            throwable,
+            loggerSharedState.getLogLimits().getMaxAttributeValueLength());
+
+    return this;
+  }
+
   @Override
   public <T> SdkLogRecordBuilder setAttribute(AttributeKey<T> key, @Nullable T value) {
     if (key == null || key.getKey().isEmpty() || value == null) {
@@ -139,6 +155,19 @@ public void emit() {
         .onEmit(context, createLogRecord(context, observedTimestampEpochNanos));
   }
 
+  /**
+   * Sets an exception-derived attribute only if it hasn't already been set by the user. This
+   * ensures user-set attributes take precedence over exception-derived attributes.
+   */
+  protected <T> void setExceptionAttribute(AttributeKey<T> key, @Nullable T value) {
+    if (key == null || key.getKey().isEmpty() || value == null) {
+      return;
+    }
+    if (attributes == null || attributes.get(key) == null) {
+      setAttribute(key, value);
+    }
+  }
+
   protected ReadWriteLogRecord createLogRecord(Context context, long observedTimestampEpochNanos) {
     return SdkReadWriteLogRecord.create(
         loggerSharedState.getLogLimits(),
diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilderTest.java
@@ -28,6 +28,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.logs.internal.LoggerConfig;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Instant;
@@ -63,6 +64,8 @@ void setup() {
     when(loggerSharedState.getClock()).thenReturn(clock);
     when(loggerSharedState.getLoggerInstrumentation())
         .thenReturn(new SdkLoggerInstrumentation(MeterProvider::noop));
+    when(loggerSharedState.getExceptionAttributeResolver())
+        .thenReturn(ExceptionAttributeResolver.getDefault());
 
     SdkLogger logger = new SdkLogger(loggerSharedState, SCOPE_INFO, LoggerConfig.enabled());
     builder = new SdkLogRecordBuilder(loggerSharedState, SCOPE_INFO, logger);
@@ -166,4 +169,31 @@ void testConvenienceAttributeMethods() {
             equalTo(booleanKey("bk"), true),
             equalTo(longKey("ik"), 13L));
   }
+
+  @Test
+  void setException() {
+    Exception exception = new Exception("error");
+
+    builder.setException(exception).emit();
+
+    assertThat(emittedLog.get().toLogRecordData()).hasException(exception);
+  }
+
+  @Test
+  void setException_UserAttributesTakePrecedence() {
+    builder
+        .setAttribute(stringKey("exception.message"), "custom message")
+        .setException(new Exception("error"))
+        .emit();
+
+    assertThat(emittedLog.get().toLogRecordData())
+        .hasAttributesSatisfying(
+            attributes -> {
+              assertThat(attributes.get(stringKey("exception.type")))
+                  .isEqualTo("java.lang.Exception");
+              assertThat(attributes.get(stringKey("exception.message")))
+                  .isEqualTo("custom message");
+              assertThat(attributes.get(stringKey("exception.stacktrace"))).isNotNull();
+            });
+  }
 }
diff --git a/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java b/sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/ExtendedLoggerBuilderTest.java
@@ -12,7 +12,6 @@
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 
-import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
 import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver;
 import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
@@ -30,9 +29,7 @@ class ExtendedLoggerBuilderTest {
   void setException_DefaultResolver() {
     Logger logger = loggerProviderBuilder.build().get("logger");
 
-    ((ExtendedLogRecordBuilder) logger.logRecordBuilder())
-        .setException(new Exception("error"))
-        .emit();
+    logger.logRecordBuilder().setException(new Exception("error")).emit();
 
     assertThat(exporter.getFinishedLogRecordItems())
         .satisfiesExactly(
@@ -64,9 +61,7 @@ public void setExceptionAttributes(
 
     Logger logger = loggerProviderBuilder.build().get("logger");
 
-    ((ExtendedLogRecordBuilder) logger.logRecordBuilder())
-        .setException(new Exception("error"))
-        .emit();
+    logger.logRecordBuilder().setException(new Exception("error")).emit();
 
     assertThat(exporter.getFinishedLogRecordItems())
         .satisfiesExactly(
@@ -81,7 +76,8 @@ public void setExceptionAttributes(
   void setException_UserAttributesTakePrecedence() {
     Logger logger = loggerProviderBuilder.build().get("logger");
 
-    ((ExtendedLogRecordBuilder) logger.logRecordBuilder())
+    logger
+        .logRecordBuilder()
         .setAttribute(EXCEPTION_MESSAGE, "custom message")
         .setException(new Exception("error"))
         .emit();
diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/LogRecordDataAssert.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/LogRecordDataAssert.java
@@ -37,6 +37,13 @@
  */
 public final class LogRecordDataAssert extends AbstractAssert<LogRecordDataAssert, LogRecordData> {
 
+  private static final AttributeKey<String> EXCEPTION_TYPE =
+      AttributeKey.stringKey("exception.type");
+  private static final AttributeKey<String> EXCEPTION_MESSAGE =
+      AttributeKey.stringKey("exception.message");
+  private static final AttributeKey<String> EXCEPTION_STACKTRACE =
+      AttributeKey.stringKey("exception.stacktrace");
+
   LogRecordDataAssert(@Nullable LogRecordData actual) {
     super(actual, LogRecordDataAssert.class);
   }
@@ -350,6 +357,31 @@ public <T> LogRecordDataAssert hasBodyField(AttributeKey<T> key, T value) {
     return this;
   }
 
+  /**
+   * Asserts the log has exception attributes for the given {@link Throwable}. The stack trace is
+   * not matched against.
+   */
+  @SuppressWarnings("NullAway")
+  public LogRecordDataAssert hasException(Throwable exception) {
+    isNotNull();
+
+    assertThat(actual.getAttributes())
+        .as("exception.type")
+        .containsEntry(EXCEPTION_TYPE, exception.getClass().getCanonicalName());
+    if (exception.getMessage() != null) {
+      assertThat(actual.getAttributes())
+          .as("exception.message")
+          .containsEntry(EXCEPTION_MESSAGE, exception.getMessage());
+    }
+
+    // Exceptions used in assertions always have a different stack trace, just confirm it was
+    // recorded.
+    String stackTrace = actual.getAttributes().get(EXCEPTION_STACKTRACE);
+    assertThat(stackTrace).as("exception.stacktrace").isNotNull();
+
+    return this;
+  }
+
   /** Asserts the log has the given attributes. */
   public LogRecordDataAssert hasAttributes(Attributes attributes) {
     isNotNull();
diff --git a/sdk/trace-shaded-deps/build.gradle.kts b/sdk/trace-shaded-deps/build.gradle.kts
@@ -17,6 +17,7 @@ tasks {
   shadowJar {
     minimize()
 
+    exclude("META-INF/maven/**")
     relocate("org.jctools", "io.opentelemetry.internal.shaded.jctools")
   }
 

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,14 @@ default LogRecordBuilder setEventName(String eventName) {`
`210`	`210`	`return this;`
`211`	`211`	`}`
`212`	`212`
	`213`	`+ /**`
	`214`	`+ * Set {@code exception.type}, {@code exception.message}, and {@code exception.stacktrace}`
	`215`	`+ * attributes based on the {@code throwable}.`
	`216`	`+ */`
	`217`	`+ default LogRecordBuilder setException(Throwable throwable) {`
	`218`	`+ return this;`
	`219`	`+ }`
	`220`	`+`
`213`	`221`	`/** Emit the log record. */`
`214`	`222`	`void emit();`
`215`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ default ExtendedLogRecordBuilder setAllAttributes(ExtendedAttributes attributes)`
`133`	`133`	`*/`
`134`	`134`	`<T> ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey<T> key, T value);`
`135`	`135`
`136`		`- /** Set standard {@code exception.} attributes based on the {@code throwable}. /`
	`136`	`+ /** {@inheritDoc} */`
	`137`	`+ @Override`
`137`	`138`	`ExtendedLogRecordBuilder setException(Throwable throwable);`
`138`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ void buildAndEmit() {`
`63`	`63`	`.setBody(Value.of("body"))`
`64`	`64`	`.setAttribute(AttributeKey.stringKey("key1"), "value1")`
`65`	`65`	`.setAllAttributes(Attributes.builder().put("key2", "value2").build())`
	`66`	`+ .setException(new RuntimeException("error"))`
`66`	`67`	`.emit())`
`67`	`68`	`.doesNotThrowAnyException();`
`68`	`69`	`}`