@@ -5,7 +5,6 @@ package k8sevents
5
5
6
6
import (
7
7
"bytes"
8
- "context"
9
8
"fmt"
10
9
"os"
11
10
"path/filepath"
@@ -19,13 +18,10 @@ import (
19
18
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
20
19
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest"
21
20
k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest"
22
- "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver"
23
21
"github.com/stretchr/testify/require"
24
- "go.opentelemetry.io/collector/component/componenttest"
25
22
"go.opentelemetry.io/collector/consumer/consumertest"
26
23
"go.opentelemetry.io/collector/pdata/pcommon"
27
24
"go.opentelemetry.io/collector/pdata/plog"
28
- "go.opentelemetry.io/collector/receiver/receivertest"
29
25
"helm.sh/helm/v3/pkg/action"
30
26
"helm.sh/helm/v3/pkg/kube"
31
27
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -108,6 +104,7 @@ func Test_K8SEvents(t *testing.T) {
108
104
plogtest .IgnoreLogRecordAttributeValue ("k8s.object.uid" ),
109
105
plogtest .IgnoreLogRecordAttributeValue ("k8s.pod.uid" ),
110
106
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
111
108
plogtest .IgnoreResourceLogsOrder (),
112
109
plogtest .IgnoreScopeLogsOrder (),
113
110
plogtest .IgnoreLogRecordsOrder (),
@@ -240,23 +237,6 @@ metadata:
240
237
` )
241
238
}
242
239
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
-
260
240
func deleteObject (t * testing.T , k8sClient * k8stest.K8sClient , objYAML string ) {
261
241
obj := & unstructured.Unstructured {}
262
242
err := yaml .Unmarshal ([]byte (objYAML ), obj )
0 commit comments