tests

Signed-off-by: Harshil Gupta <[email protected]>

Author: wololowarrior

internal/storage/metricstore/prometheus/metricstore/reader.go

@@ -365,7 +365,6 @@ func (m MetricsReader) buildPromQuery(metricsParams metricsQueryParams) string {
 		}
 	}
 
-	fmt.Println(">>>>>>>>> tagfilters", tagFilters)
 	promParams := promQueryParams{
 		serviceFilter:  strings.Join(metricsParams.ServiceNames, "|"),
 		spanKindFilter: spanKindFilter,

internal/storage/metricstore/prometheus/metricstore/reader_test.go

@@ -44,6 +44,7 @@ type (
 		wantDescription  string
 		wantLabels       map[string]string
 		wantPromQlQuery  string
+		tags             map[string]string
 	}
 )
 
@@ -162,6 +163,21 @@ func TestGetLatencies(t *testing.T) {
 			wantPromQlQuery: `histogram_quantile(0.95, sum(rate(duration_bucket{service_name =~ "emailservice", ` +
 				`span_kind =~ "SPAN_KIND_SERVER"}[10m])) by (service_name,le))`,
 		},
+		{
+			name:             "tag filtering should be included in the query",
+			serviceNames:     []string{"emailservice"},
+			spanKinds:        []string{"SPAN_KIND_SERVER"},
+			tags:             map[string]string{"http.method": "GET"},
+			groupByOperation: false,
+			wantName:         "service_latencies",
+			wantDescription:  "0.95th quantile latency, grouped by service",
+			wantLabels: map[string]string{
+				"service_name": "emailservice",
+				"http.method":  "GET",
+			},
+			wantPromQlQuery: `histogram_quantile(0.95, sum(rate(duration_bucket{service_name =~ "emailservice", ` +
+				`span_kind =~ "SPAN_KIND_SERVER", http_method="GET"}[10m])) by (service_name,le))`,
+		},
 		{
 			name:             "group by service and operation should be reflected in name/description and query group-by",
 			serviceNames:     []string{"emailservice"},
@@ -265,6 +281,23 @@ func TestGetCallRates(t *testing.T) {
 			wantPromQlQuery: `sum(rate(calls{service_name =~ "emailservice", ` +
 				`span_kind =~ "SPAN_KIND_SERVER"}[10m])) by (service_name)`,
 		},
+		{
+			name:             "tag filtering should be included in the query",
+			serviceNames:     []string{"emailservice"},
+			spanKinds:        []string{"SPAN_KIND_SERVER"},
+			groupByOperation: false,
+			tags: map[string]string{
+				"http.method": "GET",
+			},
+			wantName:        "service_call_rate",
+			wantDescription: "calls/sec, grouped by service",
+			wantLabels: map[string]string{
+				"http.method":  "GET",
+				"service_name": "emailservice",
+			},
+			wantPromQlQuery: `sum(rate(calls{service_name =~ "emailservice", span_kind =~ "SPAN_KIND_SERVER",` +
+				` http_method="GET"}[10m])) by (service_name)`,
+		},
 		{
 			name:             "group by service and operation should be reflected in name/description and query group-by",
 			serviceNames:     []string{"emailservice"},
@@ -366,6 +399,24 @@ func TestGetErrorRates(t *testing.T) {
 				`span_kind =~ "SPAN_KIND_SERVER"}[10m])) by (service_name) / ` +
 				`sum(rate(calls{service_name =~ "emailservice", span_kind =~ "SPAN_KIND_SERVER"}[10m])) by (service_name)`,
 		},
+		{
+			name:             "tag filtering should be included in the query",
+			serviceNames:     []string{"emailservice"},
+			spanKinds:        []string{"SPAN_KIND_SERVER"},
+			groupByOperation: false,
+			tags: map[string]string{
+				"http.method": "GET",
+			},
+			wantName:        "service_error_rate",
+			wantDescription: "error rate, computed as a fraction of errors/sec over calls/sec, grouped by service",
+			wantLabels: map[string]string{
+				"service_name": "emailservice",
+				"http.method":  "GET",
+			},
+			wantPromQlQuery: `sum(rate(calls{service_name =~ "emailservice", status_code = "STATUS_CODE_ERROR", ` +
+				`span_kind =~ "SPAN_KIND_SERVER", http_method="GET"}[10m])) by (service_name) / ` +
+				`sum(rate(calls{service_name =~ "emailservice", span_kind =~ "SPAN_KIND_SERVER", http_method="GET"}[10m])) by (service_name)`,
+		},
 		{
 			name:             "group by service and operation should be reflected in name/description and query group-by",
 			serviceNames:     []string{"emailservice"},
@@ -937,6 +988,8 @@ func startMockPrometheusServer(t *testing.T, wantPromQlQuery string, wantWarning
 		mockResponsePayloadFile := "testdata/service_datapoint_response.json"
 		if strings.Contains(promQuery, "by (service_name,span_name") {
 			mockResponsePayloadFile = "testdata/service_span_name_datapoint_response.json"
+		} else if strings.Contains(promQuery, "http_method=") {
+			mockResponsePayloadFile = "testdata/service_with_tags_response.json"
 		}
 		sendResponse(t, w, mockResponsePayloadFile)
 	}))
@@ -964,6 +1017,7 @@ func buildTestBaseQueryParametersFrom(tc metricsTestCase) metricstore.BaseQueryP
 		Step:             &step,
 		RatePer:          &ratePer,
 		SpanKinds:        tc.spanKinds,
+		Tags:             tc.tags,
 	}
 }
 

internal/storage/metricstore/prometheus/metricstore/testdata/service_with_tags_response.json

@@ -0,0 +1,20 @@
+{
+  "status": "success",
+  "data": {
+    "resultType": "matrix",
+    "result": [
+      {
+        "metric": {
+          "service_name": "emailservice",
+          "http.method": "GET"
+        },
+        "values": [
+          [
+            1620351786,
+            "9223372036854"
+          ]
+        ]
+      }
+    ]
+  }
+}