Merge branch 'main' into remove-more-deprecated-props

Author: trask

instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/v2_0/GwtTest.java

@@ -80,7 +80,7 @@ static void setup() throws Exception {
     Testcontainers.exposeHostPorts(port);
 
     browser =
-        new BrowserWebDriverContainer("selenium/standalone-chrome")
+        new BrowserWebDriverContainer("selenium/standalone-chrome:4.43.0")
             .withLogConsumer(new Slf4jLogConsumer(logger));
     cleanup.deferAfterAll(browser::stop);
     browser.start();

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java

@@ -64,7 +64,7 @@ abstract class AbstractJms1Test {
   @BeforeAll
   static void setUp() throws JMSException {
     broker =
-        new GenericContainer<>("rmohr/activemq:latest")
+        new GenericContainer<>("apache/activemq-classic:5.19.2")
             .withExposedPorts(61616, 8161)
             .withLogConsumer(new Slf4jLogConsumer(logger));
     broker.start();

instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfRequest.java

@@ -15,10 +15,10 @@ public class JsfRequest {
   @Nullable private final String spanName;
 
   public JsfRequest(ActionEvent event) {
-    this.spanName = getSpanName(event);
+    this.spanName = extractSpanName(event);
   }
 
-  public String spanName() {
+  public String getSpanName() {
     return requireNonNull(spanName);
   }
 
@@ -27,7 +27,7 @@ public boolean shouldStartSpan() {
   }
 
   @Nullable
-  private static String getSpanName(ActionEvent event) {
+  private static String extractSpanName(ActionEvent event) {
     // https://jakarta.ee/specifications/faces/3.0/apidocs/jakarta/faces/component/actionsource2
     // ActionSource2 was added in JSF 1.2 and is implemented by components that have an action
     // attribute such as a button or a link

instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/BaseJsfTest.java

@@ -50,7 +50,7 @@
 public abstract class BaseJsfTest extends AbstractHttpServerUsingTest<Server> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
+  private static final InstrumentationExtension testing =
       HttpServerInstrumentationExtension.forAgent();
 
   @BeforeAll

instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraSingletons.java

@@ -19,7 +19,7 @@ public class MojarraSingletons {
   static {
     instrumenter =
         Instrumenter.<JsfRequest, Void>builder(
-                GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, JsfRequest::spanName)
+                GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, JsfRequest::getSpanName)
             .setErrorCauseExtractor(new JsfErrorCauseExtractor())
             .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
             .buildInstrumenter();

instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesSingletons.java

@@ -18,7 +18,7 @@ class MyFacesSingletons {
   static {
     instrumenter =
         Instrumenter.<JsfRequest, Void>builder(
-                GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, JsfRequest::spanName)
+                GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, JsfRequest::getSpanName)
             .setErrorCauseExtractor(new MyFacesErrorCauseExtractor())
             .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
             .buildInstrumenter();

instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ClientTest.java

@@ -159,7 +159,7 @@ private static int getPort(URI uri) {
   }
 
   @Test
-  void closeChannel() throws ExecutionException, InterruptedException {
+  void closeChannel() throws InterruptedException {
     String method = "GET";
     URI uri = resolveAddress("/read-timeout");
     DefaultFullHttpRequest request = buildRequest(method, uri, emptyMap());
@@ -170,7 +170,7 @@ void closeChannel() throws ExecutionException, InterruptedException {
     CompletableFuture<Integer> result = new CompletableFuture<>();
     channel.pipeline().addLast(new ClientHandler(result));
     channel.pipeline().addLast(new ReadTimeoutHandler(READ_TIMEOUT.toMillis(), MILLISECONDS));
-    channel.writeAndFlush(request).get();
+    channel.writeAndFlush(request).sync();
     Thread.sleep(1_000);
     channel.close();
 

instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java

@@ -50,7 +50,7 @@
 
 public abstract class AbstractNetty41ServerTest extends AbstractHttpServerTest<EventLoopGroup> {
 
-  static final LoggingHandler LOGGING_HANDLER =
+  static final LoggingHandler loggingHandler =
       new LoggingHandler(AbstractNetty41ServerTest.class, LogLevel.DEBUG);
 
   protected abstract void configurePipeline(ChannelPipeline channelPipeline);
@@ -69,13 +69,13 @@ protected EventLoopGroup setupServer() {
     ServerBootstrap bootstrap =
         new ServerBootstrap()
             .group(eventLoopGroup)
-            .handler(LOGGING_HANDLER)
+            .handler(loggingHandler)
             .childHandler(
                 new ChannelInitializer<SocketChannel>() {
                   @Override
                   protected void initChannel(SocketChannel socketChannel) {
                     ChannelPipeline pipeline = socketChannel.pipeline();
-                    pipeline.addFirst("logger", LOGGING_HANDLER);
+                    pipeline.addFirst("logger", loggingHandler);
                     pipeline.addLast(new HttpServerCodec());
                     pipeline.addLast(new HttpObjectAggregator(65536));
                     pipeline.addLast(new HttpHandler());

instrumentation/netty/netty-common-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/v4_0/NettyScope.java

@@ -11,6 +11,7 @@
 import io.opentelemetry.instrumentation.netty.common.internal.NettyConnectionRequest;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.ConnectionCompleteListener;
 import io.opentelemetry.instrumentation.netty.common.v4_0.internal.client.NettyConnectionInstrumenter;
+import javax.annotation.Nullable;
 
 /** Container used to carry state between enter and exit advices */
 public class NettyScope {
@@ -34,10 +35,10 @@ public static NettyScope startNew(
   }
 
   public static void end(
-      NettyScope nettyScope,
+      @Nullable NettyScope nettyScope,
       NettyConnectionInstrumenter instrumenter,
       ChannelPromise channelPromise,
-      Throwable throwable) {
+      @Nullable Throwable throwable) {
 
     if (nettyScope == null) {
       return;

instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/NettyHttpClientAttributesGetter.java

@@ -29,7 +29,7 @@ public String getUrlFull(NettyCommonRequest requestAndChannel) {
       String hostHeader = getHost(requestAndChannel);
       String target = requestAndChannel.getRequest().getUri();
       URI uri = new URI(target);
-      if ((uri.getHost() == null || uri.getHost().equals("")) && hostHeader != null) {
+      if ((uri.getHost() == null || uri.getHost().isEmpty()) && hostHeader != null) {
         return getScheme(requestAndChannel) + "://" + hostHeader + target;
       }
       return uri.toString();