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.

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

Add additional test for authenticator #5391

Merged
merged 1 commit into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.exporter.internal.otlp.metrics.ResourceMetricsMarshaler;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
Expand Down Expand Up @@ -114,6 +115,12 @@ public TelemetryExporterBuilder<MetricData> addHeader(String key, String value)
return this;
}

@Override
public TelemetryExporterBuilder<MetricData> setAuthenticator(Authenticator authenticator) {
Authenticator.setAuthenticatorOnDelegate(builder, authenticator);
return this;
}

@Override
public TelemetryExporterBuilder<MetricData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.exporter.internal.otlp.traces.ResourceSpansMarshaler;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
Expand Down Expand Up @@ -59,6 +60,12 @@ public TelemetryExporterBuilder<SpanData> addHeader(String key, String value) {
return this;
}

@Override
public TelemetryExporterBuilder<SpanData> setAuthenticator(Authenticator authenticator) {
Authenticator.setAuthenticatorOnDelegate(builder, authenticator);
return this;
}

@Override
public TelemetryExporterBuilder<SpanData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

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

import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.marshal.Marshaler;
import io.opentelemetry.exporter.internal.otlp.logs.ResourceLogsMarshaler;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
Expand Down Expand Up @@ -60,6 +61,12 @@ public TelemetryExporterBuilder<LogRecordData> addHeader(String key, String valu
return this;
}

@Override
public TelemetryExporterBuilder<LogRecordData> setAuthenticator(Authenticator authenticator) {
Authenticator.setAuthenticatorOnDelegate(builder, authenticator);
return this;
}

@Override
public TelemetryExporterBuilder<LogRecordData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,34 @@ void withHeaders() {
}
}

@Test
void withAuthenticator() {
TelemetryExporter<T> exporter =
exporterBuilder()
.setEndpoint(server.httpUri() + path)
.setAuthenticator(() -> Collections.singletonMap("key", "value"))
.build();

addHttpError(401);

try {
assertThat(
exporter
.export(Collections.singletonList(generateFakeTelemetry()))
.join(10, TimeUnit.SECONDS)
.isSuccess())
.isTrue();
assertThat(httpRequests)
.element(0)
.satisfies(req -> assertThat(req.headers().get("key")).isNull());
assertThat(httpRequests)
.element(1)
.satisfies(req -> assertThat(req.headers().get("key")).isEqualTo("value"));
} finally {
exporter.shutdown();
}
}

@Test
void tls() throws Exception {
TelemetryExporter<T> exporter =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.exporter.otlp.testing.internal;

import io.grpc.ManagedChannel;
import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
import io.opentelemetry.exporter.internal.retry.RetryUtil;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
Expand Down Expand Up @@ -50,6 +51,11 @@ public TelemetryExporterBuilder<LogRecordData> addHeader(String key, String valu
return this;
}

@Override
public TelemetryExporterBuilder<LogRecordData> setAuthenticator(Authenticator authenticator) {
return this;
}

@Override
public TelemetryExporterBuilder<LogRecordData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.exporter.otlp.testing.internal;

import io.grpc.ManagedChannel;
import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
import io.opentelemetry.exporter.internal.retry.RetryUtil;
import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
Expand Down Expand Up @@ -50,6 +51,11 @@ public TelemetryExporterBuilder<MetricData> addHeader(String key, String value)
return this;
}

@Override
public TelemetryExporterBuilder<MetricData> setAuthenticator(Authenticator authenticator) {
return this;
}

@Override
public TelemetryExporterBuilder<MetricData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.exporter.otlp.testing.internal;

import io.grpc.ManagedChannel;
import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
import io.opentelemetry.exporter.internal.retry.RetryUtil;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
Expand Down Expand Up @@ -51,6 +52,11 @@ public TelemetryExporterBuilder<SpanData> addHeader(String key, String value) {
return this;
}

@Override
public TelemetryExporterBuilder<SpanData> setAuthenticator(Authenticator authenticator) {
return this;
}

@Override
public TelemetryExporterBuilder<SpanData> setTrustedCertificates(byte[] certificates) {
builder.setTrustedCertificates(certificates);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io.grpc.netty.NettyChannelBuilder;
import io.netty.handler.ssl.SslContext;
import io.opentelemetry.exporter.internal.TlsConfigHelper;
import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.grpc.ManagedChannelUtil;
import io.opentelemetry.exporter.internal.otlp.OtlpUserAgent;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
Expand Down Expand Up @@ -87,6 +88,11 @@ public TelemetryExporterBuilder<T> addHeader(String key, String value) {
return this;
}

@Override
public TelemetryExporterBuilder<T> setAuthenticator(Authenticator authenticator) {
return this;
}

// When a user provides a Channel, we are not in control of TLS or retry config and reimplement it
// here for use in tests. Technically we don't have to test them since they are out of the SDK's
// control, but it's probably worth verifying the baseline functionality anyways.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package io.opentelemetry.exporter.otlp.testing.internal;

import io.grpc.ManagedChannel;
import io.opentelemetry.exporter.internal.auth.Authenticator;
import io.opentelemetry.exporter.internal.retry.RetryPolicy;
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
Expand Down Expand Up @@ -40,6 +41,8 @@ static TelemetryExporterBuilder<LogRecordData> wrap(OtlpGrpcLogRecordExporterBui

TelemetryExporterBuilder<T> addHeader(String key, String value);

TelemetryExporterBuilder<T> setAuthenticator(Authenticator authenticator);

TelemetryExporterBuilder<T> setTrustedCertificates(byte[] certificates);

TelemetryExporterBuilder<T> setClientTls(byte[] privateKeyPem, byte[] certificatePem);
Expand Down