Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move autoconfigure otlp tests #5060

Merged
merged 5 commits into from
Dec 29, 2022
Merged

Move autoconfigure otlp tests #5060

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5338ab6
Unify OtlpHttp{Signal}Exporter testing
jack-berg Dec 21, 2022
f2a9c9a
Add header and compression tests
jack-berg Dec 21, 2022
1eb8aca
Move SPI otlp tests to :exporters:otlp
jack-berg Dec 21, 2022
4c1ba11
Improve test coverage
jack-berg Dec 29, 2022
51c5b2f
Improve test coverage
jack-berg Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions exporters/otlp/all/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 12 additions & 2 deletions ...all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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();
}
}
14 changes: 12 additions & 2 deletions ...p/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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();
}
}
Loading