Merge branch 'main' into cijothomas/fix-nits

Author: cijothomas

opentelemetry-prometheus/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## vNext
 
+## v0.29.0
+
+- Update `opentelemetry` dependency version to 0.29
+- Update `opentelemetry_sdk` dependency version to 0.29
+- Update `opentelemetry-semantic-conventions` dependency version to 0.29
+
 ## v0.28.0
 
 - Update `opentelemetry` dependency version to 0.28

opentelemetry-prometheus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opentelemetry-prometheus"
-version = "0.28.0"
+version = "0.29.0"
 description = "Prometheus exporter for OpenTelemetry"
 homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-prometheus"
 repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-prometheus"
@@ -21,14 +21,14 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 once_cell = { version = "1.13" }
-opentelemetry = { version = "0.28", default-features = false, features = ["metrics"] }
-opentelemetry_sdk = { version = "0.28", default-features = false, features = ["metrics"] }
+opentelemetry = { version = "0.29", default-features = false, features = ["metrics"] }
+opentelemetry_sdk = { version = "0.29", default-features = false, features = ["metrics"] }
 prometheus = "0.13"
 protobuf = "2.14"
-tracing = {version = ">=0.1.40", default-features = false, optional = true} # optional for opentelemetry internal logging
+tracing = { version = ">=0.1.40", default-features = false, optional = true } # optional for opentelemetry internal logging
 
 [dev-dependencies]
-opentelemetry-semantic-conventions = { version = "0.28" }
+opentelemetry-semantic-conventions = { version = "0.29" }
 http-body-util = { version = "0.1" }
 hyper = { version = "1.3", features = ["full"] }
 hyper-util = { version = "0.1", features = ["full"] }

opentelemetry-sdk/CHANGELOG.md

@@ -76,8 +76,7 @@ Released 2025-Mar-21
  intended to be public. If you are authoring custom processor/exporters, use
  `opentelemetry_sdk::error::OTelSdkError` and
  `opentelemetry_sdk::error::OTelSdkResult`.
- // PLACEHOLDER to fill in when the similar change is done for traces, metrics.
- // PLACEHOLDER to put all the PR links together.
+  [2790](https://github.com/open-telemetry/opentelemetry-rust/pull/2790)
 - **Breaking** for custom `LogProcessor` authors: Changed `set_resource`
   to require mutable ref.
   `fn set_resource(&mut self, _resource: &Resource) {}`

opentelemetry/src/common.rs

@@ -482,9 +482,10 @@ impl PartialEq for InstrumentationScope {
         self.name == other.name
             && self.version == other.version
             && self.schema_url == other.schema_url
+            && self.attributes.len() == other.attributes.len()
             && {
-                let mut self_attrs = self.attributes.clone();
-                let mut other_attrs = other.attributes.clone();
+                let mut self_attrs = Vec::from_iter(&self.attributes);
+                let mut other_attrs = Vec::from_iter(&other.attributes);
                 self_attrs.sort_unstable_by(|a, b| a.key.cmp(&b.key));
                 other_attrs.sort_unstable_by(|a, b| a.key.cmp(&b.key));
                 self_attrs == other_attrs
@@ -499,7 +500,7 @@ impl hash::Hash for InstrumentationScope {
         self.name.hash(state);
         self.version.hash(state);
         self.schema_url.hash(state);
-        let mut sorted_attrs = self.attributes.clone();
+        let mut sorted_attrs = Vec::from_iter(&self.attributes);
         sorted_attrs.sort_unstable_by(|a, b| a.key.cmp(&b.key));
         for attribute in sorted_attrs {
             attribute.hash(state);

opentelemetry/src/propagation/composite.rs

@@ -77,9 +77,7 @@ impl TextMapCompositePropagator {
     pub fn new(propagators: Vec<Box<dyn TextMapPropagator + Send + Sync>>) -> Self {
         let mut fields = HashSet::new();
         for propagator in &propagators {
-            for field in propagator.fields() {
-                fields.insert(field.to_string());
-            }
+            fields.extend(propagator.fields().map(ToString::to_string));
         }
 
         TextMapCompositePropagator {

opentelemetry/src/trace/span_context.rs

@@ -134,7 +134,7 @@ impl TraceState {
             return Err(TraceStateError::Value(value));
         }
 
-        let mut trace_state = self.delete_from_deque(key.clone());
+        let mut trace_state = self.delete_from_deque(&key);
         let kvs = trace_state.0.get_or_insert(VecDeque::with_capacity(1));
 
         kvs.push_front((key, value));
@@ -155,14 +155,14 @@ impl TraceState {
             return Err(TraceStateError::Key(key));
         }
 
-        Ok(self.delete_from_deque(key))
+        Ok(self.delete_from_deque(&key))
     }
 
     /// Delete key from trace state's deque. The key MUST be valid
-    fn delete_from_deque(&self, key: String) -> TraceState {
+    fn delete_from_deque(&self, key: &str) -> TraceState {
         let mut owned = self.clone();
         if let Some(kvs) = owned.0.as_mut() {
-            if let Some(index) = kvs.iter().position(|x| *x.0 == *key) {
+            if let Some(index) = kvs.iter().position(|x| x.0 == key) {
                 kvs.remove(index);
             }
         }