open-telemetry · jtescher · Dec 7, 2020 · Dec 2, 2020 · Dec 2, 2020 · Dec 2, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
         override: true
     - name: Run tests
       run: cargo --version &&
-        cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,serialize,tokio,serde,http,tonic,reqwest &&
+        cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,serialize,tokio,serde,http,tonic,reqwest,testing &&
         cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml &&
         cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
   meta:

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ observability tools.
 ## Getting Started
 
 ```rust
-use opentelemetry::{exporter::trace::stdout, trace::Tracer};
+use opentelemetry::{sdk::export::trace::stdout, trace::Tracer};
 
 fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     // Create a new instrumentation pipeline

diff --git a/examples/aws-xray/Cargo.toml b/examples/aws-xray/Cargo.toml
@@ -17,4 +17,4 @@ path = "src/client.rs"
 hyper = "0.13"
 tokio = { version = "0.2", features = ["full"] }
 opentelemetry = { path = "../../opentelemetry", features = ["http"] }
-opentelemetry-contrib = { path = "../../opentelemetry-contrib" }
+opentelemetry-contrib = { path = "../../opentelemetry-contrib", features = ["aws-xray"] }
diff --git a/examples/aws-xray/src/client.rs b/examples/aws-xray/src/client.rs
@@ -1,11 +1,12 @@
 use hyper::{body::Body, Client};
 use opentelemetry::{
-    exporter::trace::stdout,
     global,
-    sdk::{propagation::XrayPropagator, trace as sdktrace},
+    sdk::export::trace::stdout,
+    sdk::trace as sdktrace,
     trace::{TraceContextExt, Tracer},
     Context, KeyValue,
 };
+use opentelemetry_contrib::trace::propagator::XrayPropagator;
 
 fn init_tracer() -> (sdktrace::Tracer, stdout::Uninstall) {
     global::set_text_map_propagator(XrayPropagator::new());

diff --git a/examples/aws-xray/src/server.rs b/examples/aws-xray/src/server.rs
@@ -1,11 +1,12 @@
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Request, Response, Server};
 use opentelemetry::{
-    exporter::trace::stdout,
     global,
-    sdk::{propagation::XrayPropagator, trace as sdktrace},
+    sdk::export::trace::stdout,
+    sdk::trace as sdktrace,
     trace::{Span, Tracer},
 };
+use opentelemetry_contrib::trace::propagator::XrayPropagator;
 use std::{convert::Infallible, net::SocketAddr};
 
 async fn handle(req: Request<Body>) -> Result<Response<Body>, Infallible> {

diff --git a/examples/basic-otlp/src/main.rs b/examples/basic-otlp/src/main.rs
@@ -1,5 +1,4 @@
 use futures::stream::{Stream, StreamExt};
-use opentelemetry::exporter;
 use opentelemetry::sdk::metrics::PushController;
 use opentelemetry::trace::TraceError;
 use opentelemetry::{
@@ -22,7 +21,7 @@ fn delayed_interval(duration: Duration) -> impl Stream<Item = tokio::time::Insta
 }
 
 fn init_meter() -> metrics::Result<PushController> {
-    exporter::metrics::stdout(tokio::spawn, delayed_interval)
+    opentelemetry::sdk::export::metrics::stdout(tokio::spawn, delayed_interval)
         .with_quantiles(vec![0.5, 0.9, 0.99])
         .with_formatter(|batch| {
             serde_json::to_value(batch)

diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs
@@ -1,5 +1,4 @@
 use futures::stream::{Stream, StreamExt};
-use opentelemetry::exporter;
 use opentelemetry::global;
 use opentelemetry::sdk::{metrics::PushController, trace as sdktrace};
 use opentelemetry::trace::TraceError;
@@ -28,7 +27,7 @@ fn delayed_interval(duration: Duration) -> impl Stream<Item = tokio::time::Insta
 }
 
 fn init_meter() -> metrics::Result<PushController> {
-    exporter::metrics::stdout(tokio::spawn, delayed_interval)
+    opentelemetry::sdk::export::metrics::stdout(tokio::spawn, delayed_interval)
         .with_quantiles(vec![0.5, 0.9, 0.99])
         .with_formatter(|batch| {
             serde_json::to_value(batch)

diff --git a/examples/http/src/client.rs b/examples/http/src/client.rs
@@ -1,6 +1,6 @@
 use hyper::{body::Body, Client};
-use opentelemetry::exporter::trace::stdout;
 use opentelemetry::global;
+use opentelemetry::sdk::export::trace::stdout;
 use opentelemetry::sdk::{
     propagation::TraceContextPropagator,
     trace::{Config, Sampler},

diff --git a/examples/http/src/server.rs b/examples/http/src/server.rs
@@ -1,8 +1,8 @@
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Request, Response, Server};
 use opentelemetry::{
-    exporter::trace::stdout,
     global,
+    sdk::export::trace::stdout,
     sdk::{
         propagation::TraceContextPropagator,
         trace::{Config, Sampler},

diff --git a/examples/stdout.rs b/examples/stdout.rs
@@ -1,5 +1,5 @@
 use opentelemetry::{
-    exporter::trace::stdout,
+    sdk::export::trace::stdout,
     sdk::trace::{self, Sampler},
     trace::Tracer,
 };

diff --git a/opentelemetry-contrib/Cargo.toml b/opentelemetry-contrib/Cargo.toml
@@ -26,6 +26,9 @@ datadog = ["indexmap", "rmp", "async-trait", "thiserror"]
 reqwest-blocking-client = ["reqwest/blocking", "opentelemetry/reqwest"]
 reqwest-client = ["reqwest", "opentelemetry/reqwest"]
 surf-client = ["surf", "opentelemetry/surf"]
+jaeger = []
+zipkin = []
+aws-xray = []
 
 [dependencies]
 async-trait = { version = "0.1", optional = true }
@@ -42,3 +45,4 @@ thiserror = { version = "1.0", optional = true }
 [dev-dependencies]
 base64 = "0.13"
 isahc = "0.9"
+opentelemetry = { path = "../opentelemetry", features = ["trace", "http", "testing"] }
diff --git a/opentelemetry-contrib/src/trace/exporter/datadog/mod.rs b/opentelemetry-contrib/src/trace/exporter/datadog/mod.rs
@@ -72,8 +72,8 @@
 //! ```no_run
 //! use opentelemetry::{KeyValue, trace::Tracer};
 //! use opentelemetry::sdk::{trace::{self, IdGenerator, Sampler}, Resource};
