migrate to the async runtime abstraction

Author: scottgerring

opentelemetry-otlp/Cargo.toml

@@ -69,7 +69,7 @@ serialize = ["serde", "serde_json"]
 default = ["http-proto", "reqwest-blocking-client", "trace", "metrics", "logs", "internal-logs"]
 
 # grpc using tonic
-grpc-tonic = ["tonic", "prost", "http", "tokio", "opentelemetry-proto/gen-tonic", "opentelemetry_sdk/rt-tokio"]
+grpc-tonic = ["tonic", "prost", "http", "tokio", "opentelemetry-proto/gen-tonic", "opentelemetry_sdk/rt-tokio", "opentelemetry_sdk/experimental_async_runtime"]
 gzip-tonic = ["tonic/gzip"]
 zstd-tonic = ["tonic/zstd"]
 

opentelemetry-otlp/src/exporter/tonic/logs.rs

@@ -1,11 +1,11 @@
-use std::sync::Arc;
 use core::fmt;
 use opentelemetry::otel_debug;
 use opentelemetry_proto::tonic::collector::logs::v1::{
     logs_service_client::LogsServiceClient, ExportLogsServiceRequest,
 };
 use opentelemetry_sdk::error::{OTelSdkError, OTelSdkResult};
 use opentelemetry_sdk::logs::{LogBatch, LogExporter};
+use std::sync::Arc;
 use std::time;
 use tokio::sync::Mutex;
 use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
@@ -15,6 +15,7 @@ use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scop
 use super::BoxInterceptor;
 
 use opentelemetry_sdk::retry::{retry_with_exponential_backoff, RetryPolicy};
+use opentelemetry_sdk::runtime::Tokio;
 
 pub(crate) struct TonicLogsClient {
     inner: Mutex<Option<ClientInner>>,
@@ -70,7 +71,7 @@ impl LogExporter for TonicLogsClient {
 
         let batch = Arc::new(batch);
 
-        retry_with_exponential_backoff::<_, _, _, _, tokio::time::Sleep>(policy, "TonicLogsClient.Export", {
+        retry_with_exponential_backoff(Tokio, policy, "TonicLogsClient.Export", {
             let batch = Arc::clone(&batch);
             let inner = &self.inner;
             let resource = &self.resource;
@@ -82,7 +83,9 @@ impl LogExporter for TonicLogsClient {
                             let (m, e, _) = inner
                                 .interceptor
                                 .call(Request::new(()))
-                                .map_err(|e| OTelSdkError::InternalFailure(format!("error: {e:?}")))?
+                                .map_err(|e| {
+                                    OTelSdkError::InternalFailure(format!("error: {e:?}"))
+                                })?
                                 .into_parts();
                             (inner.client.clone(), m, e)
                         }

opentelemetry-otlp/src/exporter/tonic/mod.rs

@@ -25,11 +25,6 @@ pub(crate) mod metrics;
 #[cfg(feature = "trace")]
 pub(crate) mod trace;
 
-// For now, we are not exposing the retry policy. Only work with grpc-tonic since retry takes a hard dependency on tokio
-// while we sort out an abstraction for the async runtime which can be used by all exporters.
-#[cfg(feature = "grpc-tonic")]
-mod retry;
-
 /// Configuration for [tonic]
 ///
 /// [tonic]: https://github.com/hyperium/tonic