Skip to content

Commit b715ca6

Browse files
committed
Move otlp utilities to otlp package
1 parent c22f25c commit b715ca6

39 files changed

Lines changed: 177 additions & 83 deletions

File tree

exporters/otlp/all/build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ dependencies {
2222

2323
compileOnly(project(":api:incubator"))
2424

25+
annotationProcessor("com.google.auto.value:auto-value")
26+
2527
compileOnly("io.grpc:grpc-stub")
2628

2729
testImplementation(project(":exporters:otlp:testing-internal"))
2830
testImplementation("com.linecorp.armeria:armeria-junit5")
2931
testImplementation("com.linecorp.armeria:armeria-grpc-protocol")
3032
testImplementation("io.grpc:grpc-stub")
33+
testImplementation("com.google.api.grpc:proto-google-common-protos")
3134

3235
jmhImplementation(project(":sdk:testing"))
3336
jmhImplementation(project(":exporters:sender:grpc-managed-channel"))
@@ -160,6 +163,15 @@ testing {
160163
}
161164
}
162165
}
166+
register<JvmTestSuite>("testNoSender") {
167+
targets {
168+
all {
169+
testTask {
170+
classpath = classpath.filter { !it.name.startsWith("opentelemetry-exporter-sender-okhttp") }
171+
}
172+
}
173+
}
174+
}
163175
register<JvmTestSuite>("testSpanPipeline") {
164176
dependencies {
165177
implementation("io.opentelemetry.proto:opentelemetry-proto")

exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import io.grpc.ManagedChannelBuilder;
1313
import io.grpc.stub.StreamObserver;
1414
import io.opentelemetry.api.metrics.MeterProvider;
15-
import io.opentelemetry.exporter.internal.grpc.GrpcExporter;
16-
import io.opentelemetry.exporter.internal.http.HttpExporter;
17-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
15+
import io.opentelemetry.exporter.otlp.internal.GrpcExporter;
16+
import io.opentelemetry.exporter.otlp.internal.HttpExporter;
17+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1818
import io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSender;
1919
import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpGrpcSender;
2020
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.exporter.otlp.http.logs;
77

8-
import io.opentelemetry.exporter.internal.http.HttpExporter;
9-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
108
import io.opentelemetry.exporter.internal.otlp.logs.LogReusableDataMarshaler;
9+
import io.opentelemetry.exporter.otlp.internal.HttpExporter;
10+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1111
import io.opentelemetry.sdk.common.CompletableResultCode;
1212
import io.opentelemetry.sdk.common.export.MemoryMode;
1313
import io.opentelemetry.sdk.logs.data.LogRecordData;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.api.metrics.MeterProvider;
1313
import io.opentelemetry.common.ComponentLoader;
14-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
14+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1515
import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent;
1616
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1717
import io.opentelemetry.sdk.common.export.Compressor;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.exporter.otlp.http.metrics;
77

8-
import io.opentelemetry.exporter.internal.http.HttpExporter;
9-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
108
import io.opentelemetry.exporter.internal.otlp.metrics.MetricReusableDataMarshaler;
9+
import io.opentelemetry.exporter.otlp.internal.HttpExporter;
10+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1111
import io.opentelemetry.sdk.common.CompletableResultCode;
1212
import io.opentelemetry.sdk.common.export.MemoryMode;
1313
import io.opentelemetry.sdk.metrics.Aggregation;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.api.metrics.MeterProvider;
1313
import io.opentelemetry.common.ComponentLoader;
14-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
14+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1515
import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent;
1616
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1717
import io.opentelemetry.sdk.common.export.Compressor;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.exporter.otlp.http.trace;
77

8-
import io.opentelemetry.exporter.internal.http.HttpExporter;
9-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
108
import io.opentelemetry.exporter.internal.otlp.traces.SpanReusableDataMarshaler;
9+
import io.opentelemetry.exporter.otlp.internal.HttpExporter;
10+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1111
import io.opentelemetry.sdk.common.CompletableResultCode;
1212
import io.opentelemetry.sdk.common.export.MemoryMode;
1313
import io.opentelemetry.sdk.trace.data.SpanData;

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.opentelemetry.api.GlobalOpenTelemetry;
1212
import io.opentelemetry.api.metrics.MeterProvider;
1313
import io.opentelemetry.common.ComponentLoader;
14-
import io.opentelemetry.exporter.internal.http.HttpExporterBuilder;
14+
import io.opentelemetry.exporter.otlp.internal.HttpExporterBuilder;
1515
import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent;
1616
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1717
import io.opentelemetry.sdk.common.export.Compressor;

exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/CompressorUtil.java renamed to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/CompressorUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.exporter.internal.compression;
6+
package io.opentelemetry.exporter.otlp.internal;
77

88
import static io.opentelemetry.api.internal.Utils.checkArgument;
99
import static java.util.stream.Collectors.joining;

exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java renamed to exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/GrpcExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.exporter.internal.grpc;
6+
package io.opentelemetry.exporter.otlp.internal;
77

88
import io.opentelemetry.api.metrics.MeterProvider;
99
import io.opentelemetry.exporter.internal.FailedExportException;

0 commit comments

Comments
 (0)