honor OTLP env vars (#440)

Watfaq · May 31, 2024 · 292c261 · 292c261
1 parent 133157d
commit 292c261
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 72 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml
@@ -44,7 +44,7 @@ opentelemetry = "0.23"
 opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] }
 tracing-opentelemetry = "0.24"
 opentelemetry-jaeger-propagator = "0.2.0"
-opentelemetry-jaeger = { version = "0.22", features = ["collector_client", "hyper_collector_client", "rt-tokio"] }
+opentelemetry-jaeger = { version = "0.22", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.16.0", features = ["grpc-tonic"] }
 
 crc32fast = "1.4.2"

diff --git a/clash_lib/src/app/logging.rs b/clash_lib/src/app/logging.rs
@@ -3,14 +3,13 @@ use std::io::IsTerminal;
 use crate::def::LogLevel;
 use opentelemetry::global;
 use opentelemetry::KeyValue;
-use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::trace;
-use opentelemetry_sdk::trace::Sampler;
 use opentelemetry_sdk::Resource;
 use serde::Serialize;
 use tokio::sync::broadcast::Sender;
 
 use tracing::debug;
+use tracing::error;
 use tracing_appender::non_blocking::NonBlocking;
 use tracing_appender::non_blocking::WorkerGuard;
 use tracing_oslog::OsLogger;
@@ -103,28 +102,27 @@ pub fn setup_logging(
         .with_default_directive(format!("clash={}", level).parse::<Directive>().unwrap())
         .from_env_lossy();
 
-    let jaeger = if let Ok(jager_endpoint) = std::env::var("JAGER_ENDPOINT") {
+    let jaeger = if std::env::var("JAEGER_DISABLED").is_ok() {
+        None
+    } else {
         global::set_text_map_propagator(opentelemetry_jaeger_propagator::Propagator::new());
-
-        let otlp_exporter = opentelemetry_otlp::new_exporter()
-            .tonic()
-            .with_endpoint(jager_endpoint);
-        let tracer = opentelemetry_otlp::new_pipeline()
-            .tracing()
-            .with_exporter(otlp_exporter)
-            .with_trace_config(
-                trace::config()
-                    .with_sampler(Sampler::AlwaysOn)
-                    .with_resource(Resource::new(vec![KeyValue::new(
-                        "service.name",
-                        "clash-rs",
-                    )])),
-            )
-            .install_batch(opentelemetry_sdk::runtime::Tokio)?;
+        global::set_error_handler(|e| {
+            error!("OpenTelemetry error: {:?}", e);
+        })
+        .unwrap();
+
+        let otlp_exporter = opentelemetry_otlp::new_exporter().tonic();
+
+        let tracer =
+            opentelemetry_otlp::new_pipeline()
+                .tracing()
+                .with_exporter(otlp_exporter)
+                .with_trace_config(trace::config().with_resource(Resource::new(vec![
+                    KeyValue::new("service.name", "clash-rs"),
+                ])))
+                .install_batch(opentelemetry_sdk::runtime::Tokio)?;
 
         Some(tracing_opentelemetry::layer().with_tracer(tracer))
-    } else {
-        None
     };
 
     let ios_os_log = if cfg!(target_os = "ios") {

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       - type: bind
         source: ./v2ray/key.pem
         target: /etc/v2ray/v2ray.key
+    restart: unless-stopped
 
   nginx:
     image: nginx
@@ -37,12 +38,4 @@ services:
       - type: bind
         source: ./v2ray/key.pem
         target: /etc/v2ray/v2ray.key
-
-  wireguard:
-    image: linuxserver/wireguard:latest
-    network_mode: "host"
-    cap_add:
-      - NET_ADMIN
-    volumes:
-      - ./wg/config:/config
     restart: unless-stopped