Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into logbuilder-set-exception

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"
       ],

.github/workflows/codeql.yml

@@ -37,7 +37,7 @@ jobs:
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           languages: java, actions
           # using "latest" helps to keep up with the latest Kotlin support
@@ -51,4 +51,4 @@ jobs:
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,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@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -2,6 +2,80 @@
 
 ## 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
+
+* Add some helpful logging attribute methods to `LogRecordBuilder`
+  ([#7089](https://github.com/open-telemetry/opentelemetry-java/pull/7089))
+
+#### Incubator
+
+* Introduce ConfigProvider API. Rename `StructuredConfigProperties` to `DeclarativeConfigProperties`
+  and move to `opentelemetry-api-incubator`. Rename `FileConfiguration`
+  to `DeclarativeConfiguration`.
+  ([#6549](https://github.com/open-telemetry/opentelemetry-java/pull/6549))
+
+### SDK
+
+* Log warning and adjust when BatchLogRecordProcessor, BatchSpanProcessor `maxExportBatchSize`
+  exceeds `maxQueueSize`.
+  ([#7045](https://github.com/open-telemetry/opentelemetry-java/pull/7045),
+  [#7148](https://github.com/open-telemetry/opentelemetry-java/pull/7148))
+* Fix bug causing `ThrottlingLogger` to log more than once per minute
+  ([#7156](https://github.com/open-telemetry/opentelemetry-java/pull/7156))
+
+#### Metrics
+
+* Remove obsolete `SdkMeterProviderUtil#setCardinalitylimit` API
+  ([#7169](https://github.com/open-telemetry/opentelemetry-java/pull/7169))
+
+#### Traces
+
+* Fix bug preventing accurate reporting of span event dropped attribute count
+  ([#7142](https://github.com/open-telemetry/opentelemetry-java/pull/7142))
+
+#### Exporters
+
+* OTLP: remove support for `otel.java.experimental.exporter.memory_mode`
+  which was previously replaced by `otel.java.exporter.memory_mode`
+  ([#7127](https://github.com/open-telemetry/opentelemetry-java/pull/7127))
+* OTLP: Extract sender parameters to config carrier class
+  (incubating API)
+  ([#7151](https://github.com/open-telemetry/opentelemetry-java/pull/7151))
+* OTLP: Add support for setting OTLP exporter service class loader
+  ([#7150](https://github.com/open-telemetry/opentelemetry-java/pull/7150))
+
+### Tooling
+
+* Update android animalsniffer min API version to 23
+  ([#7153](https://github.com/open-telemetry/opentelemetry-java/pull/7153))
+
 ## Version 1.47.0 (2025-02-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

@@ -123,6 +123,7 @@ default LogRecordBuilder setAllAttributes(Attributes attributes) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, String value) {
     return setAttribute(stringKey(key), value);
@@ -138,6 +139,7 @@ default LogRecordBuilder setAttribute(String key, String value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, long value) {
     return setAttribute(longKey(key), value);
@@ -153,6 +155,7 @@ default LogRecordBuilder setAttribute(String key, long value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, double value) {
     return setAttribute(doubleKey(key), value);
@@ -168,6 +171,7 @@ default LogRecordBuilder setAttribute(String key, double value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, boolean value) {
     return setAttribute(booleanKey(key), value);
@@ -183,6 +187,7 @@ default LogRecordBuilder setAttribute(String key, boolean value) {
    * @param key the key for this attribute.
    * @param value the value for this attribute.
    * @return this.
+   * @since 1.48.0
    */
   default LogRecordBuilder setAttribute(String key, int value) {
     return setAttribute(key, (long) value);

api/all/src/main/java/io/opentelemetry/api/logs/LogRecordBuilder.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")