Merge branch 'main' into cijothomas/updatereadme-context

Author: cijothomas

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -28,7 +28,7 @@ body:
   - type: textarea
     id: sdk-version
     attributes:
-      label: label: OpenTelemetry SDK Version (i.e version of `opentelemetry_sdk` crate)
+      label: OpenTelemetry SDK Version (i.e version of `opentelemetry_sdk` crate)
       description: What version of the `opentelemetry_sdk` crate are you using?
       placeholder: 0.x, 1.x, etc.
     validations:

opentelemetry-appender-log/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## vNext
 
+- Similar to the `opentelemetry-appender-tracing` fix [2658](https://github.com/open-telemetry/opentelemetry-rust/issues/2658)
+  InstrumentationScope(Logger) used by the appender now uses an empty ("") named Logger.
+  Previously, a Logger with name and version of the crate was used.
+  Receivers (processors, exporters) are expected to use `LogRecord.target()` as scope name.
+  This is already done in OTLP Exporters, so this change should be transparent to most users.
+
 ## 0.28.0
 
 Released 2025-Feb-10

opentelemetry-appender-log/src/lib.rs

@@ -113,7 +113,7 @@
 use log::{Level, Metadata, Record};
 use opentelemetry::{
     logs::{AnyValue, LogRecord, Logger, LoggerProvider, Severity},
-    InstrumentationScope, Key,
+    Key,
 };
 #[cfg(feature = "experimental_metadata_attributes")]
 use opentelemetry_semantic_conventions::attribute::{
@@ -189,12 +189,13 @@ where
     L: Logger + Send + Sync,
 {
     pub fn new(provider: &P) -> Self {
-        let scope = InstrumentationScope::builder("opentelemetry-log-appender")
-            .with_version(env!("CARGO_PKG_VERSION"))
-            .build();
-
-        OpenTelemetryLogBridge {
-            logger: provider.logger_with_scope(scope),
+        Self {
+            // Using empty scope name.
+            // The name/version of this library itself can be added
+            // as a Scope attribute once a semantic convention is
+            // defined for the same.
+            // See https://github.com/open-telemetry/semantic-conventions/issues/1550
+            logger: provider.logger(""),
             _phantom: Default::default(),
         }
     }
@@ -985,9 +986,13 @@ mod tests {
         );
 
         let logs = exporter.get_emitted_logs().unwrap();
+        assert_eq!(logs.len(), 1);
+
+        let log = logs.first().unwrap();
+        assert_eq!(log.instrumentation.name(), "");
 
         let get = |needle: &str| -> Option<AnyValue> {
-            logs[0].record.attributes_iter().find_map(|(k, v)| {
+            log.record.attributes_iter().find_map(|(k, v)| {
                 if k.as_str() == needle {
                     Some(v.clone())
                 } else {
@@ -1197,9 +1202,13 @@ mod tests {
         );
 
         let logs = exporter.get_emitted_logs().unwrap();
+        assert_eq!(logs.len(), 1);
+
+        let log = logs.first().unwrap();
+        assert_eq!(log.instrumentation.name(), "");
 
         let get = |needle: &str| -> Option<AnyValue> {
-            logs[0].record.attributes_iter().find_map(|(k, v)| {
+            log.record.attributes_iter().find_map(|(k, v)| {
                 if k.as_str() == needle {
                     Some(v.clone())
                 } else {

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

@@ -24,7 +24,7 @@
 //! let meter = global::meter("mylibraryname");
 //! let histogram = meter
 //!     .u64_histogram(semconv::metric::HTTP_SERVER_REQUEST_DURATION)
-//!     .with_unit("By")
+//!     .with_unit("s")
 //!     .with_description("Duration of HTTP server requests.")
 //!     .build();
 //! ```
@@ -76,4 +76,4 @@
 pub const {{ metric.metric_name | screaming_snake_case }}: &str = "{{ metric.metric_name }}";
 
     {% endfor %}
-{% endfor %}
+{% endfor %}

opentelemetry-semantic-conventions/src/metric.rs

@@ -23,7 +23,7 @@
 //! let meter = global::meter("mylibraryname");
 //! let histogram = meter
 //!     .u64_histogram(semconv::metric::HTTP_SERVER_REQUEST_DURATION)
-//!     .with_unit("By")
+//!     .with_unit("s")
 //!     .with_description("Duration of HTTP server requests.")
 //!     .build();
 //! ```