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

[SDK] Remove the dependency on M.E.Options 5.0 #4093

Merged
merged 5 commits into from
Jan 25, 2023

Conversation

CodeBlanch
Copy link
Member

@CodeBlanch CodeBlanch commented Jan 20, 2023

Relates to #4084

Changes

Removes the direct reference to Microsoft.Extensions.Options 5.0 from SDK and instead pulls in the newer OptionsFactory bits with some modifications for what SDK needs.

TODOs

  • Appropriate CHANGELOG.md updated for non-trivial changes

@@ -31,7 +31,7 @@ internal sealed class SdkLimitOptions
private int? spanLinkAttributeCountLimit;
private bool spanLinkAttributeCountLimitSet;

internal SdkLimitOptions()
public SdkLimitOptions()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: The class is still internal this just satisfies the new() constraint which Options 3.1 requires of TOptions.

@codecov
Copy link

codecov bot commented Jan 20, 2023

Codecov Report

Merging #4093 (765d165) into main (03af717) will increase coverage by 0.10%.
The diff coverage is 65.51%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4093      +/-   ##
==========================================
+ Coverage   85.46%   85.56%   +0.10%     
==========================================
  Files         292      293       +1     
  Lines       11306    11330      +24     
==========================================
+ Hits         9663     9695      +32     
+ Misses       1643     1635       -8     
Impacted Files Coverage Δ
...Telemetry.Exporter.Jaeger/JaegerExporterOptions.cs 100.00% <ø> (ø)
...elemetryProtocol/Implementation/SdkLimitOptions.cs 100.00% <ø> (ø)
...orter.OpenTelemetryProtocol/OtlpExporterOptions.cs 100.00% <ø> (ø)
...Telemetry.Exporter.Zipkin/ZipkinExporterOptions.cs 100.00% <ø> (ø)
...emetry/Internal/Options/ConfigurationExtensions.cs 100.00% <ø> (ø)
...metry/Trace/BatchExportActivityProcessorOptions.cs 100.00% <ø> (ø)
...metry/Internal/Options/DelegatingOptionsFactory.cs 65.51% <65.51%> (ø)
src/OpenTelemetry/BatchExportProcessor.cs 84.11% <0.00%> (+1.86%) ⬆️
...ter.ZPages/Implementation/ZPagesActivityTracker.cs 100.00% <0.00%> (+2.85%) ⬆️
...emetry.Api/Internal/OpenTelemetryApiEventSource.cs 82.35% <0.00%> (+5.88%) ⬆️
... and 4 more

@CodeBlanch CodeBlanch marked this pull request as ready for review January 24, 2023 21:31
@CodeBlanch CodeBlanch requested a review from a team January 24, 2023 21:31
Comment on lines +88 to +89
}
foreach (IPostConfigureOptions<TOptions> post in _postConfigures)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
}
foreach (IPostConfigureOptions<TOptions> post in _postConfigures)
}
foreach (IPostConfigureOptions<TOptions> post in _postConfigures)

Copy link
Member

@reyang reyang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@cijothomas cijothomas merged commit 61f5351 into open-telemetry:main Jan 25, 2023
@CodeBlanch CodeBlanch deleted the options-dependency branch January 25, 2023 17:26
aunikitin pushed a commit to aunikitin/opentelemetry-dotnet that referenced this pull request Feb 4, 2023
@reyang reyang mentioned this pull request Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants