From a1490aef5d08d44f7f125aab2e21aac74e5906bf Mon Sep 17 00:00:00 2001 From: Jina Jain Date: Thu, 6 Mar 2025 11:00:43 -0800 Subject: [PATCH] reduce flaky test run (#1698) --- functional_tests/k8sevents/k8sevents_test.go | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/functional_tests/k8sevents/k8sevents_test.go b/functional_tests/k8sevents/k8sevents_test.go index 1a702fa55..ebfc22059 100644 --- a/functional_tests/k8sevents/k8sevents_test.go +++ b/functional_tests/k8sevents/k8sevents_test.go @@ -5,7 +5,6 @@ package k8sevents import ( "bytes" - "context" "fmt" "os" "path/filepath" @@ -19,13 +18,10 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" - "go.opentelemetry.io/collector/receiver/receivertest" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/kube" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -108,6 +104,7 @@ func Test_K8SEvents(t *testing.T) { plogtest.IgnoreLogRecordAttributeValue("k8s.object.uid"), plogtest.IgnoreLogRecordAttributeValue("k8s.pod.uid"), plogtest.IgnoreLogRecordAttributeValue("k8s.object.resource_version"), + plogtest.IgnoreResourceAttributeValue("com.splunk.index"), // this is flaky, the index can be the value from pod annotation due to the k8sattributes processor in the pipeline or main plogtest.IgnoreResourceLogsOrder(), plogtest.IgnoreScopeLogsOrder(), plogtest.IgnoreLogRecordsOrder(), @@ -240,23 +237,6 @@ metadata: `) } -func setupHECLogsReceiver(t *testing.T, port int) *consumertest.LogsSink { - f := splunkhecreceiver.NewFactory() - cfg := f.CreateDefaultConfig().(*splunkhecreceiver.Config) - cfg.Endpoint = fmt.Sprintf("0.0.0.0:%d", internal.HECLogsReceiverPort) - - receiver := new(consumertest.LogsSink) - rcvr, err := f.CreateLogs(context.Background(), receivertest.NewNopSettings(f.Type()), cfg, receiver) - require.NoError(t, err) - - require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) - t.Cleanup(func() { - require.NoError(t, rcvr.Shutdown(context.Background())) - }) - - return receiver -} - func deleteObject(t *testing.T, k8sClient *k8stest.K8sClient, objYAML string) { obj := &unstructured.Unstructured{} err := yaml.Unmarshal([]byte(objYAML), obj)