Update the examples to work with 0.5.0-SNAPSHOT (#1206)
This commit is contained in:
		
							parent
							
								
									5dff1b9165
								
							
						
					
					
						commit
						450d4a8f80
					
				|  | @ -14,7 +14,7 @@ subprojects { | ||||||
|     version = "0.1.0-SNAPSHOT" |     version = "0.1.0-SNAPSHOT" | ||||||
| 
 | 
 | ||||||
|     ext { |     ext { | ||||||
|         opentelemetryVersion = "0.4.0-SNAPSHOT" |         opentelemetryVersion = "0.5.0-SNAPSHOT" | ||||||
|         grpcVersion = '1.24.0' // CURRENT_GRPC_VERSION |         grpcVersion = '1.24.0' // CURRENT_GRPC_VERSION | ||||||
|         protobufVersion = '3.10.0' |         protobufVersion = '3.10.0' | ||||||
|         protocVersion = protobufVersion |         protocVersion = protobufVersion | ||||||
|  |  | ||||||
|  | @ -50,8 +50,7 @@ public class HelloWorldClient { | ||||||
|   private final GreeterGrpc.GreeterBlockingStub blockingStub; |   private final GreeterGrpc.GreeterBlockingStub blockingStub; | ||||||
| 
 | 
 | ||||||
|   // OTel API |   // OTel API | ||||||
|   Tracer tracer = |   Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; | ||||||
|       OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; |  | ||||||
|   // Export traces as log |   // Export traces as log | ||||||
|   LoggingSpanExporter exporter = new LoggingSpanExporter(); |   LoggingSpanExporter exporter = new LoggingSpanExporter(); | ||||||
|   // Share context via text headers |   // Share context via text headers | ||||||
|  | @ -86,7 +85,7 @@ public class HelloWorldClient { | ||||||
|     // Use the OpenTelemetry SDK |     // Use the OpenTelemetry SDK | ||||||
|     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); |     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); | ||||||
|     // Set to process the spans by the log exporter |     // 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 { |   public void shutdown() throws InterruptedException { | ||||||
|  |  | ||||||
|  | @ -53,8 +53,7 @@ public class HelloWorldClientStream { | ||||||
|   private final GreeterGrpc.GreeterStub asyncStub; |   private final GreeterGrpc.GreeterStub asyncStub; | ||||||
| 
 | 
 | ||||||
|   // OTel API |   // OTel API | ||||||
|   Tracer tracer = |   Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; | ||||||
|       OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldClient");; |  | ||||||
|   // Export traces as log |   // Export traces as log | ||||||
|   LoggingSpanExporter exporter = new LoggingSpanExporter(); |   LoggingSpanExporter exporter = new LoggingSpanExporter(); | ||||||
|   // Share context via text headers |   // Share context via text headers | ||||||
|  | @ -89,7 +88,7 @@ public class HelloWorldClientStream { | ||||||
|     // Use the OpenTelemetry SDK |     // Use the OpenTelemetry SDK | ||||||
|     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); |     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); | ||||||
|     // Set to process the spans by the log exporter |     // 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 { |   public void shutdown() throws InterruptedException { | ||||||
|  |  | ||||||
|  | @ -48,8 +48,7 @@ public class HelloWorldServer { | ||||||
|   private final int port = 50051; |   private final int port = 50051; | ||||||
| 
 | 
 | ||||||
|   // OTel API |   // OTel API | ||||||
|   Tracer tracer = |   Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldServer"); | ||||||
|       OpenTelemetry.getTracer("io.opentelemetry.example.HelloWorldServer"); |  | ||||||
|   // Export traces as log |   // Export traces as log | ||||||
|   LoggingSpanExporter exporter = new LoggingSpanExporter(); |   LoggingSpanExporter exporter = new LoggingSpanExporter(); | ||||||
|   // Share context via text |   // Share context via text | ||||||
|  | @ -110,7 +109,7 @@ public class HelloWorldServer { | ||||||
|     // Get the tracer |     // Get the tracer | ||||||
|     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); |     TracerSdkProvider tracerProvider = OpenTelemetrySdk.getTracerProvider(); | ||||||
|     // Set to process the the spans by the LogExporter |     // 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. */ |   /** Await termination on the main thread since the grpc library uses daemon threads. */ | ||||||
|  |  | ||||||
|  | @ -9,4 +9,6 @@ dependencies { | ||||||
|     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-api:${opentelemetryVersion}") | ||||||
|     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}") | ||||||
|     compile("io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}") |     compile("io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}") | ||||||
|  |     compile "io.grpc:grpc-context:${grpcVersion}" | ||||||
|  | 
 | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -55,7 +55,7 @@ public class HttpClient { | ||||||
|     // Show that multiple exporters can be used |     // Show that multiple exporters can be used | ||||||
| 
 | 
 | ||||||
|     // Set to export the traces also to a log file |     // 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 { |   private HttpClient() throws Exception { | ||||||
|  |  | ||||||
|  | @ -28,6 +28,9 @@ import io.opentelemetry.exporters.logging.LoggingSpanExporter; | ||||||
| import io.opentelemetry.sdk.OpenTelemetrySdk; | import io.opentelemetry.sdk.OpenTelemetrySdk; | ||||||
| import io.opentelemetry.sdk.trace.TracerSdkProvider; | import io.opentelemetry.sdk.trace.TracerSdkProvider; | ||||||
| import io.opentelemetry.sdk.trace.export.SimpleSpansProcessor; | 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.IOException; | ||||||
| import java.io.OutputStream; | import java.io.OutputStream; | ||||||
| import java.net.InetSocketAddress; | import java.net.InetSocketAddress; | ||||||
|  | @ -134,7 +137,7 @@ public class HttpServer { | ||||||
|     // Show that multiple exporters can be used |     // Show that multiple exporters can be used | ||||||
| 
 | 
 | ||||||
|     // Set to export the traces also to a log file |     // Set to export the traces also to a log file | ||||||
|     tracerProvider.addSpanProcessor(SimpleSpansProcessor.newBuilder(loggingExporter).build()); |     tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(loggingExporter)); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   private void stop() { |   private void stop() { | ||||||
|  |  | ||||||
|  | @ -15,8 +15,7 @@ public class JaegerExample { | ||||||
|   private int port; // = 14250; |   private int port; // = 14250; | ||||||
| 
 | 
 | ||||||
|   // OTel API |   // OTel API | ||||||
|   private Tracer tracer = |   private Tracer tracer = OpenTelemetry.getTracer("io.opentelemetry.example.JaegerExample"); | ||||||
|       OpenTelemetry.getTracer("io.opentelemetry.example.JaegerExample"); |  | ||||||
|   // Export traces to Jaeger |   // Export traces to Jaeger | ||||||
|   private JaegerGrpcSpanExporter jaegerExporter; |   private JaegerGrpcSpanExporter jaegerExporter; | ||||||
| 
 | 
 | ||||||
|  | @ -39,7 +38,7 @@ public class JaegerExample { | ||||||
| 
 | 
 | ||||||
|     // Set to process the spans by the Jaeger Exporter |     // Set to process the spans by the Jaeger Exporter | ||||||
|     OpenTelemetrySdk.getTracerProvider() |     OpenTelemetrySdk.getTracerProvider() | ||||||
|         .addSpanProcessor(SimpleSpansProcessor.newBuilder(this.jaegerExporter).build()); |         .addSpanProcessor(SimpleSpansProcessor.create(this.jaegerExporter)); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   private void myWonderfulUseCase() { |   private void myWonderfulUseCase() { | ||||||
|  |  | ||||||
|  | @ -8,4 +8,5 @@ ext.moduleName = "io.opentelemetry.examples.sdk.usage" | ||||||
| dependencies { | dependencies { | ||||||
|     compile "io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-sdk:${opentelemetryVersion}" | ||||||
|     compile "io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}" |     compile "io.opentelemetry:opentelemetry-exporters-logging:${opentelemetryVersion}" | ||||||
|  |     compile "io.grpc:grpc-context:${grpcVersion}" | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -22,6 +22,7 @@ import io.opentelemetry.sdk.trace.MultiSpanProcessor; | ||||||
| import io.opentelemetry.sdk.trace.SpanProcessor; | import io.opentelemetry.sdk.trace.SpanProcessor; | ||||||
| import io.opentelemetry.sdk.trace.TracerSdkProvider; | import io.opentelemetry.sdk.trace.TracerSdkProvider; | ||||||
| import io.opentelemetry.sdk.trace.export.BatchSpansProcessor; | 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.sdk.trace.export.SimpleSpansProcessor; | ||||||
| import io.opentelemetry.trace.Tracer; | import io.opentelemetry.trace.Tracer; | ||||||
| import java.util.Arrays; | import java.util.Arrays; | ||||||
|  | @ -67,19 +68,23 @@ public class ConfigureSpanProcessorExample { | ||||||
| 
 | 
 | ||||||
|     // Configure the simple spans processor. This span processor exports span immediately after they |     // Configure the simple spans processor. This span processor exports span immediately after they | ||||||
|     // are ended. |     // are ended. | ||||||
|     SimpleSpansProcessor simpleSpansProcessor = SimpleSpansProcessor.newBuilder(exporter).build(); |     SimpleSpansProcessor simpleSpansProcessor = SimpleSpansProcessor.create(exporter); | ||||||
|     tracerProvider.addSpanProcessor(simpleSpansProcessor); |     tracerProvider.addSpanProcessor(simpleSpansProcessor); | ||||||
| 
 | 
 | ||||||
|     // Configure the batch spans processor. This span processor exports span in batches. |     // Configure the batch spans processor. This span processor exports span in batches. | ||||||
|     BatchSpansProcessor batchSpansProcessor = |     BatchSpansProcessor batchSpansProcessor = | ||||||
|         BatchSpansProcessor.newBuilder(exporter) |         BatchSpansProcessor.create( | ||||||
|             .reportOnlySampled(true) // send to the exporter only spans that have been sampled |             exporter, | ||||||
|  |             Config.newBuilder() | ||||||
|  |                 .setExportOnlySampled( | ||||||
|  |                     true) // send to the exporter only spans that have been sampled | ||||||
|                 .setMaxExportBatchSize(512) // set the maximum batch size to use |                 .setMaxExportBatchSize(512) // set the maximum batch size to use | ||||||
|                 .setMaxQueueSize(2048) // set the queue size. This must be >= the export batch size |                 .setMaxQueueSize(2048) // set the queue size. This must be >= the export batch size | ||||||
|                 .setExporterTimeoutMillis( |                 .setExporterTimeoutMillis( | ||||||
|                 30_000) // set the max amount of time an export can run before getting interrupted |                     30_000) // set the max amount of time an export can run before getting | ||||||
|  |                 // interrupted | ||||||
|                 .setScheduleDelayMillis(5000) // set time between two different exports |                 .setScheduleDelayMillis(5000) // set time between two different exports | ||||||
|             .build(); |                 .build()); | ||||||
|     tracerProvider.addSpanProcessor(batchSpansProcessor); |     tracerProvider.addSpanProcessor(batchSpansProcessor); | ||||||
| 
 | 
 | ||||||
|     // Configure the multi spans processor. A MultiSpanProcessor accepts a list of Span Processors. |     // Configure the multi spans processor. A MultiSpanProcessor accepts a list of Span Processors. | ||||||
|  |  | ||||||
|  | @ -41,8 +41,7 @@ class ConfigureTraceExample { | ||||||
|   static Tracer tracer = tracerProvider.get("ConfigureTraceExample"); |   static Tracer tracer = tracerProvider.get("ConfigureTraceExample"); | ||||||
| 
 | 
 | ||||||
|   static { |   static { | ||||||
|     tracerProvider.addSpanProcessor( |     tracerProvider.addSpanProcessor(SimpleSpansProcessor.create(new LoggingSpanExporter())); | ||||||
|         SimpleSpansProcessor.newBuilder(new LoggingSpanExporter()).build()); |  | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   public static void main(String[] args) { |   public static void main(String[] args) { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue