feat: support HTTPS protocol for otel (#1206)

Signed-off-by: Gaius <gaius.qi@gmail.com>

Author: gaius-qi

Cargo.lock

@@ -12,7 +12,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.2.39"
+version = "0.2.40"
 authors = ["The Dragonfly Developers"]
 homepage = "https://d7y.io/"
 repository = "https://github.com/dragonflyoss/client.git"
@@ -22,13 +22,13 @@ readme = "README.md"
 edition = "2021"
 
 [workspace.dependencies]
-dragonfly-client = { path = "dragonfly-client", version = "0.2.39" }
-dragonfly-client-core = { path = "dragonfly-client-core", version = "0.2.39" }
-dragonfly-client-config = { path = "dragonfly-client-config", version = "0.2.39" }
-dragonfly-client-storage = { path = "dragonfly-client-storage", version = "0.2.39" }
-dragonfly-client-backend = { path = "dragonfly-client-backend", version = "0.2.39" }
-dragonfly-client-util = { path = "dragonfly-client-util", version = "0.2.39" }
-dragonfly-client-init = { path = "dragonfly-client-init", version = "0.2.39" }
+dragonfly-client = { path = "dragonfly-client", version = "0.2.40" }
+dragonfly-client-core = { path = "dragonfly-client-core", version = "0.2.40" }
+dragonfly-client-config = { path = "dragonfly-client-config", version = "0.2.40" }
+dragonfly-client-storage = { path = "dragonfly-client-storage", version = "0.2.40" }
+dragonfly-client-backend = { path = "dragonfly-client-backend", version = "0.2.40" }
+dragonfly-client-util = { path = "dragonfly-client-util", version = "0.2.40" }
+dragonfly-client-init = { path = "dragonfly-client-init", version = "0.2.40" }
 dragonfly-api = "=2.1.39"
 thiserror = "2.0"
 futures = "0.3.31"

Cargo.toml

@@ -164,6 +164,12 @@ fn default_download_max_schedule_count() -> u32 {
     5
 }
 
+/// default_tracing_path is the default tracing path for dfdaemon.
+#[inline]
+fn default_tracing_path() -> Option<PathBuf> {
+    Some(PathBuf::from("/v1/traces"))
+}
+
 /// default_scheduler_announce_interval is the default interval to announce peer to the scheduler.
 #[inline]
 fn default_scheduler_announce_interval() -> Duration {
@@ -1460,7 +1466,7 @@ pub struct Stats {
 }
 
 /// Tracing is the tracing configuration for dfdaemon.
-#[derive(Debug, Clone, Default, Validate, Deserialize)]
+#[derive(Debug, Clone, Validate, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
 pub struct Tracing {
     /// Protocol specifies the communication protocol for the tracing server.
@@ -1471,11 +1477,28 @@ pub struct Tracing {
     /// endpoint is the endpoint to report tracing log, example: "localhost:4317".
     pub endpoint: Option<String>,
 
+    /// path is the path to report tracing log, example: "/v1/traces" if the protocol is "http" or
+    /// "https".
+    #[serde(default = "default_tracing_path")]
+    pub path: Option<PathBuf>,
+
     /// headers is the headers to report tracing log.
     #[serde(with = "http_serde::header_map")]
     pub headers: reqwest::header::HeaderMap,
 }
 
+/// Tracing implements Default.
+impl Default for Tracing {
+    fn default() -> Self {
+        Self {
+            protocol: None,
+            endpoint: None,
+            path: default_tracing_path(),
+            headers: reqwest::header::HeaderMap::new(),
+        }
+    }
+}
+
 /// Config is the configuration for dfdaemon.
 #[derive(Debug, Clone, Default, Validate, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
@@ -2189,12 +2212,18 @@ key: /etc/ssl/private/client.pem
         let json_data = r#"
         {
             "protocol": "http",
-            "endpoint": "tracing.example.com"
+            "endpoint": "tracing.example.com",
+            "path": "/v1/traces",
+            "headers": {
+                "X-Custom-Header": "value"
+            }
         }"#;
 
         let tracing: Tracing = serde_json::from_str(json_data).unwrap();
         assert_eq!(tracing.protocol, Some("http".to_string()));
         assert_eq!(tracing.endpoint, Some("tracing.example.com".to_string()));
+        assert_eq!(tracing.path, Some(PathBuf::from("/v1/traces")));
+        assert!(tracing.headers.contains_key("X-Custom-Header"));
     }
 
     #[test]

dragonfly-client-config/src/dfdaemon.rs

@@ -93,6 +93,7 @@ async fn main() -> Result<(), anyhow::Error> {
         None,
         None,
         None,
+        None,
         false,
         args.console,
     );

dragonfly-client-init/src/bin/main.rs

@@ -136,6 +136,7 @@ impl ExportCommand {
             None,
             None,
             None,
+            None,
             false,
             self.console,
         );

dragonfly-client/src/bin/dfcache/export.rs

@@ -142,6 +142,7 @@ impl ImportCommand {
             None,
             None,
             None,
+            None,
             false,
             self.console,
         );

dragonfly-client/src/bin/dfcache/import.rs

@@ -88,6 +88,7 @@ impl StatCommand {
             None,
             None,
             None,
+            None,
             false,
             self.console,
         );

dragonfly-client/src/bin/dfcache/stat.rs

@@ -147,6 +147,7 @@ async fn main() -> Result<(), anyhow::Error> {
         args.log_max_files,
         config.tracing.protocol.clone(),
         config.tracing.endpoint.clone(),
+        config.tracing.path.clone(),
         Some(config.tracing.headers.clone()),
         Some(config.host.clone()),
         config.seed_peer.enable,

dragonfly-client/src/bin/dfdaemon/main.rs

@@ -307,6 +307,7 @@ async fn main() -> anyhow::Result<()> {
         None,
         None,
         None,
+        None,
         false,
         args.console,
     );

dragonfly-client/src/bin/dfget/main.rs

@@ -46,6 +46,7 @@ pub fn init_tracing(
     log_max_files: usize,
     otel_protocol: Option<String>,
     otel_endpoint: Option<String>,
+    otel_path: Option<PathBuf>,
     otel_headers: Option<reqwest::header::HeaderMap>,
     host: Option<Host>,
     is_seed_peer: bool,
@@ -122,23 +123,31 @@ pub fn init_tracing(
                     }
                 }
 
-                let addr = format!("http://{}", endpoint);
+                let endpoint_url = url::Url::parse(&format!("http://{}", endpoint))
+                    .expect("failed to parse OTLP endpoint URL");
+
                 opentelemetry_otlp::SpanExporter::builder()
                     .with_tonic()
-                    .with_endpoint(addr)
+                    .with_endpoint(endpoint_url)
                     .with_timeout(SPAN_EXPORTER_TIMEOUT)
                     .with_metadata(metadata)
                     .build()
                     .expect("failed to create OTLP exporter")
             }
             "http" | "https" => {
-                let endpoint_url = url::Url::parse(&format!("{}://{}", protocol, endpoint))
-                    .expect("failed to parse OTLP endpoint URL")
-                    .join("v1/traces")
-                    .expect("failed to construct OTLP endpoint URL");
+                let mut endpoint_url = url::Url::parse(&format!("http://{}", endpoint))
+                    .expect("failed to parse OTLP endpoint URL");
+
+                if let Some(path) = otel_path {
+                    endpoint_url = endpoint_url
+                        .join(path.to_str().unwrap())
+                        .expect("failed to join OTLP endpoint path");
+                }
+
                 opentelemetry_otlp::SpanExporter::builder()
                     .with_http()
                     .with_endpoint(endpoint_url.as_str())
+                    .with_protocol(opentelemetry_otlp::Protocol::HttpJson)
                     .with_timeout(SPAN_EXPORTER_TIMEOUT)
                     .build()
                     .expect("failed to create OTLP exporter")