Skip to content
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.

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

Remove sending_queue from AWS Prometheus Remote Write Exporter #3186

Merged
merged 2 commits into from
Apr 21, 2021
Merged

Remove sending_queue from AWS Prometheus Remote Write Exporter #3186

merged 2 commits into from
Apr 21, 2021

Conversation

rakyll
Copy link
Contributor

@rakyll rakyll commented Apr 20, 2021

This is a follow up of open-telemetry/opentelemetry-collector#2951.

Fixes #3163.

@rakyll rakyll requested a review from a team as a code owner April 20, 2021 22:07
@rakyll
Copy link
Contributor Author

rakyll commented Apr 20, 2021

cc @anuraaga

@bogdandrutu
Copy link
Member

Tests failed:

running go unit test ./... + coverage in /home/circleci/project/exporter/awsprometheusremotewriteexporter
--- FAIL: TestLoadConfig (0.01s)
    config_test.go:104: 
        	Error Trace:	config_test.go:104
        	Error:      	Not equal: 
        	            	expected: &awsprometheusremotewriteexporter.Config{Config:prometheusremotewriteexporter.Config{ExporterSettings:(*config.ExporterSettings)(0xc00066e260), TimeoutSettings:exporterhelper.TimeoutSettings{Timeout:5000000000}, QueueSettings:exporterhelper.QueueSettings{Enabled:false, NumConsumers:0, QueueSize:0}, RetrySettings:exporterhelper.RetrySettings{Enabled:true, InitialInterval:10000000000, MaxInterval:60000000000, MaxElapsedTime:600000000000}, Namespace:"test-space", ExternalLabels:map[string]string{"key1":"value1", "key2":"value2"}, HTTPClientSettings:confighttp.HTTPClientSettings{Endpoint:"http://localhost:9009", TLSSetting:configtls.TLSClientSetting{TLSSetting:configtls.TLSSetting{CAFile:"/var/lib/mycert.pem", CertFile:"", KeyFile:""}, Insecure:false, InsecureSkipVerify:false, ServerName:""}, ReadBufferSize:0, WriteBufferSize:524288, Timeout:5000000000, Headers:map[string]string{"prometheus-remote-write-version":"0.1.0", "x-scope-orgid":"234"}, CustomRoundTripper:(func(http.RoundTripper) (http.RoundTripper, error))(nil)}}, AuthConfig:awsprometheusremotewriteexporter.AuthConfig{Region:"us-west-2", Service:"service-name", RoleArn:"arn:aws:iam::123456789012:role/IAMRole"}}
        	            	actual  : &awsprometheusremotewriteexporter.Config{Config:prometheusremotewriteexporter.Config{ExporterSettings:(*config.ExporterSettings)(0xc00066ec80), TimeoutSettings:exporterhelper.TimeoutSettings{Timeout:5000000000}, QueueSettings:exporterhelper.QueueSettings{Enabled:true, NumConsumers:2, QueueSize:10}, RetrySettings:exporterhelper.RetrySettings{Enabled:true, InitialInterval:10000000000, MaxInterval:60000000000, MaxElapsedTime:600000000000}, Namespace:"test-space", ExternalLabels:map[string]string{"key1":"value1", "key2":"value2"}, HTTPClientSettings:confighttp.HTTPClientSettings{Endpoint:"http://localhost:9009", TLSSetting:configtls.TLSClientSetting{TLSSetting:configtls.TLSSetting{CAFile:"/var/lib/mycert.pem", CertFile:"", KeyFile:""}, Insecure:false, InsecureSkipVerify:false, ServerName:""}, ReadBufferSize:0, WriteBufferSize:524288, Timeout:5000000000, Headers:map[string]string{"prometheus-remote-write-version":"0.1.0", "x-scope-orgid":"234"}, CustomRoundTripper:(func(http.RoundTripper) (http.RoundTripper, error))(nil)}}, AuthConfig:awsprometheusremotewriteexporter.AuthConfig{Region:"us-west-2", Service:"service-name", RoleArn:"arn:aws:iam::123456789012:role/IAMRole"}}
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -10,5 +10,5 @@
        	            	   QueueSettings: (exporterhelper.QueueSettings) {
        	            	-   Enabled: (bool) false,
        	            	-   NumConsumers: (int) 0,
        	            	-   QueueSize: (int) 0
        	            	+   Enabled: (bool) true,
        	            	+   NumConsumers: (int) 2,
        	            	+   QueueSize: (int) 10
        	            	   },
        	Test:       	TestLoadConfig
FAIL

@codecov
Copy link

codecov bot commented Apr 21, 2021

Codecov Report

Merging #3186 (73de434) into main (e663b59) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3186      +/-   ##
==========================================
- Coverage   91.93%   91.91%   -0.02%     
==========================================
  Files         493      493              
  Lines       23946    23946              
==========================================
- Hits        22014    22010       -4     
- Misses       1427     1429       +2     
- Partials      505      507       +2     
Flag Coverage Δ
integration 63.35% <ø> (-0.06%) ⬇️
unit 90.93% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
exporter/signalfxexporter/dimensions/requests.go 82.35% <0.00%> (-3.93%) ⬇️
receiver/k8sclusterreceiver/watcher.go 95.29% <0.00%> (-2.36%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e663b59...73de434. Read the comment docs.

@rakyll
Copy link
Contributor Author

rakyll commented Apr 21, 2021

The test is passing now. PTAL.

@bogdandrutu bogdandrutu merged commit 45fb933 into open-telemetry:main Apr 21, 2021
@rakyll rakyll deleted the awspromrw-remoteconfig branch April 21, 2021 22:25
pmatyjasek-sumo pushed a commit to pmatyjasek-sumo/opentelemetry-collector-contrib that referenced this pull request Apr 28, 2021
…telemetry#3186)

* Remove sending_queue from AWS Prometheus Remote Write Exporter

This is a follow up of open-telemetry/opentelemetry-collector#2951.

Fixes open-telemetry#3163.

* Fix the test
alexperez52 referenced this pull request in open-o11y/opentelemetry-collector-contrib Aug 18, 2021
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
mstumpfx pushed a commit to mstumpfx/opentelemetry-collector-contrib that referenced this pull request Aug 31, 2021
…telemetry#3186)

* Remove sending_queue from AWS Prometheus Remote Write Exporter

This is a follow up of open-telemetry/opentelemetry-collector#2951.

Fixes open-telemetry#3163.

* Fix the test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reflect queue removal changes from PRW exporter to AWS PRW exporter
4 participants