OperationQueryParams -> OperationQueryParameters

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>

cmd/jaeger/internal/integration/trace_reader.go

@@ -90,7 +90,7 @@ func (r *traceReader) GetServices(ctx context.Context) ([]string, error) {
 	return res.Services, nil
 }
 
-func (r *traceReader) GetOperations(ctx context.Context, query tracestore.OperationQueryParams) ([]tracestore.Operation, error) {
+func (r *traceReader) GetOperations(ctx context.Context, query tracestore.OperationQueryParameters) ([]tracestore.Operation, error) {
 	var operations []tracestore.Operation
 	res, err := r.client.GetOperations(ctx, &api_v3.GetOperationsRequest{
 		Service:  query.ServiceName,

cmd/query/app/apiv3/gateway_test.go

@@ -126,7 +126,7 @@ func (gw *testGateway) runGatewayGetServices(t *testing.T) {
 }
 
 func (gw *testGateway) runGatewayGetOperations(t *testing.T) {
-	qp := tracestore.OperationQueryParams{ServiceName: "foo", SpanKind: "server"}
+	qp := tracestore.OperationQueryParameters{ServiceName: "foo", SpanKind: "server"}
 	gw.reader.
 		On("GetOperations", matchContext, qp).
 		Return([]tracestore.Operation{{Name: "get_users", SpanKind: "server"}}, nil).Once()

cmd/query/app/apiv3/grpc_handler.go

@@ -109,7 +109,7 @@ func (h *Handler) GetServices(ctx context.Context, _ *api_v3.GetServicesRequest)
 
 // GetOperations implements api_v3.QueryService's GetOperations
 func (h *Handler) GetOperations(ctx context.Context, request *api_v3.GetOperationsRequest) (*api_v3.GetOperationsResponse, error) {
-	operations, err := h.QueryService.GetOperations(ctx, tracestore.OperationQueryParams{
+	operations, err := h.QueryService.GetOperations(ctx, tracestore.OperationQueryParameters{
 		ServiceName: request.GetService(),
 		SpanKind:    request.GetSpanKind(),
 	})

cmd/query/app/apiv3/http_gateway.go

@@ -278,7 +278,7 @@ func (h *HTTPGateway) getServices(w http.ResponseWriter, r *http.Request) {
 
 func (h *HTTPGateway) getOperations(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
-	queryParams := tracestore.OperationQueryParams{
+	queryParams := tracestore.OperationQueryParameters{
 		ServiceName: query.Get("service"),
 		SpanKind:    query.Get("span_kind"),
 	}

cmd/query/app/apiv3/http_gateway_test.go

@@ -380,7 +380,7 @@ func TestHTTPGatewayGetServicesErrors(t *testing.T) {
 func TestHTTPGatewayGetOperationsErrors(t *testing.T) {
 	gw := setupHTTPGatewayNoServer(t, "")
 
-	qp := tracestore.OperationQueryParams{ServiceName: "foo", SpanKind: "server"}
+	qp := tracestore.OperationQueryParameters{ServiceName: "foo", SpanKind: "server"}
 	gw.reader.
 		On("GetOperations", matchContext, qp).
 		Return(nil, assert.AnError).Once()

cmd/query/app/querysvc/v2/querysvc/service.go

@@ -112,7 +112,7 @@ func (qs QueryService) GetServices(ctx context.Context) ([]string, error) {
 
 func (qs QueryService) GetOperations(
 	ctx context.Context,
-	query tracestore.OperationQueryParams,
+	query tracestore.OperationQueryParameters,
 ) ([]tracestore.Operation, error) {
 	return qs.traceReader.GetOperations(ctx, query)
 }

cmd/query/app/querysvc/v2/querysvc/service_test.go

@@ -253,7 +253,7 @@ func TestGetServices(t *testing.T) {
 func TestGetOperations(t *testing.T) {
 	tqs := initializeTestService()
 	expected := []tracestore.Operation{{Name: "", SpanKind: ""}, {Name: "get", SpanKind: ""}}
-	operationQuery := tracestore.OperationQueryParams{ServiceName: "abc/trifle"}
+	operationQuery := tracestore.OperationQueryParameters{ServiceName: "abc/trifle"}
 	tqs.traceReader.On(
 		"GetOperations",
 		mock.Anything,

internal/storage/integration/integration.go

@@ -276,7 +276,7 @@ func (s *StorageIntegration) testGetOperations(t *testing.T) {
 	found := s.waitForCondition(t, func(t *testing.T) bool {
 		var err error
 		actual, err = s.TraceReader.GetOperations(context.Background(),
-			tracestore.OperationQueryParams{ServiceName: "example-service-1"})
+			tracestore.OperationQueryParameters{ServiceName: "example-service-1"})
 		if err != nil {
 			t.Log(err)
 			return false

internal/storage/v2/api/tracestore/reader.go

@@ -37,7 +37,7 @@ type Reader interface {
 
 	// GetOperations returns all operation names for a given service
 	// known to the backend from spans within its retention period.
-	GetOperations(ctx context.Context, query OperationQueryParams) ([]Operation, error)
+	GetOperations(ctx context.Context, query OperationQueryParameters) ([]Operation, error)
 
 	// FindTraces returns an iterator that retrieves traces matching query parameters.
 	// The iterator is single-use: once consumed, it cannot be used again.
@@ -117,8 +117,8 @@ func (t *TraceQueryParameters) ToSpanStoreQueryParameters() *spanstore.TraceQuer
 	}
 }
 
-// OperationQueryParams contains parameters of query operations, empty spanKind means get operations for all kinds of span.
-type OperationQueryParams struct {
+// OperationQueryParameters contains parameters of query operations, empty spanKind means get operations for all kinds of span.
+type OperationQueryParameters struct {
 	ServiceName string
 	SpanKind    string
 }

internal/storage/v2/v1adapter/spanreader.go

@@ -55,7 +55,7 @@ func (sr *SpanReader) GetOperations(
 	ctx context.Context,
 	query spanstore.OperationQueryParameters,
 ) ([]spanstore.Operation, error) {
-	o, err := sr.traceReader.GetOperations(ctx, tracestore.OperationQueryParams{
+	o, err := sr.traceReader.GetOperations(ctx, tracestore.OperationQueryParameters{
 		ServiceName: query.ServiceName,
 		SpanKind:    query.SpanKind,
 	})

internal/storage/v2/v1adapter/spanreader_test.go

@@ -168,7 +168,7 @@ func TestSpanReader_GetOperations(t *testing.T) {
 	tests := []struct {
 		name               string
 		query              spanstore.OperationQueryParameters
-		expectedQuery      tracestore.OperationQueryParams
+		expectedQuery      tracestore.OperationQueryParameters
 		operations         []tracestore.Operation
 		expectedOperations []spanstore.Operation
 		err                error
@@ -179,7 +179,7 @@ func TestSpanReader_GetOperations(t *testing.T) {
 			query: spanstore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
-			expectedQuery: tracestore.OperationQueryParams{
+			expectedQuery: tracestore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
 			err:         assert.AnError,
@@ -190,7 +190,7 @@ func TestSpanReader_GetOperations(t *testing.T) {
 			query: spanstore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
-			expectedQuery: tracestore.OperationQueryParams{
+			expectedQuery: tracestore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
 			operations:         []tracestore.Operation{},
@@ -201,7 +201,7 @@ func TestSpanReader_GetOperations(t *testing.T) {
 			query: spanstore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
-			expectedQuery: tracestore.OperationQueryParams{
+			expectedQuery: tracestore.OperationQueryParameters{
 				ServiceName: "service1",
 			},
 			operations: []tracestore.Operation{

internal/storage/v2/v1adapter/tracereader.go

@@ -70,7 +70,7 @@ func (tr *TraceReader) GetServices(ctx context.Context) ([]string, error) {
 
 func (tr *TraceReader) GetOperations(
 	ctx context.Context,
-	query tracestore.OperationQueryParams,
+	query tracestore.OperationQueryParameters,
 ) ([]tracestore.Operation, error) {
 	o, err := tr.spanReader.GetOperations(ctx, spanstore.OperationQueryParameters{
 		ServiceName: query.ServiceName,

internal/storage/v2/v1adapter/tracereader_test.go

@@ -240,7 +240,7 @@ func TestTraceReader_GetOperationsDelegatesResponse(t *testing.T) {
 			}
 			operations, err := traceReader.GetOperations(
 				context.Background(),
-				tracestore.OperationQueryParams{
+				tracestore.OperationQueryParameters{
 					ServiceName: "service-a",
 					SpanKind:    "server",
 				})