Merge branch 'main' into propogate-trace-errors

Author: lalitb

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
       with:
         toolchain: stable
         components: rustfmt, clippy
-    - uses: taiki-e/install-action@d6d752794628f1e1fffa3c4d3c8874e06f043d50 # v2.62.15
+    - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
       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@d6d752794628f1e1fffa3c4d3c8874e06f043d50 # v2.62.15
+      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
         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@d6d752794628f1e1fffa3c4d3c8874e06f043d50 # v2.62.15
+      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
         with:
           tool: cargo-msrv
       - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -199,7 +199,7 @@ jobs:
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@d6d752794628f1e1fffa3c4d3c8874e06f043d50 # v2.62.15
+        uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
         with:
           tool: cargo-llvm-cov
       - name: cargo generate-lockfile
@@ -247,7 +247,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
         with:
           toolchain: stable
-      - uses: taiki-e/install-action@d6d752794628f1e1fffa3c4d3c8874e06f043d50 # v2.62.15
+      - uses: taiki-e/install-action@47be02f2de8a32619316956f6117e150bdc6763f # v2.62.44
         with:
           tool: cargo-machete
       - name: cargo machete

.github/workflows/codeql-analysis.yml

@@ -34,12 +34,12 @@ jobs:
         submodules: true
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
       with:
         languages: rust
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+      uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

.github/workflows/ossf-scorecard.yml

@@ -39,7 +39,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif
@@ -48,6 +48,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

Cargo.toml

@@ -80,7 +80,6 @@ rstest = "0.23.0"
 schemars = "0.8"
 sysinfo = "0.32"
 tempfile = "3.3.0"
-testcontainers = "0.23.1"
 tracing-log = "0.2"
 tracing-opentelemetry = "0.32"
 typed-builder = "0.20"

opentelemetry-otlp/tests/integration_test/Cargo.toml

@@ -3,7 +3,7 @@ name = "integration_test_runner"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0"
-rust-version = "1.75.0"
+rust-version = "1.88.0"
 publish = false
 autobenches = false
 
@@ -13,7 +13,7 @@ opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio
 opentelemetry-proto = { path = "../../../opentelemetry-proto", features = ["gen-tonic-messages", "trace", "logs", "metrics", "with-serde"] }
 tokio = { workspace = true, features = ["full"] }
 serde_json = { workspace = true }
-testcontainers = { workspace = true, features = ["http_wait"] }
+testcontainers = { version = "0.25.2", features = ["http_wait"] }
 anyhow = { workspace = true }
 ctor = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }

opentelemetry-sdk/src/logs/log_processor.rs

@@ -58,13 +58,17 @@ pub trait LogProcessor: Send + Sync + Debug {
     /// After shutdown returns the log processor should stop processing any logs.
     /// It's up to the implementation on when to drop the LogProcessor.
     ///
-    /// All implementors should implement this method.
+    /// Implementors that manage resources (background threads, network connections,
+    /// file handles, etc.) should override this method to properly clean up.
+    /// Processors that wrap other processors should forward the shutdown call to
+    /// the wrapped processor(s).
+    /// Simple processors that only transform log data can use the default implementation.
     fn shutdown_with_timeout(&self, _timeout: Duration) -> OTelSdkResult {
         // It would have been better to make this method required, but that ship
         // sailed when the logs API was declared stable.
         otel_warn!(
             name: "LogProcessor.DefaultShutdownWithTimeout",
-            message = format!("LogProcessor::shutdown_with_timeout should be implemented by all LogProcessor types")
+            message = "LogProcessor is using default shutdown implementation. If this processor manages background threads, network connections, file handles, or other resources that need cleanup, implement `shutdown_with_timeout()` to properly release them. Simple processors that only transform log data can safely use this default."
         );
         Ok(())
     }

opentelemetry/CHANGELOG.md

@@ -10,6 +10,7 @@ Released 2025-Sep-25
 
 - *Breaking* Change return type of `opentelemetry::global::set_tracer_provider` to Unit to align with metrics counterpart
 - Add `get_all` method to `opentelemetry::propagation::Extractor` to return all values of the given propagation key and provide a default implementation.
+- Add an `IntoIterator` implementation for `opentelemetry::trace::TraceState` to allow iterating through its key-value pair collection.
 
 ## 0.30.0
 

opentelemetry/src/trace/span_context.rs

@@ -211,6 +211,50 @@ impl FromStr for TraceState {
     }
 }
 
+/// Iterator over TraceState key-value pairs as (&str, &str)
+#[derive(Debug)]
+pub struct TraceStateIter<'a> {
+    inner: Option<std::collections::vec_deque::Iter<'a, (String, String)>>,
+}
+
+impl<'a> Iterator for TraceStateIter<'a> {
+    type Item = (&'a str, &'a str);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner
+            .as_mut()?
+            .next()
+            .map(|(key, value)| (key.as_str(), value.as_str()))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        match &self.inner {
+            Some(iter) => iter.size_hint(),
+            None => (0, Some(0)),
+        }
+    }
+}
+
+impl ExactSizeIterator for TraceStateIter<'_> {
+    fn len(&self) -> usize {
+        match &self.inner {
+            Some(iter) => iter.len(),
+            None => 0,
+        }
+    }
+}
+
+impl<'a> IntoIterator for &'a TraceState {
+    type Item = (&'a str, &'a str);
+    type IntoIter = TraceStateIter<'a>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        TraceStateIter {
+            inner: self.0.as_ref().map(|deque| deque.iter()),
+        }
+    }
+}
+
 /// A specialized `Result` type for trace state operations.
 type TraceStateResult<T> = Result<T, TraceStateError>;
 
@@ -417,4 +461,39 @@ mod tests {
              }"
         );
     }
+
+    #[test]
+    fn test_tracestate_iter_empty() {
+        let ts = TraceState::NONE;
+        let mut iter = ts.into_iter();
+        assert_eq!(iter.next(), None);
+        assert_eq!(iter.size_hint(), (0, Some(0)));
+        assert_eq!(iter.len(), 0);
+    }
+
+    #[test]
+    fn test_tracestate_iter_single() {
+        let ts = TraceState::from_key_value(vec![("foo", "bar")]).unwrap();
+        let mut iter = ts.into_iter();
+        assert_eq!(iter.next(), Some(("foo", "bar")));
+        assert_eq!(iter.next(), None);
+        assert_eq!(iter.size_hint(), (0, Some(0)));
+    }
+
+    #[test]
+    fn test_tracestate_iter_multiple() {
+        let ts = TraceState::from_key_value(vec![("foo", "bar"), ("apple", "banana")]).unwrap();
+        let mut iter = ts.into_iter();
+        assert_eq!(iter.next(), Some(("foo", "bar")));
+        assert_eq!(iter.next(), Some(("apple", "banana")));
+        assert_eq!(iter.next(), None);
+    }
+
+    #[test]
+    fn test_tracestate_iter_size_hint_and_len() {
+        let ts = TraceState::from_key_value(vec![("foo", "bar"), ("apple", "banana")]).unwrap();
+        let iter = ts.into_iter();
+        assert_eq!(iter.size_hint(), (2, Some(2)));
+        assert_eq!(iter.len(), 2);
+    }
 }