Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cmd/query/app/query_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,15 @@ func (p *queryParser) parseMetricsQueryParams(r *http.Request) (bqp metricstore.
if err != nil {
return bqp, err
}

tags, err := p.parseTags(r.Form[tagParam], r.Form[tagsParam])
if err != nil {
return bqp, err
}
if len(tags) > 0 {
bqp.Tags = tags
}

bqp.EndTime = &endTs
bqp.Lookback = &lookback
bqp.Step = &step
Expand Down
34 changes: 34 additions & 0 deletions cmd/query/app/query_parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,3 +370,37 @@ func TestParameterErrors(t *testing.T) {
})
}
}

func TestParseMetricsTags(t *testing.T) {
t.Run("simple tag only", func(t *testing.T) {
request, err := http.NewRequest(http.MethodGet, "x?service=foo&step=1000&tag=key1:value1", http.NoBody)
require.NoError(t, err)
parser := &queryParser{
timeNow: time.Now,
}
mqp, err := parser.parseMetricsQueryParams(request)
require.NoError(t, err)
assert.Equal(t, time.Second, *mqp.Step)
assert.Equal(t, map[string]string{"key1": "value1"}, mqp.Tags)
})
t.Run("Tag json", func(t *testing.T) {
request, err := http.NewRequest(http.MethodGet, "x?service=foo&step=1000&tags={\"key1\":\"value1\",\"key2\":\"value2\"}", http.NoBody)
require.NoError(t, err)
parser := &queryParser{
timeNow: time.Now,
}
mqp, err := parser.parseMetricsQueryParams(request)
require.NoError(t, err)
assert.Equal(t, time.Second, *mqp.Step)
assert.Equal(t, map[string]string{"key1": "value1", "key2": "value2"}, mqp.Tags)
})
t.Run("malformed simple tag", func(t *testing.T) {
request, err := http.NewRequest(http.MethodGet, "x?service=foo&step=1000&tag=keyWithoutValue", http.NoBody)
require.NoError(t, err)
parser := &queryParser{
timeNow: time.Now,
}
_, err = parser.parseMetricsQueryParams(request)
require.ErrorContains(t, err, "malformed 'tag' parameter, expecting key:value, received: keyWithoutValue")
})
}
3 changes: 2 additions & 1 deletion docker-compose/monitor/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Copyright (c) 2024 The Jaeger Authors.
# SPDX-License-Identifier: Apache-2.0

BINARY ?= jaeger # Default value uses v2 binary
BINARY ?= jaeger
# Default value uses v2 binary

.PHONY: build
build: clean-jaeger
Expand Down
66 changes: 66 additions & 0 deletions internal/storage/elasticsearch/query/tag_query_builder.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// Copyright (c) 2025 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package query

import (
"fmt"

"github.com/olivere/elastic/v7"

"github.com/jaegertracing/jaeger/internal/storage/elasticsearch/dbmodel"
)

const (
objectTagsField = "tag"
objectProcessTagsField = "process.tag"
nestedTagsField = "tags"
nestedProcessTagsField = "process.tags"
nestedLogFieldsField = "logs.fields"
tagKeyField = "key"
tagValueField = "value"
)

var (
objectTagFieldList = []string{objectTagsField, objectProcessTagsField}
nestedTagFieldList = []string{nestedTagsField, nestedProcessTagsField, nestedLogFieldsField}
)

type TagQueryBuilder struct {
dotReplacer dbmodel.DotReplacer
}

// NewTagQueryBuilder returns an instance of TagQueryBuilder
func NewTagQueryBuilder(dotReplacer dbmodel.DotReplacer) TagQueryBuilder {
return TagQueryBuilder{dotReplacer: dotReplacer}
}

func (q *TagQueryBuilder) BuildTagQuery(k string, v string) elastic.Query {
objectTagListLen := len(objectTagFieldList)
queries := make([]elastic.Query, len(nestedTagFieldList)+objectTagListLen)
kd := q.dotReplacer.ReplaceDot(k)
for i := range objectTagFieldList {
queries[i] = q.buildObjectQuery(objectTagFieldList[i], kd, v)
}
for i := range nestedTagFieldList {
queries[i+objectTagListLen] = q.buildNestedQuery(nestedTagFieldList[i], k, v)
}

// but configuration can change over time
return elastic.NewBoolQuery().Should(queries...)
}

func (*TagQueryBuilder) buildNestedQuery(field string, k string, v string) elastic.Query {
keyField := fmt.Sprintf("%s.%s", field, tagKeyField)
valueField := fmt.Sprintf("%s.%s", field, tagValueField)
keyQuery := elastic.NewMatchQuery(keyField, k)
valueQuery := elastic.NewRegexpQuery(valueField, v)
tagBoolQuery := elastic.NewBoolQuery().Must(keyQuery, valueQuery)
return elastic.NewNestedQuery(field, tagBoolQuery)
}

func (*TagQueryBuilder) buildObjectQuery(field string, k string, v string) elastic.Query {
keyField := fmt.Sprintf("%s.%s", field, k)
keyQuery := elastic.NewRegexpQuery(keyField, v)
return elastic.NewBoolQuery().Must(keyQuery)
}
Loading
Loading