fix

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/ignore/IgnoredTypesConfigurer.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
+import javax.annotation.Nullable;
 
 /**
  * An {@link IgnoredTypesConfigurer} can be used to augment built-in instrumentation restrictions:
@@ -34,5 +35,5 @@ default void configure(IgnoredTypesBuilder builder) {
    * @deprecated Use {@link #configure(IgnoredTypesBuilder)} instead.
    */
   @Deprecated
-  default void configure(IgnoredTypesBuilder builder, ConfigProperties config) {}
+  default void configure(IgnoredTypesBuilder builder, @Nullable ConfigProperties config) {}
 }

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModule.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import net.bytebuddy.matcher.ElementMatcher;
 
 /**
@@ -107,7 +108,7 @@ public boolean defaultEnabled() {
    * @deprecated Use {@link #defaultEnabled()} instead.
    */
   @Deprecated // will be removed in 3.0.0
-  public boolean defaultEnabled(ConfigProperties config) {
+  public boolean defaultEnabled(@Nullable ConfigProperties config) {
     return defaultEnabled();
   }
 

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentExtension.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
+import javax.annotation.Nullable;
 import net.bytebuddy.agent.builder.AgentBuilder;
 
 /**
@@ -26,7 +27,7 @@ public interface AgentExtension extends Ordered {
    * @return The customized agent. Note that this method MUST return a non-null {@link AgentBuilder}
    *     instance that contains all customizations defined in this extension.
    */
-  AgentBuilder extend(AgentBuilder agentBuilder, ConfigProperties config);
+  AgentBuilder extend(AgentBuilder agentBuilder, @Nullable ConfigProperties config);
 
   /**
    * Returns the name of the extension. It does not have to be unique, but it should be

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

@@ -161,10 +161,7 @@ private static void installBytebuddyAgent(
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
         installOpenTelemetrySdk(extensionClassLoader);
 
-    ConfigProperties sdkConfig = AutoConfigureUtil.getConfig(autoConfiguredSdk);
-    if (sdkConfig == null) {
-      throw new IllegalStateException("SDK config must not be null");
-    }
+    @Nullable ConfigProperties sdkConfig = AutoConfigureUtil.getConfig(autoConfiguredSdk);
     if (extensionClassLoader == null) {
       throw new IllegalStateException("Extension class loader must not be null");
     }
@@ -284,7 +281,7 @@ private static void installEarlyInstrumentation(
   }
 
   private static void setBootstrapPackages(
-      ConfigProperties config, ClassLoader extensionClassLoader) {
+      @Nullable ConfigProperties config, ClassLoader extensionClassLoader) {
     BootstrapPackagesBuilderImpl builder = new BootstrapPackagesBuilderImpl();
     for (BootstrapPackagesConfigurer configurer :
         load(BootstrapPackagesConfigurer.class, extensionClassLoader)) {
@@ -300,7 +297,9 @@ private static void setDefineClassHandler() {
   // Need to call deprecated API for backward compatibility with extensions that haven't migrated
   @SuppressWarnings("deprecation")
   private static AgentBuilder configureIgnoredTypes(
-      ConfigProperties config, ClassLoader extensionClassLoader, AgentBuilder agentBuilder) {
+      @Nullable ConfigProperties config,
+      ClassLoader extensionClassLoader,
+      AgentBuilder agentBuilder) {
     IgnoredTypesBuilderImpl builder = new IgnoredTypesBuilderImpl();
     for (IgnoredTypesConfigurer configurer :
         loadOrdered(IgnoredTypesConfigurer.class, extensionClassLoader)) {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/bootstrap/BootstrapPackagesConfigurer.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.tooling.bootstrap;
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import javax.annotation.Nullable;
 
 /**
  * This SPI can be used to define which packages/classes belong to the bootstrap class loader: all
@@ -24,5 +25,5 @@ public interface BootstrapPackagesConfigurer {
    * Configure the passed {@code builder} and define which classes should always be loaded by the
    * bootstrap class loader.
    */
-  void configure(BootstrapPackagesBuilder builder, ConfigProperties config);
+  void configure(BootstrapPackagesBuilder builder, @Nullable ConfigProperties config);
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationLoader.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.javaagent.tooling.Utils;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import net.bytebuddy.agent.builder.AgentBuilder;
 
 @AutoService(AgentExtension.class)
@@ -26,7 +27,7 @@ public class InstrumentationLoader implements AgentExtension {
       new InstrumentationModuleInstaller(InstrumentationHolder.getInstrumentation());
 
   @Override
-  public AgentBuilder extend(AgentBuilder agentBuilder, ConfigProperties config) {
+  public AgentBuilder extend(AgentBuilder agentBuilder, @Nullable ConfigProperties config) {
     int numberOfLoadedModules = 0;
     ClassLoader extensionsClassLoader = Utils.getExtensionsClassLoader();
     if (extensionsClassLoader == null) {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java

@@ -70,7 +70,7 @@ public InstrumentationModuleInstaller(@Nullable Instrumentation instrumentation)
   AgentBuilder install(
       InstrumentationModule instrumentationModule,
       AgentBuilder parentAgentBuilder,
-      ConfigProperties config) {
+      @Nullable ConfigProperties config) {
     if (!isInstrumentationEnabled(
         instrumentationModule.instrumentationNames(),
         instrumentationModule.defaultEnabled(config))) {