Skip to content

[otlp] Add experimental feature flag for enabling retries #5435

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

Merged
utpilla merged 16 commits into from
Mar 13, 2024
Merged

[otlp] Add experimental feature flag for enabling retries #5435

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
131bed5
Add experimental options to trace and metric exporter
vishweshbankwar Mar 11, 2024
527d89c
Merge branch 'main' into vibankwa/add-experimental-option-for-retry
vishweshbankwar Mar 11, 2024
445b270
update
vishweshbankwar Mar 12, 2024
ec50616
rmv unused file
vishweshbankwar Mar 12, 2024
a470210
Merge branch 'main' into vibankwa/add-experimental-option-for-retry
vishweshbankwar Mar 12, 2024
a24eaf6
fix nullable
vishweshbankwar Mar 12, 2024
b97adad
fix tests
vishweshbankwar Mar 12, 2024
69897ff
refactor
vishweshbankwar Mar 12, 2024
659e001
address feedback
vishweshbankwar Mar 12, 2024
22d969d
Merge branch 'main' into vibankwa/add-experimental-option-for-retry
vishweshbankwar Mar 12, 2024
b91a733
rmv duplciate registration
vishweshbankwar Mar 12, 2024
b1a08c8
Merge branch 'vibankwa/add-experimental-option-for-retry' of https://…
vishweshbankwar Mar 12, 2024
99ba724
address feedback
vishweshbankwar Mar 13, 2024
87fdbb0
fix doc
vishweshbankwar Mar 13, 2024
09a5dde
add remarks
vishweshbankwar Mar 13, 2024
0b4496c
add changelog
vishweshbankwar Mar 13, 2024
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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@vishweshbankwar
vishweshbankwar committed Mar 12, 2024
commit b97adad4214d9dc700aeb21e8714fcefebeda608
44 changes: 12 additions & 32 deletions test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/MockCollectorIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClient;
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.Transmission;
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
using OpenTelemetry.Metrics;
using OpenTelemetry.Proto.Collector.Trace.V1;
using OpenTelemetry.Tests;
Expand Down Expand Up @@ -172,23 +172,13 @@ public async Task GrpcRetryTests(bool useRetryTransmissionHandler, ExportResult

var endpoint = new Uri($"http://localhost:{testGrpcPort}");

var exporterOptions = new OtlpExporterOptions() { Endpoint = endpoint, TimeoutMilliseconds = 20000 };
var exporterOptions = new OtlpExporterOptions() { Endpoint = endpoint, TimeoutMilliseconds = 20000, Protocol = OtlpExportProtocol.Grpc };

var exportClient = new OtlpGrpcTraceExportClient(exporterOptions);
var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string> { [ExperimentalOptions.EnableInMemoryRetryEnvVar] = useRetryTransmissionHandler.ToString() })
.Build();

OtlpExporterTransmissionHandler<ExportTraceServiceRequest> transmissionHandler;

// TODO: update this to configure via experimental environment variable.
if (useRetryTransmissionHandler)
{
transmissionHandler = new OtlpExporterRetryTransmissionHandler<ExportTraceServiceRequest>(exportClient, exporterOptions.TimeoutMilliseconds);
}
else
{
transmissionHandler = new OtlpExporterTransmissionHandler<ExportTraceServiceRequest>(exportClient, exporterOptions.TimeoutMilliseconds);
}

var otlpExporter = new OtlpTraceExporter(exporterOptions, new(), transmissionHandler);
var otlpExporter = new OtlpTraceExporter(exporterOptions, new SdkLimitOptions(), new ExperimentalOptions(configuration));

var activitySourceName = "otel.grpc.retry.test";
using var source = new ActivitySource(activitySourceName);
Expand Down Expand Up @@ -266,23 +256,13 @@ public async Task HttpRetryTests(bool useRetryTransmissionHandler, ExportResult

var endpoint = new Uri($"http://localhost:{testHttpPort}/v1/traces");

var exporterOptions = new OtlpExporterOptions() { Endpoint = endpoint, TimeoutMilliseconds = 20000 };
var exporterOptions = new OtlpExporterOptions() { Endpoint = endpoint, TimeoutMilliseconds = 20000, Protocol = OtlpExportProtocol.HttpProtobuf };

var exportClient = new OtlpHttpTraceExportClient(exporterOptions, new HttpClient());

OtlpExporterTransmissionHandler<ExportTraceServiceRequest> transmissionHandler;

// TODO: update this to configure via experimental environment variable.
if (useRetryTransmissionHandler)
{
transmissionHandler = new OtlpExporterRetryTransmissionHandler<ExportTraceServiceRequest>(exportClient, exporterOptions.TimeoutMilliseconds);
}
else
{
transmissionHandler = new OtlpExporterTransmissionHandler<ExportTraceServiceRequest>(exportClient, exporterOptions.TimeoutMilliseconds);
}
var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string> { [ExperimentalOptions.EnableInMemoryRetryEnvVar] = useRetryTransmissionHandler.ToString() })
.Build();

var otlpExporter = new OtlpTraceExporter(exporterOptions, new(), transmissionHandler);
var otlpExporter = new OtlpTraceExporter(exporterOptions, new SdkLimitOptions(), new ExperimentalOptions(configuration));

var activitySourceName = "otel.http.retry.test";
using var source = new ActivitySource(activitySourceName);
Expand Down