Skip to content

Commit be6b8dd

Browse files
committed
refactor: remove the use of deprecated methods from zipkin
1 parent 3c3f826 commit be6b8dd

File tree

1 file changed

+16
-18
lines changed
  • opentelemetry-zipkin/src/exporter

1 file changed

+16
-18
lines changed

opentelemetry-zipkin/src/exporter/mod.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -93,32 +93,30 @@ impl ZipkinPipelineBuilder {
9393
self.init_exporter_with_endpoint(endpoint)
9494
}
9595

96-
fn init_config_and_endpoint(&mut self) -> (Config, Endpoint) {
96+
fn init_config_and_endpoint(&mut self) -> (Resource, Endpoint) {
9797
let service_name = self.service_name.take();
9898
if let Some(service_name) = service_name {
99-
let config = if let Some(mut cfg) = self.trace_config.take() {
99+
let resource = if let Some(mut cfg) = self.trace_config.take() {
100100
cfg.resource = Cow::Owned(Resource::new(
101101
cfg.resource
102102
.iter()
103103
.filter(|(k, _v)| k.as_str() != semcov::resource::SERVICE_NAME)
104104
.map(|(k, v)| KeyValue::new(k.clone(), v.clone()))
105105
.collect::<Vec<KeyValue>>(),
106106
));
107-
cfg
107+
cfg.resource.as_ref().clone()
108108
} else {
109-
#[allow(deprecated)]
110-
Config::default().with_resource(Resource::empty())
109+
Resource::empty()
111110
};
112-
(config, Endpoint::new(service_name, self.service_addr))
111+
(resource, Endpoint::new(service_name, self.service_addr))
113112
} else {
114113
let service_name = SdkProvidedResourceDetector
115114
.detect(Duration::from_secs(0))
116115
.get(semcov::resource::SERVICE_NAME.into())
117116
.unwrap()
118117
.to_string();
119118
(
120-
#[allow(deprecated)]
121-
Config::default().with_resource(Resource::empty()),
119+
Resource::empty(),
122120
Endpoint::new(service_name, self.service_addr),
123121
)
124122
}
@@ -140,13 +138,13 @@ impl ZipkinPipelineBuilder {
140138
}
141139

142140
/// Install the Zipkin trace exporter pipeline with a simple span processor.
143-
#[allow(deprecated)]
144141
pub fn install_simple(mut self) -> Result<Tracer, TraceError> {
145-
let (config, endpoint) = self.init_config_and_endpoint();
142+
let (resource, endpoint) = self.init_config_and_endpoint();
146143
let exporter = self.init_exporter_with_endpoint(endpoint)?;
147-
let mut provider_builder = TracerProvider::builder().with_simple_exporter(exporter);
148-
provider_builder = provider_builder.with_config(config);
149-
let provider = provider_builder.build();
144+
let provider = TracerProvider::builder()
145+
.with_simple_exporter(exporter)
146+
.with_resource(resource)
147+
.build();
150148
let scope = InstrumentationScope::builder("opentelemetry-zipkin")
151149
.with_version(env!("CARGO_PKG_VERSION"))
152150
.with_schema_url(semcov::SCHEMA_URL)
@@ -158,13 +156,13 @@ impl ZipkinPipelineBuilder {
158156

159157
/// Install the Zipkin trace exporter pipeline with a batch span processor using the specified
160158
/// runtime.
161-
#[allow(deprecated)]
162159
pub fn install_batch<R: RuntimeChannel>(mut self, runtime: R) -> Result<Tracer, TraceError> {
163-
let (config, endpoint) = self.init_config_and_endpoint();
160+
let (resource, endpoint) = self.init_config_and_endpoint();
164161
let exporter = self.init_exporter_with_endpoint(endpoint)?;
165-
let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime);
166-
provider_builder = provider_builder.with_config(config);
167-
let provider = provider_builder.build();
162+
let provider = TracerProvider::builder()
163+
.with_batch_exporter(exporter, runtime)
164+
.with_resource(resource)
165+
.build();
168166
let scope = InstrumentationScope::builder("opentelemetry-zipkin")
169167
.with_version(env!("CARGO_PKG_VERSION"))
170168
.with_schema_url(semcov::SCHEMA_URL)

0 commit comments

Comments
 (0)