diff --git a/quaint/src/connector/metrics.rs b/quaint/src/connector/metrics.rs
index f1f2783ad62..d855b5cf7d5 100644
--- a/quaint/src/connector/metrics.rs
+++ b/quaint/src/connector/metrics.rs
@@ -16,7 +16,7 @@ where
     U: Future<Output = crate::Result<T>>,
 {
     let span =
-        info_span!("quaint:query", "db.system" = %db_system_name, "db.statement" = %query, "otel.kind" = "client");
+        info_span!("quaint:query", "db.system" = db_system_name, "db.statement" = %query, "otel.kind" = "client");
     do_query(tag, query, params, f).instrument(span).await
 }
 
diff --git a/query-engine/core/src/telemetry/models.rs b/query-engine/core/src/telemetry/models.rs
index 24247c2f4cf..4482d507754 100644
--- a/query-engine/core/src/telemetry/models.rs
+++ b/query-engine/core/src/telemetry/models.rs
@@ -1,4 +1,4 @@
-use opentelemetry::{sdk::export::trace::SpanData, Key, KeyValue, Value};
+use opentelemetry::{sdk::export::trace::SpanData, KeyValue, Value};
 use serde::Serialize;
 use serde_json::json;
 use std::{
@@ -38,7 +38,7 @@ pub struct TraceSpan {
     pub(super) events: Vec<Event>,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub(super) links: Vec<Link>,
-    pub(super) otel_kind: OtelKind,
+    pub(super) kind: OtelKind,
 }
 
 #[derive(Serialize, Debug, Clone, PartialEq, Eq)]
@@ -55,8 +55,8 @@ impl TraceSpan {
 
 impl From<SpanData> for TraceSpan {
     fn from(span: SpanData) -> Self {
-        let otel_kind = match span.attributes.get(&Key::from_static_str("otel.kind")) {
-            Some(Value::String(Cow::Borrowed("client"))) => OtelKind::Client,
+        let kind = match span.span_kind {
+            opentelemetry::trace::SpanKind::Client => OtelKind::Client,
             _ => OtelKind::Internal,
         };
 
@@ -126,7 +126,7 @@ impl From<SpanData> for TraceSpan {
             attributes,
             links,
             events,
-            otel_kind,
+            kind,
         }
     }
 }