diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e95dcaefa7778..400e5fcdb6bea 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -169,6 +169,7 @@ pkg/translator/signalfx/ @open-telemetry pkg/translator/skywalking/ @open-telemetry/collector-contrib-approvers @JaredTan95 pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1 pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @alxbl @pjanotti +pkg/xk8stest/ @open-telemetry/collector-contrib-approvers @crobert-1 processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken processor/coralogixprocessor/ @open-telemetry/collector-contrib-approvers @crobert-1 @povilasv diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 920ad09c50af9..ad4f80cf2b9af 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -133,7 +133,6 @@ body: - internal/filter - internal/grpcutil - internal/k8sconfig - - internal/k8stest - internal/kafka - internal/kubelet - internal/metadataproviders @@ -169,6 +168,7 @@ body: - pkg/translator/skywalking - pkg/translator/zipkin - pkg/winperfcounters + - pkg/xk8stest - processor/attributes - processor/coralogix - processor/cumulativetodelta diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 0bcdcf6429d3b..8a702139e0d5e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -127,7 +127,6 @@ body: - internal/filter - internal/grpcutil - internal/k8sconfig - - internal/k8stest - internal/kafka - internal/kubelet - internal/metadataproviders @@ -163,6 +162,7 @@ body: - pkg/translator/skywalking - pkg/translator/zipkin - pkg/winperfcounters + - pkg/xk8stest - processor/attributes - processor/coralogix - processor/cumulativetodelta diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 945d7cf6a8dec..d18f5668048b1 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -127,7 +127,6 @@ body: - internal/filter - internal/grpcutil - internal/k8sconfig - - internal/k8stest - internal/kafka - internal/kubelet - internal/metadataproviders @@ -163,6 +162,7 @@ body: - pkg/translator/skywalking - pkg/translator/zipkin - pkg/winperfcounters + - pkg/xk8stest - processor/attributes - processor/coralogix - processor/cumulativetodelta diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index c816002a0cc6c..329bd62eebea3 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -132,7 +132,6 @@ body: - internal/filter - internal/grpcutil - internal/k8sconfig - - internal/k8stest - internal/kafka - internal/kubelet - internal/metadataproviders @@ -168,6 +167,7 @@ body: - pkg/translator/skywalking - pkg/translator/zipkin - pkg/winperfcounters + - pkg/xk8stest - processor/attributes - processor/coralogix - processor/cumulativetodelta diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 835fbbef74e66..1ff2699843129 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -364,7 +364,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter => ../../exporter/azuremonitorexporter - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter => ../../exporter/azuredataexplorerexporter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka - github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq => ../../internal/rabbitmq - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 37511f84ecceb..10ecb0207186b 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -339,7 +339,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sco replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker => ../../internal/docker -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 6ab65cabcdc5a..705ad58c5c4ff 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -471,7 +471,7 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../receiver/dockerstatsreceiver diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 2ab764737e864..094d295dd1893 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1139,8 +1139,6 @@ go.opentelemetry.io/collector/pdata/testdata v0.117.1-0.20250117002813-e970f8bb1 go.opentelemetry.io/collector/pdata/testdata v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:p0nAWaRK15OYXxzud6bs2SVq0Du276s/DeimAK/dz/M= go.opentelemetry.io/collector/pipeline v0.117.1-0.20250117002813-e970f8bb1258 h1:3/MYLjtVC+l/bF0QUjY+/yTjDy/J6GVBtZ6C/raumhY= go.opentelemetry.io/collector/pipeline v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0 h1:vRdnwIU40bYtxntVOmxg4Bhrh9QVKtx5wwlxK21rc1s= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0/go.mod h1:KxDMUOfbVy8lzZ85CZEG3gCJEYMyWiBKdN+HWUwQWTM= go.opentelemetry.io/collector/pipeline/xpipeline v0.117.1-0.20250117002813-e970f8bb1258 h1:WvVdPZtqXijUIx6ovEmzJtM0lsWBAqdYwdzXcmqWUM4= go.opentelemetry.io/collector/pipeline/xpipeline v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:lNY3uQjRcb3f7CW1JQMXJcWzCJp5122LOKrKs5eito8= go.opentelemetry.io/collector/processor v0.117.1-0.20250117002813-e970f8bb1258 h1:fkMicphhhmLvGwQS0REqYX+xPaaO5po29F3HwLRAC2U= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index bc8f761424902..d02c5e4582125 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -448,7 +448,7 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../../pkg/pdatatest -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../../receiver/dockerstatsreceiver diff --git a/internal/k8stest/Makefile b/pkg/xk8stest/Makefile similarity index 100% rename from internal/k8stest/Makefile rename to pkg/xk8stest/Makefile diff --git a/internal/k8stest/README.md b/pkg/xk8stest/README.md similarity index 84% rename from internal/k8stest/README.md rename to pkg/xk8stest/README.md index f3151dbfd3436..9b7ed89a02e46 100644 --- a/internal/k8stest/README.md +++ b/pkg/xk8stest/README.md @@ -2,6 +2,9 @@ The purpose of this package is to provide reusable kubernetes test helpers. +**Warning:** +This package is experimental and its API compatibility might be broken without any notice. + ## Functionality This package includes the ability to [create and delete k8s objects](./k8s_objects.go), diff --git a/internal/k8stest/client.go b/pkg/xk8stest/client.go similarity index 92% rename from internal/k8stest/client.go rename to pkg/xk8stest/client.go index 3de4092c4d512..e5d85e0d849c3 100644 --- a/internal/k8stest/client.go +++ b/pkg/xk8stest/client.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" +package xk8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" import ( "errors" diff --git a/internal/k8stest/go.mod b/pkg/xk8stest/go.mod similarity index 99% rename from internal/k8stest/go.mod rename to pkg/xk8stest/go.mod index b1f6d16214bca..408aa1df7bfb8 100644 --- a/internal/k8stest/go.mod +++ b/pkg/xk8stest/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest +module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest go 1.22.0 diff --git a/internal/k8stest/go.sum b/pkg/xk8stest/go.sum similarity index 100% rename from internal/k8stest/go.sum rename to pkg/xk8stest/go.sum diff --git a/internal/k8stest/k8s_collector.go b/pkg/xk8stest/k8s_collector.go similarity index 89% rename from internal/k8stest/k8s_collector.go rename to pkg/xk8stest/k8s_collector.go index b742578453444..c297641ee6c46 100644 --- a/internal/k8stest/k8s_collector.go +++ b/pkg/xk8stest/k8s_collector.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" +package xk8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" import ( "bytes" @@ -20,15 +20,14 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -func CreateCollectorObjects(t *testing.T, client *K8sClient, testID string, manifestsDir string) []*unstructured.Unstructured { +func CreateCollectorObjects(t *testing.T, client *K8sClient, testID string, manifestsDir string, templateValues map[string]string, host string) []*unstructured.Unstructured { if manifestsDir == "" { manifestsDir = filepath.Join(".", "testdata", "e2e", "collector") } manifestFiles, err := os.ReadDir(manifestsDir) require.NoErrorf(t, err, "failed to read collector manifests directory %s", manifestsDir) - host := HostEndpoint(t) if host == "" { - require.Fail(t, "host endpoint cannot be empty") + host = HostEndpoint(t) } var podNamespace string var podLabels map[string]any @@ -36,11 +35,15 @@ func CreateCollectorObjects(t *testing.T, client *K8sClient, testID string, mani for _, manifestFile := range manifestFiles { tmpl := template.Must(template.New(manifestFile.Name()).ParseFiles(filepath.Join(manifestsDir, manifestFile.Name()))) manifest := &bytes.Buffer{} - require.NoError(t, tmpl.Execute(manifest, map[string]string{ + defaultTemplateValues := map[string]string{ "Name": "otelcol-" + testID, "HostEndpoint": host, "TestID": testID, - })) + } + for key, value := range templateValues { + defaultTemplateValues[key] = value + } + require.NoError(t, tmpl.Execute(manifest, defaultTemplateValues)) obj, err := CreateObject(client, manifest.Bytes()) require.NoErrorf(t, err, "failed to create collector object from manifest %s", manifestFile.Name()) objKind := obj.GetKind() diff --git a/internal/k8stest/k8s_data_helpers.go b/pkg/xk8stest/k8s_data_helpers.go similarity index 91% rename from internal/k8stest/k8s_data_helpers.go rename to pkg/xk8stest/k8s_data_helpers.go index 09114fd29fcfb..edf5913816d0d 100644 --- a/internal/k8stest/k8s_data_helpers.go +++ b/pkg/xk8stest/k8s_data_helpers.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" +package xk8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" import ( "context" diff --git a/internal/k8stest/k8s_objects.go b/pkg/xk8stest/k8s_objects.go similarity index 96% rename from internal/k8stest/k8s_objects.go rename to pkg/xk8stest/k8s_objects.go index a9acca588f844..ca891db6e275d 100644 --- a/internal/k8stest/k8s_objects.go +++ b/pkg/xk8stest/k8s_objects.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" +package xk8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" import ( "context" diff --git a/internal/k8stest/k8s_telemetrygen.go b/pkg/xk8stest/k8s_telemetrygen.go similarity index 96% rename from internal/k8stest/k8s_telemetrygen.go rename to pkg/xk8stest/k8s_telemetrygen.go index c620d499a333e..b355c89e53f68 100644 --- a/internal/k8stest/k8s_telemetrygen.go +++ b/pkg/xk8stest/k8s_telemetrygen.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package k8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" +package xk8stest // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" import ( "bytes" diff --git a/internal/k8stest/metadata.yaml b/pkg/xk8stest/metadata.yaml similarity index 100% rename from internal/k8stest/metadata.yaml rename to pkg/xk8stest/metadata.yaml diff --git a/processor/k8sattributesprocessor/e2e_test.go b/processor/k8sattributesprocessor/e2e_test.go index 147b968ec913e..4b6f66c35e640 100644 --- a/processor/k8sattributesprocessor/e2e_test.go +++ b/processor/k8sattributesprocessor/e2e_test.go @@ -21,13 +21,13 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pipeline" - "go.opentelemetry.io/collector/pipeline/pipelineprofiles" + "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/receiver/xreceiver" "go.uber.org/multierr" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" + k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" ) const ( @@ -86,7 +86,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { defer shutdownSinks() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector"), map[string]string{}, "") createTeleOpts := &k8stest.TelemetrygenCreateOpts{ ManifestsDir: filepath.Join(testDir, "telemetrygen"), TestID: testID, @@ -421,7 +421,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { }, { name: "profiles-job", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-job", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-job-[a-z0-9]*"), @@ -446,7 +446,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { }, { name: "profiles-statefulset", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-statefulset", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-profiles-statefulset-0"), @@ -470,7 +470,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { }, { name: "profiles-deployment", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-deployment", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-deployment-[a-z0-9]*-[a-z0-9]*"), @@ -497,7 +497,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { }, { name: "profiles-daemonset", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-daemonset", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-daemonset-[a-z0-9]*"), @@ -531,7 +531,7 @@ func TestE2E_ClusterRBAC(t *testing.T) { scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) case pipeline.SignalLogs: scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) - case pipelineprofiles.SignalProfiles: + case xpipeline.SignalProfiles: scanProfilesForAttributes(t, profilesConsumer, tc.service, tc.attrs) default: t.Fatalf("unknown data type %s", tc.dataType) @@ -566,7 +566,7 @@ func TestE2E_NamespacedRBAC(t *testing.T) { defer shutdownSinks() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector"), map[string]string{}, "") createTeleOpts := &k8stest.TelemetrygenCreateOpts{ ManifestsDir: filepath.Join(testDir, "telemetrygen"), TestID: testID, @@ -670,7 +670,7 @@ func TestE2E_NamespacedRBAC(t *testing.T) { }, { name: "profiles-deployment", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-deployment", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-deployment-[a-z0-9]*-[a-z0-9]*"), @@ -703,7 +703,7 @@ func TestE2E_NamespacedRBAC(t *testing.T) { scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) case pipeline.SignalLogs: scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) - case pipelineprofiles.SignalProfiles: + case xpipeline.SignalProfiles: scanProfilesForAttributes(t, profilesConsumer, tc.service, tc.attrs) default: t.Fatalf("unknown data type %s", tc.dataType) @@ -742,11 +742,11 @@ func TestE2E_MixRBAC(t *testing.T) { } defer func() { - require.NoErrorf(t, k8stest.DeleteObject(k8sClient, nsObj), "failed to delete namespace %s", nsObj.GetName()) + require.NoErrorf(t, k8stest.DeleteObject(k8sClient, nsObj), "failed to delete namespace %s", nsObj.GetName(), "") }() } - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector"), map[string]string{}, "") defer func() { for _, obj := range collectorObjs { require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) @@ -866,7 +866,7 @@ func TestE2E_MixRBAC(t *testing.T) { }, { name: "profiles-deployment", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-deployment", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-deployment-[a-z0-9]*-[a-z0-9]*"), @@ -902,7 +902,7 @@ func TestE2E_MixRBAC(t *testing.T) { scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) case pipeline.SignalLogs: scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) - case pipelineprofiles.SignalProfiles: + case xpipeline.SignalProfiles: scanProfilesForAttributes(t, profilesConsumer, tc.service, tc.attrs) default: t.Fatalf("unknown data type %s", tc.dataType) @@ -941,7 +941,7 @@ func TestE2E_NamespacedRBACNoPodIP(t *testing.T) { defer shutdownSinks() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector"), map[string]string{}, "") createTeleOpts := &k8stest.TelemetrygenCreateOpts{ ManifestsDir: filepath.Join(testDir, "telemetrygen"), TestID: testID, @@ -1045,7 +1045,7 @@ func TestE2E_NamespacedRBACNoPodIP(t *testing.T) { }, { name: "profiles-deployment", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-deployment", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-deployment-[a-z0-9]*-[a-z0-9]*"), @@ -1078,7 +1078,7 @@ func TestE2E_NamespacedRBACNoPodIP(t *testing.T) { scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) case pipeline.SignalLogs: scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) - case pipelineprofiles.SignalProfiles: + case xpipeline.SignalProfiles: scanProfilesForAttributes(t, profilesConsumer, tc.service, tc.attrs) default: t.Fatalf("unknown data type %s", tc.dataType) @@ -1146,7 +1146,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { } // start the collector after the telemetry gen objects - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(testDir, "collector"), map[string]string{}, "") defer func() { for _, obj := range collectorObjs { require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName()) @@ -1467,7 +1467,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { }, { name: "profiles-job", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-job", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-job-[a-z0-9]*"), @@ -1492,7 +1492,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { }, { name: "profiles-statefulset", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-statefulset", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(equal, "telemetrygen-"+testID+"-profiles-statefulset-0"), @@ -1516,7 +1516,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { }, { name: "profiles-deployment", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-deployment", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-deployment-[a-z0-9]*-[a-z0-9]*"), @@ -1543,7 +1543,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { }, { name: "profiles-daemonset", - dataType: pipelineprofiles.SignalProfiles, + dataType: xpipeline.SignalProfiles, service: "test-profiles-daemonset", attrs: map[string]*expectedValue{ "k8s.pod.name": newExpectedValue(regex, "telemetrygen-"+testID+"-profiles-daemonset-[a-z0-9]*"), @@ -1577,7 +1577,7 @@ func TestE2E_ClusterRBACCollectorStartAfterTelemetryGen(t *testing.T) { scanMetricsForAttributes(t, metricsConsumer, tc.service, tc.attrs) case pipeline.SignalLogs: scanLogsForAttributes(t, logsConsumer, tc.service, tc.attrs) - case pipelineprofiles.SignalProfiles: + case xpipeline.SignalProfiles: scanProfilesForAttributes(t, profilesConsumer, tc.service, tc.attrs) default: t.Fatalf("unknown data type %s", tc.dataType) diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 2c128114376fe..3b89a34e6e8a7 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/uuid v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.117.1-0.20250117002813-e970f8bb1258 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/client v1.23.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/component v0.117.1-0.20250117002813-e970f8bb1258 @@ -23,7 +23,7 @@ require ( go.opentelemetry.io/collector/pdata v1.23.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/pdata/pprofile v0.117.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/pipeline v0.117.1-0.20250117002813-e970f8bb1258 - go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0 + go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 go.opentelemetry.io/collector/processor v0.117.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.117.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/processor/processortest v0.117.1-0.20250117002813-e970f8bb1258 @@ -145,7 +145,7 @@ retract ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest // ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules replace cloud.google.com/go v0.54.0 => cloud.google.com/go v0.110.10 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index f3530f5c5014c..1ed127a0546a4 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -1281,8 +1281,8 @@ go.opentelemetry.io/collector/pdata/testdata v0.117.1-0.20250117002813-e970f8bb1 go.opentelemetry.io/collector/pdata/testdata v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:p0nAWaRK15OYXxzud6bs2SVq0Du276s/DeimAK/dz/M= go.opentelemetry.io/collector/pipeline v0.117.1-0.20250117002813-e970f8bb1258 h1:3/MYLjtVC+l/bF0QUjY+/yTjDy/J6GVBtZ6C/raumhY= go.opentelemetry.io/collector/pipeline v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0 h1:vRdnwIU40bYtxntVOmxg4Bhrh9QVKtx5wwlxK21rc1s= -go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.116.0/go.mod h1:KxDMUOfbVy8lzZ85CZEG3gCJEYMyWiBKdN+HWUwQWTM= +go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 h1:jnHQNaNfVRIdrtOPCORUy8s1cEJyxql3uv/WQ1ve1Js= +go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0/go.mod h1:lNY3uQjRcb3f7CW1JQMXJcWzCJp5122LOKrKs5eito8= go.opentelemetry.io/collector/processor v0.117.1-0.20250117002813-e970f8bb1258 h1:fkMicphhhmLvGwQS0REqYX+xPaaO5po29F3HwLRAC2U= go.opentelemetry.io/collector/processor v0.117.1-0.20250117002813-e970f8bb1258/go.mod h1:GPbMoI/2QaOF1AEvMUVMqJeajmxMkhFfVsHo2opYjns= go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.117.1-0.20250117002813-e970f8bb1258 h1:Ybqpn4YsqLAb2GkGTQMjVmnLSCi2DBSO2IxeambAp/g= diff --git a/receiver/k8sclusterreceiver/e2e_test.go b/receiver/k8sclusterreceiver/e2e_test.go index e7b0bbb024a73..09682f1e7ff99 100644 --- a/receiver/k8sclusterreceiver/e2e_test.go +++ b/receiver/k8sclusterreceiver/e2e_test.go @@ -21,9 +21,9 @@ import ( "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" + k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" ) const ( @@ -63,7 +63,7 @@ func TestE2EClusterScoped(t *testing.T) { defer shutdownSink() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(".", "testdata", "e2e", "cluster-scoped", "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(".", "testdata", "e2e", "cluster-scoped", "collector"), map[string]string{}, "") t.Cleanup(func() { for _, obj := range append(collectorObjs) { @@ -147,7 +147,7 @@ func TestE2ENamespaceScoped(t *testing.T) { defer shutdownSink() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(".", "testdata", "e2e", "namespace-scoped", "collector")) + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, filepath.Join(".", "testdata", "e2e", "namespace-scoped", "collector"), map[string]string{}, "") t.Cleanup(func() { for _, obj := range append(collectorObjs) { diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 643187e000665..88a8ebe6cd76e 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.117.1-0.20250117002813-e970f8bb1258 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/openshift/api v3.9.0+incompatible github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.10.0 @@ -156,7 +156,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil // openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent diff --git a/receiver/k8sobjectsreceiver/e2e_test.go b/receiver/k8sobjectsreceiver/e2e_test.go index b7c9c4c54b085..ae74a4f8fc593 100644 --- a/receiver/k8sobjectsreceiver/e2e_test.go +++ b/receiver/k8sobjectsreceiver/e2e_test.go @@ -22,9 +22,9 @@ import ( "go.opentelemetry.io/collector/receiver/receivertest" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "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" ) const ( @@ -60,7 +60,7 @@ func TestE2E(t *testing.T) { }() // startup collector in k8s cluster - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "") + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "", map[string]string{}, "") defer func() { for _, obj := range collectorObjs { diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 6c43a85217570..d335f95509293 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -5,9 +5,9 @@ go 1.22.0 require ( github.com/google/uuid v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.117.1-0.20250117002813-e970f8bb1258 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.117.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/component/componenttest v0.117.1-0.20250117002813-e970f8bb1258 @@ -142,7 +142,7 @@ retract ( v0.65.0 ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest diff --git a/receiver/kubeletstatsreceiver/e2e_test.go b/receiver/kubeletstatsreceiver/e2e_test.go index 3411d2f2b9f2c..ecc9a3da8d96a 100644 --- a/receiver/kubeletstatsreceiver/e2e_test.go +++ b/receiver/kubeletstatsreceiver/e2e_test.go @@ -20,9 +20,9 @@ import ( "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/receiver/receivertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" + k8stest "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest" ) const testKubeConfig = "/tmp/kube-config-otelcol-e2e-testing" @@ -41,7 +41,7 @@ func TestE2E(t *testing.T) { defer shutdownSink() testID := uuid.NewString()[:8] - collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "") + collectorObjs := k8stest.CreateCollectorObjects(t, k8sClient, testID, "", map[string]string{}, "") defer func() { for _, obj := range append(collectorObjs) { diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 3500817d0ff83..be626570d658e 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.117.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.117.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.117.1-0.20250117002813-e970f8bb1258 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest v0.117.1-0.20250117002813-e970f8bb1258 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.117.1-0.20250117002813-e970f8bb1258 go.opentelemetry.io/collector/component/componenttest v0.117.1-0.20250117002813-e970f8bb1258 @@ -155,7 +155,7 @@ retract ( v0.65.0 ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest => ../../pkg/xk8stest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest diff --git a/versions.yaml b/versions.yaml index b40c5d9d8ac40..6f2a384738db9 100644 --- a/versions.yaml +++ b/versions.yaml @@ -132,7 +132,6 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter - github.com/open-telemetry/opentelemetry-collector-contrib/internal/grpcutil - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders @@ -166,6 +165,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters + - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xk8stest - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/coralogixprocessor