-//! use opentelemetry::exporter::trace::ExportResult;
-//! use opentelemetry::exporter::trace::HttpClient;
+//! use opentelemetry::sdk::export::trace::ExportResult;
+//! use opentelemetry::sdk::export::trace::HttpClient;
 //! use opentelemetry_contrib::trace::exporter::datadog::{new_pipeline, ApiVersion};
 //! use async_trait::async_trait;
 //! use opentelemetry_contrib::trace::exporter::datadog::Error;
@@ -127,8 +127,8 @@ pub use model::Error;
 
 use async_trait::async_trait;
 use http::{Method, Request, Uri};
-use opentelemetry::exporter::trace;
-use opentelemetry::exporter::trace::{HttpClient, SpanData};
+use opentelemetry::sdk::export::trace;
+use opentelemetry::sdk::export::trace::{HttpClient, SpanData};
 use opentelemetry::trace::TraceError;
 use opentelemetry::{global, sdk, trace::TracerProvider};
 

diff --git a/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs b/opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs
@@ -1,4 +1,4 @@
-use opentelemetry::exporter::{trace, ExportError};
+use opentelemetry::sdk::export::{trace, ExportError};
 
 mod v03;
 mod v05;

diff --git a/opentelemetry-contrib/src/trace/exporter/datadog/model/v03.rs b/opentelemetry-contrib/src/trace/exporter/datadog/model/v03.rs
@@ -1,5 +1,5 @@
 use crate::trace::exporter::datadog::model::Error;
