From f85ca677f0125bd23511f1d7ea0d25dfe0579274 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:00:00 -0600 Subject: [PATCH 1/7] Remove references to the logging exporter --- .../config/config_test.go | 2 +- cmd/otel-allocator/README.md | 4 ++-- config/samples/_v1alpha1_opampbridge.yaml | 2 +- controllers/builder_test.go | 22 +++++++++---------- controllers/suite_test.go | 2 +- controllers/testdata/test.yaml | 4 ++-- controllers/testdata/test_ta_update.yaml | 4 ++-- .../collector/testdata/ingress_testdata.yaml | 4 ++-- .../manifests/opampbridge/configmap_test.go | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/operator-opamp-bridge/config/config_test.go b/cmd/operator-opamp-bridge/config/config_test.go index abcc4fcae7..0866d470fb 100644 --- a/cmd/operator-opamp-bridge/config/config_test.go +++ b/cmd/operator-opamp-bridge/config/config_test.go @@ -118,7 +118,7 @@ func TestLoad(t *testing.T) { "batch", }, "exporters": { - "logging", + "debug", }, }, }, diff --git a/cmd/otel-allocator/README.md b/cmd/otel-allocator/README.md index 230ec8f269..0b10a85614 100644 --- a/cmd/otel-allocator/README.md +++ b/cmd/otel-allocator/README.md @@ -109,13 +109,13 @@ spec: - targets: [ '0.0.0.0:8888' ] exporters: - logging: {} + debug: {} service: pipelines: metrics: receivers: [prometheus] - exporters: [logging] + exporters: [debug] ``` In essence, Prometheus Receiver configs are overridden with a `http_sd_config` directive that points to the diff --git a/config/samples/_v1alpha1_opampbridge.yaml b/config/samples/_v1alpha1_opampbridge.yaml index 7e18e320f4..b4cfa27e0f 100644 --- a/config/samples/_v1alpha1_opampbridge.yaml +++ b/config/samples/_v1alpha1_opampbridge.yaml @@ -22,4 +22,4 @@ spec: processors: - memory_limiter exporters: - - logging + - debug diff --git a/controllers/builder_test.go b/controllers/builder_test.go index 2c5070fa84..b48638b16f 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -77,12 +77,12 @@ func TestBuildCollector(t *testing.T) { examplereceiver: endpoint: "0.0.0.0:12345" exporters: - logging: + debug: service: pipelines: metrics: receivers: [examplereceiver] - exporters: [logging] + exporters: [debug] ` goodConfig := v1beta1.Config{} @@ -270,7 +270,7 @@ service: Annotations: map[string]string{}, }, 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 debug: null\nservice:\n pipelines:\n metrics:\n exporters:\n - debug\n receivers:\n - examplereceiver\n", }, }, &corev1.ServiceAccount{ @@ -548,7 +548,7 @@ service: Annotations: map[string]string{}, }, 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 debug: null\nservice:\n pipelines:\n metrics:\n exporters:\n - debug\n receivers:\n - examplereceiver\n", }, }, &corev1.ServiceAccount{ @@ -862,7 +862,7 @@ service: Annotations: map[string]string{}, }, 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 debug: null\nservice:\n pipelines:\n metrics:\n exporters:\n - debug\n receivers:\n - examplereceiver\n", }, }, &corev1.Service{ @@ -1010,7 +1010,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) { v1alpha1.OpAMPBridgeCapabilityReportsHealth: true, v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true, }, - ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}}, + ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}}, }, }, }, @@ -1125,7 +1125,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) { ReportsStatus: true componentsAllowed: exporters: - - logging + - debug processors: - memory_limiter receivers: @@ -1218,12 +1218,12 @@ receivers: target_label: 'job' replacement: '$$1_$2' exporters: - logging: + debug: service: pipelines: metrics: receivers: [prometheus] - exporters: [logging] + exporters: [debug] ` goodConfig := v1beta1.Config{} @@ -1421,7 +1421,7 @@ service: Annotations: map[string]string{}, }, 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.test.svc.cluster.local:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n", + "collector.yaml": "exporters:\n debug: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator.test.svc.cluster.local:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - debug\n receivers:\n - prometheus\n", }, }, &corev1.ServiceAccount{ @@ -1878,7 +1878,7 @@ prometheus_cr: Annotations: map[string]string{}, }, 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.test.svc.cluster.local:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n", + "collector.yaml": "exporters:\n debug: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator.test.svc.cluster.local:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - debug\n receivers:\n - prometheus\n", }, }, &corev1.ServiceAccount{ diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 219043c4a8..0836809719 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -463,7 +463,7 @@ func opampBridgeParams() manifests.Params { v1alpha1.OpAMPBridgeCapabilityReportsHealth: true, v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true, }, - ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}}, + ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}}, }, }, Scheme: testScheme, diff --git a/controllers/testdata/test.yaml b/controllers/testdata/test.yaml index d23cad6f44..09908dd95c 100644 --- a/controllers/testdata/test.yaml +++ b/controllers/testdata/test.yaml @@ -12,10 +12,10 @@ receivers: - targets: [ '0.0.0.0:8888', '0.0.0.0:9999' ] exporters: - logging: + debug: service: pipelines: metrics: receivers: [prometheus, jaeger] - exporters: [logging] \ No newline at end of file + exporters: [debug] \ No newline at end of file diff --git a/controllers/testdata/test_ta_update.yaml b/controllers/testdata/test_ta_update.yaml index 57677928d5..3ec21812c5 100644 --- a/controllers/testdata/test_ta_update.yaml +++ b/controllers/testdata/test_ta_update.yaml @@ -12,10 +12,10 @@ receivers: - targets: [ '0.0.0.0:8888', '0.0.0.0:9999', '0.0.0.0:10100' ] exporters: - logging: + debug: service: pipelines: metrics: receivers: [prometheus, jaeger] - exporters: [logging] \ No newline at end of file + exporters: [debug] \ No newline at end of file diff --git a/internal/manifests/collector/testdata/ingress_testdata.yaml b/internal/manifests/collector/testdata/ingress_testdata.yaml index 715d16520a..1d82e586e6 100644 --- a/internal/manifests/collector/testdata/ingress_testdata.yaml +++ b/internal/manifests/collector/testdata/ingress_testdata.yaml @@ -9,8 +9,8 @@ receivers: grpc: endpoint: 0.0.0.0:98765 exporters: - logging: - loglevel: debug + debug: + verbosity: detailed service: pipelines: diff --git a/internal/manifests/opampbridge/configmap_test.go b/internal/manifests/opampbridge/configmap_test.go index b38ca6bea3..91ee5dba91 100644 --- a/internal/manifests/opampbridge/configmap_test.go +++ b/internal/manifests/opampbridge/configmap_test.go @@ -52,7 +52,7 @@ func TestDesiredConfigMap(t *testing.T) { ReportsStatus: true componentsAllowed: exporters: - - logging + - debug processors: - memory_limiter receivers: @@ -109,7 +109,7 @@ headers: v1alpha1.OpAMPBridgeCapabilityReportsHealth: true, v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true, }, - ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}}, + ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}}, }, } From a07855689c3bfcae840ccb0daba7f76c3e9d907f Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:07:26 -0600 Subject: [PATCH 2/7] Fix test --- .../config/testdata/agentbasiccomponentsallowed.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml b/cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml index 73d5683a3d..c994ad122b 100644 --- a/cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml +++ b/cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml @@ -19,4 +19,4 @@ componentsAllowed: - memory_limiter - batch exporters: - - logging + - debug From c9462004d2313efd47810da8eb6b3c85f73105c4 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:15:11 -0600 Subject: [PATCH 3/7] Update sha256s --- controllers/builder_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/builder_test.go b/controllers/builder_test.go index b48638b16f..e29e8a6356 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -152,7 +152,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1029,7 +1029,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) { "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-opampbridge-config/hash": "bd5cfc0df684966e25597a2847d5a3bae2c2b037d8bf10e7ea402ebe4d41c9f0", + "opentelemetry-opampbridge-config/hash": "05e1dc681267a9bc28fc2877ab464a98b9bd043843f14ffc0b4a394b5c86ba9f", }, }, Spec: appsv1.DeploymentSpec{ @@ -1303,7 +1303,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "42773025f65feaf30df59a306a9e38f1aaabe94c8310983beaddb7f648d699b0", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", @@ -1760,7 +1760,7 @@ prometheus_cr: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43", + "opentelemetry-operator-config/sha256": "42773025f65feaf30df59a306a9e38f1aaabe94c8310983beaddb7f648d699b0", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", From 97caf13b36ba95f43db1cdd893adfc9895db51cf Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:26:22 -0600 Subject: [PATCH 4/7] Update sha256s --- controllers/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/builder_test.go b/controllers/builder_test.go index e29e8a6356..3b6fa3c444 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -430,7 +430,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", From ee706157d838f0c5e56e2cf5c6ce14b2ba4373e3 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:00:46 -0600 Subject: [PATCH 5/7] Update sha256s --- controllers/builder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/builder_test.go b/controllers/builder_test.go index 3b6fa3c444..da3e4874f1 100644 --- a/controllers/builder_test.go +++ b/controllers/builder_test.go @@ -744,7 +744,7 @@ service: "app.kubernetes.io/version": "latest", }, Annotations: map[string]string{ - "opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8", + "opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25", "prometheus.io/path": "/metrics", "prometheus.io/port": "8888", "prometheus.io/scrape": "true", From f64526153d7ef008f393388973c01c304c855858 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:08:34 -0600 Subject: [PATCH 6/7] make bundle --- .../opentelemetry-operator.clusterserviceversion.yaml | 6 +++--- .../opentelemetry-operator.clusterserviceversion.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml index 037171d74a..0142fd4e9b 100644 --- a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -38,7 +38,7 @@ metadata: }, "componentsAllowed": { "exporters": [ - "logging" + "debug" ], "processors": [ "memory_limiter" @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-08-27T07:26:20Z" + createdAt: "2024-09-03T20:07:34Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -479,7 +479,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0-33-gee706157 livenessProbe: httpGet: path: /healthz diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml index 96927cf2be..2d08d6b42d 100644 --- a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -38,7 +38,7 @@ metadata: }, "componentsAllowed": { "exporters": [ - "logging" + "debug" ], "processors": [ "memory_limiter" @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-08-27T07:26:23Z" + createdAt: "2024-09-03T20:07:42Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -483,7 +483,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0-33-gee706157 livenessProbe: httpGet: path: /healthz From 5be463036ba74d1d9c421619a404b3218b6504fe Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:26:04 -0600 Subject: [PATCH 7/7] make bundle --- .../opentelemetry-operator.clusterserviceversion.yaml | 4 ++-- .../opentelemetry-operator.clusterserviceversion.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml index 0142fd4e9b..6875f49a6c 100644 --- a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-09-03T20:07:34Z" + createdAt: "2024-09-03T20:25:40Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -479,7 +479,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0-33-gee706157 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0 livenessProbe: httpGet: path: /healthz diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml index 2d08d6b42d..b6ec3f9ac0 100644 --- a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-09-03T20:07:42Z" + createdAt: "2024-09-03T20:25:47Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -483,7 +483,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0-33-gee706157 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.107.0 livenessProbe: httpGet: path: /healthz