From 450d4a8f80aa61fe687b56467169c6ffb64135d3 Mon Sep 17 00:00:00 2001 From: John Watson Date: Tue, 12 May 2020 14:01:08 -0700 Subject: [PATCH] Update the examples to work with 0.5.0-SNAPSHOT (#1206) --- examples/build.gradle | 2 +- .../example/HelloWorldClient.java | 5 ++-- .../example/HelloWorldClientStream.java | 5 ++-- .../example/HelloWorldServer.java | 5 ++-- examples/http/build.gradle | 2 ++ .../example/http/HttpClient.java | 2 +- .../example/http/HttpServer.java | 5 +++- .../opentelemetry/example/JaegerExample.java | 5 ++-- examples/sdk-usage/build.gradle | 1 + .../ConfigureSpanProcessorExample.java | 23 +++++++++++-------- .../sdk/example/ConfigureTraceExample.java | 3 +-- 11 files changed, 32 insertions(+), 26 deletions(-) diff --git a/examples/build.gradle b/examples/build.gradle index fcb520bcce..c7d3d83f18 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -14,7 +14,7 @@ subprojects { version = "0.1.0-SNAPSHOT" ext { - opentelemetryVersion = "0.4.0-SNAPSHOT" + opentelemetryVersion = "0.5.0-SNAPSHOT" grpcVersion = '1.24.0' // CURRENT_GRPC_VERSION protobufVersion = '3.10.0' protocVersion = protobufVersion diff --git a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClient.java b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClient.java index 019ad063c3..e52abf6e8e 100644 --- a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClient.java +++ b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClient.java @@ -50,8 +50,7 @@ public class HelloWorldClient { private final GreeterGrpc.GreeterBlockingStub blockingStub; // OTel API - Tracer tracer = - OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; + Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; // Export traces as log LoggingSpanExporter exporter = new LoggingSpanExporter(); // Share context via text headers @@ -86,7 +85,7 @@ public class HelloWorldClient { // Use the OpenTelemetry SDK TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); // Set to process the spans by the log exporter - tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(exporter).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(exporter)); } public void shutdown() throws InterruptedException { diff --git a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClientStream.java b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClientStream.java index d2db13d06e..37e8b5bc22 100644 --- a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClientStream.java +++ b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldClientStream.java @@ -53,8 +53,7 @@ public class HelloWorldClientStream { private final GreeterGrpc.GreeterStub asyncStub; // OTel API - Tracer tracer = - OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; + Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; // Export traces as log LoggingSpanExporter exporter = new LoggingSpanExporter(); // Share context via text headers @@ -89,7 +88,7 @@ public class HelloWorldClientStream { // Use the OpenTelemetry SDK TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); // Set to process the spans by the log exporter - tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(exporter).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(exporter)); } public void shutdown() throws InterruptedException { diff --git a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldServer.java b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldServer.java index 369fd9b1a1..6120310703 100644 --- a/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldServer.java +++ b/examples/grpc/src/main/java/io/opentelemetry/example/HelloWorldServer.java @@ -48,8 +48,7 @@ public class HelloWorldServer { private final int port = 50051; // OTel API - Tracer tracer = - OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldServer"); + Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldServer"); // Export traces as log LoggingSpanExporter exporter = new LoggingSpanExporter(); // Share context via text @@ -110,7 +109,7 @@ public class HelloWorldServer { // Get the tracer TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); // Set to process the the spans by the LogExporter - tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(exporter).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(exporter)); } /** Await termination on the main thread since the grpc library uses daemon threads. */ diff --git a/examples/http/build.gradle b/examples/http/build.gradle index 9d4395af3b..4ad905cdb2 100644 --- a/examples/http/build.gradle +++ b/examples/http/build.gradle @@ -9,4 +9,6 @@ dependencies { compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") compile("io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}") + compile "io.grpc:grpc-context:${grpcVersion}" + } diff --git a/examples/http/src/main/java/io/opentelemetry/example/http/HttpClient.java b/examples/http/src/main/java/io/opentelemetry/example/http/HttpClient.java index d3d7a2c985..af65e4d4df 100644 --- a/examples/http/src/main/java/io/opentelemetry/example/http/HttpClient.java +++ b/examples/http/src/main/java/io/opentelemetry/example/http/HttpClient.java @@ -55,7 +55,7 @@ public class HttpClient { // Show that multiple exporters can be used // Set to export the traces also to a log file - tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(loggingExporter).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(loggingExporter)); } private HttpClient() throws Exception { diff --git a/examples/http/src/main/java/io/opentelemetry/example/http/HttpServer.java b/examples/http/src/main/java/io/opentelemetry/example/http/HttpServer.java index 31295d5503..17dddc96c5 100644 --- a/examples/http/src/main/java/io/opentelemetry/example/http/HttpServer.java +++ b/examples/http/src/main/java/io/opentelemetry/example/http/HttpServer.java @@ -28,6 +28,9 @@ import io.opentelemetry.exporters.logging.LoggingSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.TracerSdkProvider; import io.opentelemetry.sdk.trace.export.SimpleSpansProcessor; +import io.opentelemetry.trace.Span; +import io.opentelemetry.trace.Status; +import io.opentelemetry.trace.Tracer; import java.io.IOException; import java.io.OutputStream; import java.net.InetSocketAddress; @@ -134,7 +137,7 @@ public class HttpServer { // Show that multiple exporters can be used // Set to export the traces also to a log file - tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(loggingExporter).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(loggingExporter)); } private void stop() { diff --git a/examples/jaeger/src/main/java/io/opentelemetry/example/JaegerExample.java b/examples/jaeger/src/main/java/io/opentelemetry/example/JaegerExample.java index 05e08b648a..cf3302e456 100644 --- a/examples/jaeger/src/main/java/io/opentelemetry/example/JaegerExample.java +++ b/examples/jaeger/src/main/java/io/opentelemetry/example/JaegerExample.java @@ -15,8 +15,7 @@ public class JaegerExample { private int port; // = 14250; // OTel API - private Tracer tracer = - OpenTelemetry.getTracer("io.opentelemetry.example.JaegerExample"); + private Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.JaegerExample"); // Export traces to Jaeger private JaegerGrpcSpanExporter jaegerExporter; @@ -39,7 +38,7 @@ public class JaegerExample { // Set to process the spans by the Jaeger Exporter OpenTelemetrySdk.getTracerProvider() - .addSpanProcessor(SimpleSpansProcessor.newBuilder(this.jaegerExporter).build()); + .addSpanProcessor(SimpleSpansProcessor.create(this.jaegerExporter)); } private void myWonderfulUseCase() { diff --git a/examples/sdk-usage/build.gradle b/examples/sdk-usage/build.gradle index f7fc0c97d6..615ca4fe59 100644 --- a/examples/sdk-usage/build.gradle +++ b/examples/sdk-usage/build.gradle @@ -8,4 +8,5 @@ ext.moduleName = "io.opentelemetry.examples.sdk.usage" dependencies { compile "io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}" compile "io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}" + compile "io.grpc:grpc-context:${grpcVersion}" } diff --git a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java index 6fa76e0ad1..6d8e09b482 100644 --- a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java +++ b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java @@ -22,6 +22,7 @@ import io.opentelemetry.sdk.trace.MultiSpanProcessor; import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.TracerSdkProvider; import io.opentelemetry.sdk.trace.export.BatchSpansProcessor; +import io.opentelemetry.sdk.trace.export.BatchSpansProcessor.Config; import io.opentelemetry.sdk.trace.export.SimpleSpansProcessor; import io.opentelemetry.trace.Tracer; import java.util.Arrays; @@ -67,19 +68,23 @@ public class ConfigureSpanProcessorExample { // Configure the simple spans processor. This span processor exports span immediately after they // are ended. - SimpleSpansProcessor simpleSpansProcessor = SimpleSpansProcessor.newBuilder(exporter).build(); + SimpleSpansProcessor simpleSpansProcessor = SimpleSpansProcessor.create(exporter); tracerProvider.addSpanProcessor(simpleSpansProcessor); // Configure the batch spans processor. This span processor exports span in batches. BatchSpansProcessor batchSpansProcessor = - BatchSpansProcessor.newBuilder(exporter) - .reportOnlySampled(true) // send to the exporter only spans that have been sampled - .setMaxExportBatchSize(512) // set the maximum batch size to use - .setMaxQueueSize(2048) // set the queue size. This must be >= the export batch size - .setExporterTimeoutMillis( - 30_000) // set the max amount of time an export can run before getting interrupted - .setScheduleDelayMillis(5000) // set time between two different exports - .build(); + BatchSpansProcessor.create( + exporter, + Config.newBuilder() + .setExportOnlySampled( + true) // send to the exporter only spans that have been sampled + .setMaxExportBatchSize(512) // set the maximum batch size to use + .setMaxQueueSize(2048) // set the queue size. This must be >= the export batch size + .setExporterTimeoutMillis( + 30_000) // set the max amount of time an export can run before getting + // interrupted + .setScheduleDelayMillis(5000) // set time between two different exports + .build()); tracerProvider.addSpanProcessor(batchSpansProcessor); // Configure the multi spans processor. A MultiSpanProcessor accepts a list of Span Processors. diff --git a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureTraceExample.java b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureTraceExample.java index c73a708315..2485edaf53 100644 --- a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureTraceExample.java +++ b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureTraceExample.java @@ -41,8 +41,7 @@ class ConfigureTraceExample { static Tracer tracer = tracerProvider.get("ConfigureTraceExample"); static { - tracerProvider.addSpanProcessor( - SimpleSpansProcessor.newBuilder(new LoggingSpanExporter()).build()); + tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(new LoggingSpanExporter())); } public static void main(String[] args) {