chore: Improve testkit package structure

.golangci.yaml

@@ -62,17 +62,9 @@ linters-settings:
         alias: kitk8s
       - pkg: github.com/kyma-project/telemetry-manager/test/testkit/kyma
         alias: kitkyma
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/kyma/overrides
-        alias: kitovrr
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log
-        alias: kitlogpipeline
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/metric
-        alias: kitmetricpipeline
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/trace
-        alias: kittracepipeline
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/otlp/metrics
+      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/otel/metrics
         alias: kitmetrics
-      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/otlp/traces
+      - pkg: github.com/kyma-project/telemetry-manager/test/testkit/otel/traces
         alias: kittraces
       - pkg: github.com/kyma-project/telemetry-manager/webhook/logparser
         alias: logparserwebhook
@@ -205,9 +197,9 @@ issues:
     - linters: [dupl]
       path: test/testkit/matchers/(log|metric|trace)_matchers.go
     - linters: [errcheck]
-      path: test/testkit/otlp/traces/traces.go
+      path: test/testkit/otel/traces/traces.go
     - linters: [dupl]
-      path: test/testkit/verifiers/(deployment|daemonset|metrics|traces).go
+      path: test/testkit/verifiers/(deployment|daemon_set|metrics|traces).go
     - linters: [dupl]
       path: main.go
     - linters:

Makefile

@@ -289,7 +289,7 @@ KUSTOMIZE_VERSION ?= v5.0.1
 TABLE_GEN_VERSION ?= v0.0.0-20230523174756-3dae9f177ffd
 CONTROLLER_TOOLS_VERSION ?= v0.11.3
 K3D_VERSION ?= v5.4.7
-GINKGO_VERSION ?= v2.14.0
+GINKGO_VERSION ?= v2.15.0
 GORELEASER_VERSION ?= v1.23.0
 GOLANGCI-LINT_VERSION ?= latest
 GO_TEST_COVERAGE_VERSION ?= v2.8.2

test/e2e/logs_annotation_test.go

@@ -11,10 +11,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -33,13 +32,13 @@ var _ = Describe("Logs Keep Annotations", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs).
+		mockLogProducer := loggen.New(logProducerName, mockNs).
 			WithAnnotations(map[string]string{"release": "v1.0.0"})
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-annotation-test")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			KeepAnnotations(true).

test/e2e/logs_basic_test.go

@@ -9,9 +9,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
 
@@ -29,12 +28,12 @@ var _ = Describe("Logs Basic", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs, backend.WithPersistentHostSecret(isOperational()))
-		mockLogProducer := logproducer.New(logProducerName, mockNs)
+		mockLogProducer := loggen.New(logProducerName, mockNs)
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-test")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			Persistent(isOperational())

test/e2e/logs_custom_output_test.go

@@ -9,9 +9,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
 
@@ -29,12 +28,12 @@ var _ = Describe("Logs Custom Output", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs)
+		mockLogProducer := loggen.New(logProducerName, mockNs)
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-test")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).WithCustomOutput(mockBackend.ExternalService.Host())
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).WithCustomOutput(mockBackend.ExternalService.Host())
 		objs = append(objs, logPipeline.K8sObject())
 
 		return objs

test/e2e/logs_dedot_test.go

@@ -11,10 +11,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -33,12 +32,12 @@ var _ = Describe("Logs Dedot", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs)
+		mockLogProducer := loggen.New(logProducerName, mockNs)
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("dedot.label", "logging-dedot-value")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			WithIncludeContainers([]string{logProducerName})

test/e2e/logs_exclude_container_test.go

@@ -11,10 +11,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -33,12 +32,12 @@ var _ = Describe("Logs Exclude Container", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs)
+		mockLogProducer := loggen.New(logProducerName, mockNs)
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-exclude-container")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			WithExcludeContainers([]string{logProducerName})

test/e2e/logs_label_test.go

@@ -11,10 +11,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -33,13 +32,13 @@ var _ = Describe("Logs Drop Labels", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs).
+		mockLogProducer := loggen.New(logProducerName, mockNs).
 			WithAnnotations(map[string]string{"release": "v1.0.0"})
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-label-test")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			KeepAnnotations(false).

