leverage native async trait in JaegerJsonRuntime and GcpAuthorizer (#186)

Author: gruebel

opentelemetry-contrib/Cargo.toml

@@ -23,14 +23,13 @@ api = []
 default = []
 base64_format = ["base64", "binary_propagator"]
 binary_propagator = []
-jaeger_json_exporter = ["opentelemetry_sdk", "serde_json", "futures-core", "futures-util", "async-trait"]
+jaeger_json_exporter = ["opentelemetry_sdk", "serde_json", "futures-core", "futures-util"]
 rt-tokio = ["tokio", "opentelemetry_sdk/rt-tokio"]
 rt-tokio-current-thread = ["tokio", "opentelemetry_sdk/rt-tokio-current-thread"]
 rt-async-std = ["async-std", "opentelemetry_sdk/rt-async-std"]
 
 [dependencies]
 async-std = { version = "1.10", optional = true }
-async-trait = { version = "0.1", optional = true }
 base64 = { version = "0.22", optional = true }
 futures-core = { version = "0.3", optional = true }
 futures-util = { version = "0.3", optional = true, default-features = false }

opentelemetry-contrib/src/trace/exporter/jaeger_json.rs

@@ -1,7 +1,6 @@
 //! # Jaeger JSON file Exporter
 //!
 
-use async_trait::async_trait;
 use futures_core::future::BoxFuture;
 use futures_util::FutureExt;
 use opentelemetry::trace::SpanId;
@@ -205,16 +204,18 @@ fn opentelemetry_value_to_json(value: &opentelemetry::Value) -> (&str, serde_jso
 /// Jaeger Json Runtime is an extension to [`RuntimeChannel`].
 ///
 /// [`RuntimeChannel`]: opentelemetry_sdk::runtime::RuntimeChannel
-#[async_trait]
 pub trait JaegerJsonRuntime: RuntimeChannel + std::fmt::Debug {
     /// Create a new directory if the given path does not exist yet
-    async fn create_dir(&self, path: &Path) -> OTelSdkResult;
+    fn create_dir(&self, path: &Path) -> impl std::future::Future<Output = OTelSdkResult> + Send;
     /// Write the provided content to a new file at the given path
-    async fn write_to_file(&self, path: &Path, content: &[u8]) -> OTelSdkResult;
+    fn write_to_file(
+        &self,
+        path: &Path,
+        content: &[u8],
+    ) -> impl std::future::Future<Output = OTelSdkResult> + Send;
 }
 
 #[cfg(feature = "rt-tokio")]
-#[async_trait]
 impl JaegerJsonRuntime for opentelemetry_sdk::runtime::Tokio {
     async fn create_dir(&self, path: &Path) -> OTelSdkResult {
         if tokio::fs::metadata(path).await.is_err() {
@@ -244,7 +245,6 @@ impl JaegerJsonRuntime for opentelemetry_sdk::runtime::Tokio {
 }
 
 #[cfg(feature = "rt-tokio-current-thread")]
-#[async_trait]
 impl JaegerJsonRuntime for opentelemetry_sdk::runtime::TokioCurrentThread {
     async fn create_dir(&self, path: &Path) -> OTelSdkResult {
         if tokio::fs::metadata(path).await.is_err() {
@@ -274,7 +274,6 @@ impl JaegerJsonRuntime for opentelemetry_sdk::runtime::TokioCurrentThread {
 }
 
 #[cfg(feature = "rt-async-std")]
-#[async_trait]
 impl JaegerJsonRuntime for opentelemetry_sdk::runtime::AsyncStd {
     async fn create_dir(&self, path: &Path) -> OTelSdkResult {
         if async_std::fs::metadata(path).await.is_err() {

opentelemetry-etw-metrics/src/etw/mod.rs

@@ -33,6 +33,7 @@ pub fn register() {
 }
 
 /// Write an event to the ETW provider.
+#[allow(clippy::repr_packed_without_abi)]
 pub fn write(buffer: &[u8]) -> u32 {
     tracelogging::write_event!(
         PROVIDER,

opentelemetry-resource-detectors/src/host.rs

@@ -16,7 +16,7 @@ use std::process::Command;
 ///
 /// This resource detector returns the following information:
 ///
-/// - [`host.id from non-containerized systems`]: https://opentelemetry.io/docs/specs/semconv/resource/host/#collecting-hostid-from-non-containerized-systems
+/// - [`host.id from non-containerized systems`](https://opentelemetry.io/docs/specs/semconv/resource/host/#collecting-hostid-from-non-containerized-systems)
 /// - Host architecture (host.arch).
 pub struct HostResourceDetector {
     host_id_detect: fn() -> Option<String>,

opentelemetry-stackdriver/Cargo.toml

@@ -10,7 +10,6 @@ exclude = ["/proto"]
 rust-version = "1.75.0"
 
 [dependencies]
-async-trait = "0.1.48"
 gcp_auth = { version = "0.12", optional = true }
 hex = "0.4"
 http = "1"

opentelemetry-stackdriver/src/lib.rs

@@ -23,7 +23,6 @@ use std::{
     time::{Duration, Instant},
 };
 
-use async_trait::async_trait;
 use futures_core::future::BoxFuture;
 use futures_util::stream::StreamExt;
 use opentelemetry::{
@@ -442,7 +441,6 @@ impl GcpAuthorizer {
 }
 
 #[cfg(feature = "gcp-authorizer")]
-#[async_trait]
 impl Authorizer for GcpAuthorizer {
     type Error = Error;
 
@@ -470,16 +468,15 @@ impl Authorizer for GcpAuthorizer {
     }
 }
 
-#[async_trait]
 pub trait Authorizer: Sync + Send + 'static {
     type Error: std::error::Error + fmt::Debug + Send + Sync;
 
     fn project_id(&self) -> &str;
-    async fn authorize<T: Send + Sync>(
+    fn authorize<T: Send + Sync>(
         &self,
         request: &mut Request<T>,
         scopes: &[&str],
-    ) -> Result<(), Self::Error>;
+    ) -> impl Future<Output = Result<(), Self::Error>> + Send;
 }
 
 impl From<Value> for AttributeValue {