mii/ncb-tts-r2
1
0
Fork 0
mirror of https://github.com/mii443/ncb-tts-r2.git synced 2025-08-22 16:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix warn, optimize

Browse Source
This commit is contained in:
mii443
2025-04-10 14:57:09 +09:00
parent 24de817d6f
commit 9949d501b5
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/trace.rs
View File

@ -3,16 +3,12 @@ use opentelemetry::{
trace::{SamplingDecision, SamplingResult, TraceContextExt, TraceState, TracerProvider as _}, trace::{SamplingDecision, SamplingResult, TraceContextExt, TraceState, TracerProvider as _},
KeyValue, KeyValue,
}; };
use opentelemetry_otlp::{WithExportConfig, WithHttpConfig}; use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::{ use opentelemetry_sdk::{
metrics::{MeterProviderBuilder, PeriodicReader, SdkMeterProvider}, metrics::{MeterProviderBuilder, PeriodicReader, SdkMeterProvider},
trace::{RandomIdGenerator, SdkTracerProvider, ShouldSample}, trace::{RandomIdGenerator, SdkTracerProvider, ShouldSample},
Resource, Resource,
}; };
use opentelemetry_semantic_conventions::{
resource::{SERVICE_NAME, SERVICE_VERSION},
SCHEMA_URL,
};
use tracing::Level; use tracing::Level;
use tracing_opentelemetry::{MetricsLayer, OpenTelemetryLayer}; use tracing_opentelemetry::{MetricsLayer, OpenTelemetryLayer};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
@ -93,9 +89,11 @@ fn init_tracer_provider(url: &str) -> SdkTracerProvider {
} }
pub fn init_tracing_subscriber(otel_http_url: &Option<String>) -> OtelGuard { pub fn init_tracing_subscriber(otel_http_url: &Option<String>) -> OtelGuard {
let mut registry = tracing_subscriber::registry().with( let registry = tracing_subscriber::registry()
tracing_subscriber::filter::LevelFilter::from_level(Level::INFO), .with(tracing_subscriber::filter::LevelFilter::from_level(
); Level::INFO,
))
.with(tracing_subscriber::fmt::layer());
if let Some(url) = otel_http_url { if let Some(url) = otel_http_url {
let tracer_provider = init_tracer_provider(url); let tracer_provider = init_tracer_provider(url);
@ -104,7 +102,6 @@ pub fn init_tracing_subscriber(otel_http_url: &Option<String>) -> OtelGuard {
let tracer = tracer_provider.tracer("ncb-tts-r2"); let tracer = tracer_provider.tracer("ncb-tts-r2");
registry registry
.with(tracing_subscriber::fmt::layer())
.with(MetricsLayer::new(meter_provider.clone())) .with(MetricsLayer::new(meter_provider.clone()))
.with(OpenTelemetryLayer::new(tracer)) .with(OpenTelemetryLayer::new(tracer))
.init(); .init();
@ -114,7 +111,7 @@ pub fn init_tracing_subscriber(otel_http_url: &Option<String>) -> OtelGuard {
_meter_provider: Some(meter_provider), _meter_provider: Some(meter_provider),
} }
} else { } else {
registry.with(tracing_subscriber::fmt::layer()).init(); registry.init();
OtelGuard { OtelGuard {
_tracer_provider: None, _tracer_provider: None,