This commit uses ginkgo/v2 and lager/v3 for everything

bump auction auctioneer bbs buildpackapplifecycle bytefmt cacheddownloader cfdot diego-ssh dockerapplifecycle dockerdriver ecrhelper executor fileserver goshims healthcheck inigo localdriver locket operationq rep route-emitter routing-api routing-info systemcerts trace-logger vizzini volman workpool garden grootfs guardian idmapper

Submodule src/code.cloudfoundry.org/auction f4db6c5..20b5e4e:
  > Bump to ginkgo/v2 and lager/v3 (#10)
Submodule src/code.cloudfoundry.org/auctioneer 7b69d26..6757f66:
  > Bump to ginkgo/v2 and lager/v3 (#11)
Submodule src/code.cloudfoundry.org/bbs 952b49b..41bd09f:
  > fix for `go vet` failures (#63)
  > Bump to lager/v3 (remaining)
  > Bump sqldb/helpers + test helpers to lager v3 (#61)
  > Bump to ginkgo/v2
Submodule src/code.cloudfoundry.org/buildpackapplifecycle 9bfd77998..b3c0aa499:
  > Merge pull request #61 from cloudfoundry/with-ginkgo-v2
  > Merge pull request #59 from cloudfoundry/develop
Submodule src/code.cloudfoundry.org/cacheddownloader 456a733fa..3de1f8d2e:
  > Bump to ginkgo/v2 and lager/v3 (#23)
Submodule src/code.cloudfoundry.org/cfdot f68fa7f..9c6e1b4:
  > Bump to ginkgo/v2 and lager/v3 (#6)
Submodule src/code.cloudfoundry.org/diego-ssh 0fc4f3a..1003fb5:
  > Bump to ginkgo/v2 and lager/v3 (#47)
Submodule src/code.cloudfoundry.org/dockerapplifecycle 163faed..36aa909:
  > Bump to ginkgo/v2 (#11)
  > Regenerate test certificates
Submodule src/code.cloudfoundry.org/dockerdriver 16e1fe9ba..76bff1bc5:
  > Bump to ginkgo/v2 and lager/v3 (#3)
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/code.cloudfoundry.org/ecrhelper 9a7c7e5..3949c02:
  > Bump to ginkgo/v2 (#2)
Submodule src/code.cloudfoundry.org/executor 1e5a6f1..208a08c:
  > With ginkgo v2 and lager/v3 (#75)
  > Ensure we release info lock when marshaling fails
  > Update garden container logging tags
  > Fix typo in function name
  > Fetch all containers for cleanup
  > Executor releases resources only when a container is successfully deleted
Submodule src/code.cloudfoundry.org/fileserver 11af6ea..f3dfda9:
  > Bump to ginkgo/v2 && lager/v3 (#7)
Submodule src/code.cloudfoundry.org/goshims bb24d2ef7..cf8c6ba6c:
  > Bump golang.org/x/net from 0.7.0 to 0.8.0 (#24)
  > Bump golang.org/x/net from 0.0.0-20200301022130-244492dfa37a to 0.7.0 (#23)
  > Bump github.com/go-sql-driver/mysql from 1.6.0 to 1.7.0 (#22)
  > Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (#21)
  > Revert "Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (#19)" (#20)
  > Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (#19)
  > Merge pull request #18 from cloudfoundry/dependabot/add-v2-config-file
  > Merge pull request #17 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.36.0
  > Merge pull request #16 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.35.0
  > Merge pull request #15 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.34.1
  > Merge pull request #14 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.34.0
  > Merge pull request #13 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.33.2
  > Merge pull request #12 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.33.1
  > Merge pull request #11 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.32.0
  > Merge pull request #10 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.31.1
  > Merge pull request #9 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.31.0
  > Merge pull request #8 from cloudfoundry/dependabot/go_modules/google.golang.org/grpc-1.30.0
  > go mod vendor
  > Merge pull request #7 from cloudfoundry/dependabot/go_modules/google.golang.org/grpc-1.29.1
  > 🤖 go mod vendor
  > go get -u all
  > Add gitignore file
  > Convert to go modules
  > Add SetEnv to the command interface
Submodule src/code.cloudfoundry.org/healthcheck d7f787b..7670cbf:
  > Bump to ginkgo/v2 (#9)
Submodule src/code.cloudfoundry.org/inigo 18bab03..3c8b1a8:
  > Bump to ginkgo/v2 & lager/v3 (#25)
Submodule src/code.cloudfoundry.org/localdriver 1b0a47b..0668dcc:
  > Bump to ginkgo/v2 & lager/v3 (#2)
Submodule src/code.cloudfoundry.org/locket 76a930295..5e8522d97:
  > {fake_runner,fake_runner_v2} to be used with (#14)
  > Add BeforeSuite in the right place
  > Fix govet errors
  > Bump to lager v3
  > WIP - upgrading to ginkgo v2+ ginkgomon_v2
Submodule src/code.cloudfoundry.org/operationq da3eb22..4522d08:
  > Bump to ginkgo/v2 (#2)
  > Fix the test for max capacity
  > Ginkgo v2: don't use Done channels
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/code.cloudfoundry.org/rep be8beeb..f627e21:
  > Bump to ginkgo/v2 && lager/v3 (#39)
Submodule src/code.cloudfoundry.org/route-emitter c907cd8..da039b0:
  > Bump to ginkgo/v2 && lager/v3 (#21)
Submodule src/code.cloudfoundry.org/routing-api ff096da8d..2bf566855:
  > Fix ginkgo deprecations with Done channels
  > Fix ginkgo v2 flag deprecation notices
  > Bump to lager v3
  > Convert  to ginkgo v2 + inline the archived trace package
  > Convert to ginkgo v2 + inline the archived trace package
  > ignore .test files in the repo
  > Bump to ginkgo/v2
  > Bump to ginkgo/v2 - WIP
  > Allow uaaclient callers to optionally pass in a protocol via (#30)
Submodule src/code.cloudfoundry.org/routing-info 7d023ecb0..c6998d604:
  > Bump to ginkgo/v2
Submodule src/code.cloudfoundry.org/systemcerts 95ea366d9..5244fcb1b:
  > refactor: rm use of internal/testenv
Submodule src/code.cloudfoundry.org/vizzini a59096109...6474f903a:
  > fix `go vet` failures
  > Bump to ginkgo/v2 && lager/v3
  < Fix one more test using metric tags
Submodule src/code.cloudfoundry.org/volman 4129b31..76091d5:
  > Bump to ginkgo/v2 && lager/v3 (#5)
Submodule src/code.cloudfoundry.org/workpool e8b9128..2e26d5d:
  > Bump to ginkgo/v2 (#2)
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/garden d57de807d..8534099e1:
  > Migrate to lager v3
  > Migrate to ginkgo/v2
  > Bump lager to latest on master
  > Revert "bump ginkgo to v2 and lager to v3"
  > Merge pull request #107 from xtremerui/bump-ginkgo-lager
  > Bump golang.org/x/net from 0.0.0-20210428140749-89ef3d95e781 to 0.7.0
  > Merge pull request #105 from cloudfoundry/unpin-components
  > Merge pull request #103 from ebroberson/ginkgov2-done-channels
Submodule src/grootfs ba02da43d..df476b3ba:
  > Swtch to channels from pool
  > Return to pool xfs mounts that don't cause test pollution
  > Generate 10 mount points for all quota tests
  > Use unique mount directory for each test
  > Merge pull request #197 from cloudfoundry/with-ginkgo-v2
  > go mod tidy && vendor
  > Bump lager to latest on master
  > 🔒 dep
  > Merge pull request #196 from cloudfoundry/unpin-components
  > Bump golang.org/x/sys from 0.5.0 to 0.6.0
  > go mod tidy
  > Merge remote-tracking branch 'local/dependabot/go_modules/code.cloudfoundry.org/lager-2.0.0incompatible' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/github.com/containers/image/v5-5.24.2' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/github.com/docker/docker-23.0.1incompatible' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/golang.org/x/sys-0.5.0' into main
  > Bump github.com/opencontainers/runtime-spec
  > Merge pull request #191 from cloudfoundry/out-of-disk-error-with-jammy
Submodule src/guardian 913b899bc..86f0a7d78:
  > Set container properties before creating container
  > Containers() returns all containers when garden.state is all
  > Merge pull request #364 from cloudfoundry/with-ginkgo-v2
  > go mod tidy && vendor
  > Bump lager to latest on master
  > use typeurl/v2
  > 🔓 dep
  > go mod tidy and vendor
  > go mod tidy
  > go mod tidy
  > Merge pull request #361 from cloudfoundry/dependabot/go_modules/github.com/cloudfoundry/gosigar-1.3.9
  > Merge pull request #363 from cloudfoundry/dependabot/go_modules/github.com/onsi/gomega-1.27.4
  > Merge pull request #362 from cloudfoundry/dependabot/go_modules/github.com/containerd/containerd-1.7.0
  > Merge pull request #345 from cloudfoundry/dependabot/go_modules/github.com/emicklei/go-restful-2.16.0incompatible
  > Merge pull request #359 from cloudfoundry/unpin-components
  > Update path to remove unneeded bin dir
  > Remove runc pin
  > Add runc to build package
  > go mod tidy
  > Merge pull request #355 from cloudfoundry/dependabot/go_modules/github.com/containerd/containerd-1.6.19
Submodule src/idmapper a23279655..390987bf5:
  > Bump github.com/onsi/ginkgo/v2 from 2.9.0 to 2.9.1
  > Merge pull request #65 from cloudfoundry/unpin-components
  > Bump github.com/onsi/ginkgo/v2 from 2.8.4 to 2.9.0
  > Bump github.com/onsi/ginkgo/v2 from 2.8.3 to 2.8.4
  > Bump github.com/onsi/ginkgo/v2 from 2.7.0 to 2.8.3
  > Bump github.com/onsi/ginkgo/v2 from 2.6.1 to 2.7.0
  > Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1
  > Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0
  > Bump github.com/onsi/ginkgo/v2 from 2.5.0 to 2.5.1
  > Bump github.com/onsi/ginkgo/v2 from 2.4.0 to 2.5.0
  > Bump github.com/onsi/ginkgo/v2 from 2.3.1 to 2.4.0
  > Bump github.com/onsi/ginkgo/v2 from 2.3.0 to 2.3.1
  > Bump github.com/onsi/ginkgo/v2 from 2.2.0 to 2.3.0
  > Bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0
  > Bump github.com/onsi/ginkgo/v2 from 2.1.5 to 2.1.6
  > Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.5

Author: Amin Jamali

.gitmodules

@@ -28,9 +28,6 @@
 [submodule "src/code.cloudfoundry.org/vizzini"]
 	path = src/code.cloudfoundry.org/vizzini
 	url = https://github.com/cloudfoundry/vizzini
-[submodule "src/code.cloudfoundry.org/benchmarkbbs"]
-	path = src/code.cloudfoundry.org/benchmarkbbs
-	url = https://github.com/cloudfoundry/benchmarkbbs
 [submodule "src/code.cloudfoundry.org/buildpackapplifecycle"]
 	path = src/code.cloudfoundry.org/buildpackapplifecycle
 	url = https://github.com/cloudfoundry/buildpackapplifecycle
@@ -46,9 +43,6 @@
 [submodule "src/code.cloudfoundry.org/route-emitter"]
 	path = src/code.cloudfoundry.org/route-emitter
 	url = https://github.com/cloudfoundry/route-emitter
-[submodule "src/code.cloudfoundry.org/bytefmt"]
-	path = src/code.cloudfoundry.org/bytefmt
-	url = https://github.com/cloudfoundry/bytefmt
 [submodule "src/code.cloudfoundry.org/operationq"]
 	path = src/code.cloudfoundry.org/operationq
 	url = https://github.com/cloudfoundry/operationq
@@ -73,9 +67,6 @@
 [submodule "src/code.cloudfoundry.org/routing-api"]
 	path = src/code.cloudfoundry.org/routing-api
 	url = https://github.com/cloudfoundry-incubator/routing-api
-[submodule "src/code.cloudfoundry.org/trace-logger"]
-	path = src/code.cloudfoundry.org/trace-logger
-	url = https://github.com/cloudfoundry-incubator/trace-logger
 [submodule "src/code.cloudfoundry.org/guardian"]
 	path = src/guardian
 	url = https://github.com/cloudfoundry/guardian

CONTRIBUTING.md

@@ -82,7 +82,7 @@ To be able to run unit tests, you'll also need to install the following binaries
     cd src/code.cloudfoundry.org
 
     # Install ginkgo
-    go build -o ../../bin/ginkgo github.com/onsi/ginkgo/ginkgo
+    go build -o ../../bin/ginkgo github.com/onsi/ginkgo/v2/ginkgo
 
     # Install nats-server
     go build -o ../../bin/nats-server github.com/nats-io/nats-server/v2
@@ -221,7 +221,7 @@ or the
 
 When working on individual components of Diego, work out of the submodules under `src/`.
 
-Run the individual component unit tests as you work on them using [ginkgo](https://github.com/onsi/ginkgo). To see if *everything* still works, run `./scripts/run-unit-tests` in the root of the release.
+Run the individual component unit tests as you work on them using [ginkgo v2](https://github.com/onsi/ginkgo). To see if *everything* still works, run `./scripts/run-unit-tests` in the root of the release.
 
 When you're ready to commit, run:
 

packages/auctioneer/spec

@@ -35,9 +35,9 @@ files:
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/rfc5424/*.go # gosub
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2/*.go # gosub
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/runtimeemitter/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/internal/truncate/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/lagerflags/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/lagerflags/*.go # gosub
   - code.cloudfoundry.org/locket/*.go # gosub
   - code.cloudfoundry.org/locket/jointlock/*.go # gosub
   - code.cloudfoundry.org/locket/lock/*.go # gosub
@@ -107,6 +107,8 @@ files:
   - code.cloudfoundry.org/vendor/github.com/jmespath/go-jmespath/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/mitchellh/go-homedir/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/nu7hatch/gouuid/*.go # gosub
+  - code.cloudfoundry.org/vendor/github.com/openzipkin/zipkin-go/idgenerator/*.go # gosub
+  - code.cloudfoundry.org/vendor/github.com/openzipkin/zipkin-go/model/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/pkg/errors/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/sirupsen/logrus/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/*.go # gosub

packages/bbs/spec

@@ -45,9 +45,9 @@ files:
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/rfc5424/*.go # gosub
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2/*.go # gosub
   - code.cloudfoundry.org/vendor/code.cloudfoundry.org/go-loggregator/v8/runtimeemitter/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/internal/truncate/*.go # gosub
-  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/lagerflags/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/*.go # gosub
+  - code.cloudfoundry.org/vendor/code.cloudfoundry.org/lager/v3/lagerflags/*.go # gosub
   - code.cloudfoundry.org/locket/*.go # gosub
   - code.cloudfoundry.org/locket/jointlock/*.go # gosub
   - code.cloudfoundry.org/locket/lock/*.go # gosub
@@ -125,6 +125,8 @@ files:
   - code.cloudfoundry.org/vendor/github.com/jmespath/go-jmespath/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/mitchellh/go-homedir/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/nu7hatch/gouuid/*.go # gosub
+  - code.cloudfoundry.org/vendor/github.com/openzipkin/zipkin-go/idgenerator/*.go # gosub
+  - code.cloudfoundry.org/vendor/github.com/openzipkin/zipkin-go/model/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/pkg/errors/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/sirupsen/logrus/*.go # gosub
   - code.cloudfoundry.org/vendor/github.com/tedsuo/ifrit/*.go # gosub

packages/benchmark-bbs/packaging

@@ -7,7 +7,7 @@ pushd ${BOSH_INSTALL_TARGET}
   source /var/vcap/packages/golang-1-linux/bosh/compile.env
 
   pushd src/code.cloudfoundry.org
-  go install github.com/onsi/ginkgo/ginkgo
+  go install github.com/onsi/ginkgo/v2/ginkgo
   popd
 
   pushd src/code.cloudfoundry.org/benchmarkbbs/