Merge branch 'main' into feature/internal-logs

Author: houseme

opentelemetry-http/src/lib.rs

@@ -22,6 +22,11 @@ impl Injector for HeaderInjector<'_> {
             }
         }
     }
+
+    /// Reserves capacity for at least `additional` more entries to be inserted.
+    fn reserve(&mut self, additional: usize) {
+        self.0.reserve(additional);
+    }
 }
 
 /// Helper for extracting headers from HTTP Requests. This is used for OpenTelemetry context
@@ -303,4 +308,52 @@ mod tests {
         assert!(got.contains(&"headername1"));
         assert!(got.contains(&"headername2"));
     }
+
+    #[test]
+    fn http_headers_reserve() {
+        let mut carrier = http::HeaderMap::new();
+
+        // Test that reserve doesn't panic and works correctly
+        {
+            let mut injector = HeaderInjector(&mut carrier);
+            injector.reserve(10);
+
+            // Verify the HeaderMap still works after reserve
+            injector.set("test-header", "test-value".to_string());
+        }
+        assert_eq!(
+            HeaderExtractor(&carrier).get("test-header"),
+            Some("test-value")
+        );
+
+        // Test reserve with zero capacity
+        {
+            let mut injector = HeaderInjector(&mut carrier);
+            injector.reserve(0);
+            injector.set("another-header", "another-value".to_string());
+        }
+        assert_eq!(
+            HeaderExtractor(&carrier).get("another-header"),
+            Some("another-value")
+        );
+
+        // Test that capacity is actually reserved (at least the requested amount)
+        let mut new_carrier = http::HeaderMap::new();
+        {
+            let mut new_injector = HeaderInjector(&mut new_carrier);
+            new_injector.reserve(5);
+        }
+        let initial_capacity = new_carrier.capacity();
+
+        // Add some headers and verify capacity doesn't decrease
+        {
+            let mut new_injector = HeaderInjector(&mut new_carrier);
+            for i in 0..3 {
+                new_injector.set(&format!("header-{}", i), format!("value-{}", i));
+            }
+        }
+
+        assert!(new_carrier.capacity() >= initial_capacity);
+        assert!(new_carrier.capacity() >= 5);
+    }
 }

opentelemetry/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Add `reserve` method to `opentelemetry::propagation::Injector` to hint at the number of elements that will be added to avoid multiple resize operations of the underlying data structure. Has an empty default implementation.
+
 ## v0.31.0
 
 Released 2025-Sep-25

opentelemetry/src/common.rs

@@ -81,8 +81,8 @@ impl fmt::Debug for Key {
 impl From<Key> for String {
     fn from(key: Key) -> Self {
         match key.0 {
-            OtelString::Owned(s) => s.to_string(),
-            OtelString::Static(s) => s.to_string(),
+            OtelString::Owned(s) => s.into_string(),
+            OtelString::Static(s) => s.to_owned(),
             OtelString::RefCounted(s) => s.to_string(),
         }
     }
@@ -268,8 +268,8 @@ impl StringValue {
 impl From<StringValue> for String {
     fn from(s: StringValue) -> Self {
         match s.0 {
-            OtelString::Owned(s) => s.to_string(),
-            OtelString::Static(s) => s.to_string(),
+            OtelString::Owned(s) => s.into_string(),
+            OtelString::Static(s) => s.to_owned(),
             OtelString::RefCounted(s) => s.to_string(),
         }
     }

opentelemetry/src/metrics/mod.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 mod instruments;
 mod meter;
-pub(crate) mod noop;
+pub mod noop;
 pub use instruments::{
     counter::{Counter, ObservableCounter},
     gauge::{Gauge, ObservableGauge},
@@ -14,6 +14,7 @@ pub use instruments::{
     SyncInstrument,
 };
 pub use meter::{Meter, MeterProvider};
+pub use noop::NoopMeterProvider;
 
 /// SDK implemented trait for creating instruments
 pub trait InstrumentProvider {

opentelemetry/src/metrics/noop.rs

@@ -13,13 +13,13 @@ use super::instruments::SyncInstrument;
 
 /// A no-op instance of a `MetricProvider`
 #[derive(Debug, Default)]
-pub(crate) struct NoopMeterProvider {
+pub struct NoopMeterProvider {
     _private: (),
 }
 
 impl NoopMeterProvider {
     /// Create a new no-op meter provider.
-    pub(crate) fn new() -> Self {
+    pub fn new() -> Self {
         NoopMeterProvider { _private: () }
     }
 }

opentelemetry/src/propagation/mod.rs

@@ -31,6 +31,10 @@ pub use text_map_propagator::TextMapPropagator;
 pub trait Injector {
     /// Add a key and value to the underlying data.
     fn set(&mut self, key: &str, value: String);
+
+    #[allow(unused_variables)]
+    /// Hint to reserve capacity for at least `additional` more entries to be inserted.
+    fn reserve(&mut self, additional: usize) {}
 }
 
 /// Extractor provides an interface for removing fields from an underlying struct like `HashMap`
@@ -52,6 +56,11 @@ impl<S: std::hash::BuildHasher> Injector for HashMap<String, String, S> {
     fn set(&mut self, key: &str, value: String) {
         self.insert(key.to_lowercase(), value);
     }
+
+    /// Reserves capacity for at least `additional` more entries to be inserted.
+    fn reserve(&mut self, additional: usize) {
+        self.reserve(additional);
+    }
 }
 
 impl<S: std::hash::BuildHasher> Extractor for HashMap<String, String, S> {
@@ -117,4 +126,53 @@ mod tests {
         assert!(got.contains(&"headername1"));
         assert!(got.contains(&"headername2"));
     }
+
+    #[test]
+    fn hash_map_injector_reserve() {
+        let mut carrier = HashMap::new();
+
+        // Test that reserve doesn't panic and works correctly
+        Injector::reserve(&mut carrier, 10);
+
+        // Verify the HashMap still works after reserve
+        Injector::set(&mut carrier, "test_key", "test_value".to_string());
+        assert_eq!(Extractor::get(&carrier, "test_key"), Some("test_value"));
+
+        // Test reserve with zero capacity
+        Injector::reserve(&mut carrier, 0);
+        Injector::set(&mut carrier, "another_key", "another_value".to_string());
+        assert_eq!(
+            Extractor::get(&carrier, "another_key"),
+            Some("another_value")
+        );
+
+        // Test that capacity is actually reserved (at least the requested amount)
+        let mut new_carrier = HashMap::new();
+        Injector::reserve(&mut new_carrier, 5);
+        let initial_capacity = new_carrier.capacity();
+
+        // Add some elements and verify capacity doesn't decrease
+        for i in 0..3 {
+            Injector::set(
+                &mut new_carrier,
+                &format!("key{}", i),
+                format!("value{}", i),
+            );
+        }
+
+        assert!(new_carrier.capacity() >= initial_capacity);
+        assert!(new_carrier.capacity() >= 5);
+    }
+
+    #[test]
+    fn injector_reserve() {
+        // Test to have full line coverage of default method
+        struct TestInjector();
+        impl Injector for TestInjector {
+            fn set(&mut self, _key: &str, _value: String) {}
+        }
+        let mut test_injector = TestInjector();
+        Injector::reserve(&mut test_injector, 4711);
+        Injector::set(&mut test_injector, "key", "value".to_string());
+    }
 }