Merge branch 'main' into teja/creating-delegating-metric-data

Author: vasantteja

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

@@ -67,7 +67,7 @@ dependencies {
   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.20")
-  implementation("org.owasp:dependency-check-gradle:12.1.0")
+  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

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

@@ -42,7 +42,7 @@ java {
 
 checkstyle {
   configDirectory.set(file("$rootDir/buildscripts/"))
-  toolVersion = "10.21.4"
+  toolVersion = "10.23.0"
   isIgnoreFailures = false
   configProperties["rootDir"] = rootDir
 }

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

@@ -268,6 +268,9 @@ default Executor wrap(Executor executor) {
    * making this the {@linkplain Context#current() current context} before each execution.
    */
   default ExecutorService wrap(ExecutorService executor) {
+    if (executor instanceof ContextExecutorService) {
+      return executor;
+    }
     return new ContextExecutorService(this, executor);
   }
 
@@ -277,6 +280,9 @@ default ExecutorService wrap(ExecutorService executor) {
    * execution.
    */
   default ScheduledExecutorService wrap(ScheduledExecutorService executor) {
+    if (executor instanceof ContextScheduledExecutorService) {
+      return executor;
+    }
     return new ContextScheduledExecutorService(this, executor);
   }
 

context/src/main/java/io/opentelemetry/context/Context.java

@@ -361,6 +361,24 @@ void wrapExecutor() {
     }
   }
 
+  @Test
+  void wrapExecutorService() {
+    // given
+    ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    // when
+    ExecutorService firstWrap = CAT.wrap(executorService);
+    ExecutorService secondWrap = CAT.wrap(firstWrap);
+
+    // then
+    assertThat(firstWrap).isInstanceOf(ContextExecutorService.class);
+    assertThat(((ContextExecutorService) firstWrap).context()).isEqualTo(CAT);
+    assertThat(((ContextExecutorService) firstWrap).delegate()).isEqualTo(executorService);
+    assertThat(secondWrap).isInstanceOf(ContextExecutorService.class);
+    assertThat(((ContextExecutorService) secondWrap).context()).isEqualTo(CAT);
+    assertThat(((ContextExecutorService) secondWrap).delegate()).isEqualTo(executorService);
+  }
+
   @Nested
   @TestInstance(Lifecycle.PER_CLASS)
   class WrapExecutorService {
@@ -504,6 +522,25 @@ void invokeAnyTimeout() throws Exception {
     }
   }
 
+  @Test
+  void wrapScheduledExecutorService() {
+    // given
+    ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+
+    // when
+    ScheduledExecutorService firstWrap = CAT.wrap(executorService);
+    ScheduledExecutorService secondWrap = CAT.wrap(firstWrap);
+
+    // then
+    assertThat(firstWrap).isInstanceOf(ContextScheduledExecutorService.class);
+    assertThat(((ContextScheduledExecutorService) firstWrap).context()).isEqualTo(CAT);
+    assertThat(((ContextScheduledExecutorService) firstWrap).delegate()).isEqualTo(executorService);
+    assertThat(secondWrap).isInstanceOf(ContextScheduledExecutorService.class);
+    assertThat(((ContextScheduledExecutorService) secondWrap).context()).isEqualTo(CAT);
+    assertThat(((ContextScheduledExecutorService) secondWrap).delegate())
+        .isEqualTo(executorService);
+  }
+
   @Nested
   @TestInstance(Lifecycle.PER_CLASS)
   class WrapScheduledExecutorService {

context/src/test/java/io/opentelemetry/context/ContextTest.java

@@ -11,14 +11,48 @@
 class OtelInternalJavadocTest {
 
   @Test
-  void test() {
-    doTest("internal/InternalJavadocPositiveCases.java");
-    doTest("internal/InternalJavadocNegativeCases.java");
+  void positiveCases() {
+    CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class)
+        .addSourceLines(
+            "internal/InternalJavadocPositiveCases.java",
+            "/*",
+            " * Copyright The OpenTelemetry Authors",
+            " * SPDX-License-Identifier: Apache-2.0",
+            " */",
+            "package io.opentelemetry.gradle.customchecks.internal;",
+            "// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "public class InternalJavadocPositiveCases {",
+            "  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "  public static class One {}",
+            "  /** Doesn't have the disclaimer. */",
+            "  // BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers",
+            "  public static class Two {}",
+            "}")
+        .doTest();
   }
 
-  private static void doTest(String path) {
+  @Test
+  void negativeCases() {
     CompilationTestHelper.newInstance(OtelInternalJavadoc.class, OtelInternalJavadocTest.class)
-        .addSourceFile(path)
+        .addSourceLines(
+            "internal/InternalJavadocNegativeCases.java",
+            "/*",
+            " * Copyright The OpenTelemetry Authors",
+            " * SPDX-License-Identifier: Apache-2.0",
+            " */",
+            "package io.opentelemetry.gradle.customchecks.internal;",
+            "/**",
+            " * This class is internal and is hence not for public use. Its APIs are unstable and can change at",
+            " * any time.",
+            " */",
+            "public class InternalJavadocNegativeCases {",
+            "  /**",
+            "   * This class is internal and is hence not for public use. Its APIs are unstable and can change at",
+            "   * any time.",
+            "   */",
+            "  public static class One {}",
+            "  static class Two {}",
+            "}")
         .doTest();
   }
 }