diff --git a/go.mod b/go.mod index 74611b0a9fd..c33fcc54f96 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod index c4bc0d41a03..f0e79049687 100644 --- a/staging/src/k8s.io/component-base/go.mod +++ b/staging/src/k8s.io/component-base/go.mod @@ -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 diff --git a/test/integration/logs/OWNERS b/test/integration/logs/OWNERS new file mode 100644 index 00000000000..2d8babf9531 --- /dev/null +++ b/test/integration/logs/OWNERS @@ -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 diff --git a/staging/src/k8s.io/component-base/logs/benchmark/README.md b/test/integration/logs/benchmark/README.md similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/README.md rename to test/integration/logs/benchmark/README.md diff --git a/staging/src/k8s.io/component-base/logs/benchmark/benchmark_test.go b/test/integration/logs/benchmark/benchmark_test.go similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/benchmark_test.go rename to test/integration/logs/benchmark/benchmark_test.go diff --git a/staging/src/k8s.io/component-base/logs/benchmark/common_test.go b/test/integration/logs/benchmark/common_test.go similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/common_test.go rename to test/integration/logs/benchmark/common_test.go diff --git a/staging/src/k8s.io/component-base/logs/benchmark/data/container.log b/test/integration/logs/benchmark/data/container.log similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/data/container.log rename to test/integration/logs/benchmark/data/container.log diff --git a/staging/src/k8s.io/component-base/logs/benchmark/data/error-value.log b/test/integration/logs/benchmark/data/error-value.log similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/data/error-value.log rename to test/integration/logs/benchmark/data/error-value.log diff --git a/staging/src/k8s.io/component-base/logs/benchmark/data/error.log b/test/integration/logs/benchmark/data/error.log similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/data/error.log rename to test/integration/logs/benchmark/data/error.log diff --git a/staging/src/k8s.io/component-base/logs/benchmark/data/simple.log b/test/integration/logs/benchmark/data/simple.log similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/data/simple.log rename to test/integration/logs/benchmark/data/simple.log diff --git a/staging/src/k8s.io/component-base/logs/benchmark/data/values.log b/test/integration/logs/benchmark/data/values.log similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/data/values.log rename to test/integration/logs/benchmark/data/values.log diff --git a/staging/src/k8s.io/component-base/logs/benchmark/load.go b/test/integration/logs/benchmark/load.go similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/load.go rename to test/integration/logs/benchmark/load.go diff --git a/staging/src/k8s.io/component-base/logs/benchmark/load_test.go b/test/integration/logs/benchmark/load_test.go similarity index 100% rename from staging/src/k8s.io/component-base/logs/benchmark/load_test.go rename to test/integration/logs/benchmark/load_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 1110cdda076..47d6ca2d61c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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