diff --git a/build.gradle.kts b/build.gradle.kts index c0a43929ab..49e7493a10 100644 --- a/build.gradle.kts +++ b/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 { diff --git a/doc-snippets/exporters/build.gradle.kts b/doc-snippets/exporters/build.gradle.kts index 82776ee411..d4164c6ad4 100644 --- a/doc-snippets/exporters/build.gradle.kts +++ b/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") diff --git a/doc-snippets/getting-started/build.gradle.kts b/doc-snippets/getting-started/build.gradle.kts index eb124dd252..3700427ec8 100644 --- a/doc-snippets/getting-started/build.gradle.kts +++ b/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") } diff --git a/doc-snippets/spring-starter/build.gradle.kts b/doc-snippets/spring-starter/build.gradle.kts index 9fe04e22d9..73e7ec6302 100644 --- a/doc-snippets/spring-starter/build.gradle.kts +++ b/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") diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts index a8d66e988d..bb0c476e6d 100644 --- a/grpc/build.gradle.kts +++ b/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 diff --git a/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java b/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java index e7dd2a1b60..448a98c9d3 100644 --- a/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java +++ b/grpc/src/main/java/io/opentelemetry/examples/grpc/ExampleConfiguration.java @@ -7,11 +7,12 @@ 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 { @@ -19,10 +20,10 @@ 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)); @@ -30,7 +31,7 @@ static OpenTelemetry initializeOpenTelemetry(String ip, int port) { // 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 = diff --git a/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldClient.java b/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldClient.java index 6d2fea4d87..d9c8f46454 100644 --- a/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldClient.java +++ b/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); } diff --git a/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldServer.java b/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldServer.java index 8e260607f7..86b4b1ec41 100644 --- a/grpc/src/main/java/io/opentelemetry/examples/grpc/HelloWorldServer.java +++ b/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 { diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index ee13541a7c..69bde66761 100644 --- a/javaagent/build.gradle.kts +++ b/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("copyAgent") { diff --git a/spring-declarative-configuration/build.gradle.kts b/spring-declarative-configuration/build.gradle.kts index 1e227d7f62..e458fd412a 100644 --- a/spring-declarative-configuration/build.gradle.kts +++ b/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") diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 521c531604..827d85e129 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -17,7 +17,7 @@ val moduleName by extra { "io.opentelemetry.examples.native" } 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("org.springframework.boot:spring-boot-starter-data-jdbc") diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 480867efc4..47f00fa263 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -29,7 +29,7 @@ val bootJar = tasks.named("bootJar") { dependencies { implementation(platform(SpringBootPlugin.BOM_COORDINATES)) implementation("io.opentelemetry:opentelemetry-api") - implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.24.0") + implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.25.0") //spring modules implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-restclient") @@ -44,7 +44,7 @@ dependencies { testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha") testImplementation("org.assertj:assertj-core:3.27.7") - agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.24.0") + agent("io.opentelemetry.javaagent:opentelemetry-javaagent:2.25.0") } tasks.test {