public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Loki: Add error source to DataQuery (#77876)" (#78006)

Browse Source 
This reverts commit 934456dc1c.
This commit is contained in:
Ivana Huckova
2023-11-10 17:03:59 +01:00
committed by GitHub
parent c7442c0fd2
commit 8cd8eb7882
5 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/api_test.go
+12 -12
View File
@@ -28,8 +28,8 @@ func TestApiLogVolume(t *testing.T) {
require.Equal(t, "Source=logvolhist", req.Header.Get("X-Query-Tags"))
})
res := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange}, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsVolume, QueryType: QueryTypeRange}, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
@@ -40,8 +40,8 @@ func TestApiLogVolume(t *testing.T) {
require.Equal(t, "Source=logsample", req.Header.Get("X-Query-Tags"))
})
res := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsSample, QueryType: QueryTypeRange}, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryLogsSample, QueryType: QueryTypeRange}, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
@@ -52,8 +52,8 @@ func TestApiLogVolume(t *testing.T) {
require.Equal(t, "Source=datasample", req.Header.Get("X-Query-Tags"))
})
res := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryDataSample, QueryType: QueryTypeRange}, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryDataSample, QueryType: QueryTypeRange}, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
@@ -64,8 +64,8 @@ func TestApiLogVolume(t *testing.T) {
require.Equal(t, "", req.Header.Get("X-Query-Tags"))
})
res := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryNone, QueryType: QueryTypeRange}, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), lokiQuery{Expr: "", SupportingQueryType: SupportingQueryNone, QueryType: QueryTypeRange}, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
}
@@ -133,8 +133,8 @@ func TestApiUrlHandling(t *testing.T) {
QueryType: QueryTypeRange,
}
res := api.DataQuery(context.Background(), query, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), query, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
}
@@ -154,8 +154,8 @@ func TestApiUrlHandling(t *testing.T) {
QueryType: QueryTypeInstant,
}
res := api.DataQuery(context.Background(), query, ResponseOpts{})
require.Equal(t, nil, res.Error)
_, err := api.DataQuery(context.Background(), query, ResponseOpts{})
require.NoError(t, err)
require.True(t, called)
})
}