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

Metrics to Main #2174

Merged
merged 46 commits into from
Jul 22, 2021
Merged

Metrics to Main #2174

merged 46 commits into from
Jul 22, 2021

Conversation

cijothomas
Copy link
Member

We are prepping for 1.2.0-alpha1 release. 1.2.0 is the next planned release, and now we can work in main branch for metrics code as well.

cijothomas and others added 30 commits January 29, 2021 10:12
* Remove obsolete from Metrics - one file to test

* dummy commit to test if CI is triggered

Co-authored-by: Eddy Nakamura <ednakamu@microsoft.com>
* Refactor for DataValue

* Fix bug from PR feedback
@cijothomas cijothomas requested a review from a team July 22, 2021 01:41
@codecov
Copy link

codecov bot commented Jul 22, 2021

Codecov Report

Merging #2174 (ea84510) into main (01dd4ab) will decrease coverage by 7.55%.
The diff coverage is 42.95%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2174      +/-   ##
==========================================
- Coverage   82.12%   74.57%   -7.56%     
==========================================
  Files         250      218      -32     
  Lines        6774     6957     +183     
==========================================
- Hits         5563     5188     -375     
- Misses       1211     1769     +558     
Impacted Files Coverage Δ
src/OpenTelemetry.Api/Baggage.cs 100.00% <ø> (ø)
...emetry.Api/Context/AsyncLocalRuntimeContextSlot.cs 100.00% <ø> (ø)
...elemetry.Api/Context/RemotingRuntimeContextSlot.cs 0.00% <ø> (-42.86%) ⬇️
src/OpenTelemetry.Api/Context/RuntimeContext.cs 79.16% <ø> (-0.84%) ⬇️
src/OpenTelemetry.Api/Internal/SpanHelper.cs 100.00% <ø> (ø)
src/OpenTelemetry.Api/Metrics/MeterProvider.cs 0.00% <ø> (-100.00%) ⬇️
.../OpenTelemetry.Api/Metrics/MeterProviderBuilder.cs 0.00% <0.00%> (ø)
src/OpenTelemetry.Api/Trace/ActivityExtensions.cs 94.11% <ø> (ø)
src/OpenTelemetry.Api/Trace/SpanAttributes.cs 100.00% <ø> (ø)
src/OpenTelemetry.Api/Trace/Status.cs 100.00% <ø> (ø)
... and 177 more

Comment on lines -9 to -11
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisAnalyzersPkgVer)" Condition=" $(OS) == 'Windows_NT'">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
Copy link
Member

Choose a reason for hiding this comment

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

We will continue to leave this disabled on main for now?

Comment on lines +10 to +12
* Removed existing Metrics code as the spec is completely being re-written.
([#2030](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2030))

Copy link
Member

Choose a reason for hiding this comment

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

Might make sense to update this changelog to reflect the new state of things.

Comment on lines +10 to +11
* Removed existing Metrics code as the spec is completely being re-written.
([#2030](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2030))
Copy link
Member

Choose a reason for hiding this comment

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

Same thing for the SDK changelog

@@ -34,7 +34,7 @@ public TracerProviderSdkTest()
Activity.DefaultIdFormat = ActivityIdFormat.W3C;
}

[Fact]
[Fact(Skip = "Get around GitHub failure")]
Copy link
Member

@alanwest alanwest Jul 22, 2021

Choose a reason for hiding this comment

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

Is it still necessary to skip this test on the main branch?

Copy link
Member

@alanwest alanwest left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -81,9 +84,6 @@ Released 2021-Jan-29
* `Status.WithDescription` will now ignore the provided description if the
`Status.StatusCode` is anything other than `ERROR`.
([#1655](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1655))
* Metrics removed as it is not part 1.0.0 release. See issue
Copy link
Member

Choose a reason for hiding this comment

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

I guess we need to keep this.

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. After this PR got merged, might need to update the CI definition by removing metrics branch.

@cijothomas cijothomas merged commit 7c611c8 into main Jul 22, 2021
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