Move binary propagator and base64 format to contrib. (#343)

Author: TommyCpp

.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 base64_format,trace,metrics,serialize,binary_propagator,tokio,async-std,serde,http,tonic,reqwest &&
+        cargo test --verbose --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,serialize,tokio,async-std,serde,http,tonic,reqwest &&
         cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml &&
         cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
   meta:

examples/datadog/src/main.rs

@@ -3,7 +3,7 @@ use opentelemetry::{
     trace::{Span, TraceContextExt, Tracer},
     Key,
 };
-use opentelemetry_contrib::datadog::ApiVersion;
+use opentelemetry_contrib::trace::exporter::datadog::{new_pipeline, ApiVersion};
 use std::thread;
 use std::time::Duration;
 
@@ -17,7 +17,7 @@ fn bar() {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-    let (tracer, _uninstall) = opentelemetry_contrib::datadog::new_pipeline()
+    let (tracer, _uninstall) = new_pipeline()
         .with_service_name("trace-demo")
         .with_version(ApiVersion::Version05)
         .install()?;

opentelemetry-contrib/Cargo.toml

@@ -20,6 +20,8 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 default = []
+base64_format = ["base64", "binary_propagator"]
+binary_propagator = []
 datadog = ["indexmap", "rmp", "async-trait"]
 reqwest-blocking-client = ["reqwest/blocking", "opentelemetry/reqwest"]
 reqwest-client = ["reqwest", "opentelemetry/reqwest"]
@@ -34,6 +36,7 @@ lazy_static = "1.4"
 reqwest = { version = "0.10", optional = true }
 surf = { version = "2.0", optional = true }
 http = "0.2"
+base64 = { version = "0.13", optional = true }
 
 [dev-dependencies]
 base64 = "0.13"

opentelemetry-contrib/src/lib.rs

@@ -9,6 +9,8 @@
 //!
 //! The following crate feature flags are available:
 //!
+//! * `binary-propagator`: Adds Experimental binary propagator to propagate trace context using binary format.
+//! * `base64-format`: Enables base64 format support for binary propagators.
 //! * `datadog`: Adds a Datadog trace exporter.
 //! * `reqwest-blocking-client`: Export spans using the reqwest blocking http
 //!   client.
@@ -29,6 +31,4 @@
 )]
 #![cfg_attr(test, deny(warnings))]
 
-#[cfg(feature = "datadog")]
-#[cfg_attr(docsrs, doc(cfg(feature = "datadog")))]
-pub mod datadog;
+pub mod trace;

opentelemetry-contrib/src/datadog/intern.rs renamed to opentelemetry-contrib/src/trace/exporter/datadog/intern.rs

@@ -74,6 +74,7 @@
 //! use opentelemetry::sdk::{trace::{self, IdGenerator, Sampler}, Resource};
 //! use opentelemetry::exporter::trace::ExportResult;
 //! use opentelemetry::exporter::trace::HttpClient;
+//! use opentelemetry_contrib::trace::exporter::datadog::{new_pipeline, ApiVersion};
 //! use async_trait::async_trait;
 //! use std::error::Error;
 //!
@@ -97,9 +98,9 @@
 //! }
 //!
 //! fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-//!     let (tracer, _uninstall) = opentelemetry_contrib::datadog::new_pipeline()
+//!     let (tracer, _uninstall) = new_pipeline()
 //!         .with_service_name("my_app")
-//!         .with_version(opentelemetry_contrib::datadog::ApiVersion::Version05)
+//!         .with_version(ApiVersion::Version05)
 //!         .with_agent_endpoint("http://localhost:8126")
 //!         .with_trace_config(
 //!             trace::config()

opentelemetry-contrib/src/datadog/mod.rs renamed to opentelemetry-contrib/src/trace/exporter/datadog/mod.rs

@@ -1,4 +1,4 @@
-use crate::datadog::model::Error;
+use crate::trace::exporter::datadog::model::Error;
 use opentelemetry::exporter::trace;
 use opentelemetry::{Key, Value};
 use std::time::SystemTime;

opentelemetry-contrib/src/datadog/model/mod.rs renamed to opentelemetry-contrib/src/trace/exporter/datadog/model/mod.rs

@@ -1,5 +1,5 @@
-use crate::datadog::intern::StringInterner;
-use crate::datadog::model::Error;
+use crate::trace::exporter::datadog::intern::StringInterner;
+use crate::trace::exporter::datadog::model::Error;
 use opentelemetry::exporter::trace;
 use opentelemetry::{Key, Value};
 use std::time::SystemTime;

opentelemetry-contrib/src/datadog/model/v03.rs renamed to opentelemetry-contrib/src/trace/exporter/datadog/model/v03.rs

@@ -0,0 +1,13 @@
+//! # Opentelemetry exporter contrib
+//!
+//! This module provides exporter implementations from third party vendors(like datadog). Note that
+//! there are some exporters live in their own repo. See [`Opentelemetry`] for a list of those
+//! implementations and where to find them.
+//!
+//! Currently, the following exporters are supported:
+//! * `datadog`, enable `datadog` feature to use it.
+//!
+//! [`Opentelemetry`](https://github.com/open-telemetry/opentelemetry-rust#related-crates)
+#[cfg(feature = "datadog")]
+#[cfg_attr(docsrs, doc(cfg(feature = "datadog")))]
+pub mod datadog;