feat: add endpint configuration to root configuration

Signed-off-by: hlts2 <[email protected]>

rust/libs/observability/Cargo.toml

@@ -30,3 +30,4 @@ opentelemetry-semantic-conventions = { version = "0.16.0"}
 scopeguard = { version = "1.2.0"}
 paste = {version = "1.0.15"}
 anyhow = { version = "1.0.86"}
+url = { version = "2.5.2"}

rust/libs/observability/src/config.rs

@@ -22,6 +22,7 @@ use opentelemetry_sdk::{self, Resource};
 #[derive(Clone, Debug)]
 pub struct Config {
     pub enabled: bool,
+    pub endpoint: String,
     pub attributes: HashMap<String, String>,
     pub tracer: Tracer,
     pub meter: Meter,
@@ -30,13 +31,11 @@ pub struct Config {
 #[derive(Clone, Debug)]
 pub struct Tracer {
     pub enabled: bool,
-    pub endpoint: String,
 }
 
 #[derive(Clone, Debug)]
 pub struct Meter {
     pub enabled: bool,
-    pub endpoint: String,
     pub export_duration: Duration,
     pub export_timeout_duration: Duration,
 }
@@ -45,6 +44,7 @@ impl Config {
     pub fn new() -> Self {
         Self {
             enabled: false,
+            endpoint: "".to_string(),
             attributes: HashMap::new(),
             tracer: Tracer::default(),
             meter: Meter::default(),
@@ -56,6 +56,11 @@ impl Config {
         self
     }
 
+    pub fn endpoint(mut self, endpoint: &str) -> Self {
+        self.endpoint = endpoint.to_string();
+        self
+    }
+
     pub fn attributes(mut self, attrs: HashMap<String, String>) -> Self {
         self.attributes = attrs;
         self
@@ -96,21 +101,13 @@ impl From<&Config> for Resource {
 
 impl Tracer {
     pub fn new() -> Self {
-        Self {
-            enabled: false,
-            endpoint: "".to_string(),
-        }
+        Self { enabled: false }
     }
 
     pub fn enabled(mut self, enabled: bool) -> Self {
         self.enabled = enabled;
         self
     }
-
-    pub fn endpoint(mut self, endpoint: &str) -> Self {
-        self.endpoint = endpoint.to_string();
-        self
-    }
 }
 
 impl Default for Tracer {
@@ -123,9 +120,8 @@ impl Meter {
     pub fn new() -> Self {
         Self {
             enabled: false,
-            endpoint: "".to_string(),
             export_duration: Duration::from_secs(1),
-            export_timeout_duration: Duration::from_secs(10),
+            export_timeout_duration: Duration::from_secs(5),
         }
     }
 
@@ -134,11 +130,6 @@ impl Meter {
         self
     }
 
-    pub fn endpoint(mut self, endpoint: &str) -> Self {
-        self.endpoint = endpoint.to_string();
-        self
-    }
-
     pub fn export_duration(mut self, dur: Duration) -> Self {
         self.export_duration = dur;
         self

rust/libs/observability/src/observability.rs

@@ -20,6 +20,7 @@ use opentelemetry_sdk::metrics::SdkMeterProvider;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
 use opentelemetry_sdk::trace::{self, TracerProvider};
 use opentelemetry_sdk::{runtime, Resource};
+use url::Url;
 
 use crate::config::Config;
 
@@ -65,9 +66,11 @@ impl Observability for ObservabilityImpl {
                 .with_resource(Resource::from(self.config()))
                 .with_timeout(self.config.meter.export_timeout_duration)
                 .with_exporter(
-                    opentelemetry_otlp::new_exporter()
-                        .tonic()
-                        .with_endpoint(self.config.meter.endpoint.as_str()),
+                    opentelemetry_otlp::new_exporter().tonic().with_endpoint(
+                        Url::parse(self.config.endpoint.as_str())?
+                            .join("/v1/metrics")?
+                            .as_str(),
+                    ),
                 )
                 .build()?;
             self.meter_provider = Some(provider.clone());
@@ -78,9 +81,11 @@ impl Observability for ObservabilityImpl {
             let tracer = opentelemetry_otlp::new_pipeline()
                 .tracing()
                 .with_exporter(
-                    opentelemetry_otlp::new_exporter()
-                        .tonic()
-                        .with_endpoint(self.config.tracer.endpoint.as_str()),
+                    opentelemetry_otlp::new_exporter().tonic().with_endpoint(
+                        Url::parse(self.config.endpoint.as_str())?
+                            .join("/v1/traces")?
+                            .as_str(),
+                    ),
                 )
                 .with_trace_config(
                     trace::config()