Update OpenTelemetry.

Cargo.toml

@@ -5,14 +5,13 @@ authors = ["Syfaro <syfaro@huefox.com>"]
 edition = "2018"
 
 [dependencies]
-pretty_env_logger = "0.4"
-
 tracing = "0.1"
 tracing-subscriber = "0.2"
 tracing-futures = "0.2"
 
-opentelemetry = "0.1"
-tracing-opentelemetry = "0.1"
+opentelemetry = "0.6"
+opentelemetry-jaeger = "0.5"
+tracing-opentelemetry = "0.5"
 
 tokio = { version = "0.2", features = ["full"] }
 futures = "0.3"
@@ -34,6 +33,10 @@ hamming = "0.1"
 
 bk-tree = "0.3"
 
+[profile.dev]
+opt-level = 2
+debug = true
+
 [profile.release]
 lto = true
 codegen-units = 1

src/filters.rs

@@ -1,6 +1,7 @@
 use crate::types::*;
 use crate::{handlers, Pool, Tree};
 use std::convert::Infallible;
+use tracing_futures::Instrument;
 use warp::{Filter, Rejection, Reply};
 
 pub fn search(
@@ -16,12 +17,18 @@ pub fn search(
 
 pub fn search_file(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
     warp::path("file")
-        .and(with_telem())
+        .and(warp::header::optional::<String>("x-b3"))
         .and(warp::get())
         .and(warp::query::<FileSearchOpts>())
         .and(with_pool(db))
         .and(with_api_key())
-        .and_then(handlers::search_file)
+        .and_then(|b3, opts, db, api_key| {
+            use tracing_opentelemetry::OpenTelemetrySpanExt;
+
+            let span = tracing::info_span!("search_file", ?opts);
+            span.set_parent(&with_telem(b3));
+            span.in_scope(|| handlers::search_file(opts, db, api_key).in_current_span())
+        })
 }
 
 pub fn search_image(
@@ -29,14 +36,22 @@ pub fn search_image(
     tree: Tree,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
     warp::path("image")
-        .and(with_telem())
+        .and(warp::header::optional::<String>("x-b3"))
         .and(warp::post())
         .and(warp::multipart::form().max_length(1024 * 1024 * 10))
         .and(warp::query::<ImageSearchOpts>())
         .and(with_pool(db))
         .and(with_tree(tree))
         .and(with_api_key())
-        .and_then(handlers::search_image)
+        .and_then(|b3, form, opts, pool, tree, api_key| {
+            use tracing_opentelemetry::OpenTelemetrySpanExt;
+
+            let span = tracing::info_span!("search_image", ?opts);
+            span.set_parent(&with_telem(b3));
+            span.in_scope(|| {
+                handlers::search_image(form, opts, pool, tree, api_key).in_current_span()
+            })
+        })
 }
 
 pub fn search_hashes(
@@ -44,13 +59,19 @@ pub fn search_hashes(
     tree: Tree,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
     warp::path("hashes")
-        .and(with_telem())
+        .and(warp::header::optional::<String>("x-b3"))
         .and(warp::get())
         .and(warp::query::<HashSearchOpts>())
         .and(with_pool(db))
         .and(with_tree(tree))
         .and(with_api_key())
-        .and_then(handlers::search_hashes)
+        .and_then(|b3, opts, db, tree, api_key| {
+            use tracing_opentelemetry::OpenTelemetrySpanExt;
+
+            let span = tracing::info_span!("search_hashes", ?opts);
+            span.set_parent(&with_telem(b3));
+            span.in_scope(|| handlers::search_hashes(opts, db, tree, api_key).in_current_span())
+        })
 }
 
 pub fn stream_search_image(
@@ -58,13 +79,19 @@ pub fn stream_search_image(
     tree: Tree,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
     warp::path("stream")
-        .and(with_telem())
+        .and(warp::header::optional::<String>("x-b3"))
         .and(warp::post())
         .and(warp::multipart::form().max_length(1024 * 1024 * 10))
         .and(with_pool(db))
         .and(with_tree(tree))
         .and(with_api_key())
-        .and_then(handlers::stream_image)
+        .and_then(|b3, form, pool, tree, api_key| {
+            use tracing_opentelemetry::OpenTelemetrySpanExt;
+
+            let span = tracing::info_span!("stream_search_image");
+            span.set_parent(&with_telem(b3));
+            span.in_scope(|| handlers::stream_image(form, pool, tree, api_key).in_current_span())
+        })
 }
 
 pub fn check_handle(db: Pool) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
@@ -87,28 +114,23 @@ fn with_tree(tree: Tree) -> impl Filter<Extract = (Tree,), Error = Infallible> +
     warp::any().map(move || tree.clone())
 }
 
-fn with_telem() -> impl Filter<Extract = (crate::Span,), Error = Rejection> + Clone {
-    warp::any()
-        .and(warp::header::optional("traceparent"))
-        .map(|traceparent: Option<String>| {
-            use opentelemetry::api::trace::{provider::Provider, tracer::Tracer, propagator::HttpTextFormat};
+fn with_telem(b3: Option<String>) -> opentelemetry::api::context::Context {
+    use opentelemetry::api::{HttpTextFormat, TraceContextExt};
 
-            let mut headers = std::collections::HashMap::new();
-            headers.insert("Traceparent", traceparent.unwrap_or_else(String::new));
-
-            let propagator = opentelemetry::api::distributed_context::http_trace_context_propagator::HTTPTraceContextPropagator::new();
-            let context = propagator.extract(&headers);
-
-            tracing::trace!("got context from request: {:?}", context);
-
-            if context.is_valid() {
-                let tracer = opentelemetry::global::trace_provider().get_tracer("api");
-                let span = tracer.start("context", Some(context));
-                tracer.mark_span_as_active(&span);
-
-                Some(span)
-            } else {
-                None
+    let mut carrier = std::collections::HashMap::new();
+    if let Some(b3) = b3 {
+        // It took way too long to realize it's a case-sensitive comparison...
+        // Looks like it should be fixed in the next release,
+        // https://github.com/open-telemetry/opentelemetry-rust/pull/148
+        carrier.insert("X-B3".to_string(), b3);
     }
-        })
+
+    let propagator = opentelemetry::api::B3Propagator::new(true);
+    let parent_context = propagator.extract(&carrier);
+    tracing::trace!(
+        "remote span context: {:?}",
+        parent_context.remote_span_context()
+    );
+
+    parent_context
 }

src/handlers.rs

@@ -76,9 +76,7 @@ async fn hash_input(form: warp::multipart::FormData) -> (i64, img_hash::ImageHas
     (i64::from_be_bytes(buf), hash)
 }
 
-#[tracing::instrument(skip(_telem, form, pool, tree, api_key))]
 pub async fn search_image(
-    _telem: crate::Span,
     form: warp::multipart::FormData,
     opts: ImageSearchOpts,
     pool: Pool,
@@ -144,9 +142,7 @@ pub async fn search_image(
     Ok(warp::reply::json(&similarity))
 }
 
-#[tracing::instrument(skip(_telem, form, pool, tree, api_key))]
 pub async fn stream_image(
-    _telem: crate::Span,
     form: warp::multipart::FormData,
     pool: Pool,
     tree: Tree,
@@ -181,9 +177,7 @@ fn sse_matches(
     Ok(warp::sse::json(items))
 }
 
-#[tracing::instrument(skip(_telem, db, tree, api_key))]
 pub async fn search_hashes(
-    _telem: crate::Span,
     opts: HashSearchOpts,
     db: Pool,
     tree: Tree,
@@ -221,9 +215,7 @@ pub async fn search_hashes(
     Ok(warp::reply::json(&matches))
 }
 
-#[tracing::instrument(skip(_telem, db, api_key))]
 pub async fn search_file(
-    _telem: crate::Span,
     opts: FileSearchOpts,
     db: Pool,
     api_key: String,

src/main.rs

@@ -12,15 +12,12 @@ mod utils;
 
 use warp::Filter;
 
-type Span = Option<opentelemetry::global::BoxedSpan>;
-
 fn configure_tracing() {
     use opentelemetry::{
-        api::{KeyValue, Provider, Sampler},
-        exporter::trace::jaeger,
-        sdk::Config,
+        api::{KeyValue, Provider},
+        sdk::{Config, Sampler},
     };
-    use tracing_subscriber::layer::SubscriberExt;
+    use tracing_subscriber::{layer::SubscriberExt, prelude::*};
 
     let env = if cfg!(debug_assertions) {
         "debug"
@@ -28,38 +25,44 @@ fn configure_tracing() {
         "release"
     };
 
-    let exporter = jaeger::Exporter::builder()
-        .with_collector_endpoint(std::env::var("JAEGER_COLLECTOR").unwrap().parse().unwrap())
-        .with_process(jaeger::Process {
-            service_name: "fuzzysearch",
+    let fmt_layer = tracing_subscriber::fmt::layer();
+    let filter_layer = tracing_subscriber::EnvFilter::try_from_default_env()
+        .or_else(|_| tracing_subscriber::EnvFilter::try_new("info"))
+        .unwrap();
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .finish();
+    let registry = tracing_subscriber::registry()
+        .with(filter_layer)
+        .with(fmt_layer);
+
+    let exporter = opentelemetry_jaeger::Exporter::builder()
+        .with_agent_endpoint(std::env::var("JAEGER_COLLECTOR").unwrap().parse().unwrap())
+        .with_process(opentelemetry_jaeger::Process {
+            service_name: "fuzzysearch".to_string(),
             tags: vec![
                 KeyValue::new("environment", env),
                 KeyValue::new("version", env!("CARGO_PKG_VERSION")),
             ],
         })
-        .init();
+        .init()
+        .expect("unable to create jaeger exporter");
 
     let provider = opentelemetry::sdk::Provider::builder()
-        .with_exporter(exporter)
+        .with_simple_exporter(exporter)
         .with_config(Config {
-            default_sampler: Sampler::Always,
+            default_sampler: Box::new(Sampler::Always),
             ..Default::default()
         })
         .build();
 
     opentelemetry::global::set_provider(provider);
 
-    let tracer = opentelemetry::global::trace_provider().get_tracer("api");
+    let tracer = opentelemetry::global::trace_provider().get_tracer("fuzzysearch");
+    let telem_layer = tracing_opentelemetry::layer().with_tracer(tracer);
+    let registry = registry.with(telem_layer);
 
-    let telem_layer = tracing_opentelemetry::OpentelemetryLayer::with_tracer(tracer);
-    let fmt_layer = tracing_subscriber::fmt::Layer::default();
-
-    let subscriber = tracing_subscriber::Registry::default()
-        .with(telem_layer)
-        .with(fmt_layer);
-
-    tracing::subscriber::set_global_default(subscriber)
-        .expect("Unable to set default tracing subscriber");
+    registry.init();
 }
 
 #[derive(Debug)]
@@ -86,8 +89,6 @@ impl bk_tree::Metric<Node> for Hamming {
 
 #[tokio::main]
 async fn main() {
-    pretty_env_logger::init();
-
     configure_tracing();
 
     let s = std::env::var("POSTGRES_DSN").expect("Missing POSTGRES_DSN");