Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-migration-2

Author: SylvainJuge

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -161,7 +161,7 @@ dependencies {
   compileOnly("com.google.errorprone:error_prone_annotations")
 
   codenarc("org.codenarc:CodeNarc:3.6.0")
-  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.24"))
+  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
 
   modules {
     // checkstyle uses the very old google-collections which causes Java 9 module conflict with

dependencyManagement/build.gradle.kts

@@ -10,7 +10,7 @@ val otelContribVersion = "1.46.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars
-val groovyVersion = "4.0.26"
+val groovyVersion = "4.0.27"
 
 // We don't force libraries we instrument to new versions since we compile and test against specific
 // old baseline versions but we do try to force those libraries' transitive dependencies to new

instrumentation/camel-2.20/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java

@@ -26,17 +26,16 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-public class CamelPropagationUtilTest {
+class CamelPropagationUtilTest {
 
   @BeforeAll
-  public static void setUp() {
+  static void setUp() {
     GlobalOpenTelemetry.set(
         OpenTelemetry.propagating(ContextPropagators.create(JaegerPropagator.getInstance())));
   }
 
   @Test
-  public void shouldExtractHttpParentForHttpEndpoint() throws Exception {
-
+  void shouldExtractHttpParentForHttpEndpoint() throws Exception {
     // given
     Endpoint endpoint = new HttpEndpoint("", new HttpComponent(), URI.create(""));
     Map<String, Object> exchangeHeaders =
@@ -54,8 +53,7 @@ public void shouldExtractHttpParentForHttpEndpoint() throws Exception {
   }
 
   @Test
-  public void shouldNotFailExtractingNullHttpParentForHttpEndpoint() throws Exception {
-
+  void shouldNotFailExtractingNullHttpParentForHttpEndpoint() throws Exception {
     // given
     Endpoint endpoint = new HttpEndpoint("", new HttpComponent(), URI.create(""));
     Map<String, Object> exchangeHeaders = Collections.singletonMap("uber-trace-id", null);
@@ -70,8 +68,7 @@ public void shouldNotFailExtractingNullHttpParentForHttpEndpoint() throws Except
   }
 
   @Test
-  public void shouldNotFailExtractingNullAwsParentForSqsEndpoint() {
-
+  void shouldNotFailExtractingNullAwsParentForSqsEndpoint() {
     // given
     Endpoint endpoint = new SqsEndpoint("", new SqsComponent(), new SqsConfiguration());
     Map<String, Object> exchangeHeaders = Collections.singletonMap("AWSTraceHeader", null);
@@ -86,8 +83,7 @@ public void shouldNotFailExtractingNullAwsParentForSqsEndpoint() {
   }
 
   @Test
-  public void shouldExtractAwsParentForSqsEndpoint() {
-
+  void shouldExtractAwsParentForSqsEndpoint() {
     // given
     Endpoint endpoint = new SqsEndpoint("", new SqsComponent(), new SqsConfiguration());
     Map<String, Object> exchangeHeaders =

instrumentation/camel-2.20/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/SanitizationTest.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -20,6 +20,18 @@
 
 class SanitizationTest {
 
+  static class CqlArgs implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+      return Stream.of(
+          Arguments.of("FROM TABLE WHERE FIELD>=-1234", "FROM TABLE WHERE FIELD>=?"),
+          Arguments.of(
+              "SELECT Name, Phone.Number FROM Contact WHERE Address.State = 'NY'",
+              "SELECT Name, Phone.Number FROM Contact WHERE Address.State = ?"),
+          Arguments.of("FROM col WHERE @Tag='Something'", "FROM col WHERE @Tag=?"));
+    }
+  }
+
   @ParameterizedTest
   @ArgumentsSource(CqlArgs.class)
   void sanitizeCql(String original, String expected) {
@@ -31,7 +43,22 @@ void sanitizeCql(String original, String expected) {
     when(exchange.getIn()).thenReturn(message);
 
     String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(expected, actualSanitized);
+    assertThat(actualSanitized).isEqualTo(expected);
+  }
+
+  static class JdbcArgs implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
+      return Stream.of(
+          Arguments.of("SELECT 3", "SELECT ?"),
+          Arguments.of(
+              "SELECT * FROM TABLE WHERE FIELD = 1234", "SELECT * FROM TABLE WHERE FIELD = ?"),
+          Arguments.of(
+              "SELECT * FROM TABLE WHERE FIELD<-1234", "SELECT * FROM TABLE WHERE FIELD<?"),
+          Arguments.of(
+              "SELECT col1 AS col2 FROM users WHERE field=1234",
+              "SELECT col1 AS col2 FROM users WHERE field=?"));
+    }
   }
 
   @ParameterizedTest
@@ -45,22 +72,7 @@ void sanitizeJdbc(String original, String expected) {
     when(exchange.getIn()).thenReturn(message);
 
     String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(expected, actualSanitized);
-  }
-
-  @ParameterizedTest
-  @ArgumentsSource(SqlArgs.class)
-  void sanitizeSql(String original, String expected) {
-
-    DbSpanDecorator decorator = new DbSpanDecorator("sql", "");
-
-    Exchange exchange = mock(Exchange.class);
-    Message message = mock(Message.class);
-    when(message.getHeader("CamelSqlQuery")).thenReturn(original);
-    when(exchange.getIn()).thenReturn(message);
-
-    String actualSanitized = decorator.getStatement(exchange, null);
-    assertEquals(expected, actualSanitized);
+    assertThat(actualSanitized).isEqualTo(expected);
   }
 
   static class SqlArgs implements ArgumentsProvider {
@@ -75,30 +87,18 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
     }
   }
 
-  static class CqlArgs implements ArgumentsProvider {
-    @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-      return Stream.of(
-          Arguments.of("FROM TABLE WHERE FIELD>=-1234", "FROM TABLE WHERE FIELD>=?"),
-          Arguments.of(
-              "SELECT Name, Phone.Number FROM Contact WHERE Address.State = 'NY'",
-              "SELECT Name, Phone.Number FROM Contact WHERE Address.State = ?"),
-          Arguments.of("FROM col WHERE @Tag='Something'", "FROM col WHERE @Tag=?"));
-    }
-  }
+  @ParameterizedTest
+  @ArgumentsSource(SqlArgs.class)
+  void sanitizeSql(String original, String expected) {
 
-  static class JdbcArgs implements ArgumentsProvider {
-    @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-      return Stream.of(
-          Arguments.of("SELECT 3", "SELECT ?"),
-          Arguments.of(
-              "SELECT * FROM TABLE WHERE FIELD = 1234", "SELECT * FROM TABLE WHERE FIELD = ?"),
-          Arguments.of(
-              "SELECT * FROM TABLE WHERE FIELD<-1234", "SELECT * FROM TABLE WHERE FIELD<?"),
-          Arguments.of(
-              "SELECT col1 AS col2 FROM users WHERE field=1234",
-              "SELECT col1 AS col2 FROM users WHERE field=?"));
-    }
+    DbSpanDecorator decorator = new DbSpanDecorator("sql", "");
+
+    Exchange exchange = mock(Exchange.class);
+    Message message = mock(Message.class);
+    when(message.getHeader("CamelSqlQuery")).thenReturn(original);
+    when(exchange.getIn()).thenReturn(message);
+
+    String actualSanitized = decorator.getStatement(exchange, null);
+    assertThat(actualSanitized).isEqualTo(expected);
   }
 }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DecoratorRegistry.java

@@ -32,8 +32,14 @@ private static Map<String, SpanDecorator> loadDecorators() {
     result.put("direct-vm", new InternalSpanDecorator());
     result.put("disruptor", new InternalSpanDecorator());
     result.put("disruptor-vm", new InternalSpanDecorator());
-    result.put("elasticsearch", new DbSpanDecorator("elasticsearch", "elasticsearch"));
-    result.put("opensearch", new DbSpanDecorator("opensearch", "opensearch"));
+    result.put(
+        "elasticsearch",
+        new DbSpanDecorator(
+            "elasticsearch", DbIncubatingAttributes.DbSystemIncubatingValues.ELASTICSEARCH));
+    result.put(
+        "opensearch",
+        new DbSpanDecorator(
+            "opensearch", DbIncubatingAttributes.DbSystemIncubatingValues.OPENSEARCH));
     result.put("http4", new Http4SpanDecorator());
     result.put("https4", new Https4SpanDecorator());
     result.put("http", new HttpSpanDecorator());

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.java

@@ -24,8 +24,7 @@
 class DirectCamelTest extends AbstractHttpServerUsingTest<ConfigurableApplicationContext> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private ConfigurableApplicationContext appContext;
 

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.java

@@ -24,8 +24,7 @@
 class MulticastDirectCamelTest extends AbstractHttpServerUsingTest<ConfigurableApplicationContext> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private ConfigurableApplicationContext appContext;
 

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.java

@@ -39,8 +39,7 @@
 class RestCamelTest extends AbstractHttpServerUsingTest<ConfigurableApplicationContext> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private ConfigurableApplicationContext appContext;
 

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.java

@@ -26,8 +26,7 @@
 class SingleServiceCamelTest extends AbstractHttpServerUsingTest<ConfigurableApplicationContext> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   @Override
   protected ConfigurableApplicationContext setupServer() {

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.java

@@ -42,8 +42,7 @@
 class TwoServicesWithDirectClientCamelTest
     extends AbstractHttpServerUsingTest<ConfigurableApplicationContext> {
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private static CamelContext clientContext;