Intellij cleanup (Java and Groovy) (#3285)

* Intellij cleanup * Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com> * Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com> * Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com> * Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com> * Update instrumentation/spring/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptorTest.java Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com> * Use glassfish version that supports lambdas Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
open-telemetry · Jun 14, 2021 · 62f1f49 · 62f1f49
1 parent fbb1a35
commit 62f1f49
Show file tree

Hide file tree

Showing 57 changed files with 241 additions and 348 deletions.
diff --git a/...n/java/io/opentelemetry/instrumentation/gradle/bytebuddy/ByteBuddyPluginConfigurator.java b/...n/java/io/opentelemetry/instrumentation/gradle/bytebuddy/ByteBuddyPluginConfigurator.java
@@ -81,13 +81,7 @@ public void configure() {
             .collect(Collectors.toList());
 
     TaskProvider<?> byteBuddyTask =
-        project
-            .getTasks()
-            .register(
-                taskName,
-                task -> {
-                  task.dependsOn(languageTasks);
-                });
+        project.getTasks().register(taskName, task -> task.dependsOn(languageTasks));
 
     project
         .getTasks()

diff --git a/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java b/...ation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java
@@ -138,8 +138,7 @@ private Span internalStartSpan(
       spanBuilder.setStartTimestamp(startTimeNanos, TimeUnit.NANOSECONDS);
     }
     onRequest(spanBuilder, request);
-    Span span = spanBuilder.startSpan();
-    return span;
+    return spanBuilder.startSpan();
   }
 
   protected void onRequest(SpanBuilder spanBuilder, REQUEST request) {

diff --git a/...rumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java b/...rumentation-api/src/test/java/io/opentelemetry/instrumentation/api/caching/CacheTest.java
@@ -98,7 +98,7 @@ void unbounded() {
     }
 
     @Test
-    void bounded() throws Exception {
+    void bounded() {
       Cache<String, String> cache = Cache.newBuilder().setWeakKeys().setMaximumSize(1).build();
 
       assertThat(cache.computeIfAbsent("bear", unused -> "roar")).isEqualTo("roar");

diff --git a/...a/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java b/...a/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java
@@ -18,7 +18,7 @@
 
 class CodeAttributesExtractorTest {
 
-  CodeAttributesExtractor<Map<String, String>, Void> underTest =
+  static final CodeAttributesExtractor<Map<String, String>, Void> underTest =
       new CodeAttributesExtractor<Map<String, String>, Void>() {
         @Override
         protected Class<?> codeClass(Map<String, String> request) {

diff --git a/.../java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java b/.../java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java
@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.Test;
 
 class DbAttributesExtractorTest {
-  DbAttributesExtractor<Map<String, String>, Void> underTest =
+  static final DbAttributesExtractor<Map<String, String>, Void> underTest =
       new DbAttributesExtractor<Map<String, String>, Void>() {
         @Override
         protected String system(Map<String, String> map) {

diff --git a/...java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java b/...java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java
@@ -19,7 +19,7 @@
 
 class SqlAttributesExtractorTest {
   AttributeKey<String> dbTableAttribute;
-  SqlAttributesExtractor<Map<String, String>, Void> underTest =
+  final SqlAttributesExtractor<Map<String, String>, Void> underTest =
       new SqlAttributesExtractor<Map<String, String>, Void>() {
 
         @Override

diff --git a/...elemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java b/...elemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 class MessagingAttributesExtractorTest {
-  MessagingAttributesExtractor<Map<String, String>, String> underTest =
+  static final MessagingAttributesExtractor<Map<String, String>, String> underTest =
       new MessagingAttributesExtractor<Map<String, String>, String>() {
         @Override
         protected String system(Map<String, String> request) {

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java b/...ava/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerHeaders.java
@@ -26,10 +26,6 @@ public Iterable<String> keys(HttpRequest httpRequest) {
   @Override
   public String get(HttpRequest carrier, String key) {
     Optional<HttpHeader> header = carrier.getHeader(key);
-    if (header.isPresent()) {
-      return header.get().value();
-    } else {
-      return null;
-    }
+    return header.map(HttpHeader::value).orElse(null);
   }
 }
diff --git a/.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java b/.../src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelDirection.java
@@ -7,5 +7,5 @@
 
 public enum CamelDirection {
   INBOUND,
-  OUTBOUND;
+  OUTBOUND
 }
diff --git a/.../main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java b/.../main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelEventNotifier.java
@@ -70,19 +70,18 @@ private static void onExchangeSending(ExchangeSendingEvent ese) {
 
   /** Camel finished sending (outbound). Finish span and remove it from CAMEL holder. */
   private static void onExchangeSent(ExchangeSentEvent event) {
-    ExchangeSentEvent ese = event;
-    SpanDecorator sd = CamelTracer.TRACER.getSpanDecorator(ese.getEndpoint());
+    SpanDecorator sd = CamelTracer.TRACER.getSpanDecorator(event.getEndpoint());
     if (!sd.shouldStartNewSpan()) {
       return;
     }
 
-    Span span = ActiveSpanManager.getSpan(ese.getExchange());
+    Span span = ActiveSpanManager.getSpan(event.getExchange());
     if (span != null) {
       LOG.debug("[Exchange sent] Initiator span finished: {}", span);
-      sd.post(span, ese.getExchange(), ese.getEndpoint());
-      ActiveSpanManager.deactivate(ese.getExchange());
+      sd.post(span, event.getExchange(), event.getEndpoint());
+      ActiveSpanManager.deactivate(event.getExchange());
     } else {
-      LOG.warn("Could not find managed span for exchange: {}", ese.getExchange());
+      LOG.warn("Could not find managed span for exchange: {}", event.getExchange());
     }
   }
 

diff --git a/...ent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java b/...ent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentationModule.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
 
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -20,6 +20,6 @@ public ApacheHttpAsyncClientInstrumentationModule() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(new ApacheHttpAsyncClientInstrumentation());
+    return singletonList(new ApacheHttpAsyncClientInstrumentation());
   }
 }
diff --git a/...rary/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java b/...rary/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java
@@ -40,10 +40,7 @@ public HttpResponse execute(ClientRequestContext ctx, HttpRequest req) throws Ex
     if (span.isRecording()) {
       ctx.log()
           .whenComplete()
-          .thenAccept(
-              log -> {
-                instrumenter.end(context, ctx, log, log.responseCause());
-              });
+          .thenAccept(log -> instrumenter.end(context, ctx, log, log.responseCause()));
     }
 
     try (Scope ignored = context.makeCurrent()) {

diff --git a/...y/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/WrapperConfiguration.java b/...y/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/WrapperConfiguration.java
@@ -15,7 +15,7 @@ private WrapperConfiguration() {}
       "OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT";
   public static final Duration OTEL_LAMBDA_FLUSH_TIMEOUT_DEFAULT = Duration.ofSeconds(10);
 
-  public static final Duration flushTimeout() {
+  public static Duration flushTimeout() {
     String lambdaFlushTimeout = System.getenv(OTEL_LAMBDA_FLUSH_TIMEOUT_ENV_KEY);
     if (lambdaFlushTimeout != null && !lambdaFlushTimeout.isEmpty()) {
       try {

diff --git a/...brary/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java b/...brary/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java
@@ -107,15 +107,12 @@ public void onResponse(Span span, Response<?> response) {
 
   private String qualifiedOperation(String service, Class<?> operation) {
     ConcurrentHashMap<String, String> cache = namesCache.get(operation);
-    String qualified = cache.get(service);
-    if (qualified == null) {
-      qualified =
-          service.replace("Amazon", "").trim()
-              + '.'
-              + operation.getSimpleName().replace("Request", "");
-      cache.put(service, qualified);
-    }
-    return qualified;
+    return cache.computeIfAbsent(
+        service,
+        s ->
+            s.replace("Amazon", "").trim()
+                + '.'
+                + operation.getSimpleName().replace("Request", ""));
   }
 
   @Override

diff --git a/...-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapping.java b/...-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapping.java
@@ -16,7 +16,7 @@ class FieldMapping {
 
   enum Type {
     REQUEST,
-    RESPONSE;
+    RESPONSE
   }
 
   private final Type type;
@@ -49,7 +49,7 @@ Type getType() {
     return type;
   }
 
-  static final Map<Type, List<FieldMapping>> groupByType(FieldMapping[] fieldMappings) {
+  static Map<Type, List<FieldMapping>> groupByType(FieldMapping[] fieldMappings) {
 
     EnumMap<Type, List<FieldMapping>> fields = new EnumMap<>(Type.class);
     for (FieldMapping.Type type : FieldMapping.Type.values()) {

diff --git a/....2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java b/....2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/SerializerTest.java
@@ -8,6 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -51,7 +52,7 @@ public void shouldSerializeCollection() {
   @Test
   public void shouldSerializeEmptyCollectionAsNull() {
     // given
-    List<String> collection = Arrays.asList();
+    List<String> collection = Collections.emptyList();
     // when
     String serialized = new Serializer().serialize(collection);
     // then
@@ -62,7 +63,7 @@ public void shouldSerializeEmptyCollectionAsNull() {
   public void shouldSerializeMapAsKeyCollection() {
     // given
     Map<String, Object> map = new HashMap<>();
-    map.put("uno", Long.valueOf(1));
+    map.put("uno", 1L);
     map.put("dos", new LinkedHashMap<>());
     map.put("tres", "cuatro");
     // when

diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/TracingCqlSession.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/TracingCqlSession.java
@@ -192,10 +192,9 @@ public CompletionStage<AsyncResultSet> executeAsync(Statement<?> statement) {
     try (Scope ignored = context.makeCurrent()) {
       CompletionStage<AsyncResultSet> stage = session.executeAsync(statement);
       return stage.whenComplete(
-          (asyncResultSet, throwable) -> {
-            instrumenter()
-                .end(context, request, getExecutionInfo(asyncResultSet, throwable), throwable);
-          });
+          (asyncResultSet, throwable) ->
+              instrumenter()
+                  .end(context, request, getExecutionInfo(asyncResultSet, throwable), throwable));
     }
   }
 
@@ -206,10 +205,9 @@ public CompletionStage<AsyncResultSet> executeAsync(String query) {
     try (Scope ignored = context.makeCurrent()) {
       CompletionStage<AsyncResultSet> stage = session.executeAsync(query);
       return stage.whenComplete(
-          (asyncResultSet, throwable) -> {
-            instrumenter()
-                .end(context, request, getExecutionInfo(asyncResultSet, throwable), throwable);
-          });
+          (asyncResultSet, throwable) ->
+              instrumenter()
+                  .end(context, request, getExecutionInfo(asyncResultSet, throwable), throwable));
     }
   }
 

diff --git a/...elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/...elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy
@@ -102,7 +102,7 @@ class Elasticsearch6NodeClientTest extends AgentInstrumentationSpecification {
           name "GetAction"
           kind CLIENT
           status ERROR
-          errorEvent IndexNotFoundException, ~/no such index( \[invalid-index\])?/
+          errorEvent IndexNotFoundException, ~/no such index( \[invalid-index])?/
           attributes {
             "${SemanticAttributes.DB_SYSTEM.key}" "elasticsearch"
             "${SemanticAttributes.DB_OPERATION.key}" "GetAction"

diff --git a/.../library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTracingBuilder.java b/.../library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTracingBuilder.java
@@ -60,7 +60,8 @@ public GrpcTracing build() {
         .addAttributesExtractors(
             new GrpcNetAttributesExtractor(),
             new GrpcRpcAttributesExtractor(),
-            new GrpcAttributesExtractor());
+            new GrpcAttributesExtractor())
+        .addAttributesExtractors(additionalExtractors);
     return new GrpcTracing(
         instrumenterBuilder.newServerInstrumenter(GrpcExtractAdapter.GETTER),
         // gRPC client interceptors require two phases, one to set up request and one to execute.

diff --git a/instrumentation/gwt-2.0/javaagent/src/testapp/java/test/gwt/client/GreetingEntryPoint.java b/instrumentation/gwt-2.0/javaagent/src/testapp/java/test/gwt/client/GreetingEntryPoint.java
@@ -13,7 +13,6 @@
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.RootPanel;
-import java.io.IOException;
 import test.gwt.shared.MessageService;
 import test.gwt.shared.MessageServiceAsync;
 
@@ -50,25 +49,21 @@ private void sendMessageToServer() {
         messageLabel.setText("");
         messageLabel.setStyleName("");
 
-        try {
-          messageServiceAsync.sendMessage(
-              message,
-              new AsyncCallback<String>() {
-                @Override
-                public void onFailure(Throwable caught) {
-                  messageLabel.setText("Error");
-                  messageLabel.addStyleName("error.received");
-                }
+        messageServiceAsync.sendMessage(
+            message,
+            new AsyncCallback<String>() {
+              @Override
+              public void onFailure(Throwable caught) {
+                messageLabel.setText("Error");
+                messageLabel.addStyleName("error.received");
+              }
 
-                @Override
-                public void onSuccess(String result) {
-                  messageLabel.setText(result);
-                  messageLabel.addStyleName("message.received");
-                }
-              });
-        } catch (IOException e) {
-          throw new IllegalStateException(e);
-        }
+              @Override
+              public void onSuccess(String result) {
+                messageLabel.setText(result);
+                messageLabel.addStyleName("message.received");
+              }
+            });
       }
     }
 

diff --git a/instrumentation/gwt-2.0/javaagent/src/testapp/java/test/gwt/shared/MessageServiceAsync.java b/instrumentation/gwt-2.0/javaagent/src/testapp/java/test/gwt/shared/MessageServiceAsync.java
@@ -6,9 +6,8 @@
 package test.gwt.shared;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import java.io.IOException;
 
 /** The async counterpart of <code>MessageService</code>. */
 public interface MessageServiceAsync {
-  void sendMessage(String input, AsyncCallback<String> callback) throws IOException;
+  void sendMessage(String input, AsyncCallback<String> callback);
 }
diff --git a/...entation/hibernate/hibernate-4.0/javaagent/src/hibernate6Test/groovy/SpringJpaTest.groovy b/...entation/hibernate/hibernate-4.0/javaagent/src/hibernate6Test/groovy/SpringJpaTest.groovy
@@ -42,7 +42,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName(.*)from Customer(.*)/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName(.*)from Customer(.*)/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -109,7 +109,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)where ([^\.]+)\.id( ?)=( ?)\?/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -149,7 +149,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)(where ([^\.]+)\.lastName( ?)=( ?)\?|)/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -172,7 +172,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)where ([^\.]+)\.id( ?)=( ?)\?/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }

diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/groovy/SpringJpaTest.groovy b/instrumentation/hibernate/hibernate-4.0/javaagent/src/test/groovy/SpringJpaTest.groovy
@@ -42,7 +42,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName(.*)from Customer(.*)/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName(.*)from Customer(.*)/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -109,7 +109,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)where ([^\.]+)\.id( ?)=( ?)\?/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -149,7 +149,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)(where ([^\.]+)\.lastName( ?)=( ?)\?|)/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)(where ([^.]+)\.lastName( ?)=( ?)\?|)/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }
@@ -172,7 +172,7 @@ class SpringJpaTest extends AgentInstrumentationSpecification {
             "${SemanticAttributes.DB_NAME.key}" "test"
             "${SemanticAttributes.DB_USER.key}" "sa"
             "${SemanticAttributes.DB_CONNECTION_STRING.key}" "hsqldb:mem:"
-            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^\.]+)\.id([^\,]*), ([^\.]+)\.firstName([^\,]*), ([^\.]+)\.lastName (.*)from Customer (.*)where ([^\.]+)\.id( ?)=( ?)\?/
+            "${SemanticAttributes.DB_STATEMENT.key}" ~/select ([^.]+)\.id([^,]*), ([^.]+)\.firstName([^,]*), ([^.]+)\.lastName (.*)from Customer (.*)where ([^.]+)\.id( ?)=( ?)\?/
             "${SemanticAttributes.DB_OPERATION.key}" "SELECT"
             "${SemanticAttributes.DB_SQL_TABLE.key}" "Customer"
           }