-use opentelemetry::exporter::trace;
+use opentelemetry::sdk::export::trace;
 use opentelemetry::{Key, Value};
 use std::time::SystemTime;
 

diff --git a/opentelemetry-contrib/src/trace/exporter/datadog/model/v05.rs b/opentelemetry-contrib/src/trace/exporter/datadog/model/v05.rs
@@ -1,6 +1,6 @@
 use crate::trace::exporter::datadog::intern::StringInterner;
-use crate::trace::exporter::datadog::model::Error;
-use opentelemetry::exporter::trace;
+use crate::trace::exporter::datadog::Error;
+use opentelemetry::sdk::export::trace;
 use opentelemetry::{Key, Value};
 use std::time::SystemTime;
 

diff --git a/opentelemetry/src/sdk/propagation/aws.rs → ...metry-contrib/src/trace/propagator/aws.rs b/opentelemetry/src/sdk/propagation/aws.rs → ...metry-contrib/src/trace/propagator/aws.rs
@@ -1,4 +1,4 @@
-use crate::{
+use opentelemetry::{
     propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator},
     trace::{
         SpanContext, SpanId, TraceContextExt, TraceId, TraceState, TRACE_FLAG_DEFERRED,
@@ -32,7 +32,7 @@ lazy_static::lazy_static! {
 ///
 /// ```
 /// use opentelemetry::global;
-/// use opentelemetry::sdk::propagation::XrayPropagator;
+/// use opentelemetry_contrib::trace::propagator::XrayPropagator;
 ///
 /// global::set_text_map_propagator(XrayPropagator::default());
 /// ```
@@ -236,8 +236,8 @@ fn title_case(s: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing::trace::TestSpan;
-    use crate::trace::TraceState;
+    use opentelemetry::testing::trace::TestSpan;
+    use opentelemetry::trace::TraceState;
     use std::collections::HashMap;
     use std::str::FromStr;
 

diff --git a/opentelemetry/src/sdk/propagation/b3.rs → ...emetry-contrib/src/trace/propagator/b3.rs b/opentelemetry/src/sdk/propagation/b3.rs → ...emetry-contrib/src/trace/propagator/b3.rs
@@ -13,7 +13,7 @@
 //!
 //! If `inject_encoding` is set to `B3Encoding::SingleHeader` then `b3` header is used to inject
 //! and extract. Otherwise, separate headers are used to inject and extract.
-use crate::{
+use opentelemetry::{
     propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator},
     trace::{
         SpanContext, SpanId, TraceContextExt, TraceId, TraceState, TRACE_FLAG_DEBUG,
@@ -302,9 +302,9 @@ impl TextMapPropagator for B3Propagator {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing::trace::TestSpan;
-    use crate::{
+    use opentelemetry::{
         propagation::TextMapPropagator,
+        testing::trace::TestSpan,
         trace::{
             SpanContext, SpanId, TraceId, TRACE_FLAG_DEBUG, TRACE_FLAG_DEFERRED,
             TRACE_FLAG_NOT_SAMPLED, TRACE_FLAG_SAMPLED,

diff --git a/opentelemetry/src/sdk/propagation/jaeger.rs → ...ry-contrib/src/trace/propagator/jaeger.rs b/opentelemetry/src/sdk/propagation/jaeger.rs → ...ry-contrib/src/trace/propagator/jaeger.rs
@@ -5,7 +5,7 @@
 //! See [`Jaeger documentation`] for detail of Jaeger propagation format.
 //!
 //! [`Jaeger documentation`]: https://www.jaegertracing.io/docs/1.18/client-libraries/#propagation-format
-use crate::{
+use opentelemetry::{
     propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator},
     trace::{
         SpanContext, SpanId, TraceContextExt, TraceId, TraceState, TRACE_FLAG_DEBUG,
@@ -174,9 +174,9 @@ impl TextMapPropagator for JaegerPropagator {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::testing::trace::TestSpan;
-    use crate::{
+    use opentelemetry::{
         propagation::{Injector, TextMapPropagator},
+        testing::trace::TestSpan,
         trace::{
             SpanContext, SpanId, TraceContextExt, TraceId, TraceState, TRACE_FLAG_DEBUG,
             TRACE_FLAG_NOT_SAMPLED, TRACE_FLAG_SAMPLED,

diff --git a/opentelemetry-contrib/src/trace/propagator/mod.rs b/opentelemetry-contrib/src/trace/propagator/mod.rs
@@ -6,4 +6,22 @@
 //! Currently, the following propagators are supported:
 //!
 //! * `binary_propagator`, propagating trace context in the binary format.
+//! * `XrayPropagator`, propagating via AWS XRay protocol.
+//! * `B3Propagator`, propagating via B3 protocol and headers.
+//! * `JaegerPropagator`, propagating via Jaeger protocol and headers.
+//!
+//! This module also provides relative types for those propagators.
+#[cfg(feature = "aws-xray")]
+mod aws;
+#[cfg(feature = "zipkin")]
+mod b3;
 pub mod binary;
+#[cfg(feature = "jaeger")]
+mod jaeger;
+
+#[cfg(feature = "aws-xray")]
+pub use aws::XrayPropagator;
+#[cfg(feature = "zipkin")]
+pub use b3::{B3Encoding, B3Propagator};
+#[cfg(feature = "jaeger")]
+pub use jaeger::JaegerPropagator;
diff --git a/opentelemetry-jaeger/src/lib.rs b/opentelemetry-jaeger/src/lib.rs
@@ -194,11 +194,11 @@ use agent::AgentAsyncClientUDP;
 use async_trait::async_trait;
 #[cfg(any(feature = "collector_client", feature = "wasm_collector_client"))]
 use collector::CollectorAsyncClientHttp;
-use opentelemetry::exporter::ExportError;
+use opentelemetry::sdk::export::ExportError;
 use opentelemetry::trace::TraceError;
 use opentelemetry::{
-    exporter::trace,
     global, sdk,
+    sdk::export::trace,
     trace::{Event, Link, SpanKind, StatusCode, TracerProvider},
     Key, KeyValue, Value,
 };

diff --git a/opentelemetry-jaeger/src/uploader.rs b/opentelemetry-jaeger/src/uploader.rs
@@ -2,7 +2,7 @@
 #[cfg(any(feature = "collector_client", feature = "wasm_collector_client"))]
 use crate::collector;
 use crate::{agent, jaeger};
-use opentelemetry::exporter::trace;
+use opentelemetry::sdk::export::trace;
 
 /// Uploads a batch of spans to Jaeger
 #[derive(Debug)]

diff --git a/opentelemetry-otlp/src/lib.rs b/opentelemetry-otlp/src/lib.rs
@@ -131,7 +131,7 @@ mod span;
 mod transform;
 
 pub use crate::span::{Compression, Credentials, Exporter, ExporterConfig, Protocol};
-use opentelemetry::exporter::ExportError;
+use opentelemetry::sdk::export::ExportError;
 use opentelemetry::trace::TraceError;
 
 /// Create a new pipeline builder with the recommended configuration.

diff --git a/opentelemetry-otlp/src/proto/common.rs b/opentelemetry-otlp/src/proto/common.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/metrics.rs b/opentelemetry-otlp/src/proto/metrics.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/metrics_service.rs b/opentelemetry-otlp/src/proto/metrics_service.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/resource.rs b/opentelemetry-otlp/src/proto/resource.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/trace.rs b/opentelemetry-otlp/src/proto/trace.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/trace_config.rs b/opentelemetry-otlp/src/proto/trace_config.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]

diff --git a/opentelemetry-otlp/src/proto/trace_service.rs b/opentelemetry-otlp/src/proto/trace_service.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 2.18.0. Do not edit
+// This file is generated by rust-protobuf 2.18.1. Do not edit
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -21,7 +21,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_0;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_18_1;
 
 #[derive(PartialEq,Clone,Default)]
 #[cfg_attr(feature = "with-serde", derive(Serialize, Deserialize))]