Skip to content

Commit f79d23b

Browse files
committed
resource: remove merge fn from pub api
1 parent 723feb9 commit f79d23b

File tree

2 files changed

+4
-6
lines changed
  • opentelemetry-sdk/src/resource
  • opentelemetry-stdout/examples

2 files changed

+4
-6
lines changed

opentelemetry-sdk/src/resource/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl Resource {
177177
/// 5. If both resources do not have a schema url, the schema url will be empty.
178178
///
179179
/// [Schema url]: https://github.com/open-telemetry/opentelemetry-specification/blob/v1.9.0/specification/schemas/overview.md#schema-url
180-
pub fn merge<T: Deref<Target = Self>>(&self, other: T) -> Self {
180+
fn merge<T: Deref<Target = Self>>(&self, other: T) -> Self {
181181
if self.is_empty() {
182182
return other.clone();
183183
}

opentelemetry-stdout/examples/basic.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ use opentelemetry_sdk::trace::TracerProvider;
1414
use opentelemetry_sdk::Resource;
1515

1616
static RESOURCE: Lazy<Resource> = Lazy::new(|| {
17-
Resource::default().merge(
18-
&Resource::builder_empty()
19-
.with_service_name("basic-stdout-example")
20-
.build(),
21-
)
17+
Resource::builder()
18+
.with_service_name("basic-stdout-example")
19+
.build()
2220
});
2321

2422
#[cfg(feature = "trace")]

0 commit comments

Comments
 (0)