Skip to content

Bump gcplogs and dependencies to v0.44.3#39838

Merged
tiborvass merged 3 commits intomoby:masterfrom
thaJeztah:bump_gcplogs
Oct 2, 2020
Merged

Bump gcplogs and dependencies to v0.44.3#39838
tiborvass merged 3 commits intomoby:masterfrom
thaJeztah:bump_gcplogs

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 1, 2019 •
edited by tiborvass
Loading

splitting this off of #39549 to see if we get the same oddness on Windows when using Go 1.12

@thaJeztah thaJeztah mentioned this pull request Sep 1, 2019
Merged
6 tasks
@thaJeztah

This comment has been minimized.

Sign in to view
@thaJeztah thaJeztah marked this pull request as ready for review September 2, 2019 08:26
This was referenced Feb 13, 2020
Closed
Closed
@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 17, 2020

@cpuguy83 @kolyshkin PTAL

@cpuguy83
Copy link
Member

cpuguy83 commented Mar 6, 2020

vendor conflicts.

@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 6, 2020

ah, protobuf was updated elsewhere I think

@thaJeztah thaJeztah force-pushed the bump_gcplogs branch 2 times, most recently from 4d02e6f to eb71ba0 Compare March 6, 2020 23:26
thaJeztah
thaJeztah commented Mar 6, 2020
View reviewed changes
vendor.conf Outdated
Copy link
Member Author

@thaJeztah thaJeztah Mar 6, 2020

Choose a reason for hiding this comment

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

This replaced the dependency on github.com/hashicorp/golang-lru, which was Mozilla licensed and this one is Apache 2

@thaJeztah

This comment has been minimized.

Sign in to view
@thaJeztah

This comment has been minimized.

Sign in to view
@thaJeztah thaJeztah force-pushed the bump_gcplogs branch 2 times, most recently from b73e6cd to 1515bf5 Compare April 2, 2020 23:14
@thaJeztah thaJeztah mentioned this pull request Jul 30, 2020
Merged
@thaJeztah thaJeztah force-pushed the bump_gcplogs branch 2 times, most recently from 8d9de24 to 3928afd Compare September 30, 2020 23:26
@thaJeztah thaJeztah mentioned this pull request Oct 1, 2020
Merged
cpuguy83
cpuguy83 approved these changes Oct 1, 2020
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

+41k...

LGTM

@tiborvass
Copy link
Contributor

tiborvass commented Oct 1, 2020

@thaJeztah you don't need to add the unused dependencies, do you? It's under a tools tag. Vendor validation should pass. It would reduce the lines stats to +15710, -5711

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 1, 2020

good point. I recall that things broke at the time somehow if I didn't include them, but it's been quite a while. Not at my computer, but feel free to push to my branch if you managed to get it working

@thaJeztah
bump cloud.google.com/go v-0.44.3
bbde240 
bump cloud.google.com/go v0.44.3:

full diff: googleapis/google-cloud-go@v0.23.0...v0.44.3

bump googleapis/gax-go v2.0.5

full diff: googleapis/gax-go@v2.0.0...v2.0.5

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Tibor Vass <[email protected]>
@thaJeztah
bump go.opencensus.io v0.22.3
2971204 
full diff: census-instrumentation/opencensus-go@v0.11.0...v0.22.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
bump google.golang.org/api v0.8.0
a3256d2 
full diff: googleapis/google-api-go-client@de943ba...v0.8.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
tiborvass
tiborvass approved these changes Oct 1, 2020
View reviewed changes
Copy link
Contributor

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

+17,150 −1,499

@tiborvass tiborvass merged commit 1a5b7f5 into moby:master Oct 2, 2020
@thaJeztah thaJeztah deleted the bump_gcplogs branch October 2, 2020 13:32
@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 2, 2020

Thanks @tiborvass ❤️

@thaJeztah
Copy link
Member Author

thaJeztah commented Oct 6, 2020

Ah, I just vendored a dependency, and I think this was the issue; perhaps we should exclude these in hack/vendor.sh to suppress the warnings;

2020/10/06 12:05:22 WARNING: dependency is not vendored: github.com/jstemmer/go-junit-report
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/cmd/goimports
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/internal/imports
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/go/ast/astutil
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/go/packages
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/internal/gopathwalk
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/internal/module
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/internal/semver
2020/10/06 12:05:22 WARNING: dependency is not vendored: golang.org/x/tools/internal/fastwalk
2020/10/06 12:05:23 WARNING: dependency is not vendored: golang.org/x/tools/go/gcexportdata
2020/10/06 12:05:23 WARNING: dependency is not vendored: golang.org/x/tools/go/internal/packagesdriver
2020/10/06 12:05:23 WARNING: dependency is not vendored: golang.org/x/tools/go/internal/gcimporter
2020/10/06 12:05:23 WARNING: dependency is not vendored: github.com/jstemmer/go-junit-report/formatter
2020/10/06 12:05:23 WARNING: dependency is not vendored: github.com/jstemmer/go-junit-report/parser

@thaJeztah thaJeztah added this to the 20.10.0 milestone Nov 19, 2020
@thaJeztah thaJeztah mentioned this pull request Dec 3, 2020
Merged
@thaJeztah thaJeztah mentioned this pull request Feb 17, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tiborvass tiborvass tiborvass approved these changes

Assignees

No one assigned

Labels

area/logging status/2-code-review

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @cpuguy83 @tiborvass @GordonTheTurtle