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

update proto to 0.15.0 #5064

Merged
merged 1 commit into from
Mar 24, 2022

Conversation

codeboten
Copy link
Contributor

@codeboten codeboten commented Mar 22, 2022

This includes changes to support optional types:

  • update sed script to update optional type to oneof
  • bump proto to 0.15.0
  • make genproto
  • update sum to OptionalType

Fixes #4258 #5071

Part of #5063

@codeboten codeboten requested a review from a team as a code owner March 22, 2022 18:24
@codeboten codeboten force-pushed the codeboten/otlp-v0.15.0 branch 2 times, most recently from 284797d to de67d79 Compare March 23, 2022 19:50
@codecov
Copy link

codecov bot commented Mar 23, 2022

Codecov Report

Merging #5064 (547dc66) into main (4c3b824) will decrease coverage by 0.01%.
The diff coverage is 92.72%.

❗ Current head 547dc66 differs from pull request most recent head 4f7ac00. Consider uploading reports for the commit 4f7ac00 to get more accurate results

@@            Coverage Diff             @@
##             main    #5064      +/-   ##
==========================================
- Coverage   91.03%   91.02%   -0.02%     
==========================================
  Files         180      180              
  Lines       10810    10830      +20     
==========================================
+ Hits         9841     9858      +17     
- Misses        750      753       +3     
  Partials      219      219              
Impacted Files Coverage Δ
model/internal/pdata/metrics.go 93.93% <42.85%> (-3.89%) ⬇️
model/internal/pdata/generated_common.go 100.00% <100.00%> (ø)
model/internal/pdata/generated_log.go 96.65% <100.00%> (ø)
model/internal/pdata/generated_metrics.go 97.22% <100.00%> (+0.02%) ⬆️
model/internal/pdata/generated_trace.go 96.89% <100.00%> (ø)
service/config_provider.go 94.23% <0.00%> (ø)
service/featuregate/flags.go 100.00% <0.00%> (ø)
config/configmapprovider/env.go
config/configmapprovider/yaml.go
config/configmapprovider/file.go
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4c3b824...4f7ac00. Read the comment docs.

This includes changes to support optional types:
- update sed script to update optional type to oneof
- bump proto to 0.15.0
- make genproto
- update sum to OptionalType
- InstrumentationLibraryMetrics -> ScopeMetrics
- InstrumentationLibrarySpans -> ScopeSpans
- InstrumentationLibraryLogs -> ScopeLogs
@@ -1430,12 +1430,18 @@ func (ms HistogramDataPoint) SetCount(v uint64) {

// Sum returns the sum associated with this HistogramDataPoint.
func (ms HistogramDataPoint) Sum() float64 {
return (*ms.orig).Sum
return (*ms.orig).GetSum()
Copy link
Member

Choose a reason for hiding this comment

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

nit: separate PR we should update this comment that a "zero-initialized" value is returned if the value is not present (HasSum() == false)

@bogdandrutu bogdandrutu merged commit bc4f7da into open-telemetry:main Mar 24, 2022
@codeboten codeboten deleted the codeboten/otlp-v0.15.0 branch March 24, 2022 14:46
Nicholaswang pushed a commit to Nicholaswang/opentelemetry-collector that referenced this pull request Jun 7, 2022
This includes changes to support optional types:
- update sed script to update optional type to oneof
- bump proto to 0.15.0
- make genproto
- update sum to OptionalType
- InstrumentationLibraryMetrics -> ScopeMetrics
- InstrumentationLibrarySpans -> ScopeSpans
- InstrumentationLibraryLogs -> ScopeLogs
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.

Support optional fields in proto
2 participants