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.

Sign up for GitHub

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

Jump to bottom

Upgrade zap to 1.x, remove zap 0.x #434

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+10,015 −2,802
Open

Upgrade zap to 1.x, remove zap 0.x #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions packages/gorouter/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ files:
- code.cloudfoundry.org/gorouter/handlers/*.go # gosub
- code.cloudfoundry.org/gorouter/integration/*.go # gosub
- code.cloudfoundry.org/gorouter/logger/*.go # gosub
- code.cloudfoundry.org/gorouter/logger/fakes/*.go # gosub
- code.cloudfoundry.org/gorouter/mbus/*.go # gosub
- code.cloudfoundry.org/gorouter/mbus/fakes/*.go # gosub
- code.cloudfoundry.org/gorouter/metrics/*.go # gosub
Expand Down Expand Up @@ -181,8 +180,6 @@ files:
- code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/http_server/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/sigmon/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/tedsuo/rata/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/uber-go/atomic/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/uber-go/zap/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/urfave/cli/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/urfave/negroni/v3/*.go # gosub
- code.cloudfoundry.org/vendor/github.com/vito/go-sse/sse/*.go # gosub
Expand All @@ -200,6 +197,17 @@ files:
- code.cloudfoundry.org/vendor/go.step.sm/crypto/pemutil/*.go # gosub
- code.cloudfoundry.org/vendor/go.step.sm/crypto/randutil/*.go # gosub
- code.cloudfoundry.org/vendor/go.step.sm/crypto/x25519/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/multierr/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/buffer/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/exp/zapslog/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/bufferpool/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/color/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/exit/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/pool/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/internal/stacktrace/*.go # gosub
- code.cloudfoundry.org/vendor/go.uber.org/zap/zapcore/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blake2b/*.go # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blake2b/*.s # gosub
- code.cloudfoundry.org/vendor/golang.org/x/crypto/blowfish/*.go # gosub
Expand Down
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/cf-routing-test-helpers
Open in desktop
Submodule cf-routing-test-helpers updated 2 files
+2 −3 helpers/routes.go
+1 −1 tls/certificates.go
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/cf-tcp-router
Open in desktop
Submodule cf-tcp-router updated 4 files
+1 −4 config/config.go
+1 −5 main.go
+0 −4 metrics_reporter/metrics.go
+0 −1 watcher/watcher.go
10 changes: 3 additions & 7 deletions src/code.cloudfoundry.org/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ module code.cloudfoundry.org

go 1.23.0

replace github.com/uber-go/zap => github.com/uber-go/zap v0.0.0-20161222040304-a5783ee4b216

replace github.com/uber-go/atomic => github.com/uber-go/atomic v1.1.0

replace github.com/cactus/go-statsd-client => github.com/cactus/go-statsd-client v2.0.2-0.20150911070441-6fa055a7b594+incompatible

require (
Expand Down Expand Up @@ -41,11 +37,12 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26
github.com/tedsuo/rata v1.0.0
github.com/uber-go/zap v1.27.0
github.com/urfave/cli v1.22.15
github.com/urfave/negroni/v3 v3.1.1
github.com/vito/go-sse v1.1.2
go.step.sm/crypto v0.52.0
go.uber.org/zap v1.27.0
go.uber.org/zap/exp v0.2.0
golang.org/x/crypto v0.27.0
golang.org/x/net v0.29.0
golang.org/x/oauth2 v0.23.0
Expand Down Expand Up @@ -94,11 +91,10 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/square/certstrap v1.3.0 // indirect
github.com/uber-go/atomic v1.11.0 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.uber.org/atomic v1.8.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
Expand Down
14 changes: 8 additions & 6 deletions src/code.cloudfoundry.org/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,10 +1065,6 @@ github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 h1:mWCRvpoEMVlslxEvvp
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26/go.mod h1:0uD3VMXkZ7Bw0ojGCwDzebBBzPBXtzEZeXai+56BLX4=
github.com/tedsuo/rata v1.0.0 h1:Sf9aZrYy6ElSTncjnGkyC2yuVvz5YJetBIUKJ4CmeKE=
github.com/tedsuo/rata v1.0.0/go.mod h1:X47ELzhOoLbfFIY0Cql9P6yo3Cdwf2CMX3FVZxRzJPc=
github.com/uber-go/atomic v1.1.0 h1:Gu4ORRQiHXJvKAHRN5OKzswnjkNjrRkNGxUPnbtSklw=
github.com/uber-go/atomic v1.1.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
github.com/uber-go/zap v0.0.0-20161222040304-a5783ee4b216 h1:BOf50qt5z70bo4WpdYgSDHRFbuubqPuaxZ7atAGPMiI=
github.com/uber-go/zap v0.0.0-20161222040304-a5783ee4b216/go.mod h1:GY+83l3yxBcBw2kmHu/sAWwItnTn+ynxHCRo+WiIQOY=
github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
github.com/urfave/negroni/v3 v3.1.1 h1:6MS4nG9Jk/UuCACaUlNXCbiKa0ywF9LXz5dGu09v8hw=
Expand Down Expand Up @@ -1101,10 +1097,16 @@ go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
go.step.sm/crypto v0.52.0 h1:3blUzFm0S4tPrijcvcP47tvd7VmEEGJnvzblE+sg5LI=
go.step.sm/crypto v0.52.0/go.mod h1:GcT4hMILsNiiN3dIXH/Df5fLVs/KIwGZva85faw7lYw=
go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4=
go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.uber.org/zap/exp v0.2.0 h1:FtGenNNeCATRB3CmB/yEUnjEFeJWpB/pMcy7e2bKPYs=
go.uber.org/zap/exp v0.2.0/go.mod h1:t0gqAIdh1MfKv9EwN/dLwfZnJxe9ITAZN78HEWPFWDQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/gorouter
Open in desktop
Submodule gorouter updated 189 files
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/route-registrar
Open in desktop
Submodule route-registrar updated 2 files
+1 −9 healthchecker/script_checker.go
+2 −5 main.go
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/routing-acceptance-tests
Open in desktop
Submodule routing-acceptance-tests updated 1 files
+1 −2 helpers/test_helpers.go
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/routing-api-cli
Open in desktop
Submodule routing-api-cli updated 1 files
+2 −9 main.go
11 changes: 0 additions & 11 deletions src/code.cloudfoundry.org/vendor/github.com/uber-go/atomic/.gitignore
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions src/code.cloudfoundry.org/vendor/github.com/uber-go/atomic/.travis.yml
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions src/code.cloudfoundry.org/vendor/github.com/uber-go/atomic/Makefile
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions src/code.cloudfoundry.org/vendor/github.com/uber-go/atomic/README.md
View file
Open in desktop

This file was deleted.

Loading