Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Arc to store reference to LoggerProvider from Logger #1446

Closed
wants to merge 3 commits into from
Closed

Use Arc to store reference to LoggerProvider from Logger #1446

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bc0ef1
Use Arc to store reference to LoggerProvider from Logger
bIgBV Dec 18, 2023
2cb8ed2
Merge branch 'bvoleti/use-arc-in-tracer' of github.com:bIgBV/opentele…
bIgBV Dec 30, 2023
2ff86bd
Merge branch 'open-telemetry:main' into bvoleti/use-arc-in-tracer
bIgBV Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions opentelemetry-sdk/src/logs/log_emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ use opentelemetry::{
#[cfg(feature = "logs_level_enabled")]
use opentelemetry::logs::Severity;

use std::{
borrow::Cow,
sync::{Arc, Weak},
};
use std::{borrow::Cow, sync::Arc};

#[derive(Debug, Clone)]
/// Creator for `Logger` instances.
Expand Down Expand Up @@ -55,7 +52,7 @@ impl opentelemetry::logs::LoggerProvider for LoggerProvider {
}

fn library_logger(&self, library: Arc<InstrumentationLibrary>) -> Self::Logger {
Logger::new(library, Arc::downgrade(&self.inner))
Logger::new(library, Arc::clone(&self.inner))
}
}

Expand Down Expand Up @@ -179,13 +176,13 @@ impl Builder {
/// [`LogRecord`]: opentelemetry::logs::LogRecord
pub struct Logger {
instrumentation_lib: Arc<InstrumentationLibrary>,
provider: Weak<LoggerProviderInner>,
provider: Arc<LoggerProviderInner>,
}

impl Logger {
pub(crate) fn new(
instrumentation_lib: Arc<InstrumentationLibrary>,
provider: Weak<LoggerProviderInner>,
provider: Arc<LoggerProviderInner>,
) -> Self {
Logger {
instrumentation_lib,
Expand All @@ -195,7 +192,7 @@ impl Logger {

/// LoggerProvider associated with this logger.
pub fn provider(&self) -> Option<LoggerProvider> {
self.provider.upgrade().map(LoggerProvider::new)
Some(LoggerProvider::new(Arc::clone(&self.provider)))
}

/// Instrumentation library information of this logger.
Expand Down