Merge otlp grpc trace and metric exporter into :exporters:otlp:all (#…

…4494)

README.md

@@ -251,8 +251,6 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
 | 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 Trace Exporter](./exporters/otlp/trace)          | OTLP gRPC trace exporter                                                            | `opentelemetry-exporter-otlp-trace`        | <!--VERSION_STABLE-->1.14.0<!--/VERSION_STABLE-->           |
-| [OTLP gRPC Metrics Exporter](./exporters/otlp/metrics)      | OTLP gRPC metrics exporter                                                          | `opentelemetry-exporter-otlp-metrics`      | <!--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-->           |

docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt

@@ -1,2 +1,46 @@
 Comparing source compatibility of  against 
-No changes.
++++  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
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder 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.metrics.OtlpGrpcMetricExporter getDefault()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder addHeader(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter build()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setAggregationTemporalitySelector(io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setChannel(io.grpc.ManagedChannel)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setClientTls(byte[], byte[])
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setCompression(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setEndpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setTimeout(long, java.util.concurrent.TimeUnit)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder setTrustedCertificates(byte[])
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder 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.trace.OtlpGrpcSpanExporter getDefault()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder addHeader(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter build()
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setChannel(io.grpc.ManagedChannel)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setClientTls(byte[], byte[])
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setCompression(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setEndpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setMeterProvider(io.opentelemetry.api.metrics.MeterProvider)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setTimeout(long, java.util.concurrent.TimeUnit)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder setTrustedCertificates(byte[])

exporters/otlp/all/README.md

@@ -1,4 +1,4 @@
-# OpenTelemetry - OTLP Exporter
+# OpenTelemetry - OTLP gRPC Exporters
 
 [![Javadocs][javadoc-image]][javadoc-url]
 

exporters/otlp/all/build.gradle.kts

@@ -6,11 +6,72 @@ plugins {
   id("otel.animalsniffer-conventions")
 }
 
-description = "OpenTelemetry Protocol Exporters"
+description = "OpenTelemetry Protocol gRPC Exporters"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp")
 base.archivesName.set("opentelemetry-exporter-otlp")
 
 dependencies {
-  api(project(":exporters:otlp:trace"))
-  api(project(":exporters:otlp:metrics"))
+  api(project(":sdk:trace"))
+  api(project(":sdk:metrics"))
+
+  implementation(project(":exporters:otlp:common"))
+
+  compileOnly("io.grpc:grpc-stub")
+
+  testImplementation(project(":exporters:otlp:testing-internal"))
+
+  jmhImplementation(project(":sdk:testing"))
+  jmhImplementation("com.linecorp.armeria:armeria")
+  jmhImplementation("com.linecorp.armeria:armeria-grpc")
+  jmhImplementation("io.opentelemetry.proto:opentelemetry-proto")
+  jmhRuntimeOnly("com.squareup.okhttp3:okhttp")
+  jmhRuntimeOnly("io.grpc:grpc-netty")
+}
+
+testing {
+  suites {
+    val testGrpcNetty by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcNettyShaded by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-netty-shaded")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testGrpcOkhttp by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":exporters:otlp:testing-internal"))
+
+        implementation("io.grpc:grpc-okhttp")
+        implementation("io.grpc:grpc-stub")
+      }
+    }
+    val testSpanPipeline by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation("io.opentelemetry.proto:opentelemetry-proto")
+        implementation("com.linecorp.armeria:armeria-grpc-protocol")
+        implementation("com.linecorp.armeria:armeria-junit5")
+      }
+    }
+  }
+}
+
+tasks {
+  check {
+    dependsOn(
+      testing.suites.filter {
+        // Mainly to conveniently profile through IDEA. Don't add to check task, it's for
+        // manual invocation.
+        name != "testSpanPipeline"
+      }
+    )
+  }
 }

integration-tests/otlp/build.gradle.kts

@@ -8,8 +8,7 @@ otelJava.moduleName.set("io.opentelemetry.integration.tests.otlp")
 dependencies {
   api("org.testcontainers:junit-jupiter")
 
-  implementation(project(":exporters:otlp:trace"))
-  implementation(project(":exporters:otlp:metrics"))
+  implementation(project(":exporters:otlp:all"))
   implementation(project(":exporters:otlp:logs"))
   implementation(project(":exporters:otlp-http:logs"))
   implementation(project(":exporters:otlp-http:metrics"))

perf-harness/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
   implementation(project(":api:all"))
   implementation(project(":sdk:all"))
   implementation(project(":sdk:testing"))
-  implementation(project(":exporters:otlp:trace"))
+  implementation(project(":exporters:otlp:all"))
   implementation(project(":exporters:logging"))
   implementation(project(":semconv"))
 

sdk/trace/build.gradle.kts

@@ -42,8 +42,8 @@ dependencies {
     isTransitive = false
   }
   jmh(project(":exporters:jaeger-thrift"))
-  jmh(project(":exporters:otlp:trace")) {
-    // The opentelemetry-exporter-otlp-trace depends on this project itself. So don"t pull in
+  jmh(project(":exporters:otlp:all")) {
+    // The opentelemetry-exporter-otlp depends on this project itself. So don't pull in
     // the transitive dependencies.
     isTransitive = false
   }

settings.gradle.kts

@@ -41,9 +41,7 @@ include(":exporters:logging-otlp")
 include(":exporters:otlp:all")
 include(":exporters:otlp:common")
 include(":exporters:otlp:logs")
-include(":exporters:otlp:metrics")
 include(":exporters:otlp:testing-internal")
-include(":exporters:otlp:trace")
 include(":exporters:otlp-http:logs")
 include(":exporters:otlp-http:metrics")
 include(":exporters:otlp-http:trace")