Applied jack-berg changes

Author: jackshirazi

api/incubator/src/main/java/io/opentelemetry/api/incubator/config/ConfigProvider.java

@@ -87,42 +87,6 @@ default ConfigChangeRegistration addConfigChangeListener(
     return () -> {};
   }
 
-  /**
-   * Updates the declarative configuration subtree at the given path.
-   *
-   * <p>The path uses {@code .} as a separator (e.g., {@code
-   * ".instrumentation/development.java.myLib"}). The subtree at that path is replaced with {@code
-   * newSubtree}, and any registered {@link ConfigChangeListener}s watching affected paths are
-   * notified.
-   *
-   * <p>The default implementation is a no-op.
-   *
-   * @param path the declarative configuration path to update
-   * @param newSubtree the new configuration subtree to set at the path
-   * @throws DeclarativeConfigException if an intermediate segment of the path resolves to a
-   *     non-mapping value (e.g., a scalar or list), indicating a schema conflict
-   */
-  default void updateConfig(String path, DeclarativeConfigProperties newSubtree) {}
-
-  /**
-   * Sets a single scalar configuration property at the given path.
-   *
-   * <p>The path uses {@code .} as a separator (e.g., {@code
-   * ".instrumentation/development.java.myLib"}). The property identified by {@code key} within that
-   * path is set to {@code value}, and any registered {@link ConfigChangeListener}s watching
-   * affected paths are notified.
-   *
-   * <p>The default implementation is a no-op.
-   *
-   * @param path the declarative configuration path containing the property
-   * @param key the property key within the path
-   * @param value the new value for the property (must be a scalar: String, Boolean, Long, Double,
-   *     Integer, or a List of scalars)
-   * @throws DeclarativeConfigException if an intermediate segment of the path resolves to a
-   *     non-mapping value (e.g., a scalar or list), indicating a schema conflict
-   */
-  default void setConfigProperty(String path, String key, Object value) {}
-
   /** Returns a no-op {@link ConfigProvider}. */
   static ConfigProvider noop() {
     return DeclarativeConfigProperties::empty;

api/incubator/src/test/java/io/opentelemetry/api/incubator/ConfigProviderTest.java

@@ -10,7 +10,6 @@
 
 import io.opentelemetry.api.incubator.config.ConfigChangeRegistration;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import org.junit.jupiter.api.Test;
 
 class ConfigProviderTest {
@@ -32,18 +31,4 @@ void instrumentationConfigFallback() {
             ".instrumentation/development.java.servlet", (path, newConfig) -> {});
     assertThatCode(listenerRegistration::close).doesNotThrowAnyException();
   }
-
-  @Test
-  void defaultUpdateConfig_isNoop() {
-    ConfigProvider configProvider = ConfigProvider.noop();
-    assertThatCode(() -> configProvider.updateConfig(".foo", DeclarativeConfigProperties.empty()))
-        .doesNotThrowAnyException();
-  }
-
-  @Test
-  void defaultSetConfigProperty_isNoop() {
-    ConfigProvider configProvider = ConfigProvider.noop();
-    assertThatCode(() -> configProvider.setConfigProperty(".foo", "key", "value"))
-        .doesNotThrowAnyException();
-  }
 }

api/incubator/src/test/java/io/opentelemetry/api/incubator/ExtendedOpenTelemetryTest.java

@@ -133,8 +133,7 @@ void close_shutsDownConfigProvider() {
 
     sdk.close();
 
-    configProvider.setConfigProperty(
-        ".instrumentation/development.general.http", "enabled", "true");
+    configProvider.setConfig(".instrumentation/development.general.http.enabled", "true");
     assertThat(callbackCount.get()).isEqualTo(0);
   }