Try using current context

This commit is contained in:
Cameron
2025-06-03 13:02:25 -04:00
parent b11d647ffa
commit c4153b404c

View File

@@ -1,9 +1,9 @@
use actix_web::http::header::HeaderMap;
use actix_web::HttpRequest;
use opentelemetry::global::BoxedTracer;
use opentelemetry::{global, Context, KeyValue};
use opentelemetry::propagation::TextMapPropagator;
use opentelemetry::trace::{Status, TraceContextExt, Tracer};
use opentelemetry::trace::{Span, Status, Tracer};
use opentelemetry::{global, Context, KeyValue};
use opentelemetry_appender_log::OpenTelemetryLogBridge;
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::logs::{BatchLogProcessor, SdkLoggerProvider};
@@ -85,21 +85,20 @@ pub fn extract_context_from_request(req: &HttpRequest) -> Context {
pub fn trace_db_call<F, O>(query_type: &str, operation: &str, func: F) -> anyhow::Result<O>
where F: FnOnce() -> anyhow::Result<O> {
let tracer = global::tracer("db");
let span = tracer
let mut span = tracer
.span_builder(format!("db.{}.{}", query_type, operation))
.with_attributes(vec![
KeyValue::new("db.query_type", query_type.to_string().clone()),
KeyValue::new("db.operation", operation.to_string().clone()),
]).start(&tracer);
]).start_with_context(&tracer, &Context::current());
let context = Context::current_with_span(span);
let result = func();
match &result {
Ok(_) => {
context.span().set_status(Status::Ok);
span.set_status(Status::Ok);
}
Err(e) => {
context.span().set_status(Status::error(e.to_string()))
span.set_status(Status::error(e.to_string()))
}
}