From 2fa265b87125feb7cbce799b6475b456301665df Mon Sep 17 00:00:00 2001 From: carsontham Date: Wed, 17 Sep 2025 01:19:52 +0800 Subject: [PATCH 1/4] removed reference to collector's batch processor --- test/integration/configs/otelcol-config-4017.yml | 6 ++---- test/integration/configs/otelcol-config.yml | 6 ++---- test/oats/http/configs/otelcol-config.yaml | 12 ++++++------ test/oats/kafka/configs/otelcol-config.yaml | 12 ++++++------ test/oats/mongo/configs/otelcol-config.yaml | 12 ++++++------ test/oats/redis/configs/otelcol-config.yaml | 12 ++++++------ test/oats/sql/configs/otelcol-config.yaml | 12 ++++++------ 7 files changed, 34 insertions(+), 38 deletions(-) diff --git a/test/integration/configs/otelcol-config-4017.yml b/test/integration/configs/otelcol-config-4017.yml index 986d895aa..45800aef6 100644 --- a/test/integration/configs/otelcol-config-4017.yml +++ b/test/integration/configs/otelcol-config-4017.yml @@ -16,14 +16,12 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true -processors: - batch: - timeout: 0 + sending_queue: + batch: service: pipelines: metrics: receivers: [otlp] - processors: [batch] exporters: [prometheus] # telemetry: # logs: diff --git a/test/integration/configs/otelcol-config.yml b/test/integration/configs/otelcol-config.yml index 8381276f2..7fc0d6a23 100644 --- a/test/integration/configs/otelcol-config.yml +++ b/test/integration/configs/otelcol-config.yml @@ -16,14 +16,12 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true -processors: - batch: - timeout: 0 + sending_queue: + batch: service: pipelines: metrics: receivers: [otlp] - processors: [batch] exporters: [prometheus] # telemetry: # logs: diff --git a/test/oats/http/configs/otelcol-config.yaml b/test/oats/http/configs/otelcol-config.yaml index e17f8d6e2..92f2e42cf 100644 --- a/test/oats/http/configs/otelcol-config.yaml +++ b/test/oats/http/configs/otelcol-config.yaml @@ -10,9 +10,6 @@ receivers: - "http://*" - "https://*" -processors: - batch: - exporters: debug: verbosity: detailed @@ -21,27 +18,30 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true + sending_queue: + batch: otlp: endpoint: tempo:4317 tls: insecure: true + sending_queue: + batch: loki: endpoint: http://loki:3100/loki/api/v1/push + sending_queue: + batch: service: pipelines: traces: receivers: [otlp] - processors: [batch] #exporters: [otlp] exporters: [otlp,debug] metrics: receivers: [otlp] - processors: [batch] #exporters: [prometheusremotewrite] exporters: [prometheusremotewrite,debug] logs: receivers: [otlp] - processors: [batch] exporters: [loki] #exporters: [loki,logging/logs] diff --git a/test/oats/kafka/configs/otelcol-config.yaml b/test/oats/kafka/configs/otelcol-config.yaml index b830bc605..edd0bbcda 100644 --- a/test/oats/kafka/configs/otelcol-config.yaml +++ b/test/oats/kafka/configs/otelcol-config.yaml @@ -4,19 +4,22 @@ receivers: grpc: http: -processors: - batch: - exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true + sending_queue: + batch: otlp: endpoint: tempo:4317 tls: insecure: true + sending_queue: + batch: loki: endpoint: http://loki:3100/loki/api/v1/push + sending_queue: + batch: logging/metrics: verbosity: detailed logging/traces: @@ -28,16 +31,13 @@ service: pipelines: traces: receivers: [otlp] - processors: [batch] #exporters: [otlp] exporters: [otlp,logging/traces] metrics: receivers: [otlp] - processors: [batch] exporters: [prometheusremotewrite] #exporters: [prometheusremotewrite,logging/metrics] logs: receivers: [otlp] - processors: [batch] exporters: [loki] #exporters: [loki,logging/logs] diff --git a/test/oats/mongo/configs/otelcol-config.yaml b/test/oats/mongo/configs/otelcol-config.yaml index e17f8d6e2..92f2e42cf 100644 --- a/test/oats/mongo/configs/otelcol-config.yaml +++ b/test/oats/mongo/configs/otelcol-config.yaml @@ -10,9 +10,6 @@ receivers: - "http://*" - "https://*" -processors: - batch: - exporters: debug: verbosity: detailed @@ -21,27 +18,30 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true + sending_queue: + batch: otlp: endpoint: tempo:4317 tls: insecure: true + sending_queue: + batch: loki: endpoint: http://loki:3100/loki/api/v1/push + sending_queue: + batch: service: pipelines: traces: receivers: [otlp] - processors: [batch] #exporters: [otlp] exporters: [otlp,debug] metrics: receivers: [otlp] - processors: [batch] #exporters: [prometheusremotewrite] exporters: [prometheusremotewrite,debug] logs: receivers: [otlp] - processors: [batch] exporters: [loki] #exporters: [loki,logging/logs] diff --git a/test/oats/redis/configs/otelcol-config.yaml b/test/oats/redis/configs/otelcol-config.yaml index b830bc605..edd0bbcda 100644 --- a/test/oats/redis/configs/otelcol-config.yaml +++ b/test/oats/redis/configs/otelcol-config.yaml @@ -4,19 +4,22 @@ receivers: grpc: http: -processors: - batch: - exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true + sending_queue: + batch: otlp: endpoint: tempo:4317 tls: insecure: true + sending_queue: + batch: loki: endpoint: http://loki:3100/loki/api/v1/push + sending_queue: + batch: logging/metrics: verbosity: detailed logging/traces: @@ -28,16 +31,13 @@ service: pipelines: traces: receivers: [otlp] - processors: [batch] #exporters: [otlp] exporters: [otlp,logging/traces] metrics: receivers: [otlp] - processors: [batch] exporters: [prometheusremotewrite] #exporters: [prometheusremotewrite,logging/metrics] logs: receivers: [otlp] - processors: [batch] exporters: [loki] #exporters: [loki,logging/logs] diff --git a/test/oats/sql/configs/otelcol-config.yaml b/test/oats/sql/configs/otelcol-config.yaml index b830bc605..edd0bbcda 100644 --- a/test/oats/sql/configs/otelcol-config.yaml +++ b/test/oats/sql/configs/otelcol-config.yaml @@ -4,19 +4,22 @@ receivers: grpc: http: -processors: - batch: - exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true + sending_queue: + batch: otlp: endpoint: tempo:4317 tls: insecure: true + sending_queue: + batch: loki: endpoint: http://loki:3100/loki/api/v1/push + sending_queue: + batch: logging/metrics: verbosity: detailed logging/traces: @@ -28,16 +31,13 @@ service: pipelines: traces: receivers: [otlp] - processors: [batch] #exporters: [otlp] exporters: [otlp,logging/traces] metrics: receivers: [otlp] - processors: [batch] exporters: [prometheusremotewrite] #exporters: [prometheusremotewrite,logging/metrics] logs: receivers: [otlp] - processors: [batch] exporters: [loki] #exporters: [loki,logging/logs] From aa0671c8c74942707b12b507e48dfd82dd9586af Mon Sep 17 00:00:00 2001 From: carsontham Date: Fri, 19 Sep 2025 16:24:53 +0800 Subject: [PATCH 2/4] removed sending queue from prometheus exporter --- test/integration/configs/otelcol-config-4017.yml | 5 ++--- test/integration/configs/otelcol-config.yml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/integration/configs/otelcol-config-4017.yml b/test/integration/configs/otelcol-config-4017.yml index 45800aef6..56eb3381f 100644 --- a/test/integration/configs/otelcol-config-4017.yml +++ b/test/integration/configs/otelcol-config-4017.yml @@ -16,8 +16,7 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true - sending_queue: - batch: + service: pipelines: metrics: @@ -25,4 +24,4 @@ service: exporters: [prometheus] # telemetry: # logs: -# level: debug \ No newline at end of file +# level: debug diff --git a/test/integration/configs/otelcol-config.yml b/test/integration/configs/otelcol-config.yml index 7fc0d6a23..d648019fa 100644 --- a/test/integration/configs/otelcol-config.yml +++ b/test/integration/configs/otelcol-config.yml @@ -16,8 +16,7 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true - sending_queue: - batch: + service: pipelines: metrics: From e96640938450fdbcf88e67ccb8b913b8c68a2ae6 Mon Sep 17 00:00:00 2001 From: carsontham Date: Sat, 20 Sep 2025 01:43:57 +0800 Subject: [PATCH 3/4] removed sending_queue from exporters --- test/oats/http/configs/otelcol-config.yaml | 6 ------ test/oats/kafka/configs/otelcol-config.yaml | 6 ------ test/oats/mongo/configs/otelcol-config.yaml | 6 ------ test/oats/redis/configs/otelcol-config.yaml | 6 ------ test/oats/sql/configs/otelcol-config.yaml | 6 ------ 5 files changed, 30 deletions(-) diff --git a/test/oats/http/configs/otelcol-config.yaml b/test/oats/http/configs/otelcol-config.yaml index 92f2e42cf..86b5e5bf6 100644 --- a/test/oats/http/configs/otelcol-config.yaml +++ b/test/oats/http/configs/otelcol-config.yaml @@ -18,18 +18,12 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true - sending_queue: - batch: otlp: endpoint: tempo:4317 tls: insecure: true - sending_queue: - batch: loki: endpoint: http://loki:3100/loki/api/v1/push - sending_queue: - batch: service: pipelines: diff --git a/test/oats/kafka/configs/otelcol-config.yaml b/test/oats/kafka/configs/otelcol-config.yaml index edd0bbcda..2fc6b2669 100644 --- a/test/oats/kafka/configs/otelcol-config.yaml +++ b/test/oats/kafka/configs/otelcol-config.yaml @@ -8,18 +8,12 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true - sending_queue: - batch: otlp: endpoint: tempo:4317 tls: insecure: true - sending_queue: - batch: loki: endpoint: http://loki:3100/loki/api/v1/push - sending_queue: - batch: logging/metrics: verbosity: detailed logging/traces: diff --git a/test/oats/mongo/configs/otelcol-config.yaml b/test/oats/mongo/configs/otelcol-config.yaml index 92f2e42cf..86b5e5bf6 100644 --- a/test/oats/mongo/configs/otelcol-config.yaml +++ b/test/oats/mongo/configs/otelcol-config.yaml @@ -18,18 +18,12 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true - sending_queue: - batch: otlp: endpoint: tempo:4317 tls: insecure: true - sending_queue: - batch: loki: endpoint: http://loki:3100/loki/api/v1/push - sending_queue: - batch: service: pipelines: diff --git a/test/oats/redis/configs/otelcol-config.yaml b/test/oats/redis/configs/otelcol-config.yaml index edd0bbcda..2fc6b2669 100644 --- a/test/oats/redis/configs/otelcol-config.yaml +++ b/test/oats/redis/configs/otelcol-config.yaml @@ -8,18 +8,12 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true - sending_queue: - batch: otlp: endpoint: tempo:4317 tls: insecure: true - sending_queue: - batch: loki: endpoint: http://loki:3100/loki/api/v1/push - sending_queue: - batch: logging/metrics: verbosity: detailed logging/traces: diff --git a/test/oats/sql/configs/otelcol-config.yaml b/test/oats/sql/configs/otelcol-config.yaml index edd0bbcda..2fc6b2669 100644 --- a/test/oats/sql/configs/otelcol-config.yaml +++ b/test/oats/sql/configs/otelcol-config.yaml @@ -8,18 +8,12 @@ exporters: prometheusremotewrite: endpoint: http://prometheus:9090/api/v1/write add_metric_suffixes: true - sending_queue: - batch: otlp: endpoint: tempo:4317 tls: insecure: true - sending_queue: - batch: loki: endpoint: http://loki:3100/loki/api/v1/push - sending_queue: - batch: logging/metrics: verbosity: detailed logging/traces: From 11e708cf2a44eb33da98e81148ef682f216612ee Mon Sep 17 00:00:00 2001 From: carsontham Date: Sun, 21 Sep 2025 21:59:04 +0800 Subject: [PATCH 4/4] removed extra new line --- test/integration/configs/otelcol-config-4017.yml | 3 +-- test/integration/configs/otelcol-config.yml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/configs/otelcol-config-4017.yml b/test/integration/configs/otelcol-config-4017.yml index 56eb3381f..6892bfe2e 100644 --- a/test/integration/configs/otelcol-config-4017.yml +++ b/test/integration/configs/otelcol-config-4017.yml @@ -16,7 +16,6 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true - service: pipelines: metrics: @@ -24,4 +23,4 @@ service: exporters: [prometheus] # telemetry: # logs: -# level: debug +# level: debug \ No newline at end of file diff --git a/test/integration/configs/otelcol-config.yml b/test/integration/configs/otelcol-config.yml index d648019fa..f110f7a1f 100644 --- a/test/integration/configs/otelcol-config.yml +++ b/test/integration/configs/otelcol-config.yml @@ -16,7 +16,6 @@ exporters: resource_to_telemetry_conversion: enabled: true enable_open_metrics: true - service: pipelines: metrics: