Add DB spans to the various queries

src/otel.rs

@@ -3,6 +3,7 @@ use actix_web::HttpRequest;
 use opentelemetry::global::BoxedTracer;
 use opentelemetry::{global, Context, KeyValue};
 use opentelemetry::propagation::TextMapPropagator;
+use opentelemetry::trace::Tracer;
 use opentelemetry_appender_log::OpenTelemetryLogBridge;
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::logs::{BatchLogProcessor, SdkLoggerProvider};
@@ -13,6 +14,7 @@ pub fn global_tracer() -> BoxedTracer {
     global::tracer("image-server")
 }
 
+#[allow(dead_code)]
 pub fn init_tracing() {
     let resources = Resource::builder()
         .with_attributes([
@@ -35,6 +37,7 @@ pub fn init_tracing() {
     global::set_tracer_provider(tracer_provider);
 }
 
+#[allow(dead_code)]
 pub fn init_logs() {
     let otlp_exporter = opentelemetry_otlp::LogExporter::builder()
         .with_tonic()
@@ -47,7 +50,7 @@ pub fn init_logs() {
     let resources = Resource::builder()
         .with_attributes([
             KeyValue::new("service.name", "image-server"),
-            KeyValue::new("service.version", "1.0"),
+            KeyValue::new("service.version", env!("CARGO_PKG_VERSION")),
         ])
         .build();
 
@@ -78,3 +81,16 @@ pub fn extract_context_from_request(req: &HttpRequest) -> Context {
     let propagator = TraceContextPropagator::new();
     propagator.extract(&HeaderExtractor(req.headers()))
 }
+
+pub fn trace_db_call<F, O>(operation: &str, query_type: &str, func: F) -> anyhow::Result<O>
+where F: FnOnce() -> anyhow::Result<O> {
+    let tracer = global::tracer("db");
+    let _span = tracer
+        .span_builder(format!("db.{}.{}", operation, query_type))
+        .with_attributes(vec![
+            KeyValue::new("db.operation", operation.to_string().clone()),
+            KeyValue::new("db.query_type", query_type.to_string().clone()),
+        ]).start(&tracer);
+    
+    func()
+}