fix duplicated collector when collectParams was passed in probe mode (#…

…710) * fix duplicated collector when collectParams was passed in probe mode --------- Signed-off-by: qizhicheng <[email protected]>
prometheus · Mar 4, 2023 · aa12ba2 · aa12ba2
1 parent b3483ee
commit aa12ba2
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/mysqld_exporter.go b/mysqld_exporter.go
@@ -106,7 +106,7 @@ var scrapers = map[collector.Scraper]bool{
 }
 
 func filterScrapers(scrapers []collector.Scraper, collectParams []string) []collector.Scraper {
-	filteredScrapers := scrapers
+	var filteredScrapers []collector.Scraper
 
 	// Check if we have some "collect[]" query parameters.
 	if len(collectParams) > 0 {
@@ -121,6 +121,9 @@ func filterScrapers(scrapers []collector.Scraper, collectParams []string) []coll
 			}
 		}
 	}
+	if len(filteredScrapers) == 0 {
+		return scrapers
+	}
 	return filteredScrapers
 }
 

diff --git a/mysqld_exporter_test.go b/mysqld_exporter_test.go
@@ -16,6 +16,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"github.com/prometheus/mysqld_exporter/collector"
 	"io"
 	"net"
 	"net/http"
@@ -218,3 +219,49 @@ func getBody(urlToGet string) ([]byte, error) {
 
 	return body, nil
 }
+
+func Test_filterScrapers(t *testing.T) {
+	type args struct {
+		scrapers      []collector.Scraper
+		collectParams []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want []collector.Scraper
+	}{
+		{"args_appears_in_collector",
+			args{
+				[]collector.Scraper{collector.ScrapeGlobalStatus{}},
+				[]string{collector.ScrapeGlobalStatus{}.Name()},
+			},
+			[]collector.Scraper{
+				collector.ScrapeGlobalStatus{},
+			}},
+		{"args_absent_in_collector",
+			args{
+				[]collector.Scraper{collector.ScrapeGlobalStatus{}},
+				[]string{collector.ScrapeGlobalVariables{}.Name()},
+			},
+			[]collector.Scraper{collector.ScrapeGlobalStatus{}}},
+		{"respect_params",
+			args{
+				[]collector.Scraper{
+					collector.ScrapeGlobalStatus{},
+					collector.ScrapeGlobalVariables{},
+				},
+				[]string{collector.ScrapeGlobalStatus{}.Name()},
+			},
+			[]collector.Scraper{
+				collector.ScrapeGlobalStatus{},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := filterScrapers(tt.args.scrapers, tt.args.collectParams); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("filterScrapers() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}