1414
1515use opentelemetry:: trace:: { TraceError , TracerProvider as _} ;
1616use opentelemetry:: { global, KeyValue } ;
17- use opentelemetry_otlp:: { new_pipeline , WithExportConfig } ;
18- use opentelemetry_sdk:: trace:: Config ;
17+ use opentelemetry_otlp:: { SpanExporter , WithExportConfig as _ } ;
18+ use opentelemetry_sdk:: trace:: TracerProvider ;
1919use opentelemetry_sdk:: { runtime, Resource } ;
20- use opentelemetry_semantic_conventions:: resource:: {
21- DEPLOYMENT_ENVIRONMENT , SERVICE_NAME , SERVICE_VERSION ,
22- } ;
20+ use opentelemetry_semantic_conventions:: resource:: { SERVICE_NAME , SERVICE_VERSION } ;
2321use opentelemetry_semantic_conventions:: SCHEMA_URL ;
2422use tracing:: { Level , Subscriber } ;
2523use tracing_opentelemetry:: OpenTelemetryLayer ;
@@ -37,7 +35,6 @@ fn resource() -> Resource {
3735 [
3836 KeyValue :: new ( SERVICE_NAME , env ! ( "CARGO_PKG_NAME" ) ) ,
3937 KeyValue :: new ( SERVICE_VERSION , env ! ( "CARGO_PKG_VERSION" ) ) ,
40- KeyValue :: new ( DEPLOYMENT_ENVIRONMENT , "dev" ) ,
4138 ] ,
4239 SCHEMA_URL ,
4340 )
@@ -59,15 +56,16 @@ where
5956 S : Subscriber + for < ' s > LookupSpan < ' s > ,
6057{
6158 if let Some ( endpoint) = endpoint {
62- let provider = new_pipeline ( )
63- . tracing ( )
64- . with_trace_config ( Config :: default ( ) . with_resource ( resource ( ) ) )
65- . with_exporter (
66- opentelemetry_otlp :: new_exporter ( )
67- . tonic ( )
68- . with_endpoint ( endpoint ) ,
59+ let provider = TracerProvider :: builder ( )
60+ . with_batch_exporter (
61+ SpanExporter :: builder ( )
62+ . with_tonic ( )
63+ . with_endpoint ( endpoint )
64+ . build ( ) ? ,
65+ runtime :: Tokio ,
6966 )
70- . install_batch ( runtime:: Tokio ) ?;
67+ . with_resource ( resource ( ) )
68+ . build ( ) ;
7169 global:: set_tracer_provider ( provider. clone ( ) ) ;
7270 let tracer = provider. tracer ( "visit-service" ) ;
7371 Ok ( Some (
0 commit comments