Skip to content

Commit b3879b6

Browse files
authored
Minor fixes, stdout to print scope info for logs (#2563)
1 parent 879f4d7 commit b3879b6

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

.cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
// workspace dictionary.
2727
"words": [
2828
"actix",
29+
"anyvalue",
2930
"appender",
3031
"appenders",
3132
"Bhasin",

opentelemetry-stdout/src/logs/exporter.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {
7575
fn print_logs(batch: LogBatch<'_>) {
7676
for (i, log) in batch.iter().enumerate() {
7777
println!("Log #{}", i);
78-
let (record, _library) = log;
78+
let (record, library) = log;
79+
80+
println!("\t Instrumentation Scope: {:?}", library);
81+
7982
if let Some(event_name) = record.event_name() {
8083
println!("\t EventName: {:?}", event_name);
8184
}

opentelemetry/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ js-sys = "0.3.63"
3434
default = ["trace", "metrics", "logs", "internal-logs"]
3535
trace = ["pin-project-lite", "futures-sink", "futures-core", "thiserror"]
3636
metrics = []
37-
testing = ["trace", "metrics"]
37+
testing = ["trace"]
3838
logs = []
3939
spec_unstable_logs_enabled = ["logs"]
40-
otel_unstable = []
4140
internal-logs = ["tracing"]
4241

4342
[dev-dependencies]

opentelemetry/src/global/internal_logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(unused_macros)]
22
///
33
/// **Note**: These macros (`otel_info!`, `otel_warn!`, `otel_debug!`, and `otel_error!`) are intended to be used
4-
/// **internally within OpenTelemetry code** or for **custom exporters and processors**. They are not designed
4+
/// **internally within OpenTelemetry code** or for **custom exporters, processors and other plugins**. They are not designed
55
/// for general application logging and should not be used for that purpose.
66
///
77
/// Macro for logging informational messages in OpenTelemetry.

opentelemetry/src/global/metrics.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fn global_meter_provider() -> &'static RwLock<GlobalMeterProvider> {
1515

1616
/// Sets the given [`MeterProvider`] instance as the current global meter
1717
/// provider.
18+
/// Libraries should NOT call this function. It is intended for applications/executables.
1819
///
1920
/// **NOTE:** This function should be called before getting [`Meter`] instances via [`meter()`] or [`meter_with_scope()`]. Otherwise, you could get no-op [`Meter`] instances.
2021
pub fn set_meter_provider<P>(new_provider: P)

opentelemetry/src/global/trace.rs

+1
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ pub fn tracer_with_scope(scope: InstrumentationScope) -> BoxedTracer {
422422
/// It returns the [`TracerProvider`] instance that was previously mounted as global provider
423423
/// (e.g. [`NoopTracerProvider`] if a provider had not been set before).
424424
///
425+
/// Libraries should NOT call this function. It is intended for applications/executables.
425426
/// [`TracerProvider`]: crate::trace::TracerProvider
426427
pub fn set_tracer_provider<P, T, S>(new_provider: P) -> GlobalTracerProvider
427428
where

0 commit comments

Comments
 (0)