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

Loki: Remove lokiStructuredMetadata feature toggle (#107292)

Browse Source 
Loki: Remove lokiStructuredMetadata feature toggle
This commit is contained in:
Ivana Huckova
2025-06-30 16:09:44 +02:00
committed by GitHub
parent cc542f2b91
commit dd5c545df9
12 changed files with 41 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/api.go
+9 -14
View File
@@ -27,11 +27,10 @@ import (
)
type LokiAPI struct {
client *http.Client
url string
log log.Logger
tracer trace.Tracer
requestStructuredMetadata bool
client *http.Client
url string
log log.Logger
tracer trace.Tracer
}
type RawLokiResponse struct {
@@ -40,11 +39,11 @@ type RawLokiResponse struct {
Encoding string
}
func newLokiAPI(client *http.Client, url string, log log.Logger, tracer trace.Tracer, requestStructuredMetadata bool) *LokiAPI {
return &LokiAPI{client: client, url: url, log: log, tracer: tracer, requestStructuredMetadata: requestStructuredMetadata}
func newLokiAPI(client *http.Client, url string, log log.Logger, tracer trace.Tracer) *LokiAPI {
return &LokiAPI{client: client, url: url, log: log, tracer: tracer}
}
func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery, categorizeLabels bool) (*http.Request, error) {
func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery) (*http.Request, error) {
qs := url.Values{}
qs.Set("query", query.Expr)
@@ -103,11 +102,7 @@ func makeDataRequest(ctx context.Context, lokiDsUrl string, query lokiQuery, cat
req.Header.Set("X-Query-Tags", "Source="+value)
}
}
if categorizeLabels {
req.Header.Set("X-Loki-Response-Encoding-Flags", "categorize-labels")
}
req.Header.Set("X-Loki-Response-Encoding-Flags", "categorize-labels")
setXScopeOrgIDHeader(req, ctx)
return req, nil
@@ -164,7 +159,7 @@ func readLokiError(body io.ReadCloser) error {
}
func (api *LokiAPI) DataQuery(ctx context.Context, query lokiQuery, responseOpts ResponseOpts) (*backend.DataResponse, error) {
req, err := makeDataRequest(ctx, api.url, query, api.requestStructuredMetadata)
req, err := makeDataRequest(ctx, api.url, query)
if err != nil {
return nil, err
}