test/e2e/logs_mtls_test.go

@@ -9,9 +9,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
 
@@ -29,12 +28,12 @@ var _ = Describe("Logs mTLS", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs, backend.WithTLS())
-		mockLogProducer := logproducer.New(logProducerName, mockNs)
+		mockLogProducer := loggen.New(logProducerName, mockNs)
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-mtls-test")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		pipeline := kitlogpipeline.NewPipeline(pipelineName).
+		pipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput().
 			WithTLS(mockBackend.TLSCerts)

test/e2e/logs_parser_test.go

@@ -12,10 +12,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	. "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
+	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/loggen"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -34,13 +33,13 @@ var _ = Describe("Logs Parser", Label("logs"), Ordered, func() {
 		objs = append(objs, kitk8s.NewNamespace(mockNs).K8sObject())
 
 		mockBackend := backend.New(mockBackendName, mockNs, backend.SignalTypeLogs)
-		mockLogProducer := logproducer.New(logProducerName, mockNs).
+		mockLogProducer := loggen.New(logProducerName, mockNs).
 			WithAnnotations(map[string]string{"fluentbit.io/parser": "my-regex-parser"})
 		objs = append(objs, mockBackend.K8sObjects()...)
 		objs = append(objs, mockLogProducer.K8sObject(kitk8s.WithLabel("app", "regex-parser-testing-service")))
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		logHTTPPipeline := kitlogpipeline.NewPipeline(pipelineName).
+		logHTTPPipeline := kitk8s.NewLogPipeline(pipelineName).
 			WithSecretKeyRef(mockBackend.HostSecretRef()).
 			WithHTTPOutput()
 
