Merge otlp exporters (#4499)

* Merge otlp http trace and metric exporters into :exporters:otlp:all * Merge otlp http exporter into :exporters:otlp:logs * Artifact descriptions
open-telemetry · May 28, 2022 · 92bd659 · 92bd659
1 parent 60cc5f4
commit 92bd659
Show file tree

Hide file tree

Showing 32 changed files with 94 additions and 140 deletions.
diff --git a/README.md b/README.md
@@ -248,21 +248,18 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
 
 ### SDK Exporters
 
-| Component                                                   | Description                                                                         | Artifact ID                                | Version                                                     |
-|-------------------------------------------------------------|-------------------------------------------------------------------------------------|--------------------------------------------|-------------------------------------------------------------|
-| [OTLP gRPC Exporter](./exporters/otlp/all)                  | OTLP gRPC exporters, including metrics and trace                                    | `opentelemetry-exporter-otlp`              | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [OTLP gRPC Logs Exporter](./exporters/otlp/logs)            | OTLP gRPC log exporter                                                              | `opentelemetry-exporter-otlp-logs`         | <!--VERSION_UNSTABLE-->1.14.0-alpha<!--/VERSION_UNSTABLE--> |
-| [OTLP HTTP Trace Exporter](./exporters/otlp-http/trace)     | OTLP http/protobuf trace exporter                                                   | `opentelemetry-exporter-otlp-http-trace`   | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [OTLP HTTP Metrics Exporter](./exporters/otlp-http/metrics) | OTLP http/protobuf metrics exporter                                                 | `opentelemetry-exporter-otlp-http-metrics` | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [OTLP HTTP Logs Exporter](./exporters/otlp-http/logs)       | OTLP http/protobuf logs exporter                                                    | `opentelemetry-exporter-otlp-http-logs`    | <!--VERSION_UNSTABLE-->1.14.0-alpha<!--/VERSION_UNSTABLE--> |
-| [OTLP Common](./exporters/otlp/common)                      | Shared OTLP components (internal)                                                   | `opentelemetry-exporter-otlp-common`       | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Jaeger gRPC Exporter](./exporters/jaeger)                  | Jaeger gRPC trace exporter                                                          | `opentelemetry-exporter-jaeger`            | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Jaeger Thrift Exporter](./exporters/jaeger-thrift)         | Jaeger thrift trace exporter                                                        | `opentelemetry-exporter-jaeger-thift`      | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Jaeger Proto](./exporters/jaeger-proto)                    | Jaeger gRPC protobuf definitions (deprecated)                                       | `opentelemetry-exporter-jaeger-proto`      | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Logging Exporter](./exporters/logging)                     | Logging exporters, includings metrics, traces, and logs                             | `opentelemetry-exporter-logging`           | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [OTLP Logging Exporter](./exporters/logging-otlp)           | Logging exporters in OTLP protobuf JSON format, including metrics, traces, and logs | `opentelemetry-exporter-logging-otlp`      | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Zipkin Exporter](./exporters/zipkin)                       | Zipkin trace exporter                                                               | `opentelemetry-exporter-zipkin`            | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [Prometheus Exporter](./exporters/prometheus)               | Prometheus metric exporter                                                          | `opentelemetry-exporter-prometheus`        | <!--VERSION_UNSTABLE-->1.14.0-alpha<!--/VERSION_UNSTABLE--> |
+| Component                                           | Description                                                                         | Artifact ID                           | Version                                                     |
+|-----------------------------------------------------|-------------------------------------------------------------------------------------|---------------------------------------|-------------------------------------------------------------|
+| [OTLP Exporters](./exporters/otlp/all)              | OTLP gRPC & HTTP exporters, including metrics and trace                             | `opentelemetry-exporter-otlp`         | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [OTLP Log Exporters](./exporters/otlp/logs)         | OTLP gRPC & HTTP log exporters                                                      | `opentelemetry-exporter-otlp-logs`    | <!--VERSION_UNSTABLE-->1.14.0-alpha<!--/VERSION_UNSTABLE--> |
+| [OTLP Common](./exporters/otlp/common)              | Shared OTLP components (internal)                                                   | `opentelemetry-exporter-otlp-common`  | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Jaeger gRPC Exporter](./exporters/jaeger)          | Jaeger gRPC trace exporter                                                          | `opentelemetry-exporter-jaeger`       | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Jaeger Thrift Exporter](./exporters/jaeger-thrift) | Jaeger thrift trace exporter                                                        | `opentelemetry-exporter-jaeger-thift` | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Jaeger Proto](./exporters/jaeger-proto)            | Jaeger gRPC protobuf definitions (deprecated)                                       | `opentelemetry-exporter-jaeger-proto` | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Logging Exporter](./exporters/logging)             | Logging exporters, includings metrics, traces, and logs                             | `opentelemetry-exporter-logging`      | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [OTLP Logging Exporter](./exporters/logging-otlp)   | Logging exporters in OTLP protobuf JSON format, including metrics, traces, and logs | `opentelemetry-exporter-logging-otlp` | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Zipkin Exporter](./exporters/zipkin)               | Zipkin trace exporter                                                               | `opentelemetry-exporter-zipkin`       | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
+| [Prometheus Exporter](./exporters/prometheus)       | Prometheus metric exporter                                                          | `opentelemetry-exporter-prometheus`   | <!--VERSION_UNSTABLE-->1.14.0-alpha<!--/VERSION_UNSTABLE--> |
 
 ### SDK Extensions
 

diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt
@@ -1,4 +1,45 @@
 Comparing source compatibility of  against 
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder builder()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode export(java.util.Collection)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode flush()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.metrics.data.AggregationTemporality getAggregationTemporality(io.opentelemetry.sdk.metrics.InstrumentType)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter getDefault()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder addHeader(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter build()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setAggregationTemporalitySelector(io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setClientTls(byte[], byte[])
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setCompression(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setEndpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setTimeout(long, java.util.concurrent.TimeUnit)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder setTrustedCertificates(byte[])
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder builder()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode export(java.util.Collection)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode flush()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter getDefault()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder addHeader(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter build()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setClientTls(byte[], byte[])
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setCompression(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setEndpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setTimeout(long, java.util.concurrent.TimeUnit)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder setTrustedCertificates(byte[])
 +++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object

diff --git a/exporters/otlp-http/build.gradle.kts b/exporters/otlp-http/build.gradle.kts
diff --git a/exporters/otlp-http/logs/build.gradle.kts b/exporters/otlp-http/logs/build.gradle.kts
diff --git a/exporters/otlp-http/logs/gradle.properties b/exporters/otlp-http/logs/gradle.properties
diff --git a/exporters/otlp-http/metrics/README.md b/exporters/otlp-http/metrics/README.md
diff --git a/exporters/otlp-http/metrics/build.gradle.kts b/exporters/otlp-http/metrics/build.gradle.kts
diff --git a/exporters/otlp-http/trace/README.md b/exporters/otlp-http/trace/README.md
diff --git a/exporters/otlp-http/trace/build.gradle.kts b/exporters/otlp-http/trace/build.gradle.kts
diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
   id("otel.animalsniffer-conventions")
 }
 
-description = "OpenTelemetry Protocol gRPC Exporters"
+description = "OpenTelemetry Protocol (OTLP) Exporters"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp")
 base.archivesName.set("opentelemetry-exporter-otlp")
 
@@ -19,6 +19,9 @@ dependencies {
   compileOnly("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")
+  testImplementation("com.squareup.okhttp3:okhttp-tls")
 
   jmhImplementation(project(":sdk:testing"))
   jmhImplementation("com.linecorp.armeria:armeria")

diff --git a/.../http/metrics/OtlpHttpMetricExporter.java → .../http/metrics/OtlpHttpMetricExporter.java b/.../http/metrics/OtlpHttpMetricExporter.java → .../http/metrics/OtlpHttpMetricExporter.java
diff --git a/...etrics/OtlpHttpMetricExporterBuilder.java → ...etrics/OtlpHttpMetricExporterBuilder.java b/...etrics/OtlpHttpMetricExporterBuilder.java → ...etrics/OtlpHttpMetricExporterBuilder.java
diff --git a/...orter/otlp/http/metrics/package-info.java → ...orter/otlp/http/metrics/package-info.java b/...orter/otlp/http/metrics/package-info.java → ...orter/otlp/http/metrics/package-info.java
diff --git a/...otlp/http/trace/OtlpHttpSpanExporter.java → ...otlp/http/trace/OtlpHttpSpanExporter.java b/...otlp/http/trace/OtlpHttpSpanExporter.java → ...otlp/http/trace/OtlpHttpSpanExporter.java
diff --git a/...tp/trace/OtlpHttpSpanExporterBuilder.java → ...tp/trace/OtlpHttpSpanExporterBuilder.java b/...tp/trace/OtlpHttpSpanExporterBuilder.java → ...tp/trace/OtlpHttpSpanExporterBuilder.java
diff --git a/...xporter/otlp/http/trace/package-info.java → ...xporter/otlp/http/trace/package-info.java b/...xporter/otlp/http/trace/package-info.java → ...xporter/otlp/http/trace/package-info.java
diff --git a/...p/metrics/OtlpHttpMetricExporterTest.java → ...p/metrics/OtlpHttpMetricExporterTest.java b/...p/metrics/OtlpHttpMetricExporterTest.java → ...p/metrics/OtlpHttpMetricExporterTest.java
diff --git a/.../http/trace/OtlpHttpSpanExporterTest.java → .../http/trace/OtlpHttpSpanExporterTest.java b/.../http/trace/OtlpHttpSpanExporterTest.java → .../http/trace/OtlpHttpSpanExporterTest.java
diff --git a/exporters/otlp/logs/build.gradle.kts b/exporters/otlp/logs/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   id("otel.animalsniffer-conventions")
 }
 
-description = "OpenTelemetry Protocol Logs Exporter"
+description = "OpenTelemetry Protocol (OTLP) Log Exporters"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.logs")
 
 dependencies {
@@ -16,6 +16,10 @@ dependencies {
   compileOnly("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")
+  testImplementation("com.squareup.okhttp3:okhttp-tls")
 }
 
 testing {

diff --git a/...r/otlp/http/logs/OtlpHttpLogExporter.java → ...r/otlp/http/logs/OtlpHttpLogExporter.java b/...r/otlp/http/logs/OtlpHttpLogExporter.java → ...r/otlp/http/logs/OtlpHttpLogExporter.java
diff --git a/...http/logs/OtlpHttpLogExporterBuilder.java → ...http/logs/OtlpHttpLogExporterBuilder.java b/...http/logs/OtlpHttpLogExporterBuilder.java → ...http/logs/OtlpHttpLogExporterBuilder.java
diff --git a/...exporter/otlp/http/logs/package-info.java → ...exporter/otlp/http/logs/package-info.java b/...exporter/otlp/http/logs/package-info.java → ...exporter/otlp/http/logs/package-info.java
diff --git a/...lp/http/logs/OtlpHttpLogExporterTest.java → ...lp/http/logs/OtlpHttpLogExporterTest.java b/...lp/http/logs/OtlpHttpLogExporterTest.java → ...lp/http/logs/OtlpHttpLogExporterTest.java
diff --git a/integration-tests/otlp/build.gradle.kts b/integration-tests/otlp/build.gradle.kts
@@ -10,9 +10,6 @@ dependencies {
 
   implementation(project(":exporters:otlp:all"))
   implementation(project(":exporters:otlp:logs"))
-  implementation(project(":exporters:otlp-http:logs"))
-  implementation(project(":exporters:otlp-http:metrics"))
-  implementation(project(":exporters:otlp-http:trace"))
   implementation(project(":semconv"))
 
   implementation("com.linecorp.armeria:armeria-grpc-protocol")

diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts
@@ -19,9 +19,6 @@ dependencies {
   compileOnly(project(":exporters:otlp:all"))
   compileOnly(project(":exporters:otlp:logs"))
   compileOnly(project(":exporters:otlp:common"))
-  compileOnly(project(":exporters:otlp-http:trace"))
-  compileOnly(project(":exporters:otlp-http:metrics"))
-  compileOnly(project(":exporters:otlp-http:logs"))
   compileOnly(project(":exporters:prometheus"))
   compileOnly(project(":exporters:zipkin"))
 
@@ -118,7 +115,7 @@ testing {
         }
       }
     }
-    val testOtlpGrpc by registering(JvmTestSuite::class) {
+    val testOtlp by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":exporters:otlp:all"))
         implementation(project(":exporters:otlp:logs"))
@@ -128,22 +125,9 @@ testing {
         implementation("io.opentelemetry.proto:opentelemetry-proto")
         implementation("com.linecorp.armeria:armeria-junit5")
         implementation("com.linecorp.armeria:armeria-grpc")
-        runtimeOnly("io.grpc:grpc-netty-shaded")
-      }
-    }
-    val testOtlpHttp by registering(JvmTestSuite::class) {
-      dependencies {
-        implementation(project(":exporters:otlp-http:trace"))
-        implementation(project(":exporters:otlp-http:metrics"))
-        implementation(project(":exporters:otlp-http:logs"))
-        implementation(project(":exporters:otlp:common"))
-        implementation(project(":sdk:testing"))
-
-        implementation("com.google.guava:guava")
-        implementation("com.linecorp.armeria:armeria-junit5")
         implementation("com.squareup.okhttp3:okhttp")
         implementation("com.squareup.okhttp3:okhttp-tls")
-        implementation("io.opentelemetry.proto:opentelemetry-proto")
+        runtimeOnly("io.grpc:grpc-netty-shaded")
       }
     }
     val testPrometheus by registering(JvmTestSuite::class) {