Move autoconfigure otlp tests (#5060)

* Unify OtlpHttp{Signal}Exporter testing * Add header and compression tests * Move SPI otlp tests to :exporters:otlp * Improve test coverage * Improve test coverage
open-telemetry · Dec 29, 2022 · 2834b03 · 2834b03
1 parent 50b6b3f
commit 2834b03
Show file tree

Hide file tree

Showing 34 changed files with 1,914 additions and 2,847 deletions.
diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts
@@ -19,6 +19,8 @@ dependencies {
 
   compileOnly("io.grpc:grpc-stub")
 
+  testImplementation("io.grpc:grpc-stub")
+
   testImplementation(project(":exporters:otlp:testing-internal"))
   testImplementation("com.linecorp.armeria:armeria-junit5")
   testImplementation("com.google.api.grpc:proto-google-common-protos")

diff --git a/...all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java b/...all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java
@@ -33,7 +33,7 @@ public MetricExporter createExporter(ConfigProperties config) {
     String protocol = OtlpConfigUtil.getOtlpProtocol(DATA_TYPE_METRICS, config);
 
     if (protocol.equals(PROTOCOL_HTTP_PROTOBUF)) {
-      OtlpHttpMetricExporterBuilder builder = OtlpHttpMetricExporter.builder();
+      OtlpHttpMetricExporterBuilder builder = httpBuilder();
 
       OtlpConfigUtil.configureOtlpExporterBuilder(
           DATA_TYPE_METRICS,
@@ -52,7 +52,7 @@ public MetricExporter createExporter(ConfigProperties config) {
 
       return builder.build();
     } else if (protocol.equals(PROTOCOL_GRPC)) {
-      OtlpGrpcMetricExporterBuilder builder = OtlpGrpcMetricExporter.builder();
+      OtlpGrpcMetricExporterBuilder builder = grpcBuilder();
 
       OtlpConfigUtil.configureOtlpExporterBuilder(
           DATA_TYPE_METRICS,
@@ -78,4 +78,14 @@ public MetricExporter createExporter(ConfigProperties config) {
   public String getName() {
     return "otlp";
   }
+
+  // Visible for testing
+  OtlpHttpMetricExporterBuilder httpBuilder() {
+    return OtlpHttpMetricExporter.builder();
+  }
+
+  // Visible for testing
+  OtlpGrpcMetricExporterBuilder grpcBuilder() {
+    return OtlpGrpcMetricExporter.builder();
+  }
 }
diff --git a/...p/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java b/...p/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java
@@ -32,7 +32,7 @@ public class OtlpSpanExporterProvider implements ConfigurableSpanExporterProvide
   public SpanExporter createExporter(ConfigProperties config) {
     String protocol = OtlpConfigUtil.getOtlpProtocol(DATA_TYPE_TRACES, config);
     if (protocol.equals(PROTOCOL_HTTP_PROTOBUF)) {
-      OtlpHttpSpanExporterBuilder builder = OtlpHttpSpanExporter.builder();
+      OtlpHttpSpanExporterBuilder builder = httpBuilder();
 
       OtlpConfigUtil.configureOtlpExporterBuilder(
           DATA_TYPE_TRACES,
@@ -47,7 +47,7 @@ public SpanExporter createExporter(ConfigProperties config) {
 
       return builder.build();
     } else if (protocol.equals(PROTOCOL_GRPC)) {
-      OtlpGrpcSpanExporterBuilder builder = OtlpGrpcSpanExporter.builder();
+      OtlpGrpcSpanExporterBuilder builder = grpcBuilder();
 
       OtlpConfigUtil.configureOtlpExporterBuilder(
           DATA_TYPE_TRACES,
@@ -69,4 +69,14 @@ public SpanExporter createExporter(ConfigProperties config) {
   public String getName() {
     return "otlp";
   }
+
+  // Visible for testing
+  OtlpHttpSpanExporterBuilder httpBuilder() {
+    return OtlpHttpSpanExporter.builder();
+  }
+
+  // Visible for testing
+  OtlpGrpcSpanExporterBuilder grpcBuilder() {
+    return OtlpGrpcSpanExporter.builder();
+  }
 }