From 21469b13956aa260074f5e0d44bf0e238226787e Mon Sep 17 00:00:00 2001 From: Yang Song Date: Fri, 10 Nov 2023 16:00:01 -0500 Subject: [PATCH] [chore][pkg/stanza][exporter/signalfx] One more interface{} -> any and skip flaky tests (#29101) See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28898/files#r1389614720. Looks like a merge conflict. --- exporter/signalfxexporter/exporter_test.go | 2 ++ pkg/stanza/operator/input/udp/udp.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 5d66060a0681..53e6b7decd68 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -1207,6 +1207,7 @@ func TestTLSExporterInit(t *testing.T) { } func TestTLSIngestConnection(t *testing.T) { + t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099") metricsPayload := pmetric.NewMetrics() rm := metricsPayload.ResourceMetrics().AppendEmpty() ilm := rm.ScopeMetrics().AppendEmpty() @@ -1318,6 +1319,7 @@ func TestDefaultSystemCPUTimeExcludedAndTranslated(t *testing.T) { } func TestTLSAPIConnection(t *testing.T) { + t.Skip("Flaky test see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/29099") cfg := createDefaultConfig().(*Config) converter, err := translation.NewMetricsConverter( zap.NewNop(), diff --git a/pkg/stanza/operator/input/udp/udp.go b/pkg/stanza/operator/input/udp/udp.go index ac7126f0eec8..4d49046cfda1 100644 --- a/pkg/stanza/operator/input/udp/udp.go +++ b/pkg/stanza/operator/input/udp/udp.go @@ -139,7 +139,7 @@ func (c Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) { if c.AsyncConfig != nil { udpInput.messageQueue = make(chan messageAndAddress, c.AsyncConfig.MaxQueueLength) udpInput.readBufferPool = sync.Pool{ - New: func() interface{} { + New: func() any { buffer := make([]byte, MaxUDPSize) return &buffer },