Skip to content

Commit a169e96

Browse files
committed
Deprecate versioned_tracer
1 parent 979df69 commit a169e96

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed

opentelemetry-otlp/src/span.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ fn build_simple_with_exporter(
140140
provider_builder = provider_builder.with_config(config);
141141
}
142142
let provider = provider_builder.build();
143-
let tracer = provider.versioned_tracer(
144-
"opentelemetry-otlp",
145-
Some(env!("CARGO_PKG_VERSION")),
146-
Some(SCHEMA_URL),
147-
None,
148-
);
143+
let tracer = provider
144+
.tracer_builder("opentelemetry-otlp")
145+
.with_version(env!("CARGO_PKG_VERSION"))
146+
.with_schema_url(SCHEMA_URL)
147+
.build();
149148
let _ = global::set_tracer_provider(provider);
150149
tracer
151150
}
@@ -166,12 +165,11 @@ fn build_batch_with_exporter<R: RuntimeChannel>(
166165
provider_builder = provider_builder.with_config(config);
167166
}
168167
let provider = provider_builder.build();
169-
let tracer = provider.versioned_tracer(
170-
"opentelemetry-otlp",
171-
Some(env!("CARGO_PKG_VERSION")),
172-
Some(SCHEMA_URL),
173-
None,
174-
);
168+
let tracer = provider
169+
.tracer_builder("opentelemetry-otlp")
170+
.with_version(env!("CARGO_PKG_VERSION"))
171+
.with_schema_url(SCHEMA_URL)
172+
.build();
175173
let _ = global::set_tracer_provider(provider);
176174
tracer
177175
}

opentelemetry-zipkin/src/exporter/mod.rs

+10-14
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,11 @@ impl ZipkinPipelineBuilder {
151151
let mut provider_builder = TracerProvider::builder().with_simple_exporter(exporter);
152152
provider_builder = provider_builder.with_config(config);
153153
let provider = provider_builder.build();
154-
let tracer = opentelemetry::trace::TracerProvider::versioned_tracer(
155-
&provider,
156-
"opentelemetry-zipkin",
157-
Some(env!("CARGO_PKG_VERSION")),
158-
Some(semcov::SCHEMA_URL),
159-
None,
160-
);
154+
let tracer =
155+
opentelemetry::trace::TracerProvider::tracer_builder(&provider, "opentelemetry-zipkin")
156+
.with_version(env!("CARGO_PKG_VERSION"))
157+
.with_schema_url(semcov::SCHEMA_URL)
158+
.build();
161159
let _ = global::set_tracer_provider(provider);
162160
Ok(tracer)
163161
}
@@ -170,13 +168,11 @@ impl ZipkinPipelineBuilder {
170168
let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime);
171169
provider_builder = provider_builder.with_config(config);
172170
let provider = provider_builder.build();
173-
let tracer = opentelemetry::trace::TracerProvider::versioned_tracer(
174-
&provider,
175-
"opentelemetry-zipkin",
176-
Some(env!("CARGO_PKG_VERSION")),
177-
Some(semcov::SCHEMA_URL),
178-
None,
179-
);
171+
let tracer =
172+
opentelemetry::trace::TracerProvider::tracer_builder(&provider, "opentelemetry-zipkin")
173+
.with_version(env!("CARGO_PKG_VERSION"))
174+
.with_schema_url(semcov::SCHEMA_URL)
175+
.build();
180176
let _ = global::set_tracer_provider(provider);
181177
Ok(tracer)
182178
}

opentelemetry/src/trace/tracer_provider.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,11 @@ pub trait TracerProvider {
3737
/// );
3838
/// ```
3939
fn tracer(&self, name: impl Into<Cow<'static, str>>) -> Self::Tracer {
40-
self.versioned_tracer(
41-
name,
42-
None::<Cow<'static, str>>,
43-
None::<Cow<'static, str>>,
44-
None,
45-
)
40+
self.tracer_builder(name).build()
4641
}
4742

43+
/// Deprecated, use `tracer_builder` instead
44+
///
4845
/// Returns a new versioned tracer with a given name.
4946
///
5047
/// The `name` should be the application name or the name of the library
@@ -69,6 +66,7 @@ pub trait TracerProvider {
6966
/// None,
7067
/// );
7168
/// ```
69+
#[deprecated(since = "0.23.0", note = "Please use tracer_builder() instead")]
7270
fn versioned_tracer(
7371
&self,
7472
name: impl Into<Cow<'static, str>>,

0 commit comments

Comments
 (0)