Skip to content

[SDK + Jaeger] Support loading environment variables from IConfiguration in Traces & Metrics #3720

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 8 commits into from
Oct 12, 2022
Merged

[SDK + Jaeger] Support loading environment variables from IConfiguration in Traces & Metrics #3720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81cc629
Support retrieval of environment variables through IConfiguration in …
CodeBlanch Oct 3, 2022
d4ccabf
Update Jaeger to load environment variables through IConfiguration.
CodeBlanch Oct 3, 2022
1405478
Warning fix.
CodeBlanch Oct 3, 2022
b20705e
CHANGELOG patch.
CodeBlanch Oct 3, 2022
df5b8d3
Bug fixes.
CodeBlanch Oct 3, 2022
142dbd2
Warning cleanup.
CodeBlanch Oct 3, 2022
305cfe5
Code review.
CodeBlanch Oct 12, 2022
cff5bc7
Merge from main.
CodeBlanch Oct 12, 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
Prev Previous commit
Next Next commit
Warning cleanup.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Oct 3, 2022
commit 142dbd2f893d769ba6c47cee69fd97161b3ffe92
2 changes: 1 addition & 1 deletion src/OpenTelemetry/Internal/Builder/ProviderBuilderServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static IServiceCollection AddOpenTelemetryProviderBuilderServices(this IS
// Sdk.Create* style or when manually creating a ServiceCollection. The
// point of this registration is to make IConfiguration available in
// those cases.
services.TryAddSingleton<IConfiguration>(sp => new ConfigurationBuilder().AddEnvironmentVariables().Build());
services!.TryAddSingleton<IConfiguration>(sp => new ConfigurationBuilder().AddEnvironmentVariables().Build());

return services!;
}
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderServiceCollectionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal static IServiceCollection RegisterConfigureStateCallback(
Debug.Assert(services != null, "services was null");
Debug.Assert(configure != null, "configure was null");

return services.AddSingleton(new ConfigureMeterProviderBuilderStateCallbackRegistration(configure!));
return services!.AddSingleton(new ConfigureMeterProviderBuilderStateCallbackRegistration(configure!));
}

internal static void InvokeRegisteredConfigureStateCallbacks(
Expand All @@ -52,7 +52,7 @@ internal static void InvokeRegisteredConfigureStateCallbacks(
Debug.Assert(serviceProvider != null, "serviceProvider was null");
Debug.Assert(state != null, "state was null");

var callbackRegistrations = serviceProvider.GetServices<ConfigureMeterProviderBuilderStateCallbackRegistration>();
var callbackRegistrations = serviceProvider!.GetServices<ConfigureMeterProviderBuilderStateCallbackRegistration>();

foreach (var callbackRegistration in callbackRegistrations)
{
Expand Down
4 changes: 2 additions & 2 deletions src/OpenTelemetry/Trace/Builder/TracerProviderBuilderServiceCollectionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ internal static IServiceCollection RegisterConfigureStateCallback(
Debug.Assert(services != null, "services was null");
Debug.Assert(configure != null, "configure was null");

return services.AddSingleton(new ConfigureTracerProviderBuilderStateCallbackRegistration(configure!));
return services!.AddSingleton(new ConfigureTracerProviderBuilderStateCallbackRegistration(configure!));
}

internal static void InvokeRegisteredConfigureStateCallbacks(
Expand All @@ -52,7 +52,7 @@ internal static void InvokeRegisteredConfigureStateCallbacks(
Debug.Assert(serviceProvider != null, "serviceProvider was null");
Debug.Assert(state != null, "state was null");

var callbackRegistrations = serviceProvider.GetServices<ConfigureTracerProviderBuilderStateCallbackRegistration>();
var callbackRegistrations = serviceProvider!.GetServices<ConfigureTracerProviderBuilderStateCallbackRegistration>();

foreach (var callbackRegistration in callbackRegistrations)
{
Expand Down