Merge branch 'main' into main

cijothomas · web-flow · commit 5c6ad04c8595 · 2025-11-19T13:28:30.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
       with:
         toolchain: stable
         components: rustfmt, clippy
-    - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
+    - uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
       with:
           tool: cargo-hack
     - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -93,7 +93,7 @@ jobs:
           # https://github.com/awslabs/cargo-check-external-types/releases
           toolchain: nightly-2025-05-04
           components: rustfmt
-      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
+      - uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
         with:
           tool: cargo-check-external-types@0.2.0
       - name: external-type-check
@@ -117,7 +117,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
         with:
           toolchain: stable
-      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
+      - uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
         with:
           tool: cargo-msrv
       - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -150,7 +150,7 @@ jobs:
         uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
         with:
           command: check bans
-      
+
       - name: Check sources
         uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
         with:
@@ -199,7 +199,7 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
+        uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
         with:
           tool: cargo-llvm-cov
       - name: cargo generate-lockfile
@@ -232,7 +232,7 @@ jobs:
               cargo build
             fi
           done
-  cargo-machete:
+  cargo-shear:
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
@@ -246,9 +246,12 @@ jobs:
           submodules: true
       - uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
         with:
-          toolchain: stable
-      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
+          toolchain: nightly
+      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: taiki-e/install-action@6f9c7cc51aa54b13cbcbd12f8bbf69d8ba405b4b # v2.62.47
         with:
-          tool: cargo-machete
-      - name: cargo machete
-        run: cargo machete
+          tool: cargo-shear
+      - name: cargo shear
+        run: cargo shear --expand
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,8 +33,6 @@ log = "0.4.21"
 once_cell = "1.13"
 pin-project-lite = "0.2"
 prost = "0.14"
-prost-build = "0.14"
-prost-types = "0.14"
 rand = { version = "0.9", default-features = false }
 reqwest = { version = "0.12", default-features = false }
 serde = { version = "1.0", default-features = false }
@@ -100,3 +98,10 @@ tail_expr_drop_order = "allow"
 
 [workspace.lints.clippy]
 all = { level = "warn", priority = 1 }
+
+[workspace.metadata.cargo-shear]
+ignored = [
+    # workspace crates
+    "opentelemetry-appender-log",
+    "opentelemetry-jaeger-propagator",
+]
diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml
@@ -28,9 +28,3 @@ tonic-prost = { workspace = true }
 
 [build-dependencies]
 tonic-prost-build = { workspace = true }
-
-[package.metadata.cargo-machete]
-ignored = [
-    "prost", # needed for `tonic-prost-build`
-    "tonic-prost" # needed for `tonic-prost-build`
-]
diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md
@@ -12,6 +12,7 @@ Released 2025-Sep-25
 - Update `opentelemetry-proto` and `opentelemetry-http` dependency version to 0.31.0
 - Add HTTP compression support with `gzip-http` and `zstd-http` feature flags
 - Add retry with exponential backoff and throttling support for HTTP and gRPC exporters
+  This behaviour is opt in via the `experimental-grpc-retry` and `experimental-http-retry` flags on this crate. You can customize the retry policy using the `with_retry_policy` on the exporter builders.
 
 ## 0.30.0
 
diff --git a/opentelemetry-otlp/src/retry.rs b/opentelemetry-otlp/src/retry.rs
@@ -7,6 +7,11 @@
 //! specified retry policy, using exponential backoff and jitter to determine the delay between
 //! retries. The function uses error classification to determine retry behavior and can honor
 //! server-provided throttling hints.
+#[cfg(any(
+    feature = "experimental-grpc-retry",
+    feature = "experimental-http-retry"
+))]
+use opentelemetry::{otel_debug, otel_info};
 
 #[cfg(any(
     feature = "experimental-grpc-retry",
@@ -17,24 +22,23 @@ use opentelemetry::otel_warn;
     feature = "experimental-grpc-retry",
     feature = "experimental-http-retry"
 ))]
-use std::future::Future;
+use opentelemetry_sdk::runtime::Runtime;
 #[cfg(any(
     feature = "experimental-grpc-retry",
     feature = "experimental-http-retry"
 ))]
-use std::hash::{DefaultHasher, Hasher};
-use std::time::Duration;
+use std::future::Future;
 #[cfg(any(
     feature = "experimental-grpc-retry",
     feature = "experimental-http-retry"
 ))]
-use std::time::SystemTime;
-
+use std::hash::{DefaultHasher, Hasher};
+use std::time::Duration;
 #[cfg(any(
     feature = "experimental-grpc-retry",
     feature = "experimental-http-retry"
 ))]
