Factor out lifecycle listener and remove tracer arguments as those can already be read by using the GlobalTracer abstraction or the constructor.

Author: raphw

apm-agent-core/src/main/java/co/elastic/apm/agent/bci/InstrumentationStatsLifecycleListener.java

@@ -19,8 +19,7 @@
 package co.elastic.apm.agent.bci;
 
 import co.elastic.apm.agent.bci.bytebuddy.MatcherTimer;
-import co.elastic.apm.agent.context.AbstractLifecycleListener;
-import co.elastic.apm.agent.impl.ElasticApmTracer;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
 import co.elastic.apm.agent.sdk.logging.Logger;
 import co.elastic.apm.agent.sdk.logging.LoggerFactory;
 
@@ -31,7 +30,7 @@ public class InstrumentationStatsLifecycleListener extends AbstractLifecycleList
     private static final Logger logger = LoggerFactory.getLogger(InstrumentationStatsLifecycleListener.class);
 
     @Override
-    public void init(ElasticApmTracer tracer) {
+    public void init() {
         InstrumentationStats instrumentationStats = ElasticApmAgent.getInstrumentationStats();
         instrumentationStats.reset();
         instrumentationStats.setMeasureMatching(logger.isDebugEnabled());

apm-agent-core/src/main/java/co/elastic/apm/agent/collections/WeakMapCleaner.java

@@ -18,8 +18,7 @@
  */
 package co.elastic.apm.agent.collections;
 
-import co.elastic.apm.agent.context.AbstractLifecycleListener;
-import co.elastic.apm.agent.impl.ElasticApmTracer;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
 import co.elastic.apm.agent.util.ExecutorUtils;
 import co.elastic.apm.agent.sdk.logging.Logger;
 import co.elastic.apm.agent.sdk.logging.LoggerFactory;
@@ -41,7 +40,7 @@ public WeakMapCleaner() {
     }
 
     @Override
-    public void start(ElasticApmTracer tracer) {
+    public void start() {
         scheduler.scheduleWithFixedDelay(this, 1, 1, TimeUnit.SECONDS);
     }
 

apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/ApmServerConfigurationSource.java

@@ -18,7 +18,8 @@
  */
 package co.elastic.apm.agent.configuration;
 
-import co.elastic.apm.agent.context.LifecycleListener;
+import co.elastic.apm.agent.tracer.GlobalTracer;
+import co.elastic.apm.agent.tracer.LifecycleListener;
 import co.elastic.apm.agent.impl.ElasticApmTracer;
 import co.elastic.apm.agent.report.ApmServerClient;
 import co.elastic.apm.agent.report.serialize.DslJsonSerializer;
@@ -111,12 +112,13 @@ public void reload() {
     }
 
     @Override
-    public void init(ElasticApmTracer tracer) throws Exception {
+    public void init() throws Exception {
         // noop
     }
 
     @Override
-    public void start(final ElasticApmTracer tracer) {
+    public void start() {
+        final ElasticApmTracer tracer = GlobalTracer.get().require(ElasticApmTracer.class);
         threadPool = ExecutorUtils.createSingleThreadDaemonPool("remote-config-poller", 1);
         threadPool.execute(new Runnable() {
             @Override

apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/StartupInfo.java

@@ -18,8 +18,9 @@
  */
 package co.elastic.apm.agent.configuration;
 
+import co.elastic.apm.agent.tracer.GlobalTracer;
 import co.elastic.apm.agent.tracer.configuration.TimeDuration;
-import co.elastic.apm.agent.context.AbstractLifecycleListener;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
 import co.elastic.apm.agent.impl.ElasticApmTracer;
 import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration;
 import co.elastic.apm.agent.util.VersionUtils;
@@ -56,8 +57,8 @@ private static String getJvmAndOsVersionString() {
     }
 
     @Override
-    public void init(ElasticApmTracer tracer) {
-        ConfigurationRegistry configurationRegistry = tracer.getConfigurationRegistry();
+    public void init() {
+        ConfigurationRegistry configurationRegistry = GlobalTracer.get().require(ElasticApmTracer.class).getConfigurationRegistry();
         logConfiguration(configurationRegistry, logger);
     }
 

apm-agent-core/src/main/java/co/elastic/apm/agent/context/ClosableLifecycleListenerAdapter.java

@@ -18,6 +18,9 @@
  */
 package co.elastic.apm.agent.context;
 
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
+import co.elastic.apm.agent.tracer.LifecycleListener;
+
 import java.io.Closeable;
 
 public class ClosableLifecycleListenerAdapter extends AbstractLifecycleListener {

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracer.java

@@ -29,7 +29,7 @@
 import co.elastic.apm.agent.tracer.service.ServiceInfo;
 import co.elastic.apm.agent.configuration.SpanConfiguration;
 import co.elastic.apm.agent.context.ClosableLifecycleListenerAdapter;
-import co.elastic.apm.agent.context.LifecycleListener;
+import co.elastic.apm.agent.tracer.LifecycleListener;
 import co.elastic.apm.agent.impl.baggage.Baggage;
 import co.elastic.apm.agent.impl.baggage.W3CBaggagePropagation;
 import co.elastic.apm.agent.impl.error.ErrorCapture;
@@ -673,7 +673,7 @@ void init(List<LifecycleListener> lifecycleListeners) {
         this.lifecycleListeners.addAll(lifecycleListeners);
         for (LifecycleListener lifecycleListener : lifecycleListeners) {
             try {
-                lifecycleListener.init(this);
+                lifecycleListener.init();
             } catch (Exception e) {
                 logger.error("Failed to init " + lifecycleListener.getClass().getName(), e);
             }
@@ -732,7 +732,7 @@ private synchronized void startSync() {
         reporter.start();
         for (LifecycleListener lifecycleListener : lifecycleListeners) {
             try {
-                lifecycleListener.start(this);
+                lifecycleListener.start();
             } catch (Exception e) {
                 logger.error("Failed to start " + lifecycleListener.getClass().getName(), e);
             }
@@ -944,6 +944,7 @@ public MetaDataFuture getMetaDataFuture() {
         return metaDataFuture;
     }
 
+    @Override
     public ScheduledThreadPoolExecutor getSharedSingleThreadedPool() {
         return sharedPool;
     }

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ElasticApmTracerBuilder.java

@@ -26,7 +26,7 @@
 import co.elastic.apm.agent.configuration.source.ConfigSources;
 import co.elastic.apm.agent.configuration.source.SystemPropertyConfigurationSource;
 import co.elastic.apm.agent.context.ClosableLifecycleListenerAdapter;
-import co.elastic.apm.agent.context.LifecycleListener;
+import co.elastic.apm.agent.tracer.LifecycleListener;
 import co.elastic.apm.agent.impl.metadata.MetaData;
 import co.elastic.apm.agent.impl.metadata.MetaDataFuture;
 import co.elastic.apm.agent.impl.stacktrace.StacktraceConfiguration;

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/Tracer.java

@@ -30,7 +30,9 @@
 
 import javax.annotation.Nullable;
 
-public interface Tracer extends co.elastic.apm.agent.tracer.service.ServiceAwareTracer, co.elastic.apm.agent.tracer.Tracer {
+public interface Tracer extends co.elastic.apm.agent.tracer.Tracer,
+    co.elastic.apm.agent.tracer.reporting.ReportingTracer,
+    co.elastic.apm.agent.tracer.service.ServiceAwareTracer {
 
     @Nullable
     @Override

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/circuitbreaker/CircuitBreaker.java

@@ -18,7 +18,7 @@
  */
 package co.elastic.apm.agent.impl.circuitbreaker;
 
-import co.elastic.apm.agent.context.AbstractLifecycleListener;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
 import co.elastic.apm.agent.impl.ElasticApmTracer;
 import co.elastic.apm.agent.util.ExecutorUtils;
 import co.elastic.apm.agent.sdk.logging.Logger;
@@ -50,7 +50,7 @@ public CircuitBreaker(ElasticApmTracer tracer) {
     }
 
     @Override
-    public void start(ElasticApmTracer tracer) {
+    public void start() {
         // failsafe loading of stress monitors in isolation
         loadGCStressMonitor(tracer);
         loadSystemCpuStressMonitor(tracer);

apm-agent-core/src/main/java/co/elastic/apm/agent/logging/ApmServerLogAppender.java

@@ -18,8 +18,9 @@
  */
 package co.elastic.apm.agent.logging;
 
-import co.elastic.apm.agent.context.AbstractLifecycleListener;
-import co.elastic.apm.agent.context.LifecycleListener;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
+import co.elastic.apm.agent.tracer.GlobalTracer;
+import co.elastic.apm.agent.tracer.LifecycleListener;
 import co.elastic.apm.agent.impl.ElasticApmTracer;
 import co.elastic.apm.agent.report.Reporter;
 import co.elastic.logging.log4j2.EcsLayout;
@@ -103,7 +104,8 @@ public void append(LogEvent event) {
     public LifecycleListener getInitListener() {
         return new AbstractLifecycleListener() {
             @Override
-            public void init(ElasticApmTracer tracer) throws Exception {
+            public void init() throws Exception {
+                ElasticApmTracer tracer = GlobalTracer.get().require(ElasticApmTracer.class);
                 initStreaming(tracer.getConfig(LoggingConfiguration.class), tracer.getReporter());
             }
         };