github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logs: create separate test/integration directory

Browse Source 
The benchmark depends on k8s.io/api (for v1.Container). Such a dependency is
not desirable for k8s.io/component-base/logs, even if it's just for
testing. The solution is to create a separate directory where such a dependency
isn't a problem.

The alternative, a separate package with its own go.mod file under
k8s.io/component-base/logs wouldd have been more complicated to maintain (yet
another go.mod file and different whitelisted dependencies).
This commit is contained in:
Patrick Ohly 2021-11-30 14:53:46 +01:00
parent 8e2f03d336
commit 072859c967
14 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -36,6 +36,7 @@ require (
github.com/emicklei/go-restful v2.9.5+incompatible
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/fsnotify/fsnotify v1.4.9
github.com/go-logr/logr v1.2.0
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect
github.com/godbus/dbus/v5 v5.0.4
github.com/gogo/protobuf v1.3.2
@ -82,6 +83,7 @@ require (
go.opentelemetry.io/otel/sdk v0.20.0
go.opentelemetry.io/otel/trace v0.20.0
go.opentelemetry.io/proto/otlp v0.7.0
go.uber.org/zap v1.19.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63

1
staging/src/k8s.io/component-base/go.mod
View File

@ -28,7 +28,6 @@ require (
golang.org/x/tools v0.1.8 // indirect
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
gotest.tools/v3 v3.0.3 // indirect
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/klog/v2 v2.40.1

11
test/integration/logs/OWNERS Normal file
View File

@ -0,0 +1,11 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- sig-instrumentation-approvers
- serathius
- pohly
reviewers:
- sig-instrumentation-reviewers
labels:
- sig/instrumentation
- wg/structured-logging

0
staging/src/k8s.io/component-base/logs/benchmark/README.md → test/integration/logs/benchmark/README.md
View File

0
staging/src/k8s.io/component-base/logs/benchmark/benchmark_test.go → test/integration/logs/benchmark/benchmark_test.go
View File

0
staging/src/k8s.io/component-base/logs/benchmark/common_test.go → test/integration/logs/benchmark/common_test.go
View File

0
staging/src/k8s.io/component-base/logs/benchmark/data/container.log → test/integration/logs/benchmark/data/container.log
View File

0
staging/src/k8s.io/component-base/logs/benchmark/data/error-value.log → test/integration/logs/benchmark/data/error-value.log
View File

0
staging/src/k8s.io/component-base/logs/benchmark/data/error.log → test/integration/logs/benchmark/data/error.log
View File

0
staging/src/k8s.io/component-base/logs/benchmark/data/simple.log → test/integration/logs/benchmark/data/simple.log
View File

0
staging/src/k8s.io/component-base/logs/benchmark/data/values.log → test/integration/logs/benchmark/data/values.log
View File

0
staging/src/k8s.io/component-base/logs/benchmark/load.go → test/integration/logs/benchmark/load.go
View File

0
staging/src/k8s.io/component-base/logs/benchmark/load_test.go → test/integration/logs/benchmark/load_test.go
View File

2
vendor/modules.txt vendored
View File

@ -254,6 +254,7 @@ github.com/fvbommel/sortorder
# github.com/go-errors/errors v1.0.1 => github.com/go-errors/errors v1.0.1
github.com/go-errors/errors
# github.com/go-logr/logr v1.2.0 => github.com/go-logr/logr v1.2.0
## explicit
github.com/go-logr/logr
# github.com/go-logr/zapr v1.2.0 => github.com/go-logr/zapr v1.2.0
github.com/go-logr/zapr
@ -932,6 +933,7 @@ go.uber.org/atomic
# go.uber.org/multierr v1.6.0 => go.uber.org/multierr v1.6.0
go.uber.org/multierr
# go.uber.org/zap v1.19.0 => go.uber.org/zap v1.19.0
## explicit
go.uber.org/zap
go.uber.org/zap/buffer
go.uber.org/zap/internal/bufferpool