diff --git a/README.md b/README.md index f8d7ff05365..ac7a940defd 100644 --- a/README.md +++ b/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` | 1.14.0 | -| [OTLP gRPC Trace Exporter](./exporters/otlp/trace) | OTLP gRPC trace exporter | `opentelemetry-exporter-otlp-trace` | 1.14.0 | -| [OTLP gRPC Metrics Exporter](./exporters/otlp/metrics) | OTLP gRPC metrics exporter | `opentelemetry-exporter-otlp-metrics` | 1.14.0 | | [OTLP gRPC Logs Exporter](./exporters/otlp/logs) | OTLP gRPC log exporter | `opentelemetry-exporter-otlp-logs` | 1.14.0-alpha | | [OTLP HTTP Trace Exporter](./exporters/otlp-http/trace) | OTLP http/protobuf trace exporter | `opentelemetry-exporter-otlp-http-trace` | 1.14.0 | | [OTLP HTTP Metrics Exporter](./exporters/otlp-http/metrics) | OTLP http/protobuf metrics exporter | `opentelemetry-exporter-otlp-http-metrics` | 1.14.0 | diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt index df26146497b..7f27b6986f7 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-otlp.txt @@ -1,2 +1,46 @@ Comparing source compatibility of against -No changes. \ No newline at end of file ++++ 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[]) diff --git a/exporters/otlp/all/README.md b/exporters/otlp/all/README.md index fdfb211013a..c02178ee94a 100644 --- a/exporters/otlp/all/README.md +++ b/exporters/otlp/all/README.md @@ -1,4 +1,4 @@ -# OpenTelemetry - OTLP Exporter +# OpenTelemetry - OTLP gRPC Exporters [![Javadocs][javadoc-image]][javadoc-url] diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index 657b1065d57..72230f4e2b0 100644 --- a/exporters/otlp/all/build.gradle.kts +++ b/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" + } + ) + } } diff --git a/exporters/otlp/trace/src/jmh/java/io/opentelemetry/exporter/otlp/trace/GrpcExporterBenchmark.java b/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/GrpcExporterBenchmark.java similarity index 100% rename from exporters/otlp/trace/src/jmh/java/io/opentelemetry/exporter/otlp/trace/GrpcExporterBenchmark.java rename to exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/GrpcExporterBenchmark.java diff --git a/exporters/otlp/trace/src/jmh/java/io/opentelemetry/exporter/otlp/trace/RequestMarshalState.java b/exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/RequestMarshalState.java similarity index 100% rename from exporters/otlp/trace/src/jmh/java/io/opentelemetry/exporter/otlp/trace/RequestMarshalState.java rename to exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/RequestMarshalState.java diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/ExportMetricsServiceResponse.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/ExportMetricsServiceResponse.java similarity index 100% rename from exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/ExportMetricsServiceResponse.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/ExportMetricsServiceResponse.java diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/MarshalerMetricsServiceGrpc.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/MarshalerMetricsServiceGrpc.java similarity index 100% rename from exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/MarshalerMetricsServiceGrpc.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/MarshalerMetricsServiceGrpc.java diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java similarity index 100% rename from exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporter.java diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java similarity index 100% rename from exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java diff --git a/exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/package-info.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/package-info.java similarity index 100% rename from exporters/otlp/metrics/src/main/java/io/opentelemetry/exporter/otlp/metrics/package-info.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/package-info.java diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/ExportTraceServiceResponse.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/ExportTraceServiceResponse.java similarity index 100% rename from exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/ExportTraceServiceResponse.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/ExportTraceServiceResponse.java diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/MarshalerTraceServiceGrpc.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/MarshalerTraceServiceGrpc.java similarity index 100% rename from exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/MarshalerTraceServiceGrpc.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/MarshalerTraceServiceGrpc.java diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java similarity index 100% rename from exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporter.java diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java similarity index 100% rename from exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java diff --git a/exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/package-info.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/package-info.java similarity index 100% rename from exporters/otlp/trace/src/main/java/io/opentelemetry/exporter/otlp/trace/package-info.java rename to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/package-info.java diff --git a/exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java b/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java similarity index 100% rename from exporters/otlp/metrics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java rename to exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java diff --git a/exporters/otlp/trace/src/test/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterTest.java b/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterTest.java similarity index 100% rename from exporters/otlp/trace/src/test/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterTest.java rename to exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterTest.java diff --git a/exporters/otlp/metrics/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java similarity index 100% rename from exporters/otlp/metrics/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java rename to exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java diff --git a/exporters/otlp/trace/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java b/exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java similarity index 100% rename from exporters/otlp/trace/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java rename to exporters/otlp/all/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettySpanExporterTest.java diff --git a/exporters/otlp/metrics/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java similarity index 100% rename from exporters/otlp/metrics/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java rename to exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java diff --git a/exporters/otlp/trace/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java b/exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java similarity index 100% rename from exporters/otlp/trace/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java rename to exporters/otlp/all/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcNettyShadedSpanExporterTest.java diff --git a/exporters/otlp/metrics/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java similarity index 100% rename from exporters/otlp/metrics/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java rename to exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java diff --git a/exporters/otlp/trace/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java b/exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java similarity index 100% rename from exporters/otlp/trace/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java rename to exporters/otlp/all/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcOkHttpSpanExporterTest.java diff --git a/exporters/otlp/trace/src/testSpanPipeline/java/io/opentelemetry/exporter/otlp/trace/SpanPipelineOtlpBenchmark.java b/exporters/otlp/all/src/testSpanPipeline/java/io/opentelemetry/exporter/otlp/trace/SpanPipelineOtlpBenchmark.java similarity index 100% rename from exporters/otlp/trace/src/testSpanPipeline/java/io/opentelemetry/exporter/otlp/trace/SpanPipelineOtlpBenchmark.java rename to exporters/otlp/all/src/testSpanPipeline/java/io/opentelemetry/exporter/otlp/trace/SpanPipelineOtlpBenchmark.java diff --git a/exporters/otlp/metrics/README.md b/exporters/otlp/metrics/README.md deleted file mode 100644 index a3b75a9b26f..00000000000 --- a/exporters/otlp/metrics/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# OpenTelemetry - OTLP Metrics Exporter - gRPC - -[![Javadocs][javadoc-image]][javadoc-url] - -This is the OpenTelemetry exporter, sending metrics data to OpenTelemetry collector via gRPC. - -[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp-metrics.svg -[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp-metrics diff --git a/exporters/otlp/metrics/build.gradle.kts b/exporters/otlp/metrics/build.gradle.kts deleted file mode 100644 index 76c4ce872ff..00000000000 --- a/exporters/otlp/metrics/build.gradle.kts +++ /dev/null @@ -1,54 +0,0 @@ -plugins { - id("otel.java-conventions") - id("otel.publish-conventions") - - id("otel.animalsniffer-conventions") -} - -description = "OpenTelemetry Protocol Metrics Exporter" -otelJava.moduleName.set("io.opentelemetry.exporter.otlp.metrics") - -dependencies { - api(project(":sdk:metrics")) - - implementation(project(":exporters:otlp:common")) - - compileOnly("io.grpc:grpc-stub") - - testImplementation(project(":exporters:otlp:testing-internal")) -} - -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") - } - } - } -} - -tasks { - check { - dependsOn(testing.suites) - } -} diff --git a/exporters/otlp/trace/README.md b/exporters/otlp/trace/README.md deleted file mode 100644 index 99b16052486..00000000000 --- a/exporters/otlp/trace/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# OpenTelemetry - OTLP Trace Exporter - gRPC - -[![Javadocs][javadoc-image]][javadoc-url] - -This is the OpenTelemetry exporter, sending span data to OpenTelemetry collector via gRPC. - -[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-exporter-otlp-trace.svg -[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-otlp-trace diff --git a/exporters/otlp/trace/build.gradle.kts b/exporters/otlp/trace/build.gradle.kts deleted file mode 100644 index 14a64dde1ab..00000000000 --- a/exporters/otlp/trace/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - id("otel.java-conventions") - id("otel.publish-conventions") - - id("otel.animalsniffer-conventions") - id("otel.jmh-conventions") -} - -description = "OpenTelemetry Protocol Trace Exporter" -otelJava.moduleName.set("io.opentelemetry.exporter.otlp.trace") - -dependencies { - api(project(":sdk:trace")) - - 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" - } - ) - } -} diff --git a/exporters/otlp/trace/src/main/proto/README.md b/exporters/otlp/trace/src/main/proto/README.md deleted file mode 100644 index f36259bdd21..00000000000 --- a/exporters/otlp/trace/src/main/proto/README.md +++ /dev/null @@ -1 +0,0 @@ -Non-empty folder required for wire proto compiler. diff --git a/integration-tests/otlp/build.gradle.kts b/integration-tests/otlp/build.gradle.kts index e834817ec3f..3a25ae0921c 100644 --- a/integration-tests/otlp/build.gradle.kts +++ b/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")) diff --git a/perf-harness/build.gradle.kts b/perf-harness/build.gradle.kts index ea6520c5f4e..f3d6f2e49f8 100644 --- a/perf-harness/build.gradle.kts +++ b/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")) diff --git a/sdk/trace/build.gradle.kts b/sdk/trace/build.gradle.kts index 88afa8a2e29..430ec20f1e5 100644 --- a/sdk/trace/build.gradle.kts +++ b/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 } diff --git a/settings.gradle.kts b/settings.gradle.kts index cac0dd6330b..20ee85b184e 100644 --- a/settings.gradle.kts +++ b/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")