Move plugin-related utilities and API to SDK/tracer

.ci/updatecli.d/update-json-specs.yml

@@ -97,14 +97,14 @@ targets:
     sourceid: sql_signature_examples.json
     kind: file
     spec:
-      file: apm-agent-core/src/test/resources/json-specs/sql_signature_examples.json
+      file: apm-agent-plugin-sdk/src/test/resources/json-specs/sql_signature_examples.json
   sql_token_examples.json:
     name: sql_token_examples.json
     scmid: default
     sourceid: sql_token_examples.json
     kind: file
     spec:
-      file: apm-agent-core/src/test/resources/json-specs/sql_token_examples.json
+      file: apm-agent-plugin-sdk/src/test/resources/json-specs/sql_token_examples.json
   w3c_distributed_tracing.json:
     name: w3c_distributed_tracing.json
     scmid: default

apm-agent-benchmarks/src/main/java/co/elastic/apm/agent/benchmark/sql/SignatureParserBenchmark.java

@@ -19,7 +19,7 @@
 package co.elastic.apm.agent.benchmark.sql;
 
 import co.elastic.apm.agent.benchmark.AbstractBenchmark;
-import co.elastic.apm.agent.db.signature.SignatureParser;
+import co.elastic.apm.agent.sdk.internal.db.signature.SignatureParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;

apm-agent-builds/apm-agent/src/test/java/co/elastic/apm/agent/PackagingTest.java

@@ -18,7 +18,7 @@
  */
 package co.elastic.apm.agent;
 
-import co.elastic.apm.agent.bci.PluginClassLoaderRootPackageCustomizer;
+import co.elastic.apm.agent.sdk.internal.PluginClassLoaderRootPackageCustomizer;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;

apm-agent-core/src/main/java/co/elastic/apm/agent/bbwarmup/WarmupInstrumentation.java

@@ -18,10 +18,11 @@
  */
 package co.elastic.apm.agent.bbwarmup;
 
-import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
-import co.elastic.apm.agent.bci.bytebuddy.CustomElementMatchers;
-import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory;
-import co.elastic.apm.agent.util.PrivilegedActionUtils;
+import co.elastic.apm.agent.sdk.bytebuddy.SimpleMethodSignatureOffsetMappingFactory;
+import co.elastic.apm.agent.sdk.ElasticApmInstrumentation;
+import co.elastic.apm.agent.sdk.internal.util.PrivilegedActionUtils;
+import co.elastic.apm.agent.tracer.GlobalTracer;
+import co.elastic.apm.agent.tracer.Tracer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
@@ -31,13 +32,20 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isSameClassLoader;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
 
-public class WarmupInstrumentation extends TracerAwareInstrumentation {
+public class WarmupInstrumentation extends ElasticApmInstrumentation {
+
+    static {
+        // assure initialization of tracer
+        @SuppressWarnings("unused")
+        Tracer tracer = GlobalTracer.get();
+    }
 
     @Override
     public ElementMatcher.Junction<ClassLoader> getClassLoaderMatcher() {
@@ -46,7 +54,7 @@ public ElementMatcher.Junction<ClassLoader> getClassLoaderMatcher() {
         // (caused by java.lang.ClassFormatError) on OpenJDK 7.
         // By allowing instrumentation only when the test class is loaded by the same class loader that loads this
         // instrumentation class, we avoid this problem and still allow it to work both on production and unit tests
-        return CustomElementMatchers.isSameClassLoader(PrivilegedActionUtils.getClassLoader(getClass()));
+        return isSameClassLoader(PrivilegedActionUtils.getClassLoader(getClass()));
     }
 
     @Override

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

@@ -18,7 +18,8 @@
  */
 package co.elastic.apm.agent.bci;
 
-import co.elastic.apm.agent.bci.bytebuddy.AnnotationValueOffsetMappingFactory;
+import co.elastic.apm.agent.sdk.internal.PluginClassLoaderRootPackageCustomizer;
+import co.elastic.apm.agent.sdk.bytebuddy.AnnotationValueOffsetMappingFactory;
 import co.elastic.apm.agent.bci.bytebuddy.ErrorLoggingListener;
 import co.elastic.apm.agent.bci.bytebuddy.FailSafeDeclaredMethodsCompiler;
 import co.elastic.apm.agent.bci.bytebuddy.InstallationListenerImpl;
@@ -28,7 +29,7 @@
 import co.elastic.apm.agent.bci.bytebuddy.NonInstrumented;
 import co.elastic.apm.agent.bci.bytebuddy.PatchBytecodeVersionTo51Transformer;
 import co.elastic.apm.agent.bci.bytebuddy.RootPackageCustomLocator;
-import co.elastic.apm.agent.bci.bytebuddy.SimpleMethodSignatureOffsetMappingFactory;
+import co.elastic.apm.agent.sdk.bytebuddy.SimpleMethodSignatureOffsetMappingFactory;
 import co.elastic.apm.agent.bci.classloading.ExternalPluginClassLoader;
 import co.elastic.apm.agent.bci.modules.ModuleOpener;
 import co.elastic.apm.agent.common.ThreadUtils;
@@ -48,7 +49,7 @@
 import co.elastic.apm.agent.tracemethods.TraceMethodInstrumentation;
 import co.elastic.apm.agent.util.DependencyInjectingServiceLoader;
 import co.elastic.apm.agent.util.ExecutorUtils;
-import co.elastic.apm.agent.util.PrivilegedActionUtils;
+import co.elastic.apm.agent.sdk.internal.util.PrivilegedActionUtils;
 import net.bytebuddy.ByteBuddy;
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.agent.builder.AgentBuilder.RedefinitionStrategy;
@@ -309,7 +310,7 @@ public void onChange(ConfigurationOption configurationOption, Object oldValue, O
     }
 
     public static synchronized Future<?> reInitInstrumentation() {
-        final Tracer tracer = TracerAwareInstrumentation.tracer.require(Tracer.class);
+        final Tracer tracer = GlobalTracer.get().require(Tracer.class);
         if (instrumentation == null) {
             throw new IllegalStateException("Can't re-init agent before it has been initialized");
         }

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

@@ -22,6 +22,7 @@
 import co.elastic.apm.agent.bci.classloading.IndyPluginClassLoader;
 import co.elastic.apm.agent.bci.classloading.LookupExposer;
 import co.elastic.apm.agent.common.JvmRuntimeInfo;
+import co.elastic.apm.agent.sdk.internal.PluginClassLoaderRootPackageCustomizer;
 import co.elastic.apm.agent.sdk.logging.Logger;
 import co.elastic.apm.agent.sdk.logging.LoggerFactory;
 import co.elastic.apm.agent.sdk.state.CallDepth;