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

Make + CircleCI for Code Generation (#1433) #1501

Merged
merged 1 commit into from
Nov 6, 2020
Merged

Make + CircleCI for Code Generation (#1433) #1501

merged 1 commit into from
Nov 6, 2020

Conversation

keitwb
Copy link
Contributor

@keitwb keitwb commented Nov 5, 2020

This adds a make target 'generate' that runs 'go generate' for all
modules.

It also adds a circle CI check under 'lint' that makes sure the
generated modules are up to date.

@keitwb keitwb requested a review from a team November 5, 2020 16:38
go.sum Outdated
Comment on lines 458 to 462
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.4.0 h1:72qIR/m8ybvL8L5TIyfgrigqkrw7kVYAvjEvpT85l70=
github.com/go-playground/validator/v10 v10.4.0/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
Copy link
Member

Choose a reason for hiding this comment

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

This is the problem, please run go mod tidy and they will be removed

Copy link
Member

Choose a reason for hiding this comment

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

So running make generate should not generate changes in go.sum if you just run go mod tidy

@codecov
Copy link

codecov bot commented Nov 5, 2020

Codecov Report

Merging #1501 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1501      +/-   ##
==========================================
+ Coverage   88.68%   88.69%   +0.01%     
==========================================
  Files         344      344              
  Lines       16918    16918              
==========================================
+ Hits        15003    15006       +3     
+ Misses       1446     1443       -3     
  Partials      469      469              
Flag Coverage Δ
integration 70.80% <ø> (-0.08%) ⬇️
unit 87.34% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
receiver/prometheusexecreceiver/receiver.go 88.33% <0.00%> (+2.50%) ⬆️

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 9c0807f...37eaa92. Read the comment docs.

name: Codegen
command: |
make generate
go mod tidy
Copy link
Member

Choose a reason for hiding this comment

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

This probably better to move it in the make rule

This adds a make target 'generate' that runs 'go generate' for all
modules.

It also adds a circle CI check under 'lint' that makes sure the
generated modules are up to date.
@bogdandrutu bogdandrutu merged commit 7610828 into open-telemetry:master Nov 6, 2020
@bogdandrutu bogdandrutu deleted the codegen branch November 6, 2020 15:14
dyladan referenced this pull request in dynatrace-oss-contrib/opentelemetry-collector-contrib Jan 29, 2021
ljmsc referenced this pull request in ljmsc/opentelemetry-collector-contrib Feb 21, 2022
* Reverse order of attribute precedence when merging two Resources

This reflects a change in the specification itself.
open-telemetry/opentelemetry-specification#1345

* Resolves #1500

Co-authored-by: Tyler Yahn <[email protected]>
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