Support sanitize the influxSQL

Author: steverao

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbAttributesGetter.java

@@ -7,14 +7,19 @@
 
 import io.opentelemetry.api.internal.StringUtils;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlStatementSanitizer;
+import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
 import javax.annotation.Nullable;
 
 final class InfluxDbAttributesGetter implements DbClientAttributesGetter<InfluxDbRequest> {
 
+  private static final SqlStatementSanitizer sanitizer =
+      SqlStatementSanitizer.create(CommonConfig.get().isStatementSanitizationEnabled());
+
   @Nullable
   @Override
   public String getStatement(InfluxDbRequest request) {
-    return request.getSql();
+    return sanitizer.sanitize(request.getSql()).getFullStatement();
   }
 
   @Nullable

instrumentation/influxdb-2.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbClientTest.java

@@ -147,7 +147,7 @@ void testQueryAndModifyWithOneArgument() {
 
   @Test
   void testQueryWithTwoArguments() {
-    Query query = new Query("SELECT * FROM cpu_load", databaseName);
+    Query query = new Query("SELECT * FROM cpu_load where test1 = 'influxDb'", databaseName);
     influxDb.query(query, TimeUnit.MILLISECONDS);
 
     testing.waitAndAssertTraces(
@@ -158,12 +158,17 @@ void testQueryWithTwoArguments() {
                         .hasKind(SpanKind.CLIENT)
                         .hasAttributesSatisfying(
                             attributeAssertions(
-                                "SELECT * FROM cpu_load", "SELECT", databaseName))));
+                                "SELECT * FROM cpu_load where test1 = ?",
+                                "SELECT",
+                                databaseName))));
   }
 
   @Test
   void testQueryWithThreeArguments() throws InterruptedException {
-    Query query = new Query("SELECT * FROM cpu_load", databaseName);
+    Query query =
+        new Query(
+            "SELECT * FROM cpu_load where time >= '2022-01-01T08:00:00Z' AND time <= '2022-01-01T20:00:00Z'",
+            databaseName);
     BlockingQueue<QueryResult> queue = new LinkedBlockingQueue<>();
 
     influxDb.query(query, 2, result -> queue.add(result));
@@ -178,7 +183,9 @@ void testQueryWithThreeArguments() throws InterruptedException {
                         .hasKind(SpanKind.CLIENT)
                         .hasAttributesSatisfying(
                             attributeAssertions(
-                                "SELECT * FROM cpu_load", "SELECT", databaseName))));
+                                "SELECT * FROM cpu_load where time >= ? AND time <= ?",
+                                "SELECT",
+                                databaseName))));
   }
 
   @Test
@@ -205,7 +212,10 @@ void testQueryWithThreeArgumentsCallback() throws InterruptedException {
   void testQueryWithFiveArguments() throws InterruptedException {
     CountDownLatch countDownLatch = new CountDownLatch(1);
     CountDownLatch countDownLatchFailure = new CountDownLatch(1);
-    Query query = new Query("SELECT * FROM cpu_load", databaseName);
+    Query query =
+        new Query(
+            "SELECT MEAN(water_level) FROM h2o_feet where time = '2022-01-01T08:00:00Z'; SELECT water_level FROM h2o_feet LIMIT 2",
+            databaseName);
     influxDb.query(
         query,
         10,
@@ -227,7 +237,9 @@ void testQueryWithFiveArguments() throws InterruptedException {
                         .hasKind(SpanKind.CLIENT)
                         .hasAttributesSatisfying(
                             attributeAssertions(
-                                "SELECT * FROM cpu_load", "SELECT", databaseName))));
+                                "SELECT MEAN(water_level) FROM h2o_feet where time = ?; SELECT water_level FROM h2o_feet LIMIT ?",
+                                "SELECT",
+                                databaseName))));
   }
 
   @Test