Skip to content

Commit

Permalink
Install logger provider (#1164)
Browse files Browse the repository at this point in the history
  • Loading branch information
pkoenig10 authored Jul 27, 2023
1 parent ccb510f commit fb14199
Showing 1 changed file with 21 additions and 12 deletions.
33 changes: 21 additions & 12 deletions opentelemetry-otlp/src/logs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ use std::{
time::Duration,
};

use opentelemetry_api::logs::{LogError, LoggerProvider};
use opentelemetry_api::{
global,
logs::{LogError, LoggerProvider},
};
use opentelemetry_sdk::{self, export::logs::LogData, logs::BatchMessage, runtime::RuntimeChannel};

impl OtlpPipeline {
Expand Down Expand Up @@ -419,11 +422,12 @@ impl OtlpLogPipeline {
self
}

/// Returns a [`Logger`] with the name `opentelemetry-otlp` and the
/// current crate version, using the configured log exporter.
/// Install the configured log exporter.
///
/// Returns a [`Logger`] with the name `opentelemetry-otlp` and the current crate version.
///
/// [`Logger`]: opentelemetry_sdk::logs::Logger
pub fn simple(self) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
pub fn install_simple(self) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
Ok(build_simple_with_exporter(
self.exporter_builder
.ok_or(crate::Error::NoExporterBuilder)?
Expand All @@ -432,12 +436,13 @@ impl OtlpLogPipeline {
))
}

/// Returns a [`Logger`] with the name `opentelemetry-otlp` and the
/// current crate version, using the configured log exporter and a
/// batch log processor.
/// Install the configured log exporter and a batch span processor using the
/// specified runtime.
///
/// Returns a [`Logger`] with the name `opentelemetry-otlp` and the current crate version.
///
/// [`Logger`]: opentelemetry_sdk::logs::Logger
pub fn batch<R: RuntimeChannel<BatchMessage>>(
pub fn install_batch<R: RuntimeChannel<BatchMessage>>(
self,
runtime: R,
) -> Result<opentelemetry_sdk::logs::Logger, LogError> {
Expand All @@ -461,12 +466,14 @@ fn build_simple_with_exporter(
provider_builder = provider_builder.with_config(config);
}
let provider = provider_builder.build();
provider.versioned_logger(
let logger = provider.versioned_logger(
Cow::Borrowed("opentelemetry-otlp"),
Some(Cow::Borrowed(env!("CARGO_PKG_VERSION"))),
None,
None,
)
);
let _ = global::set_logger_provider(provider);
logger
}

fn build_batch_with_exporter<R: RuntimeChannel<BatchMessage>>(
Expand All @@ -480,10 +487,12 @@ fn build_batch_with_exporter<R: RuntimeChannel<BatchMessage>>(
provider_builder = provider_builder.with_config(config);
}
let provider = provider_builder.build();
provider.versioned_logger(
let logger = provider.versioned_logger(
Cow::Borrowed("opentelemetry-otlp"),
Some(Cow::Borrowed("CARGO_PKG_VERSION")),
None,
None,
)
);
let _ = global::set_logger_provider(provider);
logger
}

0 comments on commit fb14199

Please sign in to comment.