Fix Parameter Mismatch

Signed-off-by: Mahad Zaryab <[email protected]>

cmd/query/app/apiv3/http_gateway.go

@@ -27,17 +27,18 @@
 )
 
 const (
-	paramTraceID       = "trace_id" // get trace by ID
-	paramStartTime     = "start_time"
-	paramEndTime       = "end_time"
-	paramServiceName   = "query.service_name" // find traces
-	paramOperationName = "query.operation_name"
-	paramTimeMin       = "query.start_time_min"
-	paramTimeMax       = "query.start_time_max"
-	paramNumTraces     = "query.num_traces"
-	paramDurationMin   = "query.duration_min"
-	paramDurationMax   = "query.duration_max"
-	paramRawTraces     = "query.raw_traces"
+	paramTraceID        = "trace_id" // get trace by ID
+	paramStartTime      = "start_time"
+	paramEndTime        = "end_time"
+	paramRawTraces      = "raw_traces"
+	paramServiceName    = "query.service_name" // find traces
+	paramOperationName  = "query.operation_name"
+	paramTimeMin        = "query.start_time_min"
+	paramTimeMax        = "query.start_time_max"
+	paramNumTraces      = "query.num_traces"
+	paramDurationMin    = "query.duration_min"
+	paramDurationMax    = "query.duration_max"
+	paramQueryRawTraces = "query.raw_traces"
 
 	routeGetTrace      = "/api/v3/traces/{" + paramTraceID + "}"
 	routeFindTraces    = "/api/v3/traces"
@@ -163,7 +164,7 @@
 		if h.tryParamError(w, err, paramRawTraces) {
 			return
 		}
 		request.RawTraces = rawTraces
 	}
 	trc, err := h.QueryService.GetTrace(r.Context(), request)
 	if h.tryHandleError(w, err, http.StatusInternalServerError) {
@@ -239,12 +240,12 @@
 		}
 		queryParams.DurationMax = dur
 	}
-	if r := q.Get(paramRawTraces); r != "" {
+	if r := q.Get(paramQueryRawTraces); r != "" {
 		rawTraces, err := strconv.ParseBool(r)
-		if h.tryParamError(w, err, paramRawTraces) {
+		if h.tryParamError(w, err, paramQueryRawTraces) {
 			return nil, true
 		}
 		queryParams.RawTraces = rawTraces
 	}
 	return queryParams, false
 }

cmd/query/app/apiv3/http_gateway_test.go

@@ -169,8 +169,8 @@ func TestHTTPGatewayGetTraceMalformedInputErrors(t *testing.T) {
 		},
 		{
 			name:          "TestGetTraceWithInvalidRawTraces",
-			requestUrl:    "/api/v3/traces/123?query.raw_traces=foobar",
-			expectedError: "malformed parameter query.raw_traces",
+			requestUrl:    "/api/v3/traces/123?raw_traces=foobar",
+			expectedError: "malformed parameter raw_traces",
 		},
 	}