Skip to content

Commit dc15b49

Browse files
committed
resource: remove Default fn from pub api
1 parent 9319273 commit dc15b49

File tree

10 files changed

+15
-21
lines changed

10 files changed

+15
-21
lines changed

opentelemetry-proto/src/transform/logs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ mod tests {
252252

253253
#[test]
254254
fn test_group_logs_by_resource_and_scope_single_scope() {
255-
let resource = Resource::default();
255+
let resource = Resource::builder().build();
256256
let (log_record1, instrum_lib1) = create_test_log_data("test-lib", "Log 1");
257257
let (log_record2, instrum_lib2) = create_test_log_data("test-lib", "Log 2");
258258

@@ -273,7 +273,7 @@ mod tests {
273273

274274
#[test]
275275
fn test_group_logs_by_resource_and_scope_multiple_scopes() {
276-
let resource = Resource::default();
276+
let resource = Resource::builder().build();
277277
let (log_record1, instrum_lib1) = create_test_log_data("lib1", "Log 1");
278278
let (log_record2, instrum_lib2) = create_test_log_data("lib2", "Log 2");
279279

opentelemetry-sdk/src/logs/log_emitter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ impl Builder {
221221

222222
/// Create a new provider from this configuration.
223223
pub fn build(self) -> LoggerProvider {
224-
let resource = self.resource.unwrap_or_default();
224+
let resource = self.resource.unwrap_or(Resource::builder().build());
225225

226226
let logger_provider = LoggerProvider {
227227
inner: Arc::new(LoggerProviderInner {

opentelemetry-sdk/src/metrics/meter_provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ impl MeterProviderBuilder {
265265
let meter_provider = SdkMeterProvider {
266266
inner: Arc::new(SdkMeterProviderInner {
267267
pipes: Arc::new(Pipelines::new(
268-
self.resource.unwrap_or_default(),
268+
self.resource.unwrap_or(Resource::builder().build()),
269269
self.readers,
270270
self.views,
271271
)),

opentelemetry-sdk/src/metrics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//! use opentelemetry_sdk::{metrics::SdkMeterProvider, Resource};
1515
//!
1616
//! // Generate SDK configuration, resource, views, etc
17-
//! let resource = Resource::default(); // default attributes about the current process
17+
//! let resource = Resource::builder().build(); // default attributes about the current process
1818
//!
1919
//! // Create a meter provider with the desired config
2020
//! let meter_provider = SdkMeterProvider::builder().with_resource(resource).build();

opentelemetry-sdk/src/resource/mod.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@ pub struct Resource {
5151
inner: Arc<ResourceInner>,
5252
}
5353

54-
impl Default for Resource {
55-
fn default() -> Self {
56-
Self::from_detectors(vec![
57-
Box::new(SdkProvidedResourceDetector),
58-
Box::new(TelemetryResourceDetector),
59-
Box::new(EnvResourceDetector::new()),
60-
])
61-
}
62-
}
63-
6454
impl Resource {
6555
/// Creates a [ResourceBuilder] Starting from [Resource::default()] that allows you to configure multiple aspects of the Resource.
6656
///
@@ -70,7 +60,11 @@ impl Resource {
7060
/// - [EnvResourceDetector]
7161
pub fn builder() -> ResourceBuilder {
7262
ResourceBuilder {
73-
resource: Resource::default(),
63+
resource: Self::from_detectors(vec![
64+
Box::new(SdkProvidedResourceDetector),
65+
Box::new(TelemetryResourceDetector),
66+
Box::new(EnvResourceDetector::new()),
67+
]),
7468
}
7569
}
7670

opentelemetry-sdk/src/testing/logs/in_memory_exporter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl InMemoryLogExporterBuilder {
121121
pub fn build(&self) -> InMemoryLogExporter {
122122
InMemoryLogExporter {
123123
logs: Arc::new(Mutex::new(Vec::new())),
124-
resource: Arc::new(Mutex::new(Resource::default())),
124+
resource: Arc::new(Mutex::new(Resource::builder().build())),
125125
should_reset_on_shutdown: self.reset_on_shutdown,
126126
}
127127
}

opentelemetry-sdk/src/testing/trace/in_memory_exporter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl InMemorySpanExporterBuilder {
8787
pub fn build(&self) -> InMemorySpanExporter {
8888
InMemorySpanExporter {
8989
spans: Arc::new(Mutex::new(Vec::new())),
90-
resource: Arc::new(Mutex::new(Resource::default())),
90+
resource: Arc::new(Mutex::new(Resource::builder().build())),
9191
}
9292
}
9393
}

opentelemetry-sdk/src/trace/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl Default for Config {
131131
sampler: Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn))),
132132
id_generator: Box::<RandomIdGenerator>::default(),
133133
span_limits: SpanLimits::default(),
134-
resource: Cow::Owned(Resource::default()),
134+
resource: Cow::Owned(Resource::builder().build()),
135135
};
136136

137137
if let Some(max_attributes_per_span) = env::var("OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT")

opentelemetry-stdout/src/logs/exporter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub struct LogExporter {
1717
impl Default for LogExporter {
1818
fn default() -> Self {
1919
LogExporter {
20-
resource: Resource::default(),
20+
resource: Resource::builder().build(),
2121
is_shutdown: atomic::AtomicBool::new(false),
2222
resource_emitted: atomic::AtomicBool::new(false),
2323
}

opentelemetry-stdout/src/trace/exporter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl fmt::Debug for SpanExporter {
2323
impl Default for SpanExporter {
2424
fn default() -> Self {
2525
SpanExporter {
26-
resource: Resource::default(),
26+
resource: Resource::builder().build(),
2727
is_shutdown: atomic::AtomicBool::new(false),
2828
resource_emitted: false,
2929
}

0 commit comments

Comments
 (0)