fix override

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/config/OtlpEndpointConfig.java

@@ -20,15 +20,12 @@ public class OtlpEndpointConfig
 {
     public String protocol;
     public URI location;
-    public OtlpOverridesConfig overrides;
 
     public OtlpEndpointConfig(
         String protocol,
-        URI location,
-        OtlpOverridesConfig overrides)
+        URI location)
     {
         this.protocol = protocol;
         this.location = location;
-        this.overrides = overrides;
     }
 }

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/internal/OltpConfiguration.java

@@ -23,6 +23,8 @@ public class OltpConfiguration extends Configuration
     public static final PropertyDef<Duration> OTLP_EXPORTER_RETRY_INTERVAL;
     public static final PropertyDef<Duration> OTLP_EXPORTER_TIMEOUT_INTERVAL;
     public static final PropertyDef<Duration> OTLP_EXPORTER_WARNING_INTERVAL;
+    public static final PropertyDef<String> OTLP_EXPORTER_METRICS_OVERRIDE;
+    public static final PropertyDef<String> OTLP_EXPORTER_LOGS_OVERRIDE;
 
     private static final ConfigurationDef OTLP_EXPORTER_CONFIG;
 
@@ -35,6 +37,8 @@ public class OltpConfiguration extends Configuration
             (c, v) -> Duration.parse(v), "PT30S");
         OTLP_EXPORTER_WARNING_INTERVAL = config.property(Duration.class, "warning.interval",
             (c, v) -> Duration.parse(v), "PT5M");
+        OTLP_EXPORTER_METRICS_OVERRIDE = config.property("metrics.override");
+        OTLP_EXPORTER_LOGS_OVERRIDE = config.property("logs.override");
         OTLP_EXPORTER_CONFIG = config;
     }
 
@@ -58,4 +62,15 @@ public Duration warningInterval()
     {
         return OTLP_EXPORTER_WARNING_INTERVAL.get(this);
     }
+
+    // TODO: Ati
+    public String metricsOverride()
+    {
+        return OTLP_EXPORTER_METRICS_OVERRIDE.get(this);
+    }
+
+    public String logsOverride()
+    {
+        return OTLP_EXPORTER_LOGS_OVERRIDE.get(this);
+    }
 }

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/internal/OltpExporterHandler.java

