sync: opentelemetry

Author: zooeywm

Cargo.lock

@@ -15,19 +15,20 @@ rdrs-repository    = { workspace = true }
 rdrs-gui           = { workspace = true, optional = true }
 rdrs-domain-player = { workspace = true }
 
-tokio                 = { workspace = true }
-serde                 = { workspace = true, features = ["derive"] }
-config                = { workspace = true }
-derive_more           = { version = "2.0", features = ["as_ref"] }
-tracing               = { workspace = true }
-tracing-appender      = { version = "0.2", optional = true }
-tracing-opentelemetry = { version = "0.26", optional = true }
-tracing-subscriber    = { version = "0.3", features = ["env-filter", "time", "local-time"], optional = true }
-opentelemetry         = { version = "0.25", optional = true }
-opentelemetry-otlp    = { version = "0.25", optional = true }
-opentelemetry_sdk     = { version = "0.25", features = ["rt-tokio"], optional = true }
-chrono                = "0.4"
-time                  = "0.3"
+tokio                          = { workspace = true }
+serde                          = { workspace = true, features = ["derive"] }
+config                         = { workspace = true }
+derive_more                    = { version = "2.0", features = ["as_ref"] }
+tracing                        = { workspace = true }
+tracing-appender               = { version = "0.2", optional = true }
+tracing-opentelemetry          = { version = "0.29", optional = true }
+tracing-subscriber             = { version = "0.3", features = ["env-filter", "time", "local-time"], optional = true }
+opentelemetry                  = { version = "0.28", optional = true }
+opentelemetry-otlp             = { version = "0.28", features = ["grpc-tonic"], optional = true }
+opentelemetry_sdk              = { version = "0.28", features = ["rt-tokio"], optional = true }
+opentelemetry-appender-tracing = { version = "0.28.1", optional = true }
+chrono                         = "0.4"
+time                           = "0.3"
 
 [features]
 default = []
@@ -38,6 +39,7 @@ telemetry = [
   "dep:opentelemetry-otlp",
   "dep:opentelemetry_sdk",
   "dep:tracing-appender",
+  "dep:opentelemetry-appender-tracing",
 ]
 slint = ["dep:rdrs-gui", "rdrs-gui/slint"]
 server_only = []

rdrs-kernel/Cargo.toml

@@ -2,8 +2,9 @@ pub mod config;
 
 use std::{io::IsTerminal, path::Path, sync::OnceLock};
 
-use opentelemetry::trace::{TraceResult, TracerProvider};
-use opentelemetry_otlp::WithExportConfig;
+use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
+use opentelemetry_otlp::{LogExporter, WithExportConfig};
+use opentelemetry_sdk::logs::SdkLoggerProvider;
 use rdrs_tools::error::Result;
 use time::UtcOffset;
 use tracing_appender::rolling::RollingFileAppender;
@@ -20,6 +21,7 @@ static CONSOLE_RELOAD_HANDLE: OnceLock<ReloadHandle> = OnceLock::new();
 pub fn init_telemetry(config: &TelemetryConfig) -> Result<()> {
 	let TelemetryConfig { ref app_name, enable, ref console, ref remote, ref file, timezone } =
 		*config;
+	let resource = opentelemetry_sdk::Resource::builder().with_service_name(app_name.clone()).build();
 
 	if !enable {
 		return Ok(());
@@ -94,24 +96,19 @@ pub fn init_telemetry(config: &TelemetryConfig) -> Result<()> {
 		.transpose()?;
 
 	let RemoteConfig { enable, ref collector_endpoint } = *remote;
-	let remote = enable
-		.then(|| {
-			let mut exporter = opentelemetry_otlp::new_exporter().tonic();
-			if !remote.collector_endpoint.is_empty() {
-				exporter = exporter.with_endpoint(collector_endpoint);
-			}
-
-			let tracer = opentelemetry_otlp::new_pipeline()
-				.tracing()
-				.with_exporter(exporter)
-				.install_batch(opentelemetry_sdk::runtime::Tokio)?
-				.tracer(app_name.clone());
-
-			TraceResult::Ok(tracing_opentelemetry::layer().with_tracer(tracer))
-		})
-		.transpose()?;
 
-	Registry::default().with(console).with(file).with(remote).try_init()?;
+	if enable && !collector_endpoint.is_empty() {
+		let exporter = LogExporter::builder().with_tonic().with_endpoint(collector_endpoint).build()?;
+		let logger_provider =
+			SdkLoggerProvider::builder().with_resource(resource).with_batch_exporter(exporter).build();
+		// Create a new OpenTelemetryTracingBridge using the above LoggerProvider.
+		let otel_layer = OpenTelemetryTracingBridge::new(&logger_provider);
+
+		tracing_subscriber::registry().with(console).with(file).with(otel_layer).try_init()?;
+	} else {
+		tracing_subscriber::registry().with(console).with(file).try_init()?;
+	};
+
 	Ok(())
 }