Merge pull request #38 from frigus02/otel-0.16

Update opentelemetry to 0.16

Author: frigus02

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- Upgrade to `v0.16.0` of `opentelemetry`.
+
 ## [0.16.0] - 2021-06-17
 
 - Upgrade to `v0.15.0` of `opentelemetry`.

Cargo.toml

@@ -30,9 +30,9 @@ async-trait = "0.1"
 chrono = "0.4"
 http = "0.2"
 once_cell = "1"
-opentelemetry = "0.15"
-opentelemetry-http = "0.4"
-opentelemetry-semantic-conventions = "0.7"
+opentelemetry = "0.16"
+opentelemetry-http = "0.5"
+opentelemetry-semantic-conventions = "0.8"
 reqwest = { version = "0.11", default-features = false, features = ["blocking"], optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -41,8 +41,8 @@ thiserror = "1"
 [dev-dependencies]
 async-std = { version = "1.9.0", features = ["attributes"] }
 backtrace = "0.3.60"
-env_logger = "0.8.4"
-opentelemetry = { version = "0.15.0", features = ["rt-tokio"] }
+env_logger = "0.9.0"
+opentelemetry = { version = "0.16", features = ["rt-tokio"] }
 opentelemetry-application-insights = { path = ".", features = ["reqwest-client", "reqwest-blocking-client"] }
 surf = "2.2.0"
 test-case = "1.1.0"

examples/attributes.rs

@@ -38,7 +38,7 @@ fn main() {
                 ])),
             )
             .build_simple();
-    let client_tracer = client_provider.get_tracer("example-attributes", None);
+    let client_tracer = client_provider.tracer("example-attributes", None);
 
     let server_provider = opentelemetry_application_insights::new_pipeline(instrumentation_key)
         .with_client(reqwest::blocking::Client::new())
@@ -49,7 +49,7 @@ fn main() {
             ])),
         )
         .build_simple();
-    let server_tracer = server_provider.get_tracer("example-attributes", None);
+    let server_tracer = server_provider.tracer("example-attributes", None);
 
     // An HTTP client make a request
     let span = client_tracer

src/lib.rs

@@ -283,23 +283,19 @@ impl<C> PipelineBuilder<C> {
     ///     ))
     ///     .install_simple();
     /// ```
-    pub fn with_trace_config(self, config: sdk::trace::Config) -> Self {
-        let config = match config.resource {
-            Some(ref resource) => {
-                let merged_resource = match self.config {
-                    Some(base_config) => base_config
-                        .resource
-                        .map(|r| r.merge(&resource))
-                        .unwrap_or_else(|| resource.as_ref().clone()),
-                    None => resource.as_ref().clone(),
-                };
-
-                Some(config.with_resource(merged_resource))
+    pub fn with_trace_config(self, mut config: sdk::trace::Config) -> Self {
+        if let Some(mut old_config) = self.config {
+            if let Some(old_resource) = old_config.resource.take() {
+                let merged_resource =
+                    old_resource.merge(config.resource.take().unwrap_or_default());
+                config = config.with_resource(merged_resource);
             }
-            None => Some(config),
-        };
+        }
 
-        PipelineBuilder { config, ..self }
+        PipelineBuilder {
+            config: Some(config),
+            ..self
+        }
     }
 
     /// Assign the service name under which to group traces by adding a service.name
@@ -317,11 +313,11 @@ impl<C> PipelineBuilder<C> {
     ///     .install_simple();
     /// ```
     pub fn with_service_name<T: Into<Cow<'static, str>>>(self, name: T) -> Self {
-        let config = self.config.unwrap_or_default();
+        let mut config = self.config.unwrap_or_default();
         let new_resource = sdk::Resource::new(vec![semcov::resource::SERVICE_NAME.string(name)]);
         let merged_resource = config
             .resource
-            .as_ref()
+            .take()
             .map(|r| r.merge(&new_resource))
             .unwrap_or(new_resource);
         let config = config.with_resource(merged_resource);
@@ -381,7 +377,7 @@ where
     /// that.
     pub fn install_simple(self) -> sdk::trace::Tracer {
         let trace_provider = self.build_simple();
-        let tracer = trace_provider.get_tracer(
+        let tracer = trace_provider.tracer(
             "opentelemetry-application-insights",
             Some(env!("CARGO_PKG_VERSION")),
         );
@@ -395,7 +391,7 @@ where
     /// that.
     pub fn install_batch<R: TraceRuntime>(self, runtime: R) -> sdk::trace::Tracer {
         let trace_provider = self.build_batch(runtime);
-        let tracer = trace_provider.get_tracer(
+        let tracer = trace_provider.tracer(
             "opentelemetry-application-insights",
             Some(env!("CARGO_PKG_VERSION")),
         );