diff --git a/apis/v1beta1/config.go b/apis/v1beta1/config.go index 61f166b0f3..eaaa5a3d42 100644 --- a/apis/v1beta1/config.go +++ b/apis/v1beta1/config.go @@ -27,6 +27,18 @@ import ( "gopkg.in/yaml.v3" ) +type ComponentType int + +const ( + ComponentTypeReceiver ComponentType = iota + ComponentTypeExporter + ComponentTypeProcessor +) + +func (c ComponentType) String() string { + return [...]string{"receiver", "exporter", "processor"}[c] +} + // AnyConfig represent parts of the config. type AnyConfig struct { Object map[string]interface{} `json:"-" yaml:",inline"` @@ -75,6 +87,37 @@ func (c *AnyConfig) MarshalJSON() ([]byte, error) { return json.Marshal(c.Object) } +// Pipeline is a struct of component type to a list of component IDs. +type Pipeline struct { + Exporters []string `json:"exporters" yaml:"exporters"` + Processors []string `json:"processors" yaml:"processors"` + Receivers []string `json:"receivers" yaml:"receivers"` +} + +// GetEnabledComponents constructs a list of enabled components by component type. +func (c *Config) GetEnabledComponents() map[ComponentType]map[string]interface{} { + toReturn := map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: {}, + ComponentTypeProcessor: {}, + ComponentTypeExporter: {}, + } + for _, pipeline := range c.Service.Pipelines { + if pipeline == nil { + continue + } + for _, componentId := range pipeline.Receivers { + toReturn[ComponentTypeReceiver][componentId] = struct{}{} + } + for _, componentId := range pipeline.Exporters { + toReturn[ComponentTypeExporter][componentId] = struct{}{} + } + for _, componentId := range pipeline.Processors { + toReturn[ComponentTypeProcessor][componentId] = struct{}{} + } + } + return toReturn +} + // Config encapsulates collector config. type Config struct { // +kubebuilder:pruning:PreserveUnknownFields @@ -135,7 +178,7 @@ type Service struct { // +kubebuilder:pruning:PreserveUnknownFields Telemetry *AnyConfig `json:"telemetry,omitempty" yaml:"telemetry,omitempty"` // +kubebuilder:pruning:PreserveUnknownFields - Pipelines AnyConfig `json:"pipelines" yaml:"pipelines"` + Pipelines map[string]*Pipeline `json:"pipelines" yaml:"pipelines"` } // MetricsPort gets the port number for the metrics endpoint from the collector config if it has been set. diff --git a/apis/v1beta1/config_test.go b/apis/v1beta1/config_test.go index cf148c5d91..c1ad6d59fe 100644 --- a/apis/v1beta1/config_test.go +++ b/apis/v1beta1/config_test.go @@ -145,11 +145,11 @@ func TestConfigYaml(t *testing.T) { "insights": "yeah!", }, }, - Pipelines: AnyConfig{ - Object: map[string]interface{}{ - "receivers": []string{"otlp"}, - "processors": []string{"modify_2000"}, - "exporters": []string{"otlp/exporter", "con"}, + Pipelines: map[string]*Pipeline{ + "traces": { + Receivers: []string{"otlp"}, + Processors: []string{"modify_2000"}, + Exporters: []string{"otlp/exporter", "con"}, }, }, }, @@ -173,13 +173,14 @@ service: telemetry: insights: yeah! pipelines: - exporters: - - otlp/exporter - - con - processors: - - modify_2000 - receivers: - - otlp + traces: + exporters: + - otlp/exporter + - con + processors: + - modify_2000 + receivers: + - otlp ` assert.Equal(t, expected, yamlCollector) @@ -278,3 +279,109 @@ func TestConfigToMetricsPort(t *testing.T) { }) } } + +func TestConfig_GetEnabledComponents(t *testing.T) { + tests := []struct { + name string + file string + want map[ComponentType]map[string]interface{} + }{ + + { + name: "connectors", + file: "testdata/otelcol-connectors.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: { + "foo": struct{}{}, + "count": struct{}{}, + }, + ComponentTypeProcessor: {}, + ComponentTypeExporter: { + "bar": struct{}{}, + "count": struct{}{}, + }, + }, + }, + { + name: "couchbase", + file: "testdata/otelcol-couchbase.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: { + "prometheus/couchbase": struct{}{}, + }, + ComponentTypeProcessor: { + "filter/couchbase": struct{}{}, + "metricstransform/couchbase": struct{}{}, + "transform/couchbase": struct{}{}, + }, + ComponentTypeExporter: { + "prometheus": struct{}{}, + }, + }, + }, + { + name: "demo", + file: "testdata/otelcol-demo.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: { + "otlp": struct{}{}, + }, + ComponentTypeProcessor: { + "batch": struct{}{}, + }, + ComponentTypeExporter: { + "debug": struct{}{}, + "zipkin": struct{}{}, + "otlp": struct{}{}, + "prometheus": struct{}{}, + }, + }, + }, + { + name: "extensions", + file: "testdata/otelcol-extensions.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: { + "otlp": struct{}{}, + }, + ComponentTypeProcessor: {}, + ComponentTypeExporter: { + "otlp/auth": struct{}{}, + }, + }, + }, + { + name: "filelog", + file: "testdata/otelcol-filelog.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: { + "filelog": struct{}{}, + }, + ComponentTypeProcessor: {}, + ComponentTypeExporter: { + "debug": struct{}{}, + }, + }, + }, + { + name: "null", + file: "testdata/otelcol-null-values.yaml", + want: map[ComponentType]map[string]interface{}{ + ComponentTypeReceiver: {}, + ComponentTypeProcessor: {}, + ComponentTypeExporter: {}, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + collectorYaml, err := os.ReadFile(tt.file) + require.NoError(t, err) + + c := &Config{} + err = go_yaml.Unmarshal(collectorYaml, c) + require.NoError(t, err) + assert.Equalf(t, tt.want, c.GetEnabledComponents(), "GetEnabledComponents()") + }) + } +} diff --git a/apis/v1beta1/opentelemetrycollector_types.go b/apis/v1beta1/opentelemetrycollector_types.go index f21637d7fe..4421165944 100644 --- a/apis/v1beta1/opentelemetrycollector_types.go +++ b/apis/v1beta1/opentelemetrycollector_types.go @@ -49,6 +49,7 @@ type OpenTelemetryCollector struct { Status OpenTelemetryCollectorStatus `json:"status,omitempty"` } +// Hub exists to allow for conversion. func (*OpenTelemetryCollector) Hub() {} //+kubebuilder:object:root=true diff --git a/apis/v1beta1/testdata/otelcol-connectors.yaml b/apis/v1beta1/testdata/otelcol-connectors.yaml index edc1d017f5..74f65eb2a8 100644 --- a/apis/v1beta1/testdata/otelcol-connectors.yaml +++ b/apis/v1beta1/testdata/otelcol-connectors.yaml @@ -17,7 +17,9 @@ service: pipelines: traces: receivers: [foo] + processors: [] exporters: [count] metrics: receivers: [count] + processors: [] exporters: [bar] diff --git a/apis/v1beta1/testdata/otelcol-filelog.yaml b/apis/v1beta1/testdata/otelcol-filelog.yaml index eaa18e2404..283bfc9184 100644 --- a/apis/v1beta1/testdata/otelcol-filelog.yaml +++ b/apis/v1beta1/testdata/otelcol-filelog.yaml @@ -81,4 +81,5 @@ service: pipelines: logs: receivers: [filelog] + processors: [] exporters: [debug] diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index 80cddf7dd0..c5e574127c 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -489,6 +489,36 @@ func (in *OpenTelemetryCommonFields) DeepCopy() *OpenTelemetryCommonFields { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Pipeline) DeepCopyInto(out *Pipeline) { + *out = *in + if in.Exporters != nil { + in, out := &in.Exporters, &out.Exporters + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Processors != nil { + in, out := &in.Processors, &out.Processors + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Receivers != nil { + in, out := &in.Receivers, &out.Receivers + *out = make([]string, len(*in)) + copy(*out, *in) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Pipeline. +func (in *Pipeline) DeepCopy() *Pipeline { + if in == nil { + return nil + } + out := new(Pipeline) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PodDisruptionBudgetSpec) DeepCopyInto(out *PodDisruptionBudgetSpec) { *out = *in @@ -606,7 +636,22 @@ func (in *Service) DeepCopyInto(out *Service) { in, out := &in.Telemetry, &out.Telemetry *out = (*in).DeepCopy() } - in.Pipelines.DeepCopyInto(&out.Pipelines) + if in.Pipelines != nil { + in, out := &in.Pipelines, &out.Pipelines + *out = make(map[string]*Pipeline, len(*in)) + for key, val := range *in { + var outVal *Pipeline + if val == nil { + (*out)[key] = nil + } else { + inVal := (*in)[key] + in, out := &inVal, &outVal + *out = new(Pipeline) + (*in).DeepCopyInto(*out) + } + (*out)[key] = outVal + } + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service. diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index 9facf2f1aa..5688544892 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -5522,6 +5522,25 @@ spec: type: string type: array pipelines: + additionalProperties: + properties: + exporters: + items: + type: string + type: array + processors: + items: + type: string + type: array + receivers: + items: + type: string + type: array + required: + - exporters + - processors + - receivers + type: object type: object x-kubernetes-preserve-unknown-fields: true telemetry: diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml index b17a8dede1..03a1360bfa 100644 --- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml +++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml @@ -5508,6 +5508,25 @@ spec: type: string type: array pipelines: + additionalProperties: + properties: + exporters: + items: + type: string + type: array + processors: + items: + type: string + type: array + receivers: + items: + type: string + type: array + required: + - exporters + - processors + - receivers + type: object type: object x-kubernetes-preserve-unknown-fields: true telemetry: diff --git a/controllers/builder_test.go b/controllers/builder_test.go index 5614b3fc80..5cf49c9cde 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -129,7 +129,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -151,7 +151,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -236,7 +236,7 @@ service: Annotations: nil, }, Data: map[string]string{ - "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n", + "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n processors: []\n receivers:\n - examplereceiver\n", }, }, &corev1.ServiceAccount{ @@ -376,7 +376,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -398,7 +398,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -483,7 +483,7 @@ service: Annotations: nil, }, Data: map[string]string{ - "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n", + "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n processors: []\n receivers:\n - examplereceiver\n", }, }, &corev1.ServiceAccount{ @@ -659,7 +659,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -681,7 +681,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "8f1dbf79c3a8d89f9799abcb169581e2de70318e00e10cac1cd71fe234185401", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -766,7 +766,7 @@ service: Annotations: nil, }, Data: map[string]string{ - "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n", + "collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n processors: []\n receivers:\n - examplereceiver\n", }, }, &corev1.Service{ @@ -1180,7 +1180,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "57434ab43283b8d3cd0b8584aad7f05226ec24225f28d93b3969d3d2ccf7d009", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1203,7 +1203,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "57434ab43283b8d3cd0b8584aad7f05226ec24225f28d93b3969d3d2ccf7d009", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1288,7 +1288,7 @@ service: Annotations: nil, }, Data: map[string]string{ - "collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n", + "collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n processors: []\n receivers:\n - prometheus\n", }, }, &corev1.ServiceAccount{ @@ -1574,7 +1574,7 @@ prometheus_cr: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "57434ab43283b8d3cd0b8584aad7f05226ec24225f28d93b3969d3d2ccf7d009", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1597,7 +1597,7 @@ prometheus_cr: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "57434ab43283b8d3cd0b8584aad7f05226ec24225f28d93b3969d3d2ccf7d009", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1682,7 +1682,7 @@ prometheus_cr: Annotations: nil, }, Data: map[string]string{ - "collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n", + "collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n processors: []\n receivers:\n - prometheus\n", }, }, &corev1.ServiceAccount{ diff --git a/docs/api.md b/docs/api.md index 8235f45406..ab95401ad4 100644 --- a/docs/api.md +++ b/docs/api.md @@ -30248,10 +30248,10 @@ The empty objects e.g. batch: should be written as batch: {} otherwise they won' - pipelines - object + pipelines + map[string]object - AnyConfig represent parts of the config.
+
true @@ -30272,6 +30272,47 @@ The empty objects e.g. batch: should be written as batch: {} otherwise they won' +### OpenTelemetryCollector.spec.config.service.pipelines[key] +[↩ Parent](#opentelemetrycollectorspecconfigservice) + + + +Pipeline is a struct of component type to a list of component IDs. + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescriptionRequired
exporters[]string +
+ 		true
processors[]string +
+ 		true
receivers[]string +
+ 		true
+ + ### OpenTelemetryCollector.spec.additionalContainers[index] [↩ Parent](#opentelemetrycollectorspec-1) diff --git a/pkg/collector/upgrade/v0_19_0_test.go b/pkg/collector/upgrade/v0_19_0_test.go index 63162e5dce..e925c07a67 100644 --- a/pkg/collector/upgrade/v0_19_0_test.go +++ b/pkg/collector/upgrade/v0_19_0_test.go @@ -149,6 +149,7 @@ service: pipelines: traces: receivers: [otlp] + processors: [] exporters: [otlp] `, res.Spec.Config) } diff --git a/pkg/collector/upgrade/v0_24_0_test.go b/pkg/collector/upgrade/v0_24_0_test.go index caf53bdfd2..2dc1341be9 100644 --- a/pkg/collector/upgrade/v0_24_0_test.go +++ b/pkg/collector/upgrade/v0_24_0_test.go @@ -88,6 +88,7 @@ service: pipelines: traces: receivers: [otlp] + processors: [] exporters: [otlp] `, res.Spec.Config) } diff --git a/pkg/collector/upgrade/v0_31_0_test.go b/pkg/collector/upgrade/v0_31_0_test.go index 861cdb492d..e1e290478c 100644 --- a/pkg/collector/upgrade/v0_31_0_test.go +++ b/pkg/collector/upgrade/v0_31_0_test.go @@ -83,6 +83,7 @@ service: metrics: exporters: - prometheusremotewrite + processors: [] receivers: - influxdb `, res.Spec.Config) diff --git a/pkg/collector/upgrade/v0_36_0_test.go b/pkg/collector/upgrade/v0_36_0_test.go index 7695d39c00..9dfaac1207 100644 --- a/pkg/collector/upgrade/v0_36_0_test.go +++ b/pkg/collector/upgrade/v0_36_0_test.go @@ -120,6 +120,7 @@ service: traces: exporters: - otlp + processors: [] receivers: - otlp/mtls `, res.Spec.Config) diff --git a/pkg/collector/upgrade/v0_38_0_test.go b/pkg/collector/upgrade/v0_38_0_test.go index 26e3d69bbb..afb105af4f 100644 --- a/pkg/collector/upgrade/v0_38_0_test.go +++ b/pkg/collector/upgrade/v0_38_0_test.go @@ -100,6 +100,7 @@ service: traces: exporters: - otlp + processors: [] receivers: - otlp/mtls telemetry: @@ -124,6 +125,7 @@ service: traces: exporters: - otlp + processors: [] receivers: - otlp/mtls telemetry: diff --git a/pkg/collector/upgrade/v0_39_0_test.go b/pkg/collector/upgrade/v0_39_0_test.go index 204c576c8a..4fbb3f01f8 100644 --- a/pkg/collector/upgrade/v0_39_0_test.go +++ b/pkg/collector/upgrade/v0_39_0_test.go @@ -101,6 +101,7 @@ service: metrics: exporters: - debug + processors: [] receivers: - apache/mtls - apache @@ -164,6 +165,7 @@ service: traces: exporters: - debug + processors: [] receivers: - otlp/mtls - otlp diff --git a/pkg/collector/upgrade/v0_41_0_test.go b/pkg/collector/upgrade/v0_41_0_test.go index 01903044a5..496a864549 100644 --- a/pkg/collector/upgrade/v0_41_0_test.go +++ b/pkg/collector/upgrade/v0_41_0_test.go @@ -87,6 +87,7 @@ service: metrics: exporters: - debug + processors: [] receivers: - otlp `, res.Spec.Config) @@ -138,6 +139,7 @@ service: metrics: exporters: - debug + processors: [] receivers: - otlp `, res.Spec.Config) diff --git a/pkg/collector/upgrade/v0_43_0_test.go b/pkg/collector/upgrade/v0_43_0_test.go index 348b1d0b96..a71e0137c0 100644 --- a/pkg/collector/upgrade/v0_43_0_test.go +++ b/pkg/collector/upgrade/v0_43_0_test.go @@ -61,6 +61,7 @@ service: pipelines: traces: receivers: [otlp/mtls] + processors: [] exporters: [otlp] `, }, @@ -98,6 +99,7 @@ service: traces: exporters: - otlp + processors: [] receivers: - otlp/mtls telemetry: @@ -119,6 +121,7 @@ service: traces: exporters: - otlp + processors: [] receivers: - otlp/mtls telemetry: diff --git a/pkg/collector/upgrade/v0_57_2_test.go b/pkg/collector/upgrade/v0_57_2_test.go index a3ca59919c..8d1e49587e 100644 --- a/pkg/collector/upgrade/v0_57_2_test.go +++ b/pkg/collector/upgrade/v0_57_2_test.go @@ -96,6 +96,7 @@ service: metrics: exporters: - debug + processors: [] receivers: - otlp `, upgradedInstance.Spec.Config)