-
Notifications
You must be signed in to change notification settings - Fork 2.7k
[SPM] Filter metrics on page by tag #7504
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
wololowarrior
wants to merge
7
commits into
jaegertracing:main
Choose a base branch
from
wololowarrior:support-metrics-filtering-elasticsearch
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cd8c899
add metrics tags search support to prometheus
wololowarrior 226b11e
tests
wololowarrior 492ea99
filtering ES metrics using tag
wololowarrior 8e0750d
Address review on Tests
wololowarrior 4b69793
Shared tagbuilder
wololowarrior c5a0790
Address reviews and tests
wololowarrior db73f16
Fmt fix
wololowarrior File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.