Skip to content

Fix #1028#1029

Merged
lalitb merged 2 commits intoopen-telemetry:mainfrom
owent:fix_1028
Oct 24, 2021
Merged

Fix #1028#1029
lalitb merged 2 commits intoopen-telemetry:mainfrom
owent:fix_1028

Conversation

@owent
Copy link
Copy Markdown
Member

@owent owent commented Oct 23, 2021

Signed-off-by: owentou owentou@tencent.com

Fixes #1028

Changes

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

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@owent owent requested a review from a team October 23, 2021 14:21
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 23, 2021 •
edited
Loading

Codecov Report

Merging #1029 (75ed1cd) into main (05d43d6) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1029   +/-   ##
=======================================
  Coverage   94.85%   94.85%           
=======================================
  Files         151      151           
  Lines        5972     5972           
=======================================
  Hits         5664     5664           
  Misses        308      308

lalitb
lalitb approved these changes Oct 23, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

Thanks for the fix

@lalitb
Copy link
Copy Markdown
Member

lalitb commented Oct 23, 2021 •
edited
Loading

While you are fixing this, can you include the similar fix here:

opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h

Line 36 in cfb02da

explicit GaugeAggregator<T>(metrics_api::InstrumentKind kind)

@owent
Copy link
Copy Markdown
Member Author

owent commented Oct 24, 2021

While you are fixing this, can you include the similar fix here:

opentelemetry-cpp/sdk/include/opentelemetry/sdk/metrics/aggregator/gauge_aggregator.h

Line 36 in cfb02da

explicit GaugeAggregator<T>(metrics_api::InstrumentKind kind)

Done

@lalitb
Copy link
Copy Markdown
Member

lalitb commented Oct 24, 2021 •
edited
Loading

@owent - Also, rebase it to main as this will allow merging. Thanks :)

owent and others added 2 commits October 24, 2021 11:20
@owent
Fix open-telemetry#1028
75f7a26 
Signed-off-by: owentou <owentou@tencent.com>
@owent
Fix constructor of GaugeAggregator
75ed1cd 
Signed-off-by: owent <admin@owent.net>
@owent
Copy link
Copy Markdown
Member Author

owent commented Oct 24, 2021

@owent - Also, rebase it to main as this will allow merging. Thanks :)

Done

@lalitb lalitb merged commit 6e8a169 into open-telemetry:main Oct 24, 2021
@owent owent deleted the fix_1028 branch October 24, 2021 08:08
This was referenced Oct 27, 2021
Closed
Closed
@owent owent mentioned this pull request Nov 24, 2021
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ThomsonTan ThomsonTan ThomsonTan approved these changes

@lalitb lalitb lalitb approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Build failed with gcc 11.2.0 with ENABLE_METRICS_PREVIEW

3 participants

@owent @lalitb @ThomsonTan