Merge pull request #44 from frigus02/update-opentelemetry

Update to opentelemetry 0.17

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.17.0` of `opentelemetry`.
+
 ## [0.18.0] - 2021-09-12
 
 - Add support for metrics.

Cargo.toml

@@ -36,9 +36,9 @@ bytes = "1"
 chrono = "0.4"
 http = "0.2"
 once_cell = "1"
-opentelemetry = "0.16"
-opentelemetry-http = "0.5"
-opentelemetry-semantic-conventions = "0.8"
+opentelemetry = "0.17"
+opentelemetry-http = "0.6"
+opentelemetry-semantic-conventions = "0.9"
 reqwest = { version = "0.11", default-features = false, features = ["blocking"], optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
@@ -50,7 +50,7 @@ async-std = { version = "1.9.0", features = ["attributes"] }
 backtrace = "0.3.60"
 doc-comment = "0.3.3"
 env_logger = "0.9.0"
-opentelemetry = { version = "0.16", features = ["rt-tokio"] }
+opentelemetry = { version = "0.17", features = ["rt-tokio"] }
 opentelemetry-application-insights = { path = ".", features = ["reqwest-client", "reqwest-blocking-client"] }
 rand = "0.8.4"
 surf = "2.2.0"

examples/attributes.rs

@@ -38,7 +38,7 @@ fn main() {
                 ])),
             )
             .build_simple();
-    let client_tracer = client_provider.tracer("example-attributes", None);
+    let client_tracer = client_provider.tracer("example-attributes");
 
     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.tracer("example-attributes", None);
+    let server_tracer = server_provider.tracer("example-attributes");
 
     // An HTTP client make a request
     let span = client_tracer
@@ -74,9 +74,8 @@ fn main() {
                 KeyValue::new("net.peer.ip", "10.1.2.3"),
                 KeyValue::new("http.target", "/hello/world?name=marry"),
                 KeyValue::new("http.status_code", "200"),
-            ])
-            .with_parent_context(cx);
-        let span = server_tracer.build(builder);
+            ]);
+        let span = server_tracer.build_with_context(builder, &cx);
         server_tracer.with_span(span, |_cx| {
             log();
             exception();

examples/opentelemetry.rs

@@ -55,7 +55,7 @@ async fn spawn_child_process(process_name: &str) {
 async fn run_in_child_process() {
     let tracer = global::tracer("run_in_child_process");
     let mut span = tracer.start("run_in_child_process");
-    span.add_event("leaf fn".into(), vec![]);
+    span.add_event("leaf fn", vec![]);
     sleep(Duration::from_millis(50)).await
 }
 

src/convert.rs

@@ -1,19 +1,8 @@
 use crate::models::Properties;
 use chrono::{DateTime, SecondsFormat, Utc};
-use opentelemetry::{
-    sdk::{trace::EvictedHashMap, Resource},
-    trace::{SpanId, TraceId},
-};
+use opentelemetry::sdk::{trace::EvictedHashMap, Resource};
 use std::time::{Duration, SystemTime};
 
-pub(crate) fn trace_id_to_string(trace_id: TraceId) -> String {
-    format!("{:032x}", trace_id.to_u128())
-}
-
-pub(crate) fn span_id_to_string(span_id: SpanId) -> String {
-    format!("{:016x}", span_id.to_u64())
-}
-
 pub(crate) fn duration_to_string(duration: Duration) -> String {
     let micros = duration.as_micros();
     let s = micros / 1_000_000 % 60;
@@ -55,20 +44,6 @@ mod tests {
     use super::*;
     use test_case::test_case;
 
-    #[test_case(TraceId::invalid(),            "00000000000000000000000000000000" ; "zero")]
-    #[test_case(TraceId::from_u128(314),       "0000000000000000000000000000013a" ; "some number")]
-    #[test_case(TraceId::from_u128(u128::MAX), "ffffffffffffffffffffffffffffffff" ; "max")]
-    fn trace_id(id: TraceId, expected: &'static str) {
-        assert_eq!(expected.to_string(), trace_id_to_string(id));
-    }
-
-    #[test_case(SpanId::invalid(),          "0000000000000000" ; "zero")]
-    #[test_case(SpanId::from_u64(314),      "000000000000013a" ; "some number")]
-    #[test_case(SpanId::from_u64(u64::MAX), "ffffffffffffffff" ; "max")]
-    fn span_id(id: SpanId, expected: &'static str) {
-        assert_eq!(expected.to_string(), span_id_to_string(id));
-    }
-
     #[test_case(Duration::from_micros(123456789123), "1.10:17:36.789123" ; "all")]
     fn duration(duration: Duration, expected: &'static str) {
         assert_eq!(expected.to_string(), duration_to_string(duration));

src/lib.rs

@@ -430,9 +430,10 @@ where
     /// that.
     pub fn install_simple(self) -> sdk::trace::Tracer {
         let trace_provider = self.build_simple();
-        let tracer = trace_provider.tracer(
+        let tracer = trace_provider.versioned_tracer(
             "opentelemetry-application-insights",
             Some(env!("CARGO_PKG_VERSION")),
+            None,
         );
         let _previous_provider = global::set_tracer_provider(trace_provider);
         tracer
@@ -444,9 +445,10 @@ 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.tracer(
+        let tracer = trace_provider.versioned_tracer(
             "opentelemetry-application-insights",
             Some(env!("CARGO_PKG_VERSION")),
+            None,
         );
         let _previous_provider = global::set_tracer_provider(trace_provider);
         tracer

src/tags.rs

@@ -1,7 +1,4 @@
-use crate::{
-    convert::{span_id_to_string, trace_id_to_string},
-    models::context_tag_keys::{self as tags, Tags, TAG_KEY_LOOKUP},
-};
+use crate::models::context_tag_keys::{self as tags, Tags, TAG_KEY_LOOKUP};
 #[cfg(feature = "metrics")]
 use opentelemetry::sdk::export::metrics::Record;
 use opentelemetry::{
@@ -20,15 +17,9 @@ pub(crate) fn get_tags_for_span(span: &SpanData) -> Tags {
     };
 
     // Set the operation id and operation parent id.
-    tags.insert(
-        tags::OPERATION_ID,
-        trace_id_to_string(span.span_context.trace_id()),
-    );
-    if span.parent_span_id != SpanId::invalid() {
-        tags.insert(
-            tags::OPERATION_PARENT_ID,
-            span_id_to_string(span.parent_span_id),
-        );
+    tags.insert(tags::OPERATION_ID, span.span_context.trace_id().to_string());
+    if span.parent_span_id != SpanId::INVALID {
+        tags.insert(tags::OPERATION_PARENT_ID, span.parent_span_id.to_string());
     }
 
     // Ensure the name of the operation is `METHOD /the/route/path`.
@@ -48,13 +39,10 @@ pub(crate) fn get_tags_for_span(span: &SpanData) -> Tags {
 
 pub(crate) fn get_tags_for_event(span: &SpanData) -> Tags {
     let mut tags = Tags::new();
-    tags.insert(
-        tags::OPERATION_ID,
-        trace_id_to_string(span.span_context.trace_id()),
-    );
+    tags.insert(tags::OPERATION_ID, span.span_context.trace_id().to_string());
     tags.insert(
         tags::OPERATION_PARENT_ID,
-        span_id_to_string(span.span_context.span_id()),
+        span.span_context.span_id().to_string(),
     );
     tags
 }

src/trace.rs

@@ -1,5 +1,5 @@
 use crate::{
-    convert::{attrs_to_properties, duration_to_string, span_id_to_string, time_to_string},
+    convert::{attrs_to_properties, duration_to_string, time_to_string},
     models::{
         Data, Envelope, ExceptionData, ExceptionDetails, LimitedLenString1024, MessageData,
         Properties, RemoteDependencyData, RequestData,
@@ -96,7 +96,7 @@ impl From<&SpanData> for RequestData {
     fn from(span: &SpanData) -> RequestData {
         let mut data = RequestData {
             ver: 2,
-            id: span_id_to_string(span.span_context.span_id()).into(),
+            id: span.span_context.span_id().to_string().into(),
             name: Some(LimitedLenString1024::from(span.name.clone()))
                 .filter(|x| !x.as_ref().is_empty()),
             duration: duration_to_string(
@@ -158,7 +158,7 @@ impl From<&SpanData> for RemoteDependencyData {
     fn from(span: &SpanData) -> RemoteDependencyData {
         let mut data = RemoteDependencyData {
             ver: 2,
-            id: Some(span_id_to_string(span.span_context.span_id()).into()),
+            id: Some(span.span_context.span_id().to_string().into()),
             name: span.name.clone().into(),
             duration: duration_to_string(
                 span.end_time