Fix class loading stuff

Author: jack-berg

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/AgentListener.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.extension;
 
-import io.opentelemetry.javaagent.bootstrap.internal.StructuredConfigPropertiesBridge;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/StructuredConfigPropertiesBridge.java renamed to javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/StructuredConfigPropertiesBridge.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.bootstrap.internal;
+package io.opentelemetry.javaagent.extension;
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.StructuredConfigProperties;
@@ -44,20 +44,20 @@
  *         string_key: value
  * </pre>
  */
-public final class StructuredConfigPropertiesBridge implements ConfigProperties {
+final class StructuredConfigPropertiesBridge implements ConfigProperties {
 
   private static final StructuredConfigProperties EMPTY = new EmptyStructuredConfigProperties();
 
   private final StructuredConfigProperties javaInstrumentation;
 
-  public StructuredConfigPropertiesBridge(
-      StructuredConfigProperties rootStructuredConfigProperties) {
+  StructuredConfigPropertiesBridge(StructuredConfigProperties rootStructuredConfigProperties) {
     StructuredConfigProperties instrumentation =
         rootStructuredConfigProperties.getStructured("instrumentation");
     if (instrumentation != null) {
-      javaInstrumentation = instrumentation.getStructured("java");
+      StructuredConfigProperties javaInstrumentation = instrumentation.getStructured("java");
+      this.javaInstrumentation = javaInstrumentation != null ? javaInstrumentation : EMPTY;
     } else {
-      javaInstrumentation = EMPTY;
+      this.javaInstrumentation = EMPTY;
     }
   }
 

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/bootstrap/internal/StructuredConfigPropertiesBridgeTest.java renamed to javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/StructuredConfigPropertiesBridgeTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.bootstrap.internal;
+package io.opentelemetry.javaagent.extension;
 
 import static org.assertj.core.api.Assertions.assertThat;