PMM-4145 Add RDS disable metric collection. #41

askomorokhov · 2020-03-11T15:20:38Z

https://jira.percona.com/browse/PMM-4145

Ref:

FB:

PMM-4145 Add submodules for RDS disable metrics collection. Percona-Lab/pmm-submodules#750

it-percona · 2020-03-11T15:20:46Z

All committers have signed the CLA.

golangcibot · 2020-03-11T15:22:04Z

basic/collector.go

+			continue
+		}
 		instance := instance
+		wg.Add(1)


only cuddled expressions if assigning variable or using from line above (from wsl)

codecov · 2020-03-11T15:23:48Z

Codecov Report

Merging #41 into master will increase coverage by 0.24%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master      #41      +/-   ##
==========================================
+ Coverage   81.64%   81.89%   +0.24%     
==========================================
  Files           9        9              
  Lines         741      751      +10     
==========================================
+ Hits          605      615      +10     
  Misses        118      118              
  Partials       18       18

Impacted Files	Coverage Δ
config/config.go	`43.75% <ø> (ø)`	⬆️
sessions/sessions.go	`83.48% <100%> (+0.62%)`	⬆️
basic/collector.go	`94.11% <100%> (+0.56%)`	⬆️
enhanced/scraper.go	`77.47% <100%> (+0.62%)`	⬆️

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 2688e80...2c98741. Read the comment docs.

golangcibot · 2020-03-12T16:23:53Z

basic/collector_test.go

 	assert.Equal(t, expectedMetrics, actualMetrics)
 }
