Fix exception when pulsar has multiple service addresses (#8816)

Author: laurit

instrumentation/pulsar/pulsar-2.8/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParserTest.java

@@ -16,6 +16,8 @@ public class UrlParserTest {
   void parseUrl() {
     assertThat(UrlParser.parseUrl(null)).isNull();
     assertThat(UrlParser.parseUrl("localhost:1")).isNull();
+    assertThat(UrlParser.parseUrl("localhost:1,localhost:2")).isNull();
+    assertThat(UrlParser.parseUrl("localhost:1;localhost:2")).isNull();
 
     {
       UrlData url = UrlParser.parseUrl("pulsar://localhost:1");
@@ -32,5 +34,10 @@ void parseUrl() {
       assertThat(url.getHost()).isEqualTo("localhost");
       assertThat(url.getPort()).isNull();
     }
+    {
+      UrlData url = UrlParser.parseUrl("pulsar://localhost:xxx");
+      assertThat(url.getHost()).isEqualTo("localhost");
+      assertThat(url.getPort()).isNull();
+    }
   }
 }

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ConsumerImplInstrumentation.java

@@ -88,12 +88,12 @@ public static void after(
   @SuppressWarnings("unused")
   public static class ConsumerInternalReceiveAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static Timer before() {
       return Timer.start();
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void after(
         @Advice.Enter Timer timer,
         @Advice.This Consumer<?> consumer,
@@ -117,7 +117,7 @@ public static Timer before() {
       return Timer.start();
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void after(
         @Advice.Enter Timer timer,
         @Advice.This Consumer<?> consumer,
@@ -137,7 +137,7 @@ public static Timer before() {
       return Timer.start();
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void after(
         @Advice.Enter Timer timer,
         @Advice.This Consumer<?> consumer,
@@ -154,7 +154,7 @@ public static Timer before() {
       return Timer.start();
     }
 
-    @Advice.OnMethodExit(onThrowable = Throwable.class)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void after(
         @Advice.Enter Timer timer,
         @Advice.This Consumer<?> consumer,

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageInstrumentation.java

@@ -33,7 +33,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class MessageRecycleAdvice {
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     public static void after(@Advice.This Message<?> message) {
       // Clean context to prevent memory leak.
       VirtualFieldStore.inject(message, null);

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/MessageListenerInstrumentation.java

@@ -44,7 +44,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ConsumerConfigurationDataMethodAdvice {
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     public static void after(
         @Advice.This ConsumerConfigurationData<?> data,
         @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC)

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/ProducerImplInstrumentation.java

@@ -56,7 +56,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ProducerImplConstructorAdvice {
 
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     public static void intercept(
         @Advice.This ProducerImpl<?> producer, @Advice.Argument(value = 0) PulsarClient client) {
       PulsarClientImpl pulsarClient = (PulsarClientImpl) client;
@@ -69,7 +69,7 @@ public static void intercept(
   @SuppressWarnings("unused")
   public static class ProducerSendAsyncMethodAdvice {
 
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void before(
         @Advice.This ProducerImpl<?> producer,
         @Advice.Argument(value = 0) Message<?> message,

instrumentation/pulsar/pulsar-2.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/UrlParser.java

@@ -10,7 +10,8 @@ public class UrlParser {
   private UrlParser() {}
 
   public static UrlData parseUrl(String url) {
-    if (url == null) {
+    // if there are multiple addresses then they are separated with , or ;
+    if (url == null || url.indexOf(',') != -1 || url.indexOf(';') != -1) {
       return null;
     }
 
@@ -33,7 +34,11 @@ public static UrlData parseUrl(String url) {
       port = null;
     } else {
       host = authority.substring(0, portStart);
-      port = Integer.parseInt(authority.substring(portStart + 1));
+      try {
+        port = Integer.parseInt(authority.substring(portStart + 1));
+      } catch (NumberFormatException exception) {
+        port = null;
+      }
     }
 
     return new UrlData(host, port);