Merge branch 'main' into jmx

Author: jefchien

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

@@ -640,7 +640,7 @@ private static String getDBStatementRemoteOperation(
 
     // Remove all whitespace and newline characters from the beginning of remote_operation
     // and retrieve the first MAX_KEYWORD_LENGTH characters
-    remoteOperation = remoteOperation.stripLeading();
+    remoteOperation = remoteOperation.replaceFirst("^\\s+", "");
     if (remoteOperation.length() > MAX_KEYWORD_LENGTH) {
       remoteOperation = remoteOperation.substring(0, MAX_KEYWORD_LENGTH);
     }

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java

@@ -632,6 +632,19 @@ public void testGetDBStatementRemoteOperation() {
     mockAttribute(DB_STATEMENT, "SELECT FROM *");
     mockAttribute(DB_OPERATION, "DB operation");
     validateExpectedRemoteAttributes("DB system", "DB operation");
+
+    // Case 10: Duplicate of case 1 with leading whitespace
+    mockAttribute(DB_SYSTEM, "DB system");
+    mockAttribute(DB_STATEMENT, "    SELECT DB statement");
+    mockAttribute(DB_OPERATION, null);
+    validateExpectedRemoteAttributes("DB system", "SELECT");
+
+    // Case 11: Duplicate of case 2 with leading whitespace. Test if whitespace affects longest
+    // match
+    mockAttribute(DB_SYSTEM, "DB system");
+    mockAttribute(DB_STATEMENT, "     DROP VIEW DB statement");
+    mockAttribute(DB_OPERATION, null);
+    validateExpectedRemoteAttributes("DB system", "DROP VIEW");
   }
 
   @Test