Skip to content

[chore] Remove references to the logging exporter #3259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 3, 2024
Merged

[chore] Remove references to the logging exporter #3259

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f85ca67
Remove references to the logging exporter
TylerHelmuth Sep 3, 2024
a078556
Fix test
TylerHelmuth Sep 3, 2024
c946200
Update sha256s
TylerHelmuth Sep 3, 2024
15368a6
Merge branch 'main' into remove-logging-exporter-references
TylerHelmuth Sep 3, 2024
97caf13
Update sha256s
TylerHelmuth Sep 3, 2024
ee70615
Update sha256s
TylerHelmuth Sep 3, 2024
f645261
make bundle
TylerHelmuth Sep 3, 2024
5be4630
make bundle
TylerHelmuth Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/operator-opamp-bridge/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestLoad(t *testing.T) {
"batch",
},
"exporters": {
"logging",
"debug",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-opamp-bridge/config/testdata/agentbasiccomponentsallowed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ componentsAllowed:
- memory_limiter
- batch
exporters:
- logging
- debug
4 changes: 2 additions & 2 deletions cmd/otel-allocator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/samples/_v1alpha1_opampbridge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ spec:
processors:
- memory_limiter
exporters:
- logging
- debug
32 changes: 16 additions & 16 deletions controllers/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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"}},
},
},
},
Expand All @@ -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{
Expand Down Expand Up @@ -1125,7 +1125,7 @@ func TestBuildAll_OpAMPBridge(t *testing.T) {
ReportsStatus: true
componentsAllowed:
exporters:
- logging
- debug
processors:
- memory_limiter
receivers:
Expand Down Expand Up @@ -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{}
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions controllers/testdata/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 2 additions & 2 deletions controllers/testdata/test_ta_update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 2 additions & 2 deletions internal/manifests/collector/testdata/ingress_testdata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ receivers:
grpc:
endpoint: 0.0.0.0:98765
exporters:
logging:
loglevel: debug
debug:
verbosity: detailed

service:
pipelines:
Expand Down
4 changes: 2 additions & 2 deletions internal/manifests/opampbridge/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestDesiredConfigMap(t *testing.T) {
ReportsStatus: true
componentsAllowed:
exporters:
- logging
- debug
processors:
- memory_limiter
receivers:
Expand Down Expand Up @@ -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"}},
},
}

Expand Down