resource: turn empty fn from pub to crate

Author: pitoniak32

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -24,7 +24,7 @@ fn noop_logger_provider() -> &'static LoggerProvider {
     NOOP_LOGGER_PROVIDER.get_or_init(|| LoggerProvider {
         inner: Arc::new(LoggerProviderInner {
             processors: Vec::new(),
-            resource: Resource::builder_empty().build(),
+            resource: Resource::empty(),
             is_shutdown: AtomicBool::new(true),
         }),
     })
@@ -482,7 +482,7 @@ mod tests {
 
         // If user provided a resource, it takes priority during collision.
         let no_service_name = super::LoggerProvider::builder()
-            .with_resource(Resource::builder_empty().build())
+            .with_resource(Resource::empty())
             .build();
         assert_eq!(no_service_name.resource().len(), 0);
     }
@@ -641,7 +641,7 @@ mod tests {
                     shutdown_called.clone(),
                     flush_called.clone(),
                 ))],
-                resource: Resource::builder_empty().build(),
+                resource: Resource::empty(),
                 is_shutdown: AtomicBool::new(false),
             });
 
@@ -682,7 +682,7 @@ mod tests {
                 shutdown_called.clone(),
                 flush_called.clone(),
             ))],
-            resource: Resource::builder_empty().build(),
+            resource: Resource::empty(),
             is_shutdown: AtomicBool::new(false),
         });
 

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -435,7 +435,7 @@ mod tests {
         let reader5 = TestMetricReader::new();
         let no_service_name = super::SdkMeterProvider::builder()
             .with_reader(reader5)
-            .with_resource(Resource::builder_empty().build())
+            .with_resource(Resource::empty())
             .build();
 
         assert_eq!(no_service_name.inner.pipes.0[0].resource.len(), 0)

opentelemetry-sdk/src/metrics/periodic_reader.rs

@@ -325,7 +325,7 @@ impl PeriodicReaderInner {
         // TODO: Reuse the internal vectors. Or refactor to avoid needing any
         // owned data structures to be passed to exporters.
         let mut rm = ResourceMetrics {
-            resource: Resource::builder_empty().build(),
+            resource: Resource::empty(),
             scope_metrics: Vec::new(),
         };
 
@@ -647,7 +647,7 @@ mod tests {
             .build();
 
         let rm = &mut ResourceMetrics {
-            resource: Resource::builder_empty().build(),
+            resource: Resource::empty(),
             scope_metrics: Vec::new(),
         };
         // Pipeline is not registered, so collect should return an error

opentelemetry-sdk/src/metrics/periodic_reader_with_async_runtime.rs

@@ -119,7 +119,7 @@ where
                     timeout: self.timeout,
                     runtime,
                     rm: ResourceMetrics {
-                        resource: Resource::builder_empty().build(),
+                        resource: Resource::empty(),
                         scope_metrics: Vec::new(),
                     },
                 }
@@ -466,7 +466,7 @@ mod tests {
         let exporter = InMemoryMetricExporter::default();
         let reader = PeriodicReader::builder(exporter.clone(), runtime::Tokio).build();
         let mut rm = ResourceMetrics {
-            resource: Resource::builder_empty().build(),
+            resource: Resource::empty(),
             scope_metrics: Vec::new(),
         };
 

opentelemetry-sdk/src/resource/env.rs

@@ -22,7 +22,7 @@ impl ResourceDetector for EnvResourceDetector {
     fn detect(&self) -> Resource {
         match env::var(OTEL_RESOURCE_ATTRIBUTES) {
             Ok(s) if !s.is_empty() => construct_otel_resources(s),
-            Ok(_) | Err(_) => Resource::builder_empty().with_attributes(vec![]).build(), // return empty resource
+            Ok(_) | Err(_) => Resource::empty(), // return empty resource
         }
     }
 }

opentelemetry-sdk/src/resource/mod.rs

@@ -79,7 +79,7 @@ impl Resource {
 
     /// Creates an empty resource.
     /// This is the basic constructor that initializes a resource with no attributes and no schema URL.
-    fn empty() -> Self {
+    pub(crate) fn empty() -> Self {
         Resource {
             inner: Arc::new(ResourceInner {
                 attrs: HashMap::new(),
@@ -92,7 +92,7 @@ impl Resource {
     ///
     /// Values are de-duplicated by key, and the first key-value pair with a non-empty string value
     /// will be retained
-    fn new<T: IntoIterator<Item = KeyValue>>(kvs: T) -> Self {
+    pub(crate) fn new<T: IntoIterator<Item = KeyValue>>(kvs: T) -> Self {
         let mut attrs = HashMap::new();
         for kv in kvs {
             attrs.insert(kv.key, kv.value);

opentelemetry-sdk/src/trace/provider.rs

@@ -93,7 +93,7 @@ fn noop_tracer_provider() -> &'static TracerProvider {
                     sampler: Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn))),
                     id_generator: Box::<RandomIdGenerator>::default(),
                     span_limits: SpanLimits::default(),
-                    resource: Cow::Owned(Resource::builder_empty().build()),
+                    resource: Cow::Owned(Resource::empty()),
                 },
                 is_shutdown: AtomicBool::new(true),
             }),
@@ -644,7 +644,7 @@ mod tests {
 
         // If user provided a resource, it takes priority during collision.
         let no_service_name = super::TracerProvider::builder()
-            .with_resource(Resource::builder_empty().build())
+            .with_resource(Resource::empty())
             .build();
 
         assert_eq!(no_service_name.config().resource.len(), 0)