From 9605bb88fe8398ca86c506eafec3433386080b03 Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 5 Feb 2025 07:15:54 -0500 Subject: [PATCH 1/2] Replcate Deprecated Address Field With Readers Signed-off-by: Mahad Zaryab --- cmd/jaeger/config-badger.yaml | 7 ++++++- cmd/jaeger/config-cassandra.yaml | 7 ++++++- cmd/jaeger/config-elasticsearch.yaml | 7 ++++++- cmd/jaeger/config-kafka-collector.yaml | 7 ++++++- cmd/jaeger/config-kafka-ingester.yaml | 8 +++++++- cmd/jaeger/config-opensearch.yaml | 7 ++++++- cmd/jaeger/config-remote-storage.yaml | 7 ++++++- cmd/jaeger/config-spm.yaml | 7 ++++++- cmd/jaeger/config-tail-sampling-always-sample.yaml | 7 ++++++- cmd/jaeger/config-tail-sampling-service-name-policy.yaml | 7 ++++++- cmd/jaeger/config.yaml | 7 ++++++- 11 files changed, 67 insertions(+), 11 deletions(-) diff --git a/cmd/jaeger/config-badger.yaml b/cmd/jaeger/config-badger.yaml index b2dae4891a9..f2d744309fc 100644 --- a/cmd/jaeger/config-badger.yaml +++ b/cmd/jaeger/config-badger.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: info # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-cassandra.yaml b/cmd/jaeger/config-cassandra.yaml index 4b55737f624..ef6b7757c14 100644 --- a/cmd/jaeger/config-cassandra.yaml +++ b/cmd/jaeger/config-cassandra.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-elasticsearch.yaml b/cmd/jaeger/config-elasticsearch.yaml index 66c3f5e3a81..07f6ff28cde 100644 --- a/cmd/jaeger/config-elasticsearch.yaml +++ b/cmd/jaeger/config-elasticsearch.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-kafka-collector.yaml b/cmd/jaeger/config-kafka-collector.yaml index b04e05d177b..def8931ad39 100644 --- a/cmd/jaeger/config-kafka-collector.yaml +++ b/cmd/jaeger/config-kafka-collector.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger_collector metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 extensions: healthcheckv2: diff --git a/cmd/jaeger/config-kafka-ingester.yaml b/cmd/jaeger/config-kafka-ingester.yaml index 4a5c22605ed..bbeb4574a42 100644 --- a/cmd/jaeger/config-kafka-ingester.yaml +++ b/cmd/jaeger/config-kafka-ingester.yaml @@ -10,7 +10,13 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 + logs: level: info diff --git a/cmd/jaeger/config-opensearch.yaml b/cmd/jaeger/config-opensearch.yaml index 918959529ac..28c8c175806 100644 --- a/cmd/jaeger/config-opensearch.yaml +++ b/cmd/jaeger/config-opensearch.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-remote-storage.yaml b/cmd/jaeger/config-remote-storage.yaml index 966812aaffb..96228ff0f05 100644 --- a/cmd/jaeger/config-remote-storage.yaml +++ b/cmd/jaeger/config-remote-storage.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-spm.yaml b/cmd/jaeger/config-spm.yaml index 86d6a64576a..0d7813e6a22 100644 --- a/cmd/jaeger/config-spm.yaml +++ b/cmd/jaeger/config-spm.yaml @@ -13,7 +13,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: DEBUG diff --git a/cmd/jaeger/config-tail-sampling-always-sample.yaml b/cmd/jaeger/config-tail-sampling-always-sample.yaml index a3064f7b69c..f56d12beaf7 100644 --- a/cmd/jaeger/config-tail-sampling-always-sample.yaml +++ b/cmd/jaeger/config-tail-sampling-always-sample.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config-tail-sampling-service-name-policy.yaml b/cmd/jaeger/config-tail-sampling-service-name-policy.yaml index 3478a9ff39d..3f7a5ce1cc1 100644 --- a/cmd/jaeger/config-tail-sampling-service-name-policy.yaml +++ b/cmd/jaeger/config-tail-sampling-service-name-policy.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. diff --git a/cmd/jaeger/config.yaml b/cmd/jaeger/config.yaml index f3593342cbe..bfdce03a31c 100644 --- a/cmd/jaeger/config.yaml +++ b/cmd/jaeger/config.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: 0.0.0.0:8888 + readers: + - pull: + exporter: + prometheus: + host: 0.0.0.0 + port: 8888 logs: level: debug # TODO Initialize telemetry tracer once OTEL released new feature. From 9fa3bac83e8490d22f3b5345f6b4686d61530ed6 Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Wed, 5 Feb 2025 16:53:27 -0500 Subject: [PATCH 2/2] Fix all-in-one.yaml Signed-off-by: Mahad Zaryab --- cmd/jaeger/internal/all-in-one.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/jaeger/internal/all-in-one.yaml b/cmd/jaeger/internal/all-in-one.yaml index 70fe648660d..3b399c2f6c6 100644 --- a/cmd/jaeger/internal/all-in-one.yaml +++ b/cmd/jaeger/internal/all-in-one.yaml @@ -10,7 +10,12 @@ service: service.name: jaeger metrics: level: detailed - address: "${env:JAEGER_LISTEN_HOST:-localhost}:8888" + readers: + - pull: + exporter: + prometheus: + host: "${env:JAEGER_LISTEN_HOST:-localhost}" + port: 8888 logs: level: info # TODO Initialize telemetry tracer once OTEL released new feature.