From b95c23eea7db4dc1dfb86eb0dcc85e2ff71b2928 Mon Sep 17 00:00:00 2001
From: Natasha Dada <natasha.dada@datadoghq.com>
Date: Mon, 23 Jun 2025 13:50:54 -0400
Subject: [PATCH] [SDBM-1829] Set tag in try block

---
 .../java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
index 1df3ab2d359..6c8e3b0651c 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -286,6 +286,7 @@ public void setAction(AgentSpan span, Connection connection) {
 
       connection.setClientInfo("OCSID.ACTION", traceContext);
 
+      span.setTag("_dd.dbm_trace_injected", true);
     } catch (Throwable e) {
       log.debug(
           "Failed to set extra DBM data in application_name for trace {}. "
@@ -294,8 +295,6 @@ public void setAction(AgentSpan span, Connection connection) {
           span.getTraceId().toHexString(),
           e);
       DECORATE.onError(span, e);
-    } finally {
-      span.setTag("_dd.dbm_trace_injected", true);
     }
   }