Skip to content

[OtlpExporter] Registration extension configuration delegate fix #4058

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
CodeBlanch merged 7 commits into from
Jan 6, 2023
Merged

[OtlpExporter] Registration extension configuration delegate fix #4058

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9d4f4b
Fix tracing and metric otlp exporter extensions mutating the same opt…
CodeBlanch Jan 5, 2023
455607f
Log tweaks.
CodeBlanch Jan 6, 2023
8fac3ef
Clean up.
CodeBlanch Jan 6, 2023
7444f51
Issue links.
CodeBlanch Jan 6, 2023
c64c352
Tweaks.
CodeBlanch Jan 6, 2023
cd1acee
Code review.
CodeBlanch Jan 6, 2023
f506089
Merge branch 'main' into otlp-options-fix
CodeBlanch Jan 6, 2023
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
Code review.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Jan 6, 2023
commit cd1acee5fb5944e16275dc1e1db024a3b9f35d56
10 changes: 10 additions & 0 deletions src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpExporterOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
using System.Net.Http;
#endif
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using OpenTelemetry.Internal;
using OpenTelemetry.Metrics;
using OpenTelemetry.Trace;
Expand Down Expand Up @@ -189,5 +191,13 @@ public Uri Endpoint
/// Gets a value indicating whether <see cref="Endpoint" /> was modified via its setter.
/// </summary>
internal bool ProgrammaticallyModifiedEndpoint { get; private set; }

internal static void RegisterOtlpExporterOptionsFactory(IServiceCollection services)
{
services.RegisterOptionsFactory(
(sp, configuration, name) => new OtlpExporterOptions(
configuration,
sp.GetRequiredService<IOptionsMonitor<BatchExportActivityProcessorOptions>>().Get(name)));
}
}
}
5 changes: 2 additions & 3 deletions src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpMetricExporterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using Microsoft.Extensions.Options;
using OpenTelemetry.Exporter;
using OpenTelemetry.Internal;
using OpenTelemetry.Trace;

namespace OpenTelemetry.Metrics
{
Expand Down Expand Up @@ -69,7 +68,7 @@ public static MeterProviderBuilder AddOtlpExporter(
services.Configure(finalOptionsName, configureExporter);
}

OtlpTraceExporterHelperExtensions.RegisterOtlpExporterOptionsFactory(services);
OtlpExporterOptions.RegisterOtlpExporterOptionsFactory(services);
});

return builder.ConfigureBuilder((sp, builder) =>
Expand Down Expand Up @@ -127,7 +126,7 @@ public static MeterProviderBuilder AddOtlpExporter(

builder.ConfigureServices(services =>
{
OtlpTraceExporterHelperExtensions.RegisterOtlpExporterOptionsFactory(services);
OtlpExporterOptions.RegisterOtlpExporterOptionsFactory(services);
});

return builder.ConfigureBuilder((sp, builder) =>
Expand Down
10 changes: 1 addition & 9 deletions src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OtlpTraceExporterHelperExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static TracerProviderBuilder AddOtlpExporter(
services.Configure(finalOptionsName, configure);
}

RegisterOtlpExporterOptionsFactory(services);
OtlpExporterOptions.RegisterOtlpExporterOptionsFactory(services);
services.RegisterOptionsFactory(configuration => new SdkLimitOptions(configuration));
});

Expand Down Expand Up @@ -98,14 +98,6 @@ public static TracerProviderBuilder AddOtlpExporter(
});
}

internal static void RegisterOtlpExporterOptionsFactory(IServiceCollection services)
{
services.RegisterOptionsFactory(
(sp, configuration, name) => new OtlpExporterOptions(
configuration,
sp.GetRequiredService<IOptionsMonitor<BatchExportActivityProcessorOptions>>().Get(name)));
}

internal static TracerProviderBuilder AddOtlpExporter(
TracerProviderBuilder builder,
OtlpExporterOptions exporterOptions,
Expand Down