Merge branch 'main' into chore/otlp-retry-postreview-cleanup

Author: cijothomas

.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: [email protected]
       - 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

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",
+]

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`
-]

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

@@ -3,6 +3,7 @@ use crate::Protocol;
 use opentelemetry::{otel_debug, otel_warn};
 use opentelemetry_sdk::error::{OTelSdkError, OTelSdkResult};
 use opentelemetry_sdk::logs::{LogBatch, LogExporter};
+#[cfg(feature = "http-proto")]
 use prost::Message;
 use std::time;
 
@@ -51,13 +52,18 @@ fn handle_partial_success(response_body: &[u8], protocol: Protocol) {
                 return;
             }
         },
-        _ => match Message::decode(response_body) {
+        #[cfg(feature = "http-proto")]
+        Protocol::HttpBinary => match Message::decode(response_body) {
             Ok(r) => r,
             Err(e) => {
                 otel_debug!(name: "HttpLogsClient.ResponseParseError", error = e.to_string());
                 return;
             }
         },
+        #[cfg(feature = "grpc-tonic")]
+        Protocol::Grpc => {
+            unreachable!("HTTP client should not receive Grpc protocol")
+        }
     };
 
     if let Some(partial_success) = response.partial_success {

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

@@ -3,6 +3,7 @@ use crate::Protocol;
 use opentelemetry::{otel_debug, otel_warn};
 use opentelemetry_sdk::error::{OTelSdkError, OTelSdkResult};
 use opentelemetry_sdk::metrics::data::ResourceMetrics;
+#[cfg(feature = "http-proto")]
 use prost::Message;
 
 use super::OtlpHttpClient;
@@ -47,13 +48,18 @@ fn handle_partial_success(response_body: &[u8], protocol: Protocol) {
                 return;
             }
         },
-        _ => match Message::decode(response_body) {
+        #[cfg(feature = "http-proto")]
+        Protocol::HttpBinary => match Message::decode(response_body) {
             Ok(r) => r,
             Err(e) => {
                 otel_debug!(name: "HttpMetricsClient.ResponseParseError", error = e.to_string());
                 return;
             }
         },
+        #[cfg(feature = "grpc-tonic")]
+        Protocol::Grpc => {
+            unreachable!("HTTP client should not receive Grpc protocol")
+        }
     };
 
     if let Some(partial_success) = response.partial_success {

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

@@ -1,5 +1,5 @@
 use super::{
-    default_headers, default_protocol, parse_header_string, resolve_timeout, ExporterBuildError,
+    default_headers, parse_header_string, resolve_timeout, ExporterBuildError,
     OTEL_EXPORTER_OTLP_HTTP_ENDPOINT_DEFAULT,
 };
 use crate::{ExportConfig, Protocol, OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_HEADERS};
@@ -15,6 +15,7 @@ use opentelemetry_proto::transform::trace::tonic::group_spans_by_resource_and_sc
 use opentelemetry_sdk::logs::LogBatch;
 #[cfg(feature = "trace")]
 use opentelemetry_sdk::trace::SpanData;
+#[cfg(feature = "http-proto")]
 use prost::Message;
 use std::collections::HashMap;
 use std::env;
@@ -154,7 +155,7 @@ impl Default for HttpExporterBuilder {
     fn default() -> Self {
         HttpExporterBuilder {
             exporter_config: ExportConfig {
-                protocol: default_protocol(),
+                protocol: Protocol::default(),
                 ..ExportConfig::default()
             },
             http_config: HttpConfig {
@@ -595,7 +596,12 @@ impl OtlpHttpClient {
                 Ok(json) => (json.into_bytes(), "application/json"),
                 Err(e) => return Err(e.to_string()),
             },
-            _ => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "http-proto")]
+            Protocol::HttpBinary => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "grpc-tonic")]
+            Protocol::Grpc => {
+                unreachable!("HTTP client should not receive Grpc protocol")
+            }
         };
 
         let (processed_body, content_encoding) = self.process_body(body)?;
@@ -617,7 +623,12 @@ impl OtlpHttpClient {
                 Ok(json) => (json.into_bytes(), "application/json"),
                 Err(e) => return Err(e.to_string()),
             },
-            _ => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "http-proto")]
+            Protocol::HttpBinary => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "grpc-tonic")]
+            Protocol::Grpc => {
+                unreachable!("HTTP client should not receive Grpc protocol")
+            }
         };
 
         let (processed_body, content_encoding) = self.process_body(body)?;
@@ -642,7 +653,12 @@ impl OtlpHttpClient {
                     return None;
                 }
             },
-            _ => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "http-proto")]
+            Protocol::HttpBinary => (req.encode_to_vec(), "application/x-protobuf"),
+            #[cfg(feature = "grpc-tonic")]
+            Protocol::Grpc => {
+                unreachable!("HTTP client should not receive Grpc protocol")
+            }
         };
 
         match self.process_body(body) {

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

@@ -5,6 +5,7 @@ use opentelemetry_sdk::{
     error::{OTelSdkError, OTelSdkResult},
     trace::{SpanData, SpanExporter},
 };
+#[cfg(feature = "http-proto")]
 use prost::Message;
 
 impl SpanExporter for OtlpHttpClient {
@@ -52,13 +53,18 @@ fn handle_partial_success(response_body: &[u8], protocol: Protocol) {
                 return;
             }
         },
-        _ => match Message::decode(response_body) {
+        #[cfg(feature = "http-proto")]
+        Protocol::HttpBinary => match Message::decode(response_body) {
             Ok(r) => r,
             Err(e) => {
                 otel_debug!(name: "HttpTraceClient.ResponseParseError", error = e.to_string());
                 return;
             }
         },
+        #[cfg(feature = "grpc-tonic")]
+        Protocol::Grpc => {
+            unreachable!("HTTP client should not receive Grpc protocol")
+        }
     };
 
     if let Some(partial_success) = response.partial_success {