@@ -80,8 +80,8 @@ public OltpExporterHandler(
         this.timeoutInterval = config.timeoutInterval();
         this.warningInterval = config.warningInterval().toMillis();
         this.context = context;
-        this.metricsEndpoint = exporter.resolveMetrics();
-        this.logsEndpoint = exporter.resolveLogs();
+        this.metricsEndpoint = exporter.resolveMetrics(config.metricsOverride());
+        this.logsEndpoint = exporter.resolveLogs(config.logsOverride());
         this.signals = exporter.resolveSignals();
         this.protocol = exporter.resolveProtocol();
         this.interval = exporter.resolveInterval();

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/internal/config/OtlpEndpointAdapter.java

@@ -22,21 +22,12 @@
 import jakarta.json.bind.adapter.JsonbAdapter;
 
 import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpEndpointConfig;
-import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpOverridesConfig;
 
 public class OtlpEndpointAdapter implements JsonbAdapter<OtlpEndpointConfig, JsonObject>
 {
     private static final String PROTOCOL_NAME = "protocol";
     private static final String PROTOCOL_DEFAULT = "http";
     private static final String LOCATION_NAME = "location";
-    private static final String OVERRIDES_NAME = "overrides";
-
-    private final OtlpOverridesAdapter overrides;
-
-    public OtlpEndpointAdapter()
-    {
-        this.overrides = new OtlpOverridesAdapter();
-    }
 
     @Override
     public JsonObject adaptToJson(
@@ -51,10 +42,6 @@ public JsonObject adaptToJson(
         {
             object.add(LOCATION_NAME, endpoint.location.toString());
         }
-        if (endpoint.overrides != null)
-        {
-            object.add(OVERRIDES_NAME, overrides.adaptToJson(endpoint.overrides));
-        }
         return object.build();
     }
 
@@ -66,9 +53,6 @@ public OtlpEndpointConfig adaptFromJson(
             ? object.getString(PROTOCOL_NAME)
             : PROTOCOL_DEFAULT;
         URI url = URI.create(object.getString(LOCATION_NAME));
-        OtlpOverridesConfig overridesConfig = object.containsKey(OVERRIDES_NAME)
-            ? overrides.adaptFromJson(object.getJsonObject(OVERRIDES_NAME))
-            : null;
-        return new OtlpEndpointConfig(protocol, url, overridesConfig);
+        return new OtlpEndpointConfig(protocol, url);
     }
 }

incubator/exporter-otlp/src/main/java/io/aklivity/zilla/runtime/exporter/otlp/internal/config/OtlpExporterConfig.java

@@ -39,17 +39,18 @@ public OtlpExporterConfig(
         this.options = (OtlpOptionsConfig)exporter.options;
     }
 
-    public URI resolveMetrics()
+    public URI resolveMetrics(
+        String override)
     {
         assert options != null;
         assert options.endpoint != null;
         assert options.endpoint.location != null;
 
         URI result;
         URI location = options.endpoint.location;
-        if (options.endpoint.overrides != null && options.endpoint.overrides.metrics != null)
+        if (override != null)
         {
-            result = location.resolve(options.endpoint.overrides.metrics);
+            result = location.resolve(override);
         }
         else
         {
@@ -58,17 +59,18 @@ public URI resolveMetrics()
         return result;
     }
 
-    public URI resolveLogs()
+    public URI resolveLogs(
+        String override)
     {
         assert options != null;
         assert options.endpoint != null;
         assert options.endpoint.location != null;
 
         URI result;
         URI location = options.endpoint.location;
-        if (options.endpoint.overrides != null && options.endpoint.overrides.logs != null)
+        if (override != null)
         {
-            result = location.resolve(options.endpoint.overrides.logs);
+            result = location.resolve(override);
         }
         else
         {

incubator/exporter-otlp/src/test/java/io/aklivity/zilla/runtime/exporter/otlp/internal/config/OltpOptionsConfigAdapterTest.java

@@ -33,7 +33,6 @@
 
 import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpEndpointConfig;
 import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpOptionsConfig;
-import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpOverridesConfig;
 
 public class OltpOptionsConfigAdapterTest
 {
@@ -60,12 +59,7 @@ public void shouldReadOptions()
                     "],\n" +
                 "\"endpoint\":\n" +
                     "{\n" +
-                        "\"location\": \"http://localhost:4317\",\n" +
-                        "\"overrides\": \n" +
-                            "{\n" +
-                                "\"metrics\": \"/v1/metricsOverride\",\n" +
-                                "\"logs\": \"/v1/logsOverride\"\n" +
-                            "}\n" +
+                        "\"location\": \"http://localhost:4317\"\n" +
                     "}\n" +
             "}";
 
@@ -77,8 +71,6 @@ public void shouldReadOptions()
         assertThat(options.interval, equalTo(30L));
         assertThat(options.signals, containsInAnyOrder(METRICS));
         assertThat(options.endpoint.location, equalTo(URI.create("http://localhost:4317")));
-        assertThat(options.endpoint.overrides.metrics, equalTo(URI.create("/v1/metricsOverride")));
-        assertThat(options.endpoint.overrides.logs, equalTo(URI.create("/v1/logsOverride")));
     }
 
     @Test
@@ -94,16 +86,10 @@ public void shouldWriteOptions()
                     "]," +
                 "\"endpoint\":" +
                     "{" +
-                        "\"location\":\"http://localhost:4317\"," +
-                        "\"overrides\":" +
-                            "{" +
-                                "\"metrics\":\"/v1/metrics\"," +
-                                "\"logs\":\"/v1/logs\"" +
-                            "}" +
+                        "\"location\":\"http://localhost:4317\"" +
                     "}" +
             "}";
-        OtlpOverridesConfig overrides = new OtlpOverridesConfig(URI.create("/v1/metrics"), URI.create("/v1/logs"));
-        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://localhost:4317"), overrides);
+        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://localhost:4317"));
         OtlpOptionsConfig config = new OtlpOptionsConfig(30, Set.of(METRICS), endpoint);
 
         // WHEN

incubator/exporter-otlp/src/test/java/io/aklivity/zilla/runtime/exporter/otlp/internal/config/OtlpExporterConfigTest.java

@@ -26,16 +26,14 @@
 import io.aklivity.zilla.runtime.engine.config.ExporterConfig;
 import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpEndpointConfig;
 import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpOptionsConfig;
-import io.aklivity.zilla.runtime.exporter.otlp.config.OtlpOverridesConfig;
 
 public class OtlpExporterConfigTest
 {
     @Test
     public void shouldCreateDefaultMetricsUrl()
     {
         // GIVEN
-        OtlpOverridesConfig overrides = new OtlpOverridesConfig(null, null);
-        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"), overrides);
+        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"));
         OtlpOptionsConfig options = new OtlpOptionsConfig(30L, Set.of(METRICS), endpoint);
         ExporterConfig exporter = ExporterConfig.builder()
                 .namespace("test")
@@ -46,8 +44,8 @@ public void shouldCreateDefaultMetricsUrl()
         OtlpExporterConfig oltpExporter = new OtlpExporterConfig(exporter);
 
         // WHEN
-        URI metrics = oltpExporter.resolveMetrics();
-        URI logs = oltpExporter.resolveLogs();
+        URI metrics = oltpExporter.resolveMetrics(null);
+        URI logs = oltpExporter.resolveLogs(null);
 
         // THEN
         assertThat(metrics, equalTo(URI.create("http://example.com/v1/metrics")));
@@ -58,9 +56,7 @@ public void shouldCreateDefaultMetricsUrl()
     public void shouldOverrideAbsoluteMetricsUrl()
     {
         // GIVEN
-        OtlpOverridesConfig overrides = new OtlpOverridesConfig(URI.create("http://overridden.com/metrics"),
-            URI.create("http://overridden.com/logs"));
-        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"), overrides);
+        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"));
         OtlpOptionsConfig options = new OtlpOptionsConfig(30L, Set.of(METRICS), endpoint);
         ExporterConfig exporter = ExporterConfig.builder()
                 .namespace("test")
@@ -71,8 +67,8 @@ public void shouldOverrideAbsoluteMetricsUrl()
         OtlpExporterConfig oltpExporter = new OtlpExporterConfig(exporter);
 
         // WHEN
-        URI metrics = oltpExporter.resolveMetrics();
-        URI logs = oltpExporter.resolveLogs();
+        URI metrics = oltpExporter.resolveMetrics("http://overridden.com/metrics");
+        URI logs = oltpExporter.resolveLogs("http://overridden.com/logs");
 
         // THEN
         assertThat(metrics, equalTo(URI.create("http://overridden.com/metrics")));
@@ -83,8 +79,7 @@ public void shouldOverrideAbsoluteMetricsUrl()
     public void shouldOverrideRelativeMetricsUrl()
     {
         // GIVEN
-        OtlpOverridesConfig overrides = new OtlpOverridesConfig(URI.create("/v42/metrix"), URI.create("/v42/logz"));
-        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"), overrides);
+        OtlpEndpointConfig endpoint = new OtlpEndpointConfig("http", URI.create("http://example.com"));
         OtlpOptionsConfig options = new OtlpOptionsConfig(30L, Set.of(METRICS), endpoint);
         ExporterConfig exporter = ExporterConfig.builder()
                 .namespace("test")
@@ -95,8 +90,8 @@ public void shouldOverrideRelativeMetricsUrl()
         OtlpExporterConfig oltpExporter = new OtlpExporterConfig(exporter);
 
         // WHEN
-        URI metrics = oltpExporter.resolveMetrics();
-        URI logs = oltpExporter.resolveLogs();
+        URI metrics = oltpExporter.resolveMetrics("/v42/metrix");
+        URI logs = oltpExporter.resolveLogs("/v42/logz");
 
         // THEN
         assertThat(metrics, equalTo(URI.create("http://example.com/v42/metrix")));