Fixed containsTraceComment for test cases

Author: Yoone

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/SQLCommenter.java

@@ -109,18 +109,17 @@ private static boolean hasDDComment(String sql, boolean appendComment) {
   }
 
   private static String extractCommentContent(String sql, boolean appendComment) {
+    int startIdx;
+    int endIdx;
     if (appendComment) {
-      int startIdx = sql.lastIndexOf(OPEN_COMMENT);
-      int endIdx = sql.lastIndexOf(CLOSE_COMMENT);
-      if (startIdx != -1 && endIdx != -1 && endIdx > startIdx) {
-        return sql.substring(startIdx + OPEN_COMMENT_LEN, endIdx);
-      }
+      startIdx = sql.lastIndexOf(OPEN_COMMENT);
+      endIdx = sql.lastIndexOf(CLOSE_COMMENT);
     } else {
-      int startIdx = sql.indexOf(OPEN_COMMENT);
-      int endIdx = sql.indexOf(CLOSE_COMMENT);
-      if (startIdx != -1 && endIdx != -1 && endIdx > startIdx) {
-        return sql.substring(startIdx + OPEN_COMMENT_LEN, endIdx);
-      }
+      startIdx = sql.indexOf(OPEN_COMMENT);
+      endIdx = sql.indexOf(CLOSE_COMMENT);
+    }
+    if (startIdx != -1 && endIdx != -1 && endIdx > startIdx) {
+      return sql.substring(startIdx + OPEN_COMMENT_LEN, endIdx);
     }
     return "";
   }

dd-trace-core/src/main/java/datadog/trace/core/database/SharedDBCommenter.java

@@ -36,8 +36,13 @@ public class SharedDBCommenter {
   public static boolean containsTraceComment(String commentContent) {
     return commentContent.contains(PARENT_SERVICE + "=")
         || commentContent.contains(DATABASE_SERVICE + "=")
+        || commentContent.contains(DD_HOSTNAME + "=")
+        || commentContent.contains(DD_DB_NAME + "=")
+        || commentContent.contains(DD_PEER_SERVICE + "=")
         || commentContent.contains(DD_ENV + "=")
-        || commentContent.contains(TRACEPARENT + "=");
+        || commentContent.contains(DD_VERSION + "=")
+        || commentContent.contains(TRACEPARENT + "=")
+        || commentContent.contains(DD_SERVICE_HASH + "=");
   }
 
   // Build database comment content without comment delimiters such as /* */