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

Bump go-plugin to 1.3.0 #2597

Merged
merged 1 commit into from
Dec 3, 2020
Merged

Conversation

chlunde
Copy link
Contributor

@chlunde chlunde commented Oct 28, 2020

go-plugin was accidentally downgraded in a previous merge.

go get github.com/hashicorp/go-plugin@v1.3.0; go mod tidy; git add go.sum go.mod
cd cmd/opentelemetry/; go mod tidy; git add go.sum

Fixes #2593

@chlunde chlunde requested a review from a team as a code owner October 28, 2020 16:35
yurishkuro
yurishkuro previously approved these changes Oct 28, 2020
@mergify mergify bot dismissed yurishkuro’s stale review October 29, 2020 05:12

Pull request has been modified.

    go get github.com/hashicorp/go-plugin@v1.3.0; go mod tidy; git add go.sum go.mod
    cd cmd/opentelemetry/; go mod tidy; git add go.sum

Fixes jaegertracing#2593

Signed-off-by: Carl Henrik Lunde <chlunde@ifi.uio.no>
@chlunde
Copy link
Contributor Author

chlunde commented Dec 3, 2020

rebased

I think go mod tidycreated a merge conflict because it deleted lines from go.sum. I wonder if it would be better with an "add only" mode for go mod tidy.

@codecov
Copy link

codecov bot commented Dec 3, 2020

Codecov Report

Merging #2597 (a6ae39a) into master (6c2be45) will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2597      +/-   ##
==========================================
+ Coverage   95.51%   95.54%   +0.03%     
==========================================
  Files         214      214              
  Lines        9546     9546              
==========================================
+ Hits         9118     9121       +3     
+ Misses        348      346       -2     
+ Partials       80       79       -1     
Impacted Files Coverage Δ
plugin/storage/integration/integration.go 77.34% <0.00%> (-0.56%) ⬇️
cmd/collector/app/server/zipkin.go 76.92% <0.00%> (+15.38%) ⬆️

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 6c2be45...a6ae39a. Read the comment docs.

Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

Thanks!

@yurishkuro yurishkuro merged commit 0cbd8c8 into jaegertracing:master Dec 3, 2020
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.

Bump go-plugin to 1.3 accidentally reverted
2 participants