Merge branch 'main' into re-export-tonic

Author: lalitb

opentelemetry-appender-log/src/lib.rs

@@ -117,7 +117,7 @@ use opentelemetry::{
 };
 #[cfg(feature = "experimental_metadata_attributes")]
 use opentelemetry_semantic_conventions::attribute::{
-    CODE_FILEPATH, CODE_LINE_NUMBER, CODE_NAMESPACE,
+    CODE_FILE_PATH, CODE_FUNCTION_NAME, CODE_LINE_NUMBER,
 };
 
 pub struct OpenTelemetryLogBridge<P, L>
@@ -156,7 +156,7 @@ where
             {
                 if let Some(filepath) = record.file() {
                     log_record.add_attribute(
-                        Key::new(CODE_FILEPATH),
+                        Key::new(CODE_FILE_PATH),
                         AnyValue::from(filepath.to_string()),
                     );
                 }
@@ -167,7 +167,7 @@ where
 
                 if let Some(module) = record.module_path() {
                     log_record.add_attribute(
-                        Key::new(CODE_NAMESPACE),
+                        Key::new(CODE_FUNCTION_NAME),
                         AnyValue::from(module.to_string()),
                     );
                 }
@@ -1180,7 +1180,7 @@ mod tests {
     #[test]
     fn logbridge_code_attributes() {
         use opentelemetry_semantic_conventions::attribute::{
-            CODE_FILEPATH, CODE_LINE_NUMBER, CODE_NAMESPACE,
+            CODE_FILE_PATH, CODE_FUNCTION_NAME, CODE_LINE_NUMBER,
         };
 
         let exporter = InMemoryLogExporter::default();
@@ -1219,11 +1219,11 @@ mod tests {
 
         assert_eq!(
             Some(AnyValue::String(StringValue::from("src/main.rs"))),
-            get(CODE_FILEPATH)
+            get(CODE_FILE_PATH)
         );
         assert_eq!(
             Some(AnyValue::String(StringValue::from("service"))),
-            get(CODE_NAMESPACE)
+            get(CODE_FUNCTION_NAME)
         );
         assert_eq!(Some(AnyValue::Int(101)), get(CODE_LINE_NUMBER));
     }

opentelemetry-semantic-conventions/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Update to [v1.32.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.32.0) of the semantic conventions.
+
 ## 0.29.0
 
 Released 2025-Mar-21

opentelemetry-semantic-conventions/scripts/generate-consts-from-spec.sh

@@ -5,8 +5,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CRATE_DIR="${SCRIPT_DIR}/../"
 
 # freeze the spec version and generator version to make generation reproducible
-SPEC_VERSION=1.31.0
-WEAVER_VERSION=v0.13.0
+SPEC_VERSION=1.32.0
+WEAVER_VERSION=v0.13.2
 
 cd "$CRATE_DIR"
 

opentelemetry-semantic-conventions/scripts/templates/registry/rust/attribute.rs.j2

@@ -18,7 +18,7 @@
 #[cfg(feature = "semconv_experimental")]
         {% endif %}
         {% if attr is deprecated %}
-#[deprecated(note="{{ attr.deprecated.strip(" \n\"") }}")]
+#[deprecated(note="{{ attr.deprecated | replace('\n', ' ') | replace('"', '') | trim }}")]
         {% endif %}
 pub const {{ attr.name | screaming_snake_case }}: &str = "{{ attr.name }}";
 

opentelemetry-semantic-conventions/scripts/templates/registry/rust/metric.rs.j2

@@ -71,7 +71,7 @@
 #[cfg(feature = "semconv_experimental")]
         {% endif %}
         {% if metric is deprecated %}
-#[deprecated(note="{{ metric.deprecated.strip(" \n\"") }}")]
+#[deprecated(note="{{ metric.deprecated | replace('"', '') | replace('\n', ' ') | trim }}")]
         {% endif %}
 pub const {{ metric.metric_name | screaming_snake_case }}: &str = "{{ metric.metric_name }}";
 

opentelemetry-semantic-conventions/scripts/templates/registry/rust/weaver.yaml

@@ -14,7 +14,7 @@ comment_formats:
 default_comment_format: rust
 
 params:
-  schema_url: "https://opentelemetry.io/schemas/1.31.0"
+  schema_url: "https://opentelemetry.io/schemas/1.32.0"
   exclude_root_namespace: []
   excluded_attributes: ["messaging.client_id"]