[chore] Remove references to the logging exporter (#3259)

* Remove references to the logging exporter * Fix test * Update sha256s * Update sha256s
open-telemetry · Sep 3, 2024 · 7a8c9c8 · 7a8c9c8
1 parent 629aed5
commit 7a8c9c8
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git 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: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

diff --git 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: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

diff --git 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/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
diff --git 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
@@ -22,4 +22,4 @@ spec:
     processors:
     - memory_limiter
     exporters:
-    - logging
+    - debug
diff --git 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{}
@@ -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",
@@ -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{
@@ -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",
@@ -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{
@@ -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",
@@ -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"}},
 					},
 				},
 			},
@@ -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{
@@ -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{}
@@ -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",
@@ -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{
@@ -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",
@@ -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
@@ -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
@@ -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]
+      exporters: [debug]
diff --git 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]
+      exporters: [debug]
diff --git 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
@@ -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"}},
 				},
 			}