@@ -49,7 +48,7 @@ Regex  ^(?<user>[^ ]*) (?<pass>[^ ]*)$
 Time_Key time
 Time_Format %d/%b/%Y:%H:%M:%S %z
 Types user:string pass:string`
-		logRegexParser := kitlogpipeline.NewParser("my-regex-parser", parser)
+		logRegexParser := kitk8s.NewLogParser("my-regex-parser", parser)
 		objs = append(objs, logHTTPPipeline.K8sObject())
 		objs = append(objs, logRegexParser.K8sObject())
 

test/e2e/logs_webhook_test.go

@@ -9,7 +9,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitlogpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -31,12 +30,12 @@ var _ = Describe("Logs Validating Webhook", Label("logs"), Ordered, func() {
 		})
 
 		It("Should reject a logpipeline with unknown custom filter", func() {
-			logPipeline := kitlogpipeline.NewPipeline("unknown-custom-filter-pipeline").WithStdout().WithFilter("Name unknown")
+			logPipeline := kitk8s.NewLogPipeline("unknown-custom-filter-pipeline").WithStdout().WithFilter("Name unknown")
 			Expect(kitk8s.CreateObjects(ctx, k8sClient, logPipeline.K8sObject())).ShouldNot(Succeed())
 		})
 
 		It("Should reject a logpipeline with denied custom filter", func() {
-			logPipeline := kitlogpipeline.NewPipeline("denied-custom-filter-pipeline").WithStdout().WithFilter("Name kubernetes")
+			logPipeline := kitk8s.NewLogPipeline("denied-custom-filter-pipeline").WithStdout().WithFilter("Name kubernetes")
 			Expect(kitk8s.CreateObjects(ctx, k8sClient, logPipeline.K8sObject())).ShouldNot(Succeed())
 		})
 

test/e2e/metrics_basic_test.go

@@ -18,9 +18,8 @@ import (
 	"github.com/kyma-project/telemetry-manager/internal/otelcollector/ports"
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
 	kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
-	kitmetricpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/metric"
 	"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
-	kitmetrics "github.com/kyma-project/telemetry-manager/test/testkit/otlp/metrics"
+	kitmetrics "github.com/kyma-project/telemetry-manager/test/testkit/otel/metrics"
 	"github.com/kyma-project/telemetry-manager/test/testkit/periodic"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
@@ -45,7 +44,7 @@ var _ = Describe("Metrics Basic", Label("metrics"), func() {
 		objs = append(objs, mockBackend.K8sObjects()...)
 		telemetryExportURL = mockBackend.TelemetryExportURL(proxyClient)
 
-		metricPipeline := kitmetricpipeline.NewPipeline(fmt.Sprintf("%s-pipeline", mockBackend.Name())).
+		metricPipeline := kitk8s.NewMetricPipeline(fmt.Sprintf("%s-pipeline", mockBackend.Name())).
 			WithOutputEndpointFromSecret(mockBackend.HostSecretRef()).
 			Persistent(isOperational())
 		pipelineName = metricPipeline.Name()

test/e2e/metrics_endpoint_path_validation_test.go

@@ -7,31 +7,30 @@ import (
 	. "github.com/onsi/gomega"
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
-	kitmetricpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/metric"
 )
 
 var _ = Describe("Metrics Validating Endpoint Path", Label("metrics"), Ordered, func() {
 
-	metricPipelineDefaultGRPCWithPath := kitmetricpipeline.NewPipeline("metricpipeline-default-reject-with-path").
+	metricPipelineDefaultGRPCWithPath := kitk8s.NewMetricPipeline("metricpipeline-default-reject-with-path").
 		WithOutputEndpoint("mock-endpoint:4817").WithEndpointPath("/v1/mock/metrics").
 		Persistent(isOperational()).K8sObject()
 
-	metricPipelineWithGRPCAndPath := kitmetricpipeline.NewPipeline("metricpipeline-reject-with-grpc-and-path").
+	metricPipelineWithGRPCAndPath := kitk8s.NewMetricPipeline("metricpipeline-reject-with-grpc-and-path").
 		WithOutputEndpoint("mock-endpoint:4817").WithEndpointPath("/v1/mock/metrics").
 		WithProtocol("grpc").
 		Persistent(isOperational()).K8sObject()
 
-	metricPipelineWithGRPCAndWithoutPath := kitmetricpipeline.NewPipeline("metricpipeline-accept-with-grpc-and-no-path").
+	metricPipelineWithGRPCAndWithoutPath := kitk8s.NewMetricPipeline("metricpipeline-accept-with-grpc-and-no-path").
 		WithOutputEndpoint("mock-endpoint:4817").
 		WithProtocol("grpc").
 		Persistent(isOperational()).K8sObject()
 
-	metricPipelineWithHTTPAndPath := kitmetricpipeline.NewPipeline("metricpipeline-accept-with-http-and-path").
+	metricPipelineWithHTTPAndPath := kitk8s.NewMetricPipeline("metricpipeline-accept-with-http-and-path").
 		WithOutputEndpoint("mock-endpoint:4817").WithEndpointPath("/v1/mock/metrics").
 		WithProtocol("http").
 		Persistent(isOperational()).K8sObject()
 
-	metricPipelineWithHTTPAndWithoutPath := kitmetricpipeline.NewPipeline("metricpipeline-accept-with-http-and-no-path").
+	metricPipelineWithHTTPAndWithoutPath := kitk8s.NewMetricPipeline("metricpipeline-accept-with-http-and-no-path").
 		WithOutputEndpoint("mock-endpoint:4817").
 		WithProtocol("http").
 		Persistent(isOperational()).K8sObject()

test/e2e/metrics_endpoint_with_path_test.go

@@ -11,7 +11,6 @@ import (
 
 	kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
 	kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma"
-	kitmetricpipeline "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/metric"
 	"github.com/kyma-project/telemetry-manager/test/testkit/verifiers"
 )
 
@@ -26,7 +25,7 @@ var _ = Describe("Metrics Endpoint with Path", Label("metrics"), func() {
 	makeResources := func() []client.Object {
 		var objs []client.Object
 
-		metricPipeline := kitmetricpipeline.NewPipeline("mock-metric-endpoint-path").
+		metricPipeline := kitk8s.NewMetricPipeline("mock-metric-endpoint-path").
 			WithProtocol("http").
 			WithOutputEndpoint(endpoint).WithEndpointPath(path)