Merge branch 'main' into remove-logdata

Author: lalitb

examples/logs-basic/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 opentelemetry = { path = "../../opentelemetry", features = ["logs"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]}
-opentelemetry-appender-log = { path = "../../opentelemetry-appender-log", default-features = false}
+opentelemetry-appender-tracing = { path = "../../opentelemetry-appender-tracing", default-features = false}
 opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
-log = { workspace = true }
-serde_json = { workspace = true }
+tracing = { workspace = true, features = ["std"]}
+tracing-subscriber = { workspace = true, features = ["registry", "std"] }

examples/logs-basic/README.md

@@ -1,15 +1,15 @@
-# OpenTelemetry Log Appender for log -  Example
+# OpenTelemetry Log Appender for tracing -  Example
 
-This example shows how to use the opentelemetry-appender-log crate, which is a
+This example shows how to use the opentelemetry-appender-tracing crate, which is a
 [logging
 appender](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/glossary.md#log-appender--bridge)
-that bridges logs from the [log crate](https://docs.rs/log/latest/log/) to
+that bridges logs from the [tracing crate](https://tracing.rs/tracing/#events) to
 OpenTelemetry. The example setups a LoggerProvider with stdout exporter, so logs
 are emitted to stdout.
 
 ## Usage
 
-Run the following, and Logs emitted using [log](https://docs.rs/log/latest/log/)
+Run the following, and Logs emitted using [tracing](https://docs.rs/tracing/latest/tracing/)
 will be written out to stdout.
 
 ```shell

examples/logs-basic/src/main.rs

@@ -1,27 +1,22 @@
-use log::{error, Level};
 use opentelemetry::KeyValue;
-use opentelemetry_appender_log::OpenTelemetryLogBridge;
+use opentelemetry_appender_tracing::layer;
 use opentelemetry_sdk::logs::LoggerProvider;
 use opentelemetry_sdk::Resource;
-use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
+use tracing::error;
+use tracing_subscriber::prelude::*;
 
 fn main() {
-    // Setup LoggerProvider with a stdout exporter
     let exporter = opentelemetry_stdout::LogExporter::default();
-    let logger_provider = LoggerProvider::builder()
-        .with_resource(Resource::new([KeyValue::new(
-            SERVICE_NAME,
-            "logs-basic-example",
+    let provider: LoggerProvider = LoggerProvider::builder()
+        .with_resource(Resource::new(vec![KeyValue::new(
+            "service.name",
+            "log-appender-tracing-example",
         )]))
         .with_simple_exporter(exporter)
         .build();
+    let layer = layer::OpenTelemetryTracingBridge::new(&provider);
+    tracing_subscriber::registry().with(layer).init();
 
-    // Setup Log Appender for the log crate.
-    let otel_log_appender = OpenTelemetryLogBridge::new(&logger_provider);
-    log::set_boxed_logger(Box::new(otel_log_appender)).unwrap();
-    log::set_max_level(Level::Error.to_level_filter());
-
-    // Emit logs using macros from the log crate.
-    // These logs gets piped through OpenTelemetry bridge and gets exported to stdout.
-    error!(target: "my-target", "hello from {}. My price is {}", "apple", 2.99);
+    error!(name: "my-event-name", target: "my-system", event_id = 20, user_name = "otel", user_email = "[email protected]", message = "This is an example message");
+    let _ = provider.shutdown();
 }

opentelemetry-sdk/CHANGELOG.md

@@ -22,6 +22,12 @@
   - logs::LogData - Previously deprecated in version 0.27.1
   Migration Guidance: This structure is no longer utilized within the SDK, and users should not have dependencies on it.
 
+- *Breaking* Removed the following deprecated methods:
+  - `Logger::provider()` : Previously deprecated in version 0.27.1
+  - `Logger::instrumentation_scope()` : Previously deprecated in version 0.27.1.
+     Migration Guidance: 
+        - These methods were intended for log appenders. Keep the clone of the provider handle, instead of depending on above methods.
+
 ## 0.27.1
 
 Released 2024-Nov-27

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -257,21 +257,8 @@ impl Logger {
         Logger { scope, provider }
     }
 
-    #[deprecated(
-        since = "0.27.1",
-        note = "This method was intended for appender developers, but has no defined use-case in typical workflows. It is deprecated and will be removed in the next major release."
-    )]
-    /// LoggerProvider associated with this logger.
-    pub fn provider(&self) -> &LoggerProvider {
-        &self.provider
-    }
-
-    #[deprecated(
-        since = "0.27.1",
-        note = "This method was intended for appender developers, but has no defined use-case in typical workflows. It is deprecated and will be removed in the next major release."
-    )]
-    /// Instrumentation scope of this logger.
-    pub fn instrumentation_scope(&self) -> &InstrumentationScope {
+    #[cfg(test)]
+    pub(crate) fn instrumentation_scope(&self) -> &InstrumentationScope {
         &self.scope
     }
 }

opentelemetry-semantic-conventions/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Update to [v1.29.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.29.0) of the semantic conventions.
+- Update to [v0.11.0](https://github.com/open-telemetry/weaver/releases/tag/v0.11.0) of the semantic conventions.
+
 ## 0.27.0
 
 Released 2024-Nov-11

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.28.0
-WEAVER_VERSION=v0.10.0
+SPEC_VERSION=1.29.0
+WEAVER_VERSION=v0.11.0
 
 cd "$CRATE_DIR"
 

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

@@ -11,7 +11,9 @@
 
 {% for root_ns in ctx %}
     {% for attr in root_ns.attributes | rejectattr("name", "in", params.excluded_attributes) %}
-{{ [attr.brief, concat_if("\n\n## Notes\n\n", attr.note), attr_macros.examples(attr)] | comment }}
+{# Escape any `<...>` tags to `[...]` to avoid Rustdoc warnings and HTML parsing issues. #}
+{% set safe_note = attr.note | replace('<', '[') | replace('>', ']') %}
+{{ [attr.brief, concat_if("\n\n## Notes\n\n", safe_note), attr_macros.examples(attr)] | comment }}
         {% if attr is experimental %}
 #[cfg(feature = "semconv_experimental")]
         {% endif %}

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.28.0"
+  schema_url: "https://opentelemetry.io/schemas/1.29.0"
   exclude_root_namespace: []
   excluded_attributes: ["messaging.client_id"]