Declarative config 0.4 (#7064)

Author: jack-berg

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterComponentProvider.java

@@ -26,7 +26,7 @@ public Class<LogRecordExporter> getType() {
 
   @Override
   public String getName() {
-    return "experimental-otlp/stdout";
+    return "otlp_file/development";
   }
 
   @Override

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporterComponentProvider.java

@@ -26,7 +26,7 @@ public Class<MetricExporter> getType() {
 
   @Override
   public String getName() {
-    return "experimental-otlp/stdout";
+    return "otlp_file/development";
   }
 
   @Override

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporterComponentProvider.java

@@ -26,7 +26,7 @@ public Class<SpanExporter> getType() {
 
   @Override
   public String getName() {
-    return "experimental-otlp/stdout";
+    return "otlp_file/development";
   }
 
   @Override

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/AbstractOtlpStdoutExporterTest.java

@@ -335,7 +335,7 @@ protected T exporterFromComponentProvider(DeclarativeConfigProperties properties
                     .filter(
                         p -> {
                           ComponentProvider<?> c = (ComponentProvider<?>) p;
-                          return "experimental-otlp/stdout".equals(c.getName())
+                          return "otlp_file/development".equals(c.getName())
                               && c.getType().equals(componentProviderType);
                         })
                     .findFirst()

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpDeclarativeConfigUtil.java

@@ -54,9 +54,8 @@ public static void configureOtlpExporterBuilder(
       Consumer<byte[]> setTrustedCertificates,
       BiConsumer<byte[], byte[]> setClientTls,
       Consumer<RetryPolicy> setRetryPolicy,
-      Consumer<MemoryMode> setMemoryMode) {
-    String protocol = getStructuredConfigOtlpProtocol(config);
-    boolean isHttpProtobuf = protocol.equals(PROTOCOL_HTTP_PROTOBUF);
+      Consumer<MemoryMode> setMemoryMode,
+      boolean isHttpProtobuf) {
     URL endpoint = validateEndpoint(config.getString("endpoint"), isHttpProtobuf);
     if (endpoint != null) {
       setEndpoint.accept(endpoint.toString());
@@ -92,16 +91,16 @@ public static void configureOtlpExporterBuilder(
       setTimeout.accept(Duration.ofMillis(timeoutMs));
     }
 
-    String certificatePath = config.getString("certificate");
-    String clientKeyPath = config.getString("client_key");
-    String clientKeyChainPath = config.getString("client_certificate");
+    String certificatePath = config.getString("certificate_file");
+    String clientKeyPath = config.getString("client_key_file");
+    String clientKeyChainPath = config.getString("client_certificate_file");
 
     if (clientKeyPath != null && clientKeyChainPath == null) {
       throw new ConfigurationException(
-          "client_key provided without client_certificate - both client_key and client_certificate must be set");
+          "client_key_file provided without client_certificate_file - both client_key_file and client_certificate_file must be set");
     } else if (clientKeyPath == null && clientKeyChainPath != null) {
       throw new ConfigurationException(
-          "client_certificate provided without client_key - both client_key and client_certificate must be set");
+          "client_certificate_file provided without client_key_file - both client_key_file and client_certificate_file must be set");
     }
     byte[] certificateBytes = readFileBytes(certificatePath);
     if (certificateBytes != null) {

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcLogRecordExporterComponentProvider.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_LOGS;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter;
+import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+
+/**
+ * Declarative configuration SPI implementation for {@link OtlpGrpcLogRecordExporter}.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class OtlpGrpcLogRecordExporterComponentProvider
+    implements ComponentProvider<LogRecordExporter> {
+
+  @Override
+  public Class<LogRecordExporter> getType() {
+    return LogRecordExporter.class;
+  }
+
+  @Override
+  public String getName() {
+    return "otlp_grpc";
+  }
+
+  @Override
+  public LogRecordExporter create(DeclarativeConfigProperties config) {
+    OtlpGrpcLogRecordExporterBuilder builder = grpcBuilder();
+
+    OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_LOGS,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode,
+        /* isHttpProtobuf= */ false);
+
+    return builder.build();
+  }
+
+  // Visible for testing
+  OtlpGrpcLogRecordExporterBuilder grpcBuilder() {
+    return OtlpGrpcLogRecordExporter.builder();
+  }
+}

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcMetricExporterComponentProvider.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_METRICS;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.internal.IncubatingExporterBuilderUtil;
+import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
+import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.metrics.export.MetricExporter;
+
+/**
+ * Declarative configuration SPI implementation for {@link OtlpGrpcMetricExporter}.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class OtlpGrpcMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
+
+  @Override
+  public Class<MetricExporter> getType() {
+    return MetricExporter.class;
+  }
+
+  @Override
+  public String getName() {
+    return "otlp_grpc";
+  }
+
+  @Override
+  public MetricExporter create(DeclarativeConfigProperties config) {
+    OtlpGrpcMetricExporterBuilder builder = grpcBuilder();
+
+    OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_METRICS,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode,
+        /* isHttpProtobuf= */ false);
+    IncubatingExporterBuilderUtil.configureOtlpAggregationTemporality(
+        config, builder::setAggregationTemporalitySelector);
+    IncubatingExporterBuilderUtil.configureOtlpHistogramDefaultAggregation(
+        config, builder::setDefaultAggregationSelector);
+
+    return builder.build();
+  }
+
+  // Visible for testing
+  OtlpGrpcMetricExporterBuilder grpcBuilder() {
+    return OtlpGrpcMetricExporter.builder();
+  }
+}

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpGrpcSpanExporterComponentProvider.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_TRACES;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
+import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.trace.export.SpanExporter;
+
+/**
+ * Declarative configuration SPI implementation for {@link OtlpGrpcSpanExporter}.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class OtlpGrpcSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
+
+  @Override
+  public Class<SpanExporter> getType() {
+    return SpanExporter.class;
+  }
+
+  @Override
+  public String getName() {
+    return "otlp_grpc";
+  }
+
+  @Override
+  public SpanExporter create(DeclarativeConfigProperties config) {
+    OtlpGrpcSpanExporterBuilder builder = grpcBuilder();
+
+    OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_TRACES,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode,
+        /* isHttpProtobuf= */ false);
+
+    return builder.build();
+  }
+
+  // Visible for testing
+  OtlpGrpcSpanExporterBuilder grpcBuilder() {
+    return OtlpGrpcSpanExporter.builder();
+  }
+}

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpHttpLogRecordExporterComponentProvider.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_LOGS;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
+import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+
+/**
+ * Declarative configuration SPI implementation for {@link OtlpHttpLogRecordExporter}.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class OtlpHttpLogRecordExporterComponentProvider
+    implements ComponentProvider<LogRecordExporter> {
+
+  @Override
+  public Class<LogRecordExporter> getType() {
+    return LogRecordExporter.class;
+  }
+
+  @Override
+  public String getName() {
+    return "otlp_http";
+  }
+
+  @Override
+  public LogRecordExporter create(DeclarativeConfigProperties config) {
+    OtlpHttpLogRecordExporterBuilder builder = httpBuilder();
+
+    OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_LOGS,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode,
+        /* isHttpProtobuf= */ true);
+
+    return builder.build();
+  }
+
+  // Visible for testing
+  OtlpHttpLogRecordExporterBuilder httpBuilder() {
+    return OtlpHttpLogRecordExporter.builder();
+  }
+}

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpHttpMetricExporterComponentProvider.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import static io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil.DATA_TYPE_METRICS;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.internal.IncubatingExporterBuilderUtil;
+import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
+import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.metrics.export.MetricExporter;
+
+/**
+ * Declarative configuration SPI implementation for {@link OtlpHttpMetricExporter}.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class OtlpHttpMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
+
+  @Override
+  public Class<MetricExporter> getType() {
+    return MetricExporter.class;
+  }
+
+  @Override
+  public String getName() {
+    return "otlp_http";
+  }
+
+  @Override
+  public MetricExporter create(DeclarativeConfigProperties config) {
+    OtlpHttpMetricExporterBuilder builder = httpBuilder();
+
+    OtlpDeclarativeConfigUtil.configureOtlpExporterBuilder(
+        DATA_TYPE_METRICS,
+        config,
+        builder::setEndpoint,
+        builder::addHeader,
+        builder::setCompression,
+        builder::setTimeout,
+        builder::setTrustedCertificates,
+        builder::setClientTls,
+        builder::setRetryPolicy,
+        builder::setMemoryMode,
+        /* isHttpProtobuf= */ true);
+    IncubatingExporterBuilderUtil.configureOtlpAggregationTemporality(
+        config, builder::setAggregationTemporalitySelector);
+    IncubatingExporterBuilderUtil.configureOtlpHistogramDefaultAggregation(
+        config, builder::setDefaultAggregationSelector);
+
+    return builder.build();
+  }
+
+  // Visible for testing
+  OtlpHttpMetricExporterBuilder httpBuilder() {
+    return OtlpHttpMetricExporter.builder();
+  }
+}