From e4832c3499679bd8939ef77fcde065db9bee45c4 Mon Sep 17 00:00:00 2001
From: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
Date: Tue, 21 Oct 2025 10:10:33 +0200
Subject: [PATCH] Otel: set db.operation.name and db.system.name at span build
 time (#1091)

* set db.operation.name and db.system.name at span build time

* clean
---
 .../instrumentation/OpenTelemetryForElasticsearch.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/java-client/src/main/java/co/elastic/clients/transport/instrumentation/OpenTelemetryForElasticsearch.java b/java-client/src/main/java/co/elastic/clients/transport/instrumentation/OpenTelemetryForElasticsearch.java
index ec8afb223..6e56e43d8 100644
--- a/java-client/src/main/java/co/elastic/clients/transport/instrumentation/OpenTelemetryForElasticsearch.java
+++ b/java-client/src/main/java/co/elastic/clients/transport/instrumentation/OpenTelemetryForElasticsearch.java
@@ -185,10 +185,13 @@ <TRequest> OTelContext(TRequest request, Endpoint<TRequest, ?, ?> endpoint) {
                 }
                 this.endpointId = endpointId;
 
-                span = tracer.spanBuilder(endpointId).setSpanKind(SpanKind.CLIENT).startSpan();
+                span = tracer.spanBuilder(endpointId).setSpanKind(SpanKind.CLIENT)
+                    .setAttribute(ATTR_DB_SYSTEM, "elasticsearch")
+                    .setAttribute(ATTR_DB_OPERATION, endpointId)
+                    .startSpan();
+
                 if (span.isRecording()) {
-                    span.setAttribute(ATTR_DB_SYSTEM, "elasticsearch");
-                    span.setAttribute(ATTR_DB_OPERATION, endpointId);
+
                     span.setAttribute(ATTR_HTTP_REQUEST_METHOD, endpoint.method(request));
 
                     for (Map.Entry<String, String> pathParamEntry : endpoint.pathParameters(request).entrySet()) {