-use opentelemetry_sdk::runtime::Runtime;
+use std::time::SystemTime;
 
 /// Classification of errors for retry purposes.
 #[derive(Debug, Clone, PartialEq)]
@@ -61,26 +65,6 @@ pub struct RetryPolicy {
     pub jitter_ms: u64,
 }
 
-/// 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(any(
-    feature = "experimental-grpc-retry",
-    feature = "experimental-http-retry"
-)))]
-#[derive(Debug, Clone, Default)]
-pub struct NoOpRuntime;
-
-#[cfg(not(any(
-    feature = "experimental-grpc-retry",
-    feature = "experimental-http-retry"
-)))]
-impl NoOpRuntime {
-    /// Creates a new no-op runtime.
-    pub fn new() -> Self {
-        Self
-    }
-}
-
 // Generates a random jitter value up to max_jitter
 #[cfg(any(
     feature = "experimental-grpc-retry",
@@ -144,15 +128,23 @@ where
 
                 match error_type {
                     RetryErrorType::NonRetryable => {
-                        otel_warn!(name: "OtlpRetry", message = format!("Operation {:?} failed with non-retryable error: {:?}", operation_name, err));
+                        otel_warn!(name: "Export.Failed.NonRetryable",
+                            operation = operation_name,
+                            message = "OTLP export failed with non-retryable error - telemetry data will be lost");
                         return Err(err);
                     }
                     RetryErrorType::Retryable if attempt < policy.max_retries => {
                         attempt += 1;
                         // Use exponential backoff with jitter
-                        otel_warn!(name: "OtlpRetry", message = format!("Retrying operation {:?} due to retryable error: {:?}", operation_name, err));
                         let jitter = generate_jitter(policy.jitter_ms);
                         let delay_with_jitter = std::cmp::min(delay + jitter, policy.max_delay_ms);
+                        otel_debug!(name: "Export.InProgress.Retrying",
+                            operation = operation_name,
+                            attempt = attempt,
+                            delay_ms = delay_with_jitter,
+                            jitter_ms = jitter,
+                            message = "OTLP export failed with retryable error - retrying"
+                        );
                         runtime
                             .delay(Duration::from_millis(delay_with_jitter))
                             .await;
@@ -161,13 +153,22 @@ where
                     RetryErrorType::Throttled(server_delay) if attempt < policy.max_retries => {
                         attempt += 1;
                         // Use server-specified delay (overrides exponential backoff)
-                        otel_warn!(name: "OtlpRetry", message = format!("Retrying operation {:?} after server-specified throttling delay: {:?}", operation_name, server_delay));
+                        otel_info!(name: "Export.InProgress.Throttled",
+                            operation = operation_name,
+                            attempt = attempt,
+                            delay_ms = server_delay.as_millis(),
+                            message = "OTLP export throttled by OTLP endpoint - delaying and retrying"
+                        );
                         runtime.delay(server_delay).await;
                         // Don't update exponential backoff delay for next attempt since server provided specific timing
                     }
                     _ => {
                         // Max retries reached
-                        otel_warn!(name: "OtlpRetry", message = format!("Operation {:?} failed after {} attempts: {:?}", operation_name, attempt, err));
+                        otel_warn!(name: "Export.Failed.Exhausted",
+                            operation = operation_name,
+                            retries = attempt,
+                            message = "OTLP export exhausted retries - telemetry data will be lost"
+                        );
                         return Err(err);
                     }
                 }
diff --git a/opentelemetry-otlp/tests/integration_test/Cargo.toml b/opentelemetry-otlp/tests/integration_test/Cargo.toml
@@ -23,7 +23,6 @@ tracing = {workspace = true}
 [target.'cfg(unix)'.dependencies]
 opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing", default-features = false}
 opentelemetry-otlp = { path = "../../../opentelemetry-otlp", default-features = false }
-opentelemetry-semantic-conventions = { path = "../../../opentelemetry-semantic-conventions" }
 
 [features]
 hyper-client = ["opentelemetry-otlp/hyper-client", "opentelemetry-otlp/http-proto", "opentelemetry-otlp/trace", "opentelemetry-otlp/logs", "opentelemetry-otlp/metrics", "internal-logs"]
diff --git a/opentelemetry-prometheus/Cargo.toml b/opentelemetry-prometheus/Cargo.toml
@@ -37,8 +37,3 @@ tokio = { version = "1", features = ["full"] }
 default = ["internal-logs"]
 prometheus-encoding = []
 internal-logs = ["tracing"]
-
-[package.metadata.cargo-machete]
-ignored = [
-    "tracing" # needed for `internal-logs`
-]
diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
@@ -66,7 +66,6 @@ base64 = { workspace = true, optional = true }
 [dev-dependencies]
 opentelemetry = { workspace = true, features = ["testing"] }
 tonic-prost-build = { workspace = true }
-prost-build = { workspace = true }
 tempfile = { workspace = true }
 serde_json = { workspace = true }
 
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
@@ -6,6 +6,7 @@
 - **Breaking** Removed the following public fields and methods from the `SpanBuilder` [#3227][3227]:
   - `trace_id`, `span_id`, `end_time`, `status`, `sampling_result`
   - `with_trace_id`, `with_span_id`, `with_end_time`, `with_status`, `with_sampling_result`
+- **Added** `#[must_use]` attribute to `opentelemetry::metrics::AsyncInstrumentBuilder` to add compile time warning when `.build()` is not called on observable instrument builders, preventing silent failures where callbacks are never registered and metrics are never reported.
 
 [3227]: https://github.com/open-telemetry/opentelemetry-rust/pull/3227
 
@@ -117,10 +118,10 @@ let counter = meter.u64_counter("my_counter").build();
   - Replaced `global::meter_with_version` with `global::meter_with_scope`
   - Added `global::tracer_with_scope`
   - Refer to PR description for migration guide.
-- **Breaking change**: replaced `InstrumentationScope` public attributes by getters [#2275](https://github.com/open-telemetry/opentelemetry-rust/pull/2275)  
+- **Breaking change**: replaced `InstrumentationScope` public attributes by getters [#2275](https://github.com/open-telemetry/opentelemetry-rust/pull/2275)
 
 - **Breaking change**: [#2260](https://github.com/open-telemetry/opentelemetry-rust/pull/2260)
-  - Removed `global::set_error_handler` and `global::handle_error`. 
+  - Removed `global::set_error_handler` and `global::handle_error`.
   - `global::handle_error` usage inside the opentelemetry crates has been replaced with `global::otel_info`, `otel_warn`, `otel_debug` and `otel_error` macros based on the severity of the internal logs.
   - The default behavior of `global::handle_error` was to log the error using `eprintln!`. With otel macros, the internal logs get emitted via `tracing` macros of matching severity. Users now need to configure a `tracing` layer/subscriber to capture these logs.
   - Refer to PR description for migration guide. Also refer to [self-diagnostics](https://github.com/open-telemetry/opentelemetry-rust/tree/main/examples/self-diagnostics) example to learn how to view internal logs in stdout using `tracing::fmt` layer.
@@ -220,7 +221,7 @@ to learn how to provide Observable callbacks.
   opaque string. Migration: Replace `.with_unit(Unit::new("myunit"))` with
   `.with_unit("myunit")`.
 
-- [1869](https://github.com/open-telemetry/opentelemetry-rust/pull/1869) Introduced the `LogRecord::set_target()` method in the log bridge API. 
+- [1869](https://github.com/open-telemetry/opentelemetry-rust/pull/1869) Introduced the `LogRecord::set_target()` method in the log bridge API.
 This method allows appenders to set the target/component emitting the logs.
 
 ## v0.23.0
@@ -241,7 +242,7 @@ This method allows appenders to set the target/component emitting the logs.
         - opentelemetry::global::shutdown_logger_provider
         - opentelemetry::global::logger_provider
         - opentelemetry::global::GlobalLoggerProvider
-        - opentelemetry::global::ObjectSafeLoggerProvider 
+        - opentelemetry::global::ObjectSafeLoggerProvider
     For creating appenders using Logging bridge API, refer to the opentelemetry-tracing-appender [example](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-appender-tracing/examples/basic.rs)
 
 ### Changed
diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml
@@ -46,7 +46,6 @@ opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["spec_unstable_
 criterion = { workspace = true }
 rand = { workspace = true, features = ["os_rng", "thread_rng"] }
 tokio = { version = "1.0", features = ["full"] }
-futures = "0.3"
 
 [[bench]]
 name = "metrics"
diff --git a/opentelemetry/src/metrics/instruments/mod.rs b/opentelemetry/src/metrics/instruments/mod.rs
@@ -241,6 +241,7 @@ impl<T> fmt::Debug for HistogramBuilder<'_, T> {
 pub type Callback<T> = Box<dyn Fn(&dyn AsyncInstrument<T>) + Send + Sync>;
 
 /// Configuration for building an async instrument.
+#[must_use = "Callbacks will not be invoked unless you call .build() on this async instrument builder."]
 #[non_exhaustive] // We expect to add more configuration fields in the future
 pub struct AsyncInstrumentBuilder<'a, I, M> {
     /// Instrument provider is used to create the instrument.
