Skip to content

Commit a1490ae

Browse files
authored
reduce flaky test run (#1698)
1 parent 1f4ed43 commit a1490ae

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

functional_tests/k8sevents/k8sevents_test.go

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package k8sevents
55

66
import (
77
"bytes"
8-
"context"
98
"fmt"
109
"os"
1110
"path/filepath"
@@ -19,13 +18,10 @@ import (
1918
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
2019
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
2120
k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest"
22-
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver"
2321
"github.com/stretchr/testify/require"
24-
"go.opentelemetry.io/collector/component/componenttest"
2522
"go.opentelemetry.io/collector/consumer/consumertest"
2623
"go.opentelemetry.io/collector/pdata/pcommon"
2724
"go.opentelemetry.io/collector/pdata/plog"
28-
"go.opentelemetry.io/collector/receiver/receivertest"
2925
"helm.sh/helm/v3/pkg/action"
3026
"helm.sh/helm/v3/pkg/kube"
3127
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -108,6 +104,7 @@ func Test_K8SEvents(t *testing.T) {
108104
plogtest.IgnoreLogRecordAttributeValue("k8s.object.uid"),
109105
plogtest.IgnoreLogRecordAttributeValue("k8s.pod.uid"),
110106
plogtest.IgnoreLogRecordAttributeValue("k8s.object.resource_version"),
107+
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
111108
plogtest.IgnoreResourceLogsOrder(),
112109
plogtest.IgnoreScopeLogsOrder(),
113110
plogtest.IgnoreLogRecordsOrder(),
@@ -240,23 +237,6 @@ metadata:
240237
`)
241238
}
242239

243-
func setupHECLogsReceiver(t *testing.T, port int) *consumertest.LogsSink {
244-
f := splunkhecreceiver.NewFactory()
245-
cfg := f.CreateDefaultConfig().(*splunkhecreceiver.Config)
246-
cfg.Endpoint = fmt.Sprintf("0.0.0.0:%d", internal.HECLogsReceiverPort)
247-
248-
receiver := new(consumertest.LogsSink)
249-
rcvr, err := f.CreateLogs(context.Background(), receivertest.NewNopSettings(f.Type()), cfg, receiver)
250-
require.NoError(t, err)
251-
252-
require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost()))
253-
t.Cleanup(func() {
254-
require.NoError(t, rcvr.Shutdown(context.Background()))
255-
})
256-
257-
return receiver
258-
}
259-
260240
func deleteObject(t *testing.T, k8sClient *k8stest.K8sClient, objYAML string) {
261241
obj := &unstructured.Unstructured{}
262242
err := yaml.Unmarshal([]byte(objYAML), obj)

0 commit comments

Comments
 (0)