Feat/add resource builder (#2322)

Co-authored-by: Lalit Kumar Bhasin <[email protected]>

Author: pitoniak32

.gitignore

@@ -5,4 +5,6 @@
 Cargo.lock
 /.idea/
 
-.cosine
+.cosine
+
+opentelemetry-otlp/tests/integration_test/result.json

examples/logs-basic/src/main.rs

@@ -1,4 +1,3 @@
-use opentelemetry::KeyValue;
 use opentelemetry_appender_tracing::layer;
 use opentelemetry_sdk::logs::LoggerProvider;
 use opentelemetry_sdk::Resource;
@@ -8,10 +7,11 @@ use tracing_subscriber::prelude::*;
 fn main() {
     let exporter = opentelemetry_stdout::LogExporter::default();
     let provider: LoggerProvider = LoggerProvider::builder()
-        .with_resource(Resource::new(vec![KeyValue::new(
-            "service.name",
-            "log-appender-tracing-example",
-        )]))
+        .with_resource(
+            Resource::builder()
+                .with_service_name("log-appender-tracing-example")
+                .build(),
+        )
         .with_simple_exporter(exporter)
         .build();
     let layer = layer::OpenTelemetryTracingBridge::new(&provider);

examples/metrics-advanced/src/main.rs

@@ -50,12 +50,14 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
         .build();
 
     let reader = PeriodicReader::builder(exporter).build();
+
+    let resource = Resource::builder()
+        .with_service_name("metrics-advanced-example")
+        .build();
+
     let provider = SdkMeterProvider::builder()
         .with_reader(reader)
-        .with_resource(Resource::new([KeyValue::new(
-            "service.name",
-            "metrics-advanced-example",
-        )]))
+        .with_resource(resource)
         .with_view(my_view_rename_and_unit)
         .with_view(my_view_drop_attributes)
         .with_view(my_view_change_aggregation)

examples/metrics-basic/src/main.rs

@@ -12,10 +12,11 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
     let reader = PeriodicReader::builder(exporter).build();
     let provider = SdkMeterProvider::builder()
         .with_reader(reader)
-        .with_resource(Resource::new([KeyValue::new(
-            "service.name",
-            "metrics-basic-example",
-        )]))
+        .with_resource(
+            Resource::builder()
+                .with_service_name("metrics-basic-example")
+                .build(),
+        )
         .build();
     global::set_meter_provider(provider.clone());
     provider

examples/tracing-jaeger/src/main.rs

@@ -5,7 +5,6 @@ use opentelemetry::{
 };
 use opentelemetry_sdk::trace::TracerProvider;
 use opentelemetry_sdk::{runtime, Resource};
-use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
 
 use std::error::Error;
 
@@ -16,10 +15,11 @@ fn init_tracer_provider() -> Result<opentelemetry_sdk::trace::TracerProvider, Tr
 
     Ok(TracerProvider::builder()
         .with_batch_exporter(exporter, runtime::Tokio)
-        .with_resource(Resource::new(vec![KeyValue::new(
-            SERVICE_NAME,
-            "tracing-jaeger",
-        )]))
+        .with_resource(
+            Resource::builder()
+                .with_service_name("tracing-jaeger")
+                .build(),
+        )
         .build())
 }
 

opentelemetry-appender-tracing/benches/logs.rs

@@ -15,7 +15,7 @@
 
 use async_trait::async_trait;
 use criterion::{criterion_group, criterion_main, Criterion};
-use opentelemetry::{InstrumentationScope, KeyValue};
+use opentelemetry::InstrumentationScope;
 use opentelemetry_appender_tracing::layer as tracing_layer;
 use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
 use opentelemetry_sdk::logs::LogResult;
@@ -126,10 +126,11 @@ fn benchmark_with_ot_layer(c: &mut Criterion, enabled: bool, bench_name: &str) {
     let exporter = NoopExporter { enabled };
     let processor = NoopProcessor::new(Box::new(exporter));
     let provider = LoggerProvider::builder()
-        .with_resource(Resource::new(vec![KeyValue::new(
-            "service.name",
-            "benchmark",
-        )]))
+        .with_resource(
+            Resource::builder_empty()
+                .with_service_name("benchmark")
+                .build(),
+        )
         .with_log_processor(processor)
         .build();
     let ot_layer = tracing_layer::OpenTelemetryTracingBridge::new(&provider);

opentelemetry-appender-tracing/examples/basic.rs

@@ -1,6 +1,5 @@
 //! run with `$ cargo run --example basic
 
-use opentelemetry::KeyValue;
 use opentelemetry_appender_tracing::layer;
 use opentelemetry_sdk::{logs::LoggerProvider, Resource};
 use tracing::error;
@@ -9,10 +8,11 @@ use tracing_subscriber::prelude::*;
 fn main() {
     let exporter = opentelemetry_stdout::LogExporter::default();
     let provider: LoggerProvider = LoggerProvider::builder()
-        .with_resource(Resource::new(vec![KeyValue::new(
-            "service.name",
-            "log-appender-tracing-example",
-        )]))
+        .with_resource(
+            Resource::builder()
+                .with_service_name("log-appender-tracing-example")
+                .build(),
+        )
         .with_simple_exporter(exporter)
         .build();
     let layer = layer::OpenTelemetryTracingBridge::new(&provider);

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

@@ -24,10 +24,9 @@ use tracing_subscriber::prelude::*;
 use tracing_subscriber::EnvFilter;
 
 static RESOURCE: Lazy<Resource> = Lazy::new(|| {
-    Resource::new(vec![KeyValue::new(
-        opentelemetry_semantic_conventions::resource::SERVICE_NAME,
-        "basic-otlp-example",
-    )])
+    Resource::builder()
+        .with_service_name("basic-otlp-example")
+        .build()
 });
 
 fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry_sdk::logs::LogError> {

opentelemetry-otlp/examples/basic-otlp/src/main.rs

@@ -15,10 +15,9 @@ use tracing_subscriber::prelude::*;
 use tracing_subscriber::EnvFilter;
 
 static RESOURCE: Lazy<Resource> = Lazy::new(|| {
-    Resource::new(vec![KeyValue::new(
-        opentelemetry_semantic_conventions::resource::SERVICE_NAME,
-        "basic-otlp-example",
-    )])
+    Resource::builder()
+        .with_service_name("basic-otlp-example")
+        .build()
 });
 
 fn init_traces() -> Result<sdktrace::TracerProvider, TraceError> {

opentelemetry-otlp/src/lib.rs

@@ -162,7 +162,7 @@
 //!                 .with_max_events_per_span(64)
 //!                 .with_max_attributes_per_span(16)
 //!                 .with_max_events_per_span(16)
-//!                 .with_resource(Resource::new(vec![KeyValue::new("service.name", "example")])),
+//!                 .with_resource(Resource::builder_empty().with_attributes(vec![KeyValue::new("service.name", "example")]).build()),
 //!         ).build();
 //!     global::set_tracer_provider(tracer_provider);
 //!     let tracer = global::tracer("tracer-name");
@@ -186,7 +186,7 @@
 //!
 //!    let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()
 //!        .with_reader(reader)
-//!         .with_resource(Resource::new(vec![KeyValue::new("service.name", "example")]))
+//!         .with_resource(Resource::builder_empty().with_attributes(vec![KeyValue::new("service.name", "example")]).build())
 //!         .build();
 //!     # }
 //!