flip order of comment append condition in JDBC instrumentation

na-ji · na-ji · commit e99adf576002 · 2025-10-28T11:28:06.000+01:00
diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DBMCompatibleConnectionInstrumentation.java
@@ -127,7 +127,7 @@ public static String onEnter(
             traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);
       }
 
-      boolean append = "sqlserver".equals(dbInfo.getType()) || DECORATE.shouldAppendSqlComment();
+      boolean append = DECORATE.shouldAppendSqlComment() || "sqlserver".equals(dbInfo.getType());
       sql =
           SQLCommenter.inject(
               sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static String onEnter(`
`127`	`127`	`traceConfig(activeSpan()).getServiceMapping().getOrDefault(dbService, dbService);`
`128`	`128`	`}`
`129`	`129`
`130`		`- boolean append = "sqlserver".equals(dbInfo.getType()) \|\| DECORATE.shouldAppendSqlComment();`
	`130`	`+ boolean append = DECORATE.shouldAppendSqlComment() \|\| "sqlserver".equals(dbInfo.getType());`
`131`	`131`	`sql =`
`132`	`132`	`SQLCommenter.inject(`
`133`	`133`	`sql, dbService, dbInfo.getType(), dbInfo.getHost(), dbInfo.getDb(), null, append);`