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

Remove NET452 NET46 from OpenTelemetry sdk #2163

Merged
merged 2 commits into from
Jul 20, 2021
Merged

Conversation

cijothomas
Copy link
Member

Part of #2138

Changes

Please provide a brief description of the changes here.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Design discussion issue #
  • Changes in public API reviewed

@cijothomas cijothomas requested a review from a team July 20, 2021 01:36
@codecov
Copy link

codecov bot commented Jul 20, 2021

Codecov Report

Merging #2163 (a92e809) into main (90d3047) will decrease coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2163      +/-   ##
==========================================
- Coverage   85.20%   85.15%   -0.05%     
==========================================
  Files         186      186              
  Lines        6103     6096       -7     
==========================================
- Hits         5200     5191       -9     
- Misses        903      905       +2     
Impacted Files Coverage Δ
src/OpenTelemetry/BatchLogRecordExportProcessor.cs 0.00% <ø> (ø)
...nTelemetry/Internal/OpenTelemetrySdkEventSource.cs 71.76% <ø> (ø)
...nTelemetry/Internal/SelfDiagnosticsConfigParser.cs 82.60% <ø> (ø)
...lemetry/Internal/SelfDiagnosticsConfigRefresher.cs 86.53% <ø> (-0.85%) ⬇️
...Telemetry/Internal/SelfDiagnosticsEventListener.cs 97.63% <ø> (ø)
src/OpenTelemetry/Logs/LogRecord.cs 93.84% <ø> (ø)
src/OpenTelemetry/Logs/LogRecordScope.cs 82.60% <ø> (ø)
src/OpenTelemetry/Logs/OpenTelemetryLogger.cs 94.11% <ø> (ø)
...c/OpenTelemetry/Logs/OpenTelemetryLoggerOptions.cs 72.72% <ø> (ø)
.../OpenTelemetry/Logs/OpenTelemetryLoggerProvider.cs 77.08% <ø> (ø)
... and 4 more

@cijothomas
Copy link
Member Author

Waiting for one more approval, as this is bit larger PR, and it touches the heart of this repo!

@@ -55,11 +55,7 @@ public SelfDiagnosticsEventListener(EventLevel logLevel, SelfDiagnosticsConfigRe

foreach (var eventSource in eventSources)
{
#if NET452
this.EnableEvents(eventSource, this.logLevel, (EventKeywords)(-1));
Copy link
Member

@reyang reyang Jul 20, 2021

Choose a reason for hiding this comment

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

Finally 👍

IIRC there are many places where we have (EventKeywords)(-1) (check out this link), probably not fully covered by this PR. Can be a separate PR though - up to you 😺

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452;net46;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
Copy link
Member

Choose a reason for hiding this comment

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

After this PR we might be able to consolidate these TargetFrameworks (e.g. using the default setting in the top level .props file).

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.

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.

3 participants