chore: move retry from sdk down to otlp for now

Author: scottgerring

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

@@ -25,7 +25,7 @@ use std::time::Duration;
 #[cfg(feature = "experimental-http-retry")]
 use crate::retry_classification::http::classify_http_error;
 #[cfg(feature = "experimental-http-retry")]
-use opentelemetry_sdk::retry::{RetryErrorType, RetryPolicy};
+use crate::retry::{RetryErrorType, RetryPolicy};
 
 // Shared HTTP retry functionality
 /// HTTP-specific error wrapper for retry classification
@@ -387,7 +387,7 @@ impl OtlpHttpClient {
     {
         #[cfg(feature = "experimental-http-retry")]
         {
-            use opentelemetry_sdk::retry::retry_with_backoff;
+            use crate::retry::retry_with_backoff;
             use opentelemetry_sdk::runtime::Tokio;
 
             // Build request body once before retry loop
@@ -1493,7 +1493,7 @@ mod tests {
         fn test_with_retry_policy() {
             use super::super::HttpExporterBuilder;
             use crate::WithHttpConfig;
-            use opentelemetry_sdk::retry::RetryPolicy;
+            use crate::retry::RetryPolicy;
 
             let custom_policy = RetryPolicy {
                 max_retries: 5,
@@ -1527,7 +1527,7 @@ mod tests {
         #[cfg(feature = "experimental-http-retry")]
         #[test]
         fn test_custom_retry_policy_used() {
-            use opentelemetry_sdk::retry::RetryPolicy;
+            use crate::retry::RetryPolicy;
 
             let custom_policy = RetryPolicy {
                 max_retries: 7,

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

@@ -14,7 +14,7 @@ use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scop
 
 use super::BoxInterceptor;
 
-use opentelemetry_sdk::retry::RetryPolicy;
+use crate::retry::RetryPolicy;
 #[cfg(feature = "experimental-grpc-retry")]
 use opentelemetry_sdk::runtime::Tokio;
 

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

@@ -12,7 +12,7 @@ use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Chann
 use super::BoxInterceptor;
 use crate::metric::MetricsClient;
 
-use opentelemetry_sdk::retry::RetryPolicy;
+use crate::retry::RetryPolicy;
 #[cfg(feature = "experimental-grpc-retry")]
 use opentelemetry_sdk::runtime::Tokio;
 

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

@@ -20,9 +20,9 @@ use crate::{ExportConfig, OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_HEADER
     feature = "experimental-grpc-retry",
     any(feature = "trace", feature = "metrics", feature = "logs")
 ))]
-use opentelemetry_sdk::retry::retry_with_backoff;
+use crate::retry::retry_with_backoff;
 #[cfg(feature = "grpc-tonic")]
-use opentelemetry_sdk::retry::RetryPolicy;
+use crate::retry::RetryPolicy;
 #[cfg(all(
     feature = "experimental-grpc-retry",
     any(feature = "trace", feature = "metrics", feature = "logs")
@@ -366,7 +366,7 @@ impl TonicExporterBuilder {
 async fn tonic_retry_with_backoff<R, F, Fut, T>(
     runtime: R,
     policy: RetryPolicy,
-    classify_fn: fn(&tonic::Status) -> opentelemetry_sdk::retry::RetryErrorType,
+    classify_fn: fn(&tonic::Status) -> crate::retry::RetryErrorType,
     operation_name: &'static str,
     operation: F,
 ) -> Result<T, tonic::Status>
@@ -387,7 +387,7 @@ where
 async fn tonic_retry_with_backoff<F, Fut, T>(
     _runtime: (),
     _policy: RetryPolicy,
-    _classify_fn: fn(&tonic::Status) -> opentelemetry_sdk::retry::RetryErrorType,
+    _classify_fn: fn(&tonic::Status) -> crate::retry::RetryErrorType,
     _operation_name: &'static str,
     operation: F,
 ) -> Result<T, tonic::Status>
@@ -857,7 +857,7 @@ mod tests {
     #[test]
     fn test_with_retry_policy() {
         use crate::WithTonicConfig;
-        use opentelemetry_sdk::retry::RetryPolicy;
+        use crate::retry::RetryPolicy;
 
         let custom_policy = RetryPolicy {
             max_retries: 5,

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

@@ -16,7 +16,7 @@ use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Chann
 
 use super::BoxInterceptor;
 
-use opentelemetry_sdk::retry::RetryPolicy;
+use crate::retry::RetryPolicy;
 #[cfg(feature = "experimental-grpc-retry")]
 use opentelemetry_sdk::runtime::Tokio;
 

opentelemetry-otlp/src/lib.rs

@@ -369,6 +369,10 @@ mod span;
 #[cfg(any(feature = "grpc-tonic", feature = "experimental-http-retry"))]
 pub mod retry_classification;
 
+/// Retry logic for exporting telemetry data.
+#[cfg(any(feature = "grpc-tonic", feature = "experimental-http-retry"))]
+pub mod retry;
+
 pub use crate::exporter::Compression;
 pub use crate::exporter::ExportConfig;
 pub use crate::exporter::ExporterBuildError;
@@ -410,7 +414,7 @@ pub use crate::exporter::{
 };
 
 #[cfg(feature = "experimental-http-retry")]
-pub use opentelemetry_sdk::retry::RetryPolicy;
+pub use retry::RetryPolicy;
 
 /// Type to indicate the builder does not have a client set.
 #[derive(Debug, Default, Clone)]

opentelemetry-sdk/src/retry.rs renamed to opentelemetry-otlp/src/retry.rs

@@ -8,16 +8,17 @@
 //! retries. The function uses error classification to determine retry behavior and can honor
 //! server-provided throttling hints.
 
-#[cfg(feature = "experimental_async_runtime")]
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
 use opentelemetry::otel_warn;
-#[cfg(feature = "experimental_async_runtime")]
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
 use std::future::Future;
+use std::hash::DefaultHasher;
 use std::time::Duration;
-#[cfg(feature = "experimental_async_runtime")]
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
 use std::time::SystemTime;
 
-#[cfg(feature = "experimental_async_runtime")]
-use crate::runtime::Runtime;
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
+use opentelemetry_sdk::runtime::Runtime;
 
 /// Classification of errors for retry purposes.
 #[derive(Debug, Clone, PartialEq)]
@@ -46,11 +47,11 @@ pub struct RetryPolicy {
 
 /// A runtime stub for when experimental_async_runtime is not enabled.
 /// This allows retry policy to be configured but no actual retries occur.
-#[cfg(not(feature = "experimental_async_runtime"))]
+#[cfg(not(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry")))]
 #[derive(Debug, Clone, Default)]
 pub struct NoOpRuntime;
 
-#[cfg(not(feature = "experimental_async_runtime"))]
+#[cfg(not(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry")))]
 impl NoOpRuntime {
     /// Creates a new no-op runtime.
     pub fn new() -> Self {
@@ -59,13 +60,16 @@ impl NoOpRuntime {
 }
 
 // Generates a random jitter value up to max_jitter
-#[cfg(feature = "experimental_async_runtime")]
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
 fn generate_jitter(max_jitter: u64) -> u64 {
     let now = SystemTime::now();
     let nanos = now
         .duration_since(SystemTime::UNIX_EPOCH)
         .unwrap()
         .subsec_nanos();
+
+    let hasher = DefaultHasher::default();
+
     nanos as u64 % (max_jitter + 1)
 }
 
@@ -86,7 +90,7 @@ fn generate_jitter(max_jitter: u64) -> u64 {
 ///
 /// A `Result` containing the operation's result or an error if max retries are reached
 /// or a non-retryable error occurs.
-#[cfg(feature = "experimental_async_runtime")]
+#[cfg(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry"))]
 pub async fn retry_with_backoff<R, F, Fut, T, E, C>(
     runtime: R,
     policy: RetryPolicy,
@@ -147,7 +151,7 @@ where
 
 /// No-op retry function for when experimental_async_runtime is not enabled.
 /// This function will execute the operation exactly once without any retries.
-#[cfg(not(feature = "experimental_async_runtime"))]
+#[cfg(not(any(feature = "experimental-grpc-retry", feature = "experimental-http-retry")))]
 pub async fn retry_with_backoff<R, F, Fut, T, E, C>(
     _runtime: R,
     _policy: RetryPolicy,
@@ -163,10 +167,10 @@ where
     operation().await
 }
 
-#[cfg(all(test, feature = "experimental_async_runtime", feature = "rt-tokio"))]
+#[cfg(all(test, feature = "experimental-grpc-retry"))]
 mod tests {
     use super::*;
-    use crate::runtime::Tokio;
+    use opentelemetry_sdk::runtime::Tokio;
     use std::sync::atomic::{AtomicUsize, Ordering};
     use std::time::Duration;
     use tokio::time::timeout;

opentelemetry-otlp/src/retry_classification.rs

@@ -4,7 +4,7 @@
 //! supporting server-provided throttling hints like HTTP Retry-After headers and
 //! gRPC RetryInfo metadata.
 
-use opentelemetry_sdk::retry::RetryErrorType;
+use crate::retry::RetryErrorType;
 use std::time::Duration;
 
 #[cfg(feature = "grpc-tonic")]
@@ -222,7 +222,7 @@ mod tests {
     #[cfg(feature = "grpc-tonic")]
     mod grpc_tests {
         use crate::retry_classification::grpc::classify_tonic_status;
-        use opentelemetry_sdk::retry::RetryErrorType;
+        use crate::retry::RetryErrorType;
         use tonic_types::{ErrorDetails, StatusExt};
 
         #[test]

opentelemetry-sdk/src/lib.rs

@@ -168,5 +168,3 @@ impl<T> From<std::sync::PoisonError<T>> for InMemoryExporterError {
     }
 }
 
-/// Retry logic for exporting telemetry data.
-pub mod retry;