Skip to content

Commit 7a8c9c8

Browse files
authored
[chore] Remove references to the logging exporter (#3259)
* Remove references to the logging exporter * Fix test * Update sha256s * Update sha256s
1 parent 629aed5 commit 7a8c9c8

File tree

12 files changed

+35
-35
lines changed

12 files changed

+35
-35
lines changed

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadata:
3838
},
3939
"componentsAllowed": {
4040
"exporters": [
41-
"logging"
41+
"debug"
4242
],
4343
"processors": [
4444
"memory_limiter"
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-08-27T07:26:20Z"
102+
createdAt: "2024-09-03T20:25:40Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadata:
3838
},
3939
"componentsAllowed": {
4040
"exporters": [
41-
"logging"
41+
"debug"
4242
],
4343
"processors": [
4444
"memory_limiter"
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-08-27T07:26:23Z"
102+
createdAt: "2024-09-03T20:25:47Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

cmd/operator-opamp-bridge/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestLoad(t *testing.T) {
118118
"batch",
119119
},
120120
"exporters": {
121-
"logging",
121+
"debug",
122122
},
123123
},
124124
},

cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ componentsAllowed:
1919
- memory_limiter
2020
- batch
2121
exporters:
22-
- logging
22+
- debug

cmd/otel-allocator/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ spec:
109109
- targets: [ '0.0.0.0:8888' ]
110110

111111
exporters:
112-
logging: {}
112+
debug: {}
113113

114114
service:
115115
pipelines:
116116
metrics:
117117
receivers: [prometheus]
118-
exporters: [logging]
118+
exporters: [debug]
119119
```
120120
121121
In essence, Prometheus Receiver configs are overridden with a `http_sd_config` directive that points to the

config/samples/_v1alpha1_opampbridge.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ spec:
2222
processors:
2323
- memory_limiter
2424
exporters:
25-
- logging
25+
- debug

controllers/builder_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ func TestBuildCollector(t *testing.T) {
7777
examplereceiver:
7878
endpoint: "0.0.0.0:12345"
7979
exporters:
80-
logging:
80+
debug:
8181
service:
8282
pipelines:
8383
metrics:
8484
receivers: [examplereceiver]
85-
exporters: [logging]
85+
exporters: [debug]
8686
`
8787

8888
goodConfig := v1beta1.Config{}
@@ -152,7 +152,7 @@ service:
152152
"app.kubernetes.io/version": "latest",
153153
},
154154
Annotations: map[string]string{
155-
"opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8",
155+
"opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25",
156156
"prometheus.io/path": "/metrics",
157157
"prometheus.io/port": "8888",
158158
"prometheus.io/scrape": "true",
@@ -270,7 +270,7 @@ service:
270270
Annotations: map[string]string{},
271271
},
272272
Data: map[string]string{
273-
"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",
273+
"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",
274274
},
275275
},
276276
&corev1.ServiceAccount{
@@ -430,7 +430,7 @@ service:
430430
"app.kubernetes.io/version": "latest",
431431
},
432432
Annotations: map[string]string{
433-
"opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8",
433+
"opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25",
434434
"prometheus.io/path": "/metrics",
435435
"prometheus.io/port": "8888",
436436
"prometheus.io/scrape": "true",
@@ -548,7 +548,7 @@ service:
548548
Annotations: map[string]string{},
549549
},
550550
Data: map[string]string{
551-
"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",
551+
"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",
552552
},
553553
},
554554
&corev1.ServiceAccount{
@@ -744,7 +744,7 @@ service:
744744
"app.kubernetes.io/version": "latest",
745745
},
746746
Annotations: map[string]string{
747-
"opentelemetry-operator-config/sha256": "6f6f11da374b2c1e42fc78fbe55e2d9bcc2f5998ab63a631b49c478e8c0f6af8",
747+
"opentelemetry-operator-config/sha256": "2d266e55025628659355f1271b689d6fb53648ef6cd5595831f5835d18e59a25",
748748
"prometheus.io/path": "/metrics",
749749
"prometheus.io/port": "8888",
750750
"prometheus.io/scrape": "true",
@@ -862,7 +862,7 @@ service:
862862
Annotations: map[string]string{},
863863
},
864864
Data: map[string]string{
865-
"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",
865+
"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",
866866
},
867867
},
868868
&corev1.Service{
@@ -1010,7 +1010,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) {
10101010
v1alpha1.OpAMPBridgeCapabilityReportsHealth: true,
10111011
v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true,
10121012
},
1013-
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}},
1013+
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}},
10141014
},
10151015
},
10161016
},
@@ -1029,7 +1029,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) {
10291029
"app.kubernetes.io/version": "latest",
10301030
},
10311031
Annotations: map[string]string{
1032-
"opentelemetry-opampbridge-config/hash": "bd5cfc0df684966e25597a2847d5a3bae2c2b037d8bf10e7ea402ebe4d41c9f0",
1032+
"opentelemetry-opampbridge-config/hash": "05e1dc681267a9bc28fc2877ab464a98b9bd043843f14ffc0b4a394b5c86ba9f",
10331033
},
10341034
},
10351035
Spec: appsv1.DeploymentSpec{
@@ -1125,7 +1125,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) {
11251125
ReportsStatus: true
11261126
componentsAllowed:
11271127
exporters:
1128-
- logging
1128+
- debug
11291129
processors:
11301130
- memory_limiter
11311131
receivers:
@@ -1218,12 +1218,12 @@ receivers:
12181218
target_label: 'job'
12191219
replacement: '$$1_$2'
12201220
exporters:
1221-
logging:
1221+
debug:
12221222
service:
12231223
pipelines:
12241224
metrics:
12251225
receivers: [prometheus]
1226-
exporters: [logging]
1226+
exporters: [debug]
12271227
`
12281228

12291229
goodConfig := v1beta1.Config{}
@@ -1303,7 +1303,7 @@ service:
13031303
"app.kubernetes.io/version": "latest",
13041304
},
13051305
Annotations: map[string]string{
1306-
"opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43",
1306+
"opentelemetry-operator-config/sha256": "42773025f65feaf30df59a306a9e38f1aaabe94c8310983beaddb7f648d699b0",
13071307
"prometheus.io/path": "/metrics",
13081308
"prometheus.io/port": "8888",
13091309
"prometheus.io/scrape": "true",
@@ -1421,7 +1421,7 @@ service:
14211421
Annotations: map[string]string{},
14221422
},
14231423
Data: map[string]string{
1424-
"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",
1424+
"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",
14251425
},
14261426
},
14271427
&corev1.ServiceAccount{
@@ -1760,7 +1760,7 @@ prometheus_cr:
17601760
"app.kubernetes.io/version": "latest",
17611761
},
17621762
Annotations: map[string]string{
1763-
"opentelemetry-operator-config/sha256": "39cae697770f9d7e183e8fa9ba56043315b62e19c7231537870acfaaabc30a43",
1763+
"opentelemetry-operator-config/sha256": "42773025f65feaf30df59a306a9e38f1aaabe94c8310983beaddb7f648d699b0",
17641764
"prometheus.io/path": "/metrics",
17651765
"prometheus.io/port": "8888",
17661766
"prometheus.io/scrape": "true",
@@ -1878,7 +1878,7 @@ prometheus_cr:
18781878
Annotations: map[string]string{},
18791879
},
18801880
Data: map[string]string{
1881-
"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",
1881+
"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",
18821882
},
18831883
},
18841884
&corev1.ServiceAccount{

controllers/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ func opampBridgeParams() manifests.Params {
463463
v1alpha1.OpAMPBridgeCapabilityReportsHealth: true,
464464
v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true,
465465
},
466-
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}},
466+
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}},
467467
},
468468
},
469469
Scheme: testScheme,

controllers/testdata/test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ receivers:
1212
- targets: [ '0.0.0.0:8888', '0.0.0.0:9999' ]
1313

1414
exporters:
15-
logging:
15+
debug:
1616

1717
service:
1818
pipelines:
1919
metrics:
2020
receivers: [prometheus, jaeger]
21-
exporters: [logging]
21+
exporters: [debug]

controllers/testdata/test_ta_update.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ receivers:
1212
- targets: [ '0.0.0.0:8888', '0.0.0.0:9999', '0.0.0.0:10100' ]
1313

1414
exporters:
15-
logging:
15+
debug:
1616

1717
service:
1818
pipelines:
1919
metrics:
2020
receivers: [prometheus, jaeger]
21-
exporters: [logging]
21+
exporters: [debug]

internal/manifests/collector/testdata/ingress_testdata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ receivers:
99
grpc:
1010
endpoint: 0.0.0.0:98765
1111
exporters:
12-
logging:
13-
loglevel: debug
12+
debug:
13+
verbosity: detailed
1414

1515
service:
1616
pipelines:

internal/manifests/opampbridge/configmap_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestDesiredConfigMap(t *testing.T) {
5252
ReportsStatus: true
5353
componentsAllowed:
5454
exporters:
55-
- logging
55+
- debug
5656
processors:
5757
- memory_limiter
5858
receivers:
@@ -109,7 +109,7 @@ headers:
109109
v1alpha1.OpAMPBridgeCapabilityReportsHealth: true,
110110
v1alpha1.OpAMPBridgeCapabilityReportsRemoteConfig: true,
111111
},
112-
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"logging"}},
112+
ComponentsAllowed: map[string][]string{"receivers": {"otlp"}, "processors": {"memory_limiter"}, "exporters": {"debug"}},
113113
},
114114
}
115115

0 commit comments

Comments
 (0)