Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into experimental-extended-attributes

Author: jack-berg

.github/renovate.json5

@@ -17,6 +17,7 @@
     },
     {
       "matchPackageNames": [
+        "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
         "io.opentelemetry.proto:opentelemetry-proto",
         "io.opentelemetry.semconv:opentelemetry-semconv-incubating"
       ],

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## Unreleased
 
+## Version 1.49.0 (2025-04-04)
+
+### SDK
+
+#### Trace
+
+* Avoid linear queue.size() calls in span producers by storing queue size separately
+  ([#7141](https://github.com/open-telemetry/opentelemetry-java/pull/7141))
+
+#### Exporters
+
+* OTLP: Add support for setting exporter executor service
+  ([#7152](https://github.com/open-telemetry/opentelemetry-java/pull/7152))
+* OTLP: Refine delay jitter for exponential backoff
+  ([#7206](https://github.com/open-telemetry/opentelemetry-java/pull/7206))
+
+#### Extensions
+
+* Autoconfigure: Remove support for otel.experimental.exporter.otlp.retry.enabled
+  ([#7200](https://github.com/open-telemetry/opentelemetry-java/pull/7200))
+* Autoconfigure: Add stable cardinality limit property otel.java.metrics.cardinality.limit
+  ([#7199](https://github.com/open-telemetry/opentelemetry-java/pull/7199))
+* Incubator: Add declarative config model customizer SPI
+  ([#7118](https://github.com/open-telemetry/opentelemetry-java/pull/7118))
+
 ## Version 1.48.0 (2025-03-07)
 
 ### API

README.md

@@ -73,7 +73,7 @@ respect to semantic versioning.
 |----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Java     | 8+                                                                                                                                                                                                                               | All artifacts, unless otherwise noted                   | Changing requires major version bump.                                                                                                                                              |
 | Android  | 23+ (NOTE: [desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) is required. We stay up to date with the latest version of [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs).) | Artifacts using `otel.animalsniffer-conventions` plugin | Kept in sync with minimum requirements for [Google Play services](https://developers.google.com/android/guides/setup). Subject to change in minor version.                         |
-| Kotlin   | 1.6+                                                                                                                                                                                                                             | Only applies to `opentelemetry-extension-kotlin`        | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-js) version. Subject to change in minor versions. |
+| Kotlin   | 1.8+                                                                                                                                                                                                                             | Only applies to `opentelemetry-extension-kotlin`        | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-js) version. Subject to change in minor versions. |
 
 ## API vs SDK
 

VERSIONING.md

@@ -27,7 +27,7 @@ configurations.add(signatureJarClasspath)
 configurations.add(generatedSignature)
 
 dependencies {
-  signature("com.toasttab.android:gummy-bears-api-23:0.10.0@signature")
+  signature("com.toasttab.android:gummy-bears-api-23:0.12.0@signature")
   signatureJar("com.android.tools:desugar_jdk_libs")
 }
 

animal-sniffer-signature/build.gradle.kts

@@ -40,6 +40,11 @@ public ExtendedLogRecordBuilder setEventName(String eventName) {
       return this;
     }
 
+    @Override
+    public ExtendedLogRecordBuilder setException(Throwable throwable) {
+      return this;
+    }
+
     @Override
     public <T> ExtendedLogRecordBuilder setAttribute(ExtendedAttributeKey<T> key, T value) {
       return this;

api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedDefaultLogger.java

@@ -130,4 +130,7 @@ default ExtendedLogRecordBuilder setAllAttributes(ExtendedAttributes attributes)
    * record with a non-empty event name is an Event.
    */
   ExtendedLogRecordBuilder setEventName(String eventName);
+
+  /** Set standard {@code exception.*} attributes based on the {@code throwable}. */
+  ExtendedLogRecordBuilder setException(Throwable throwable);
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.java

@@ -2,7 +2,7 @@ plugins {
   `kotlin-dsl`
 
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.2"
+  id("com.diffplug.spotless") version "7.0.3"
 }
 
 if (!hasLauncherForJavaVersion(17)) {
@@ -53,9 +53,7 @@ dependencies {
   implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.3.1"))
   implementation("com.google.auto.value:auto-value-annotations:1.11.0")
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
-  // Needed for japicmp but not automatically brought in for some reason.
-  implementation("com.google.guava:guava:33.4.0-jre")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.19.2")
   implementation("com.squareup:javapoet:1.13.0")
   implementation("com.squareup.wire:wire-compiler")
@@ -66,8 +64,8 @@ dependencies {
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10")
-  implementation("org.owasp:dependency-check-gradle:12.1.0")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
+  implementation("org.owasp:dependency-check-gradle:12.1.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.0")
 }
 

buildSrc/build.gradle.kts

@@ -87,6 +87,9 @@ tasks {
         // cognitive load is dubious.
         disable("YodaCondition")
 
+        // Text blocks are not supported in java 8
+        disable("StringConcatToTextBlock")
+
         if ((name.contains("Jmh") || name.contains("Test") || project.name.contains("testing-internal")) && !project.name.equals("custom-checks")) {
           // Allow underscore in test-type method names
           disable("MemberName")

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 jacoco {
-  toolVersion = "0.8.12"
+  toolVersion = "0.8.13"
 }
 
 // https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html