Tracing appender and user_event exporter minor fixes (#1123)

Author: cijothomas

opentelemetry-appender-tracing/Cargo.toml

@@ -11,12 +11,12 @@ license = "Apache-2.0"
 rust-version = "1.60"
 
 [dependencies]
-opentelemetry_api = { version = "0.19", path = "../opentelemetry-api", features = ["logs"]}
-opentelemetry_sdk = { version = "0.19", path = "../opentelemetry-sdk", features = ["logs"]}
+opentelemetry_api = { version = "0.19", path = "../opentelemetry-api", features = ["logs"] }
+opentelemetry_sdk = { version = "0.19", path = "../opentelemetry-sdk", features = ["logs"] }
 tracing = {version = "0.1.37", default-features = false, features = ["std"]}
 tracing-core = "0.1.31"
 tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std"] }
 once_cell = "1.13.0"
 
 [dev-dependencies]
-opentelemetry-stdout = {path = "../opentelemetry-stdout", features = ["logs"] }
+opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] }

opentelemetry-appender-tracing/src/layer.rs

@@ -27,6 +27,26 @@ impl<'a> tracing::field::Visit for EventVisitor<'a> {
         }
     }
 
+    fn record_f64(&mut self, field: &tracing::field::Field, value: f64) {
+        if let Some(ref mut map) = self.log_record.attributes {
+            map.insert(field.name().into(), value.into());
+        } else {
+            let mut map = OrderMap::with_capacity(1);
+            map.insert(field.name().into(), value.into());
+            self.log_record.attributes = Some(map);
+        }
+    }
+
+    fn record_i64(&mut self, field: &tracing::field::Field, value: i64) {
+        if let Some(ref mut map) = self.log_record.attributes {
+            map.insert(field.name().into(), value.into());
+        } else {
+            let mut map = OrderMap::with_capacity(1);
+            map.insert(field.name().into(), value.into());
+            self.log_record.attributes = Some(map);
+        }
+    }
+
     // TODO: All record functions should be implemented instead of relying
     // of record_debug which stores everything as string.
 }

opentelemetry-user-events-logs/Cargo.toml

@@ -13,12 +13,15 @@ license = "Apache-2.0"
 [dependencies]
 eventheader = "0.2"
 eventheader_dynamic = "0.2"
-opentelemetry_api = { version = "0.19", path = "../opentelemetry-api", features = ["logs"]}
-opentelemetry_sdk = { version = "0.19", path = "../opentelemetry-sdk", features = ["logs"]}
-opentelemetry-appender-log = {path = "../opentelemetry-appender-log"}
-tokio = {version="1.0", optional=true, features=["rt-multi-thread", "rt"]}
-async-std = {version="1.6"}
-async-trait = {version="0.1"}
-chrono = {version="0.4", default-features = false, features=["std"]}
-log =  { version ="0.4.17", features = ["std"]}
+opentelemetry_api = { version = "0.19", path = "../opentelemetry-api", features = ["logs"] }
+opentelemetry_sdk = { version = "0.19", path = "../opentelemetry-sdk", features = ["logs"] }
+async-std = { version="1.6" }
+async-trait = { version="0.1" }
+chrono = { version="0.4", default-features = false, features=["std"] }
+
+[dev-dependencies]
+opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing" }
+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
+tracing-core = "0.1.31"
+tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std"] }
 

opentelemetry-user-events-logs/examples/basic.rs

@@ -1,13 +1,10 @@
 //! run with `$ cargo run --example basic --all-features
 
-use opentelemetry_api::{logs::Logger, logs::LoggerProvider as _, logs::Severity};
-
-use log::info;
+use opentelemetry_appender_tracing::layer;
 use opentelemetry_sdk::logs::LoggerProvider;
-
-use opentelemetry_appender_log::OpenTelemetryLogBridge;
 use opentelemetry_user_events_logs::{ExporterConfig, ReentrantLogProcessor};
-use std::time::SystemTime;
+use tracing::error;
+use tracing_subscriber::prelude::*;
 
 fn init_logger() -> LoggerProvider {
     let exporter_config = ExporterConfig { keyword: 1 };
@@ -18,23 +15,20 @@ fn init_logger() -> LoggerProvider {
 }
 
 fn main() {
-    // Example with log crate appender.
+    // Example with tracing appender.
     let logger_provider = init_logger();
-    let logger = OpenTelemetryLogBridge::new(&logger_provider);
-    let _ = log::set_boxed_logger(Box::new(logger));
-    log::set_max_level(log::LevelFilter::Info);
-    info!("test");
+    let layer = layer::OpenTelemetryTracingBridge::new(&logger_provider);
+    tracing_subscriber::registry().with(layer).init();
 
-    // Example with LogBridge API - this is NOT supposed to be used by end user
-    let logger_provider = init_logger();
-    let logger: opentelemetry_sdk::logs::Logger = logger_provider.logger("test");
-    let log_record = opentelemetry_api::logs::LogRecordBuilder::new()
-        .with_body("test message".into())
-        .with_severity_number(Severity::Debug)
-        .with_attribute("key1", "value1")
-        .with_attribute("event_id", 23)
-        .with_attribute("event_name", "test_event")
-        .with_timestamp(SystemTime::now())
-        .build();
-    logger.emit(log_record);
+    // event_name is now passed as an attribute, but once https://github.com/tokio-rs/tracing/issues/1426
+    // is done, it can be passed with name:"my-event-name", so it'll be available as metadata for
+    // fast filtering.
+    // event_id is also passed as an attribute now, there is nothing in metadata where a
+    // numeric id can be stored.
+    error!(
+        event_name = "my-event-name",
+        event_id = 20,
+        user_name = "otel user",
+        user_email = "[email protected]"
+    );
 }