Merge remote-tracking branch 'upstream/main' into configurable-retry-predicate

Author: YuriyHolinko

CHANGELOG.md

@@ -10,7 +10,6 @@
 import io.opentelemetry.api.incubator.propagation.ExtendedContextPropagators;
 import io.opentelemetry.api.internal.ApiUsageLogger;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
@@ -33,7 +32,7 @@ static Tracer getNoop() {
   }
 
   @Override
-  public SpanBuilder spanBuilder(String spanName) {
+  public ExtendedSpanBuilder spanBuilder(String spanName) {
     return NoopSpanBuilder.create();
   }
 

README.md

@@ -20,4 +20,7 @@ public interface ExtendedTracer extends Tracer {
   default boolean isEnabled() {
     return true;
   }
+
+  @Override
+  ExtendedSpanBuilder spanBuilder(String spanName);
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedDefaultTracer.java

@@ -166,27 +166,32 @@ void startAndCallOrRun() {
 
     // Get a Tracer for a scope
     Tracer tracer = tracerProvider.get("org.foo.my-scope");
+    ExtendedTracer extendedTracer = (ExtendedTracer) tracer;
 
     // Wrap the resetCheckout method in a span
     String cartId =
         ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout_and_return"))
             .setAttribute("key123", "val456")
             .startAndCall(() -> resetCheckoutAndReturn("abc123", /* throwException= */ false));
     assertThat(cartId).isEqualTo("abc123");
+    // ...or use ExtendedTracer instance
     // ...or runnable variation
-    ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout"))
+    extendedTracer
+        .spanBuilder("reset_checkout")
         .startAndRun(() -> resetCheckout("abc123", /* throwException= */ false));
 
     // Wrap the resetCheckout method in a span; resetCheckout throws an exception
     try {
-      ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout_and_return"))
+      extendedTracer
+          .spanBuilder("reset_checkout_and_return")
           .startAndCall(() -> resetCheckoutAndReturn("def456", /* throwException= */ true));
     } catch (Throwable e) {
       // Ignore expected exception
     }
     // ...or runnable variation
     try {
-      ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout"))
+      extendedTracer
+          .spanBuilder("reset_checkout")
           .startAndRun(() -> resetCheckout("def456", /* throwException= */ true));
     } catch (Throwable e) {
       // Ignore expected exception
@@ -195,7 +200,8 @@ void startAndCallOrRun() {
     // Wrap the resetCheckout method in a span; resetCheckout throws an exception; use custom error
     // handler
     try {
-      ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout_and_return"))
+      extendedTracer
+          .spanBuilder("reset_checkout_and_return")
           .startAndCall(
               () -> resetCheckoutAndReturn("ghi789", /* throwException= */ true),
               (span, throwable) -> span.setAttribute("my-attribute", "error"));
@@ -204,7 +210,8 @@ void startAndCallOrRun() {
     }
     // ...or runnable variation
     try {
-      ((ExtendedSpanBuilder) tracer.spanBuilder("reset_checkout"))
+      extendedTracer
+          .spanBuilder("reset_checkout")
           .startAndRun(
               () -> resetCheckout("ghi789", /* throwException= */ true),
               (span, throwable) -> span.setAttribute("my-attribute", "error"));

api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedTracer.java

@@ -2,7 +2,7 @@ plugins {
   `kotlin-dsl`
 
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.25.0"
+  id("com.diffplug.spotless") version "7.0.1"
 }
 
 if (!hasLauncherForJavaVersion(17)) {
@@ -50,10 +50,10 @@ repositories {
 }
 
 dependencies {
-  implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.2.0"))
+  implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.2.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:6.25.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.1")
   // Needed for japicmp but not automatically brought in for some reason.
   implementation("com.google.guava:guava:33.4.0-jre")
   implementation("com.squareup:javapoet:1.13.0")
@@ -64,9 +64,9 @@ dependencies {
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
-  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.1.0")
+  implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
-  implementation("org.owasp:dependency-check-gradle:11.1.1")
+  implementation("org.owasp:dependency-check-gradle:12.0.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.2")
 }
 

api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTraceApiUsageTest.java

@@ -70,7 +70,7 @@ spotless {
       "*.sh",
       "src/**/*.properties",
     )
-    indentWithSpaces()
+    leadingTabsToSpaces()
     trimTrailingWhitespace()
     endWithNewline()
   }

buildSrc/build.gradle.kts

@@ -10,12 +10,12 @@ rootProject.extra["versions"] = dependencyVersions
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.18.2",
   "com.google.guava:guava-bom:33.4.0-jre",
-  "com.google.protobuf:protobuf-bom:4.29.2",
+  "com.google.protobuf:protobuf-bom:4.29.3",
   "com.linecorp.armeria:armeria-bom:1.31.3",
   "com.squareup.okhttp3:okhttp-bom:4.12.0",
-  "com.squareup.okio:okio-bom:3.9.1", // applies to transitive dependencies of okhttp
+  "com.squareup.okio:okio-bom:3.10.2", // applies to transitive dependencies of okhttp
   "io.grpc:grpc-bom:1.69.0",
-  "io.netty:netty-bom:4.1.116.Final",
+  "io.netty:netty-bom:4.1.117.Final",
   "io.zipkin.brave:brave-bom:6.0.3",
   "io.zipkin.reporter2:zipkin-reporter-bom:3.4.3",
   "org.assertj:assertj-bom:3.27.2",
@@ -60,7 +60,7 @@ val DEPENDENCIES = listOf(
   "io.prometheus:simpleclient_httpserver:${prometheusClientVersion}",
   "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.50.0",
+  "com.google.api.grpc:proto-google-common-protos:2.50.1",
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",
@@ -72,11 +72,11 @@ val DEPENDENCIES = listOf(
   "io.jaegertracing:jaeger-client:1.8.1",
   "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.39.0-alpha",
   "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.29.0-alpha",
-  "io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
   "io.opentracing:opentracing-api:0.33.0",
   "io.opentracing:opentracing-noop:0.33.0",
   "junit:junit:4.13.2",
-  "nl.jqno.equalsverifier:equalsverifier:3.18",
+  "nl.jqno.equalsverifier:equalsverifier:3.18.1",
   "org.awaitility:awaitility:4.2.2",
   "org.bouncycastle:bcpkix-jdk15on:1.70",
   "org.codehaus.mojo:animal-sniffer-annotations:1.24",

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

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-api-1.46.0.jar against opentelemetry-api-1.45.0.jar
+No changes.

dependencyManagement/build.gradle.kts

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-context-1.46.0.jar against opentelemetry-context-1.45.0.jar
+No changes.