+
+func TestCollectorDisableBasicMetrics(t *testing.T) {


func TestCollectorDisableBasicMetrics is unused (from unused)

golangcibot · 2020-03-12T16:23:54Z

basic/collector_test.go

+func TestCollectorDisableBasicMetrics(t *testing.T) {
+	cfg, err := config.Load("../config.tests.yml")
+	require.NoError(t, err)
+	client := client.New()


assignments should only be cuddled with other assignments (from wsl)

golangcibot · 2020-03-12T16:23:54Z

basic/collector_test.go

+	cfg, err := config.Load("../config.tests.yml")
+	require.NoError(t, err)
+	client := client.New()
+	for i := range cfg.Instances {


only one cuddle assignment allowed before range statement (from wsl)

golangcibot · 2020-03-12T16:23:54Z

basic/collector_test.go

+	for i := range cfg.Instances {
+		cfg.Instances[i].DisableBasicMetrics = true
+	}
+	sess, err := sessions.New(cfg.Instances, client.HTTP(), false)


assignments should only be cuddled with other assignments (from wsl)

golangcibot · 2020-03-12T16:23:54Z

basic/collector_test.go

+
+	actualMetrics := helpers.ReadMetrics(helpers.CollectMetrics(c))
+	actualLines := helpers.Format(helpers.WriteMetrics(actualMetrics))
+	for _, line := range actualLines {


only one cuddle assignment allowed before range statement (from wsl)

BupycHuk · 2020-03-12T20:35:22Z

basic/collector_test.go

+			assert.Falsef(
+				t,
+				strings.Contains(inst.Instance, line),
+				"Instance %s with disabled metrics reseive: %s",


BupycHuk · 2020-03-12T20:43:33Z

basic/collector_test.go

+	require.NoError(t, err)
+	client := client.New()
+	for i := range cfg.Instances {
+		cfg.Instances[i].DisableBasicMetrics = true


let's disable only part of our instances to check that tests work.

golangcibot · 2020-03-13T14:28:10Z

basic/collector_test.go

+				return true
+			}
+		}
+		return false


return statements should not be cuddled if block has more than two lines (from wsl)

golangcibot · 2020-03-13T14:28:11Z

basic/collector_test.go

+	instanceGroups := make(map[bool][]string, 2)
+	for i := range cfg.Instances {
+		// Disable basic metrics in odd instances.
+		isDisabled := i%2 == 1


mnd: Magic number: 2, in detected (from gomnd)

golangcibot · 2020-03-13T16:20:04Z

basic/collector_test.go

+	for i := range cfg.Instances {
+		// Disable basic metrics in even instances.
+		// This disable instance: no-such-instance.
+		isDisabled := i%2 == 0


mnd: Magic number: 2, in detected (from gomnd)

golangcibot · 2020-03-13T17:06:53Z

enhanced/scraper_test.go

 	}
 }
+
+func TestScraperDisableEnhancedMetrics(t *testing.T) {


func TestScraperDisableEnhancedMetrics is unused (from unused)

golangcibot · 2020-03-13T17:06:54Z

enhanced/scraper_test.go

+func TestScraperDisableEnhancedMetrics(t *testing.T) {
+	cfg, err := config.Load("../config.tests.yml")
+	require.NoError(t, err)
+	client := client.New()


assignments should only be cuddled with other assignments (from wsl)

golangcibot · 2020-03-13T17:06:54Z

enhanced/scraper_test.go

+	cfg, err := config.Load("../config.tests.yml")
+	require.NoError(t, err)
+	client := client.New()
+	for i := range cfg.Instances {


only one cuddle assignment allowed before range statement (from wsl)

golangcibot · 2020-03-13T17:06:54Z

enhanced/scraper_test.go

+				return true
+			}
+		}
+		return false


return statements should not be cuddled if block has more than two lines (from wsl)

golangcibot · 2020-03-13T17:06:55Z

enhanced/scraper_test.go

+	for i := range cfg.Instances {
+		// Disable enhanced metrics in even instances.
+		// This disable instance: no-such-instance.
+		isDisabled := i%2 == 0


mnd: Magic number: 2, in detected (from gomnd)

PMM-4145 Add RDS disable metric collection.

27d52f3

golangcibot reviewed Mar 11, 2020

View reviewed changes

This was referenced Mar 12, 2020

PMM-4145 Add dissable metric collection flags to RDS. Percona-Lab/pmm-submodules#687

Closed

PMM-4145 RDS disable metrics flags. percona/pmm-admin#96

Merged

PMM-4145 Add dissable metric collection flags to RDS. percona/pmm#500

Merged

askomorokhov requested review from AlekSi, BupycHuk and percona-csalguero March 12, 2020 08:09

askomorokhov mentioned this pull request Mar 12, 2020

PMM-4145 Add submodules for RDS disable metrics collection. Percona-Lab/pmm-submodules#750

Closed

7 tasks

askomorokhov marked this pull request as ready for review March 12, 2020 08:16

PMM-4145 Update README. Try test.

1dcf70a

golangcibot reviewed Mar 12, 2020

View reviewed changes

BupycHuk requested changes Mar 12, 2020

View reviewed changes

PMM-4145 Extend test for disabled metrics.

71ceece

golangcibot reviewed Mar 13, 2020

View reviewed changes

PMM-4145 Fix test.

29fd4c2

golangcibot reviewed Mar 13, 2020

View reviewed changes

askomorokhov requested a review from BupycHuk March 13, 2020 16:22

PMM-4145 Add test for disable enhanced metrics.

2c98741

golangcibot reviewed Mar 13, 2020

View reviewed changes

percona-csalguero approved these changes Mar 16, 2020

View reviewed changes

BupycHuk approved these changes Mar 17, 2020

View reviewed changes

AlekSi approved these changes Mar 19, 2020

View reviewed changes

AlekSi merged commit db4ca34 into master Mar 19, 2020

AlekSi deleted the PMM-4145-rds-disable-metric-collection branch March 19, 2020 18:00

askomorokhov mentioned this pull request Mar 31, 2020

PMM-4145 RDS Disable Metric Collection Percona-Lab/pmm-submodules#772

Closed

6 tasks

Uh oh!

PMM-4145 Add RDS disable metric collection. #41

PMM-4145 Add RDS disable metric collection. #41

Uh oh!

Conversation

askomorokhov commented Mar 11, 2020 • edited by AlekSi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

it-percona commented Mar 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Mar 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

askomorokhov commented Mar 11, 2020 •

edited by AlekSi

Loading

it-percona commented Mar 11, 2020 •

edited

Loading

codecov bot commented Mar 11, 2020 •

edited

Loading