Create builder for Micrometer observation collector

Author: acogoluegnes

src/main/java/com/rabbitmq/model/observation/micrometer/DeliverContext.java

@@ -29,7 +29,7 @@ public class DeliverContext extends ReceiverContext<Message> {
   private final String messageId;
   private final String correlationId;
 
-  public DeliverContext(String exchange, String routingKey, String queue, Message message) {
+  DeliverContext(String exchange, String routingKey, String queue, Message message) {
     super(
         (carrier, key) -> {
           Object result = carrier.annotation(key);
@@ -55,27 +55,27 @@ public DeliverContext(String exchange, String routingKey, String queue, Message
     setCarrier(message);
   }
 
-  String exchange() {
+  public String exchange() {
     return this.exchange;
   }
 
-  String routingKey() {
+  public String routingKey() {
     return this.routingKey;
   }
 
-  String queue() {
+  public String queue() {
     return this.queue;
   }
 
-  int payloadSizeBytes() {
+  public int payloadSizeBytes() {
     return this.payloadSizeBytes;
   }
 
-  String messageId() {
+  public String messageId() {
     return this.messageId;
   }
 
-  String correlationId() {
+  public String correlationId() {
     return this.correlationId;
   }
 }

src/main/java/com/rabbitmq/model/observation/micrometer/MicrometerObservationCollector.java

@@ -25,19 +25,24 @@
 import io.micrometer.observation.ObservationRegistry;
 import java.util.function.Function;
 
-public class MicrometerObservationCollector implements ObservationCollector {
+class MicrometerObservationCollector implements ObservationCollector {
 
   private final ObservationRegistry registry;
   private final PublishObservationConvention customPublishConvention, defaultPublishConvention;
   private final DeliverObservationConvention customProcessConvention, defaultProcessConvention;
 
   @SuppressFBWarnings("EI_EXPOSE_REP2")
-  public MicrometerObservationCollector(ObservationRegistry registry) {
-    this.customPublishConvention = null;
-    this.defaultPublishConvention = new DefaultPublishObservationConvention();
-    this.customProcessConvention = null;
-    this.defaultProcessConvention = new DefaultProcessObservationConvention();
+  MicrometerObservationCollector(
+      ObservationRegistry registry,
+      PublishObservationConvention customPublishConvention,
+      PublishObservationConvention defaultPublishConvention,
+      DeliverObservationConvention customProcessConvention,
+      DeliverObservationConvention defaultProcessConvention) {
     this.registry = registry;
+    this.customPublishConvention = customPublishConvention;
+    this.defaultPublishConvention = defaultPublishConvention;
+    this.customProcessConvention = customProcessConvention;
+    this.defaultProcessConvention = defaultProcessConvention;
   }
 
   @Override

src/main/java/com/rabbitmq/model/observation/micrometer/MicrometerObservationCollectorBuilder.java

@@ -0,0 +1,70 @@
+// Copyright (c) 2024 Broadcom. All Rights Reserved.
+// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// If you have any questions regarding licensing, please contact us at
+// [email protected].
+package com.rabbitmq.model.observation.micrometer;
+
+import com.rabbitmq.model.ObservationCollector;
+import io.micrometer.observation.ObservationRegistry;
+
+public class MicrometerObservationCollectorBuilder {
+
+  private ObservationRegistry registry = ObservationRegistry.NOOP;
+  private PublishObservationConvention customPublishConvention = null;
+  private PublishObservationConvention defaultPublishConvention =
+      new DefaultPublishObservationConvention();
+  private DeliverObservationConvention customProcessConvention = null;
+  private DeliverObservationConvention defaultProcessConvention =
+      new DefaultProcessObservationConvention();
+
+  public MicrometerObservationCollectorBuilder registry(ObservationRegistry registry) {
+    this.registry = registry;
+    return this;
+  }
+
+  public MicrometerObservationCollectorBuilder customPublishConvention(
+      PublishObservationConvention customPublishConvention) {
+    this.customPublishConvention = customPublishConvention;
+    return this;
+  }
+
+  public MicrometerObservationCollectorBuilder defaultPublishConvention(
+      PublishObservationConvention defaultPublishConvention) {
+    this.defaultPublishConvention = defaultPublishConvention;
+    return this;
+  }
+
+  public MicrometerObservationCollectorBuilder customProcessConvention(
+      DeliverObservationConvention customProcessConvention) {
+    this.customProcessConvention = customProcessConvention;
+    return this;
+  }
+
+  public MicrometerObservationCollectorBuilder defaultProcessConvention(
+      DeliverObservationConvention defaultProcessConvention) {
+    this.defaultProcessConvention = defaultProcessConvention;
+    return this;
+  }
+
+  public ObservationCollector build() {
+    return new MicrometerObservationCollector(
+        this.registry,
+        this.customPublishConvention,
+        this.defaultPublishConvention,
+        this.customProcessConvention,
+        this.defaultProcessConvention);
+  }
+}

src/main/java/com/rabbitmq/model/observation/micrometer/PublishContext.java

@@ -55,31 +55,31 @@ public class PublishContext extends SenderContext<Message> {
     setCarrier(message);
   }
 
-  String exchange() {
+  public String exchange() {
     return this.exchange;
   }
 
-  String routingKey() {
+  public String routingKey() {
     return this.routingKey;
   }
 
-  int payloadSizeBytes() {
+  public int payloadSizeBytes() {
     return this.payloadSizeBytes;
   }
 
-  String messageId() {
+  public String messageId() {
     return this.messageId;
   }
 
-  String correlationId() {
+  public String correlationId() {
     return this.correlationId;
   }
 
-  String peerAddress() {
+  public String peerAddress() {
     return this.peerAddress;
   }
 
-  int peerPort() {
+  public int peerPort() {
     return this.peerPort;
   }
 }

src/test/java/com/rabbitmq/model/amqp/MicrometerObservationCollectorTest.java

@@ -24,7 +24,7 @@
 import com.rabbitmq.model.Environment;
 import com.rabbitmq.model.Management;
 import com.rabbitmq.model.Publisher;
-import com.rabbitmq.model.observation.micrometer.MicrometerObservationCollector;
+import com.rabbitmq.model.observation.micrometer.MicrometerObservationCollectorBuilder;
 import io.micrometer.tracing.exporter.FinishedSpan;
 import io.micrometer.tracing.test.SampleTestRunner;
 import io.micrometer.tracing.test.reporter.BuildingBlocks;
@@ -57,7 +57,10 @@ public SampleTestRunner.SampleTestRunnerConsumer yourCode() {
       return (buildingBlocks, meterRegistry) -> {
         try (Environment env =
             new AmqpEnvironmentBuilder()
-                .observationCollector(new MicrometerObservationCollector(getObservationRegistry()))
+                .observationCollector(
+                    new MicrometerObservationCollectorBuilder()
+                        .registry(getObservationRegistry())
+                        .build())
                 .build()) {
           Connection publisherConnection = env.connectionBuilder().build();
           Connection consumerConnection = env.connectionBuilder().build();