diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 7c8a2e9181c0..56f620a97f40 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -213,6 +213,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.116.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.116.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.116.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/valkeyreceiver v0.116.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.116.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.116.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/webhookeventreceiver v0.116.0 @@ -343,6 +344,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ../../pkg/stanza - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver => ../../receiver/fluentforwardreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver => ../../receiver/redisreceiver + - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/valkeyreceiver => ../../receiver/valkeyreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension => ../../extension/basicauthextension - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => ../../exporter/influxdbexporter - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter => ../../exporter/alertmanagerexporter diff --git a/receiver/valkeyreceiver/generated_package_test.go b/receiver/valkeyreceiver/generated_package_test.go index 427c4c582346..7a4005cd7a77 100644 --- a/receiver/valkeyreceiver/generated_package_test.go +++ b/receiver/valkeyreceiver/generated_package_test.go @@ -3,8 +3,9 @@ package valkeyreceiver import ( - "go.uber.org/goleak" "testing" + + "go.uber.org/goleak" ) func TestMain(m *testing.M) { diff --git a/receiver/valkeyreceiver/go.mod b/receiver/valkeyreceiver/go.mod index c09d1b74d3c1..ec6d63ff99f7 100644 --- a/receiver/valkeyreceiver/go.mod +++ b/receiver/valkeyreceiver/go.mod @@ -13,7 +13,6 @@ require ( go.opentelemetry.io/collector/component v0.116.1-0.20241220212031-7c2639723f67 go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20241220212031-7c2639723f67 go.opentelemetry.io/collector/config/confignet v1.22.1-0.20241220212031-7c2639723f67 - go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20241220212031-7c2639723f67 go.opentelemetry.io/collector/config/configtls v1.22.1-0.20241220212031-7c2639723f67 go.opentelemetry.io/collector/confmap v1.22.1-0.20241220212031-7c2639723f67 go.opentelemetry.io/collector/consumer v1.22.1-0.20241220212031-7c2639723f67 @@ -80,6 +79,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20241220212031-7c2639723f67 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20241220212031-7c2639723f67 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20241220212031-7c2639723f67 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20241220212031-7c2639723f67 // indirect diff --git a/receiver/valkeyreceiver/receiver.go b/receiver/valkeyreceiver/receiver.go index c2d5c1131e91..278d86632a5a 100644 --- a/receiver/valkeyreceiver/receiver.go +++ b/receiver/valkeyreceiver/receiver.go @@ -8,13 +8,13 @@ import ( "strconv" "time" + "github.com/valkey-io/valkey-go" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/valkeyreceiver/internal/metadata" - "github.com/valkey-io/valkey-go" ) type valkeyScraper struct { diff --git a/receiver/valkeyreceiver/receiver_test.go b/receiver/valkeyreceiver/receiver_test.go index 7f5356f5c987..6fa3b399f857 100644 --- a/receiver/valkeyreceiver/receiver_test.go +++ b/receiver/valkeyreceiver/receiver_test.go @@ -5,15 +5,15 @@ package valkeyreceiver import ( "context" + _ "embed" "path/filepath" "testing" - _ "embed" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/receiver/receivertest" ) //go:embed testdata/all-metrics/raw_info.txt