enhance messaging testapp (#907)

* allow to set destination + async receive msg

* fix test + reformat

Author: SylvainJuge

smoke-tests/src/test/java/com/example/javaagent/smoketest/AgentFeaturesSmokeTest.java

@@ -96,26 +96,26 @@ void httpHeaderCapture() {
   @Test
   void messagingHeaderCapture() {
     doRequest(
-        getUrl("/messages/send?headerName=My_Header&headerValue=my-header-value"), okResponse());
-    doRequest(getUrl("/messages/receive"), okResponse());
+        getUrl("/messages/send/sync-queue?headerName=My_Header&headerValue=my-header-value"),
+        okResponse());
+    doRequest(getUrl("/messages/receive/sync-queue"), okResponse());
 
     List<ExportTraceServiceRequest> traces = waitForTraces();
     List<Span> spans = getSpans(traces).toList();
     assertThat(spans)
         .hasSize(3)
         .extracting("name", "kind")
         .containsOnly(
-            tuple("GET /messages/send", Span.SpanKind.SPAN_KIND_SERVER),
-            tuple("messages-destination publish", Span.SpanKind.SPAN_KIND_PRODUCER),
-            tuple("GET /messages/receive", Span.SpanKind.SPAN_KIND_SERVER));
+            tuple("GET /messages/send/{destination}", Span.SpanKind.SPAN_KIND_SERVER),
+            tuple("sync-queue publish", Span.SpanKind.SPAN_KIND_PRODUCER),
+            tuple("GET /messages/receive/{destination}", Span.SpanKind.SPAN_KIND_SERVER));
 
     spans.stream()
         .filter(span -> span.getKind() == Span.SpanKind.SPAN_KIND_PRODUCER)
         .forEach(
             span ->
                 assertThat(getAttributes(span.getAttributesList()))
-                    .containsEntry(
-                        "messaging.destination.name", attributeValue("messages-destination"))
+                    .containsEntry("messaging.destination.name", attributeValue("sync-queue"))
                     .containsEntry(
                         "messaging.header.My_Header", attributeArrayValue("my-header-value")));
   }

smoke-tests/test-app/build.gradle.kts

@@ -5,6 +5,8 @@ plugins {
   alias(catalog.plugins.taskinfo)
 }
 
+val mainClass = "co.elastic.otel.test.AppMain"
+
 dependencies {
 
   // Using a spring boot app is simpler for a general-purpose test app
@@ -40,7 +42,7 @@ jib {
   from.image = "gcr.io/distroless/java17-debian11:debug"
   to.image = "docker.elastic.co/open-telemetry/elastic-otel-java/smoke-test/test-app:$tag"
   container.ports = listOf("8080")
-  container.mainClass = "co.elastic.otel.test.AppMain"
+  container.mainClass = mainClass
 }
 
 tasks {
@@ -52,6 +54,12 @@ tasks {
     isEnabled = false
   }
 
+  jar {
+    manifest {
+      attributes("Main-Class" to mainClass)
+    }
+  }
+
   // build docker image with 'assemble'
   assemble {
     dependsOn(jibDockerBuild)

smoke-tests/test-app/src/main/java/co/elastic/otel/test/AppMain.java

@@ -19,9 +19,11 @@
 package co.elastic.otel.test;
 
 import co.elastic.otel.agent.attach.RuntimeAttach;
+import javax.jms.Message;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.jms.annotation.JmsListener;
 
 @SpringBootApplication
 @EnableJms
@@ -33,4 +35,9 @@ public static void main(String[] args) {
     }
     SpringApplication.run(AppMain.class, args);
   }
+
+  @JmsListener(destination = "async-queue")
+  public static void onMessage(Message message) {
+    System.out.println("message received");
+  }
 }

smoke-tests/test-app/src/main/java/co/elastic/otel/test/MessagingController.java

@@ -24,6 +24,7 @@
 import javax.jms.TextMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsTemplate;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,21 +33,20 @@
 @RequestMapping("/messages")
 public class MessagingController {
 
-  private static final String DESTINATION = "messages-destination";
-
   @Autowired
   public MessagingController(JmsTemplate jmsTemplate) {
     this.jmsTemplate = jmsTemplate;
   }
 
   private final JmsTemplate jmsTemplate;
 
-  @RequestMapping("/send")
+  @RequestMapping("/send/{destination}")
   public String send(
+      @PathVariable(name = "destination") String destination,
       @RequestParam(name = "headerName", required = false) String headerName,
       @RequestParam(name = "headerValue", required = false) String headerValue) {
     jmsTemplate.send(
-        DESTINATION,
+        destination,
         session -> {
           TextMessage message = session.createTextMessage("Hello World");
           if (headerName != null && headerValue != null) {
@@ -57,9 +57,10 @@ public String send(
     return null;
   }
 
-  @RequestMapping("/receive")
-  public String receive() throws JMSException {
-    Message received = jmsTemplate.receive(DESTINATION);
+  @RequestMapping("/receive/{destination}")
+  public String receive(@PathVariable(name = "destination") String destination)
+      throws JMSException {
+    Message received = jmsTemplate.receive(destination);
     if (received instanceof TextMessage) {
       TextMessage textMessage = (TextMessage) received;
       StringBuilder sb = new StringBuilder();