Reuse APMMeterService of APMTelemetryProvider (#104906)

elastic · Jan 30, 2024 · a3b1d86 · a3b1d86
1 parent 79d6c3e
commit a3b1d86
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/APM.java b/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/APM.java
@@ -64,14 +64,15 @@ public TelemetryProvider getTelemetryProvider(Settings settings) {
     @Override
     public Collection<?> createComponents(PluginServices services) {
         final APMTracer apmTracer = telemetryProvider.get().getTracer();
+        final APMMeterService apmMeter = telemetryProvider.get().getMeterService();
 
         apmTracer.setClusterName(services.clusterService().getClusterName().value());
         apmTracer.setNodeName(services.clusterService().getNodeName());
 
         final APMAgentSettings apmAgentSettings = new APMAgentSettings();
         apmAgentSettings.syncAgentSystemProperties(settings);
-        final APMMeterService apmMeter = new APMMeterService(settings);
-        apmAgentSettings.addClusterSettingsListeners(services.clusterService(), telemetryProvider.get(), apmMeter);
+
+        apmAgentSettings.addClusterSettingsListeners(services.clusterService(), telemetryProvider.get());
         logger.info("Sending apm metrics is {}", APMAgentSettings.TELEMETRY_METRICS_ENABLED_SETTING.get(settings) ? "enabled" : "disabled");
         logger.info("Sending apm tracing is {}", APMAgentSettings.TELEMETRY_TRACING_ENABLED_SETTING.get(settings) ? "enabled" : "disabled");
 

diff --git a/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMAgentSettings.java b/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMAgentSettings.java
@@ -37,13 +37,10 @@ public class APMAgentSettings {
 
     private static final Logger LOGGER = LogManager.getLogger(APMAgentSettings.class);
 
-    public void addClusterSettingsListeners(
-        ClusterService clusterService,
-        APMTelemetryProvider apmTelemetryProvider,
-        APMMeterService apmMeterService
-    ) {
+    public void addClusterSettingsListeners(ClusterService clusterService, APMTelemetryProvider apmTelemetryProvider) {
         final ClusterSettings clusterSettings = clusterService.getClusterSettings();
         final APMTracer apmTracer = apmTelemetryProvider.getTracer();
+        final APMMeterService apmMeterService = apmTelemetryProvider.getMeterService();
 
         clusterSettings.addSettingsUpdateConsumer(TELEMETRY_TRACING_ENABLED_SETTING, enabled -> {
             apmTracer.setEnabled(enabled);

diff --git a/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMMeterService.java b/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMMeterService.java
@@ -49,7 +49,7 @@ public APMMeterRegistry getMeterRegistry() {
     }
 
     /**
-     * @see APMAgentSettings#addClusterSettingsListeners(ClusterService, APMTelemetryProvider, APMMeterService)
+     * @see APMAgentSettings#addClusterSettingsListeners(ClusterService, APMTelemetryProvider)
      */
     void setEnabled(boolean enabled) {
         this.enabled = enabled;

diff --git a/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMTelemetryProvider.java b/modules/apm/src/main/java/org/elasticsearch/telemetry/apm/internal/APMTelemetryProvider.java
@@ -14,12 +14,10 @@
 import org.elasticsearch.telemetry.apm.internal.tracing.APMTracer;
 
 public class APMTelemetryProvider implements TelemetryProvider {
-    private final Settings settings;
     private final APMTracer apmTracer;
     private final APMMeterService apmMeterService;
 
     public APMTelemetryProvider(Settings settings) {
-        this.settings = settings;
         apmTracer = new APMTracer(settings);
         apmMeterService = new APMMeterService(settings);
     }
@@ -29,6 +27,10 @@ public APMTracer getTracer() {
         return apmTracer;
     }
 
+    public APMMeterService getMeterService() {
+        return apmMeterService;
+    }
+
     @Override
     public APMMeterRegistry getMeterRegistry() {
         return apmMeterService.getMeterRegistry();