fix(deps): update opentelemetry instrumentation packages (#1018)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jason Plumb <jplumb@splunk.com>

Author: renovate[bot]

build.gradle.kts

@@ -18,7 +18,7 @@ subprojects {
 
     dependencies {
         // using the bom ensures that all of your opentelemetry dependency versions are aligned
-        implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.24.0-alpha"))
+        implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.25.0-alpha"))
     }
 
     spotless {

doc-snippets/exporters/build.gradle.kts

@@ -15,7 +15,7 @@ java {
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.25.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("io.opentelemetry:opentelemetry-exporter-otlp")

doc-snippets/getting-started/build.gradle.kts

@@ -15,7 +15,7 @@ java {
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.25.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
 }

doc-snippets/spring-starter/build.gradle.kts

@@ -15,7 +15,7 @@ java {
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.25.0"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-webflux")

grpc/build.gradle.kts

@@ -25,12 +25,12 @@ dependencies {
     implementation ("io.grpc:grpc-services:${grpcVersion}")
     implementation ("io.grpc:grpc-stub:${grpcVersion}")
     implementation ("com.google.protobuf:protobuf-java-util:${protobufVersion}")
-    implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.24.0-alpha")
+    implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.25.0-alpha")
     implementation ("com.google.guava:guava:33.5.0-jre")
 
     implementation("io.opentelemetry:opentelemetry-api")
     implementation("io.opentelemetry:opentelemetry-sdk")
-    implementation("io.opentelemetry:opentelemetry-exporter-zipkin")
+    implementation("io.opentelemetry:opentelemetry-exporter-otlp")
     implementation("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6")
 
     //alpha modules

grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java

@@ -7,30 +7,31 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.semconv.ServiceAttributes;
 
 public final class ExampleConfiguration {
 
   // Name of the service
   private static final String SERVICE_NAME = "myExampleService";
 
-  /** Adds a SimpleSpanProcessor initialized with ZipkinSpanExporter to the TracerSdkProvider */
+  /** Adds a SimpleSpanProcessor initialized with OtlpHttpSpanExporter to the TracerSdkProvider */
   static OpenTelemetry initializeOpenTelemetry(String ip, int port) {
-    String endpoint = String.format("http://%s:%s/api/v2/spans", ip, port);
-    ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(endpoint).build();
+    String endpoint = String.format("http://%s:%s/api/v1/traces", ip, port);
+    SpanExporter spanExporter = OtlpHttpSpanExporter.builder().setEndpoint(endpoint).build();
 
     Resource serviceNameResource =
         Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, SERVICE_NAME));
 
     // Set to process the spans by the Zipkin Exporter
     SdkTracerProvider tracerProvider =
         SdkTracerProvider.builder()
-            .addSpanProcessor(SimpleSpanProcessor.create(zipkinExporter))
+            .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
             .setResource(Resource.getDefault().merge(serviceNameResource))
             .build();
     OpenTelemetrySdk openTelemetry =

grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldClient.java

@@ -20,7 +20,7 @@ public class HelloWorldClient {
 
   private static final Logger logger = Logger.getLogger(HelloWorldClient.class.getName());
   private static final OpenTelemetry openTelemetry =
-      ExampleConfiguration.initializeOpenTelemetry("localhost", 9411);
+      ExampleConfiguration.initializeOpenTelemetry("localhost", 4318);
   private final ManagedChannel channel;
   private final GreeterGrpc.GreeterBlockingStub blockingStub;
 
@@ -33,7 +33,7 @@ public HelloWorldClient() {
     this.channel =
         ManagedChannelBuilder.forAddress("localhost", 50051)
             .usePlaintext()
-            .intercept(grpcTelemetry.newClientInterceptor())
+            .intercept(grpcTelemetry.createClientInterceptor())
             .build();
     this.blockingStub = GreeterGrpc.newBlockingStub(this.channel);
   }

grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldServer.java

@@ -22,7 +22,7 @@
 public class HelloWorldServer {
   private static final Logger logger = Logger.getLogger(HelloWorldServer.class.getName());
   private static final OpenTelemetry openTelemetry =
-      ExampleConfiguration.initializeOpenTelemetry("localhost", 9411);
+      ExampleConfiguration.initializeOpenTelemetry("localhost", 4318);
   private Server server;
 
   private void start() throws IOException {
@@ -56,7 +56,7 @@ public void run() {
   ServerServiceDefinition configureServerInterceptor(
       OpenTelemetry openTelemetry, BindableService bindableService) {
     GrpcTelemetry grpcTelemetry = GrpcTelemetry.create(openTelemetry);
-    return ServerInterceptors.intercept(bindableService, grpcTelemetry.newServerInterceptor());
+    return ServerInterceptors.intercept(bindableService, grpcTelemetry.createServerInterceptor());
   }
 
   private void stop() throws InterruptedException {

javaagent/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
 
-    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.24.0")
+    agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.25.0")
 }
 
 val copyAgent = tasks.register<Copy>("copyAgent") {

spring-declarative-configuration/build.gradle.kts

@@ -17,7 +17,7 @@ java {
 
 dependencies {
     implementation(platform(SpringBootPlugin.BOM_COORDINATES))
-    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.24.0"))
+    implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.25.0"))
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter")