Merge branch 'main' into renovate/protobuf-monorepo

Author: laurit

custom/src/main/java/com/splunk/opentelemetry/logging/SplunkSlf4jLoggingCustomizer.java

@@ -19,7 +19,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.logging.simple.Slf4jSimpleLoggingCustomizer;
 import io.opentelemetry.javaagent.tooling.LoggingCustomizer;
-import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 
 @AutoService(LoggingCustomizer.class)
 public class SplunkSlf4jLoggingCustomizer implements LoggingCustomizer {
@@ -31,10 +30,10 @@ public String name() {
   }
 
   @Override
-  public void init(EarlyInitAgentConfig earlyConfig) {
+  public void init() {
     addCustomLoggingConfiguration();
 
-    delegate.init(earlyConfig);
+    delegate.init();
   }
 
   @Override

instrumentation/jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/jdbc/oracle/OracleInstrumentationModule.java

@@ -21,7 +21,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
@@ -38,7 +37,7 @@ public int order() {
   }
 
   @Override
-  public boolean defaultEnabled(ConfigProperties config) {
+  public boolean defaultEnabled() {
     return false;
   }
 

instrumentation/jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/jdbc/postgresql/PostgreSqlInstrumentationModule.java

@@ -21,7 +21,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
@@ -38,7 +37,7 @@ public int order() {
   }
 
   @Override
-  public boolean defaultEnabled(ConfigProperties config) {
+  public boolean defaultEnabled() {
     return false;
   }
 

instrumentation/jdbc/src/main/java/com/splunk/opentelemetry/instrumentation/jdbc/sqlserver/SqlServerInstrumentationModule.java

@@ -21,7 +21,6 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
@@ -38,7 +37,7 @@ public int order() {
   }
 
   @Override
-  public boolean defaultEnabled(ConfigProperties config) {
+  public boolean defaultEnabled() {
     return false;
   }