feat(api-usage-monitoring-filter): use {no-match} for not matched pat…

…hs (instead of <unknown>) (zalando#949) Signed-off-by: Maxim Tschumak <maxim.tschumak@gmail.com>
maxim-tschumak · Feb 11, 2019 · 4f0e734 · 4f0e734
1 parent 3b8f034
commit 4f0e734
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/filters/apiusagemonitoring/filter_clientmetrics_test.go b/filters/apiusagemonitoring/filter_clientmetrics_test.go
@@ -52,7 +52,7 @@ func Test_Filter_ClientMetrics_NoMatchingPath_RealmIsKnown(t *testing.T) {
 		clientTrackingPattern:        s(".*"),
 		header:                       headerUsersJoe,
 		url:                          "https://www.example.com/non/configured/path/template",
-		expectedEndpointMetricPrefix: "apiUsageMonitoring.custom.my_app.<unknown>.GET.<unknown>.*.*.",
+		expectedEndpointMetricPrefix: "apiUsageMonitoring.custom.my_app.<unknown>.GET.{no-match}.*.*.",
 		expectedClientMetricPrefix:   "apiUsageMonitoring.custom.my_app.<unknown>.*.*.users.<unknown>.",
 	})
 }
@@ -64,7 +64,7 @@ func Test_Filter_ClientMetrics_NoMatchingPath_RealmIsUnknown(t *testing.T) {
 		clientTrackingPattern:        s(".*"),
 		header:                       headerUsersJoe,
 		url:                          "https://www.example.com/non/configured/path/template",
-		expectedEndpointMetricPrefix: "apiUsageMonitoring.custom.my_app.<unknown>.GET.<unknown>.*.*.",
+		expectedEndpointMetricPrefix: "apiUsageMonitoring.custom.my_app.<unknown>.GET.{no-match}.*.*.",
 		expectedClientMetricPrefix:   "apiUsageMonitoring.custom.my_app.<unknown>.*.*.<unknown>.<unknown>.",
 	})
 }

diff --git a/filters/apiusagemonitoring/filter_endpointmetrics_test.go b/filters/apiusagemonitoring/filter_endpointmetrics_test.go
@@ -20,7 +20,7 @@ func Test_Filter_NoPathTemplate(t *testing.T) {
 		"https://www.example.org/a/b/c",
 		299,
 		func(t *testing.T, pass int, m *metricstest.MockMetrics) {
-			pre := "apiUsageMonitoring.custom.my_app.<unknown>.GET.<unknown>.*.*."
+			pre := "apiUsageMonitoring.custom.my_app.<unknown>.GET.{no-match}.*.*."
 			// no path matching: tracked as unknown
 			m.WithCounters(func(counters map[string]int64) {
 				assert.Equal(t,
@@ -48,7 +48,7 @@ func Test_Filter_NoConfiguration(t *testing.T) {
 		"https://www.example.org/a/b/c",
 		200,
 		func(t *testing.T, pass int, m *metricstest.MockMetrics) {
-			pre := "apiUsageMonitoring.custom.<unknown>.<unknown>.GET.<unknown>.*.*."
+			pre := "apiUsageMonitoring.custom.<unknown>.<unknown>.GET.{no-match}.*.*."
 			// no path matching: tracked as unknown
 			m.WithCounters(func(counters map[string]int64) {
 				assert.Equal(t,
@@ -238,15 +238,15 @@ func Test_Filter_StatusCodeUnder100IsMonitoredWithoutHttpStatusCount(t *testing.
 		})
 }
 
-func Test_Filter_NonConfiguredPathTrackedUnderUnknown(t *testing.T) {
+func Test_Filter_NonConfiguredPathTrackedUnderNoMatch(t *testing.T) {
 	testWithFilter(
 		t,
 		createFilterForTest,
 		http.MethodGet,
 		"https://www.example.org/lapin/malin",
 		200,
 		func(t *testing.T, pass int, m *metricstest.MockMetrics) {
-			pre := "apiUsageMonitoring.custom.my_app.<unknown>.GET.<unknown>.*.*."
+			pre := "apiUsageMonitoring.custom.my_app.<unknown>.GET.{no-match}.*.*."
 			m.WithCounters(func(counters map[string]int64) {
 				assert.Equal(t,
 					map[string]int64{
@@ -288,7 +288,7 @@ func Test_Filter_AllHttpMethodsAreSupported(t *testing.T) {
 				200,
 				func(t *testing.T, pass int, m *metricstest.MockMetrics) {
 					pre := fmt.Sprintf(
-						"apiUsageMonitoring.custom.my_app.<unknown>.%s.<unknown>.*.*.",
+						"apiUsageMonitoring.custom.my_app.<unknown>.%s.{no-match}.*.*.",
 						testCase.expectedMethodInMetric)
 					m.WithCounters(func(counters map[string]int64) {
 						assert.Equal(t,

diff --git a/filters/apiusagemonitoring/spec.go b/filters/apiusagemonitoring/spec.go
@@ -13,6 +13,7 @@ const (
 	Name = "apiUsageMonitoring"
 
 	unknownElementPlaceholder = "<unknown>"
+	noMatchPath               = "{no-match}"
 
 	regexUrlPathPart     = `.+`
 	regexOptionalSlashes = `\/*`
@@ -64,7 +65,7 @@ func NewApiUsageMonitoring(
 	unknownPath := newPathInfo(
 		unknownElementPlaceholder,
 		unknownElementPlaceholder,
-		unknownElementPlaceholder,
+		noMatchPath,
 		unknownPathClientTracking,
 	)
 	spec := &apiUsageMonitoringSpec{

diff --git a/filters/apiusagemonitoring/spec_test.go b/filters/apiusagemonitoring/spec_test.go
@@ -43,7 +43,7 @@ type pathMatcher struct {
 
 func unknownPath(applicationId string) pathMatcher {
 	return pathMatcher{
-		PathTemplate:  "<unknown>",
+		PathTemplate:  "{no-match}",
 		ApplicationId: applicationId,
 		ApiId:         "<unknown>",
 		Matcher:       nil,