From c4a903804c0a6e723947d0bd448cf4a07abd7e57 Mon Sep 17 00:00:00 2001 From: timn Date: Thu, 30 Nov 2023 10:25:58 -0500 Subject: [PATCH] finally run make all --- extension/memorylimiter/factory_test.go | 3 +-- extension/memorylimiter/go.mod | 14 +++++++------- extension/memorylimiter/go.sum | 5 ++--- extension/memorylimiter/memorylimiter.go | 1 - extension/memorylimiter/memorylimiter_test.go | 3 +-- versions.yaml | 1 + 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/extension/memorylimiter/factory_test.go b/extension/memorylimiter/factory_test.go index 69e80fe84f2..84f699a94fc 100644 --- a/extension/memorylimiter/factory_test.go +++ b/extension/memorylimiter/factory_test.go @@ -11,9 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/extension/extensiontest" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension/extensiontest" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/extension/memorylimiter/go.mod b/extension/memorylimiter/go.mod index 859bf5601c8..d2b217d8a67 100644 --- a/extension/memorylimiter/go.mod +++ b/extension/memorylimiter/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.90.0 - go.opentelemetry.io/collector/component v0.90.0 - go.opentelemetry.io/collector/confmap v0.90.0 - go.opentelemetry.io/collector/consumer v0.90.0 - go.opentelemetry.io/collector/extension v0.90.0 + go.opentelemetry.io/collector v0.90.1 + go.opentelemetry.io/collector/component v0.90.1 + go.opentelemetry.io/collector/confmap v0.90.1 + go.opentelemetry.io/collector/consumer v0.90.1 + go.opentelemetry.io/collector/extension v0.90.1 go.uber.org/zap v1.26.0 ) @@ -30,11 +30,11 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/shirou/gopsutil/v3 v3.23.10 // indirect + github.com/shirou/gopsutil/v3 v3.23.11 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.90.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.90.1 // indirect go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/pdata v1.0.0 // indirect go.opentelemetry.io/otel v1.21.0 // indirect diff --git a/extension/memorylimiter/go.sum b/extension/memorylimiter/go.sum index b2eb34f0c79..3febaea31b8 100644 --- a/extension/memorylimiter/go.sum +++ b/extension/memorylimiter/go.sum @@ -48,8 +48,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM= -github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE= +github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= +github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -100,7 +100,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/extension/memorylimiter/memorylimiter.go b/extension/memorylimiter/memorylimiter.go index 40370333dc3..a1fb223c2e5 100644 --- a/extension/memorylimiter/memorylimiter.go +++ b/extension/memorylimiter/memorylimiter.go @@ -15,7 +15,6 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/internal/iruntime" ) diff --git a/extension/memorylimiter/memorylimiter_test.go b/extension/memorylimiter/memorylimiter_test.go index a5fcff8f3b5..ecaa7bb5993 100644 --- a/extension/memorylimiter/memorylimiter_test.go +++ b/extension/memorylimiter/memorylimiter_test.go @@ -14,10 +14,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "go.opentelemetry.io/collector/internal/iruntime" - "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/internal/iruntime" ) func TestNew(t *testing.T) { diff --git a/versions.yaml b/versions.yaml index d5a98856a53..755dbbe056b 100644 --- a/versions.yaml +++ b/versions.yaml @@ -35,6 +35,7 @@ module-sets: - go.opentelemetry.io/collector/extension/auth - go.opentelemetry.io/collector/extension/ballastextension - go.opentelemetry.io/collector/extension/zpagesextension + - go.opentelemetry.io/collector/extension/memorylimiter - go.opentelemetry.io/collector/otelcol - go.opentelemetry.io/collector/processor - go.opentelemetry.io/collector/processor/batchprocessor