From 54669e00a612922c5c74e4d4853b1b0654ce530a Mon Sep 17 00:00:00 2001 From: JBD <jbd@amazon.com> Date: Tue, 20 Apr 2021 15:07:12 -0700 Subject: [PATCH 1/2] Remove sending_queue from AWS Prometheus Remote Write Exporter This is a follow up of https://github.com/open-telemetry/opentelemetry-collector/pull/2951. Fixes #3163. --- .../awsprometheusremotewriteexporter/testdata/config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/exporter/awsprometheusremotewriteexporter/testdata/config.yaml b/exporter/awsprometheusremotewriteexporter/testdata/config.yaml index 4c62799e957d..5a028e2bd5e6 100644 --- a/exporter/awsprometheusremotewriteexporter/testdata/config.yaml +++ b/exporter/awsprometheusremotewriteexporter/testdata/config.yaml @@ -8,10 +8,6 @@ exporters: awsprometheusremotewrite: awsprometheusremotewrite/2: namespace: "test-space" - sending_queue: - enabled: true - num_consumers: 2 - queue_size: 10 retry_on_failure: enabled: true initial_interval: 10s From 73de434ce779cd24fc8a13a13c931402eb434c13 Mon Sep 17 00:00:00 2001 From: JBD <jbd@amazon.com> Date: Wed, 21 Apr 2021 14:09:07 -0700 Subject: [PATCH 2/2] Fix the test --- .../awsprometheusremotewriteexporter/config_test.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/exporter/awsprometheusremotewriteexporter/config_test.go b/exporter/awsprometheusremotewriteexporter/config_test.go index beff92238bc0..1682008de36d 100644 --- a/exporter/awsprometheusremotewriteexporter/config_test.go +++ b/exporter/awsprometheusremotewriteexporter/config_test.go @@ -60,11 +60,6 @@ func TestLoadConfig(t *testing.T) { TypeVal: "awsprometheusremotewrite", }, TimeoutSettings: exporterhelper.DefaultTimeoutSettings(), - QueueSettings: exporterhelper.QueueSettings{ - Enabled: true, - NumConsumers: 2, - QueueSize: 10, - }, RetrySettings: exporterhelper.RetrySettings{ Enabled: true, InitialInterval: 10 * time.Second, @@ -81,12 +76,9 @@ func TestLoadConfig(t *testing.T) { }, Insecure: false, }, - ReadBufferSize: 0, - + ReadBufferSize: 0, WriteBufferSize: 512 * 1024, - - Timeout: 5 * time.Second, - + Timeout: 5 * time.Second, Headers: map[string]string{ "prometheus-remote-write-version": "0.1.0", "x-scope-orgid": "234"},