Use HttpClient from opentelemetry-http crate

Author: frigus02

Cargo.toml

@@ -19,32 +19,32 @@ exclude = [
 ]
 
 [features]
-reqwest-blocking-client = ["reqwest", "reqwest/native-tls", "reqwest/blocking"]
-reqwest-blocking-client-rustls = ["reqwest", "reqwest/rustls-tls", "reqwest/blocking"]
-reqwest-client = ["reqwest", "reqwest/native-tls"]
-reqwest-client-rustls = ["reqwest", "reqwest/rustls-tls"]
-surf-client = ["surf"]
+reqwest-blocking-client = ["reqwest-client"]
+reqwest-blocking-client-rustls = ["reqwest-client-rustls"]
+reqwest-client = ["opentelemetry-http/reqwest", "reqwest/native-tls"]
+reqwest-client-rustls = ["opentelemetry-http/reqwest", "reqwest/rustls-tls"]
+surf-client = ["opentelemetry-http/surf"]
 
 [dependencies]
 async-trait = "0.1"
-bytes = "1"
 chrono = "0.4"
 http = "0.2"
-thiserror = "1"
+once_cell = "1"
 opentelemetry = "0.14"
+opentelemetry-http = "0.3"
 opentelemetry-semantic-conventions = "0.6"
-reqwest = { version = "0.11", optional = true, default-features = false }
+reqwest = { version = "0.11", default-features = false, features = ["blocking"], optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-surf = { version = "2", optional = true }
-once_cell = "1"
+thiserror = "1"
 
 [dev-dependencies]
 async-std = { version = "1.9.0", features = ["attributes"] }
 backtrace = "0.3.56"
 env_logger = "0.8.3"
 opentelemetry = { version = "0.14.0", features = ["rt-tokio"] }
 opentelemetry-application-insights = { path = ".", features = ["reqwest-client", "reqwest-blocking-client"] }
+surf = "2"
 test-case = "1.1.0"
 tokio = { version = "1.6.0", features = ["rt", "macros", "process", "time"] }
 version-sync = "0.9.2"
@@ -57,15 +57,15 @@ github = { repository = "frigus02/opentelemetry-application-insights", workflow
 
 [[example]]
 name = "attributes"
-required-features = ["reqwest-blocking-client"]
+required-features = ["reqwest-client"]
 
 [[example]]
 name = "http_client_reqwest"
 required-features = ["reqwest-client", "opentelemetry/rt-tokio"]
 
 [[example]]
 name = "http_client_reqwest_blocking"
-required-features = ["reqwest-blocking-client"]
+required-features = ["reqwest-client"]
 
 [[example]]
 name = "http_client_surf"

src/http_client.rs

@@ -55,16 +55,17 @@
 //! ## Features
 //!
 //! In order to support different async runtimes, the exporter requires you to specify an HTTP
-//! client that works with your chosen runtime. This crate comes with support for:
+//! client that works with your chosen runtime. The [`opentelemetry-http`] crate comes with support
+//! for:
 //!
 //! - [`surf`] for [`async-std`]: enable the **surf-client** and **opentelemetry/rt-async-std**
 //!   features and configure the exporter with `with_client(surf::Client::new())`.
-//! - [`reqwest`] for [`tokio`]: enable the **reqwest-client** and **opentelemetry/rt-tokio** features
-//!   and configure the exporter with `with_client(reqwest::Client::new())`.
-//! - [`reqwest`] for synchronous exports: enable the **reqwest-blocking-client** feature and
-//!   configure the exporter with `with_client(reqwest::blocking::Client::new())`.
+//! - [`reqwest`] for [`tokio`]: enable the **reqwest-client** and **opentelemetry/rt-tokio**
+//!   features and configure the exporter with either `with_client(reqwest::Client::new())` or
+//!   `with_client(reqwest::blocking::Client::new())`.
 //!
 //! [`async-std`]: https://crates.io/crates/async-std
+//! [`opentelemetry-http`]: https://crates.io/crates/opentelemetry-http
 //! [`reqwest`]: https://crates.io/crates/reqwest
 //! [`surf`]: https://crates.io/crates/surf
 //! [`tokio`]: https://crates.io/crates/tokio
@@ -151,14 +152,12 @@
 #![cfg_attr(test, deny(warnings))]
 
 mod convert;
-mod http_client;
 mod models;
 mod tags;
 mod uploader;
 
 use async_trait::async_trait;
 use convert::{attrs_to_properties, duration_to_string, span_id_to_string, time_to_string};
-pub use http_client::HttpClient;
 pub use models::context_tag_keys::attrs;
 use models::{
     Data, Envelope, ExceptionData, ExceptionDetails, LimitedLenString1024, MessageData, Properties,
@@ -177,6 +176,7 @@ use opentelemetry::{
     trace::{Event, SpanKind, StatusCode, TracerProvider},
     Key, Value,
 };
+pub use opentelemetry_http::HttpClient;
 use opentelemetry_semantic_conventions as semcov;
 use std::{borrow::Cow, collections::HashMap, convert::TryInto, error::Error as StdError};
 use tags::{get_tags_for_event, get_tags_for_span};