Skip to content

fix(tagged): mark tagged terms with empty values with HasWildcard when using useCarbonBehavior feature flag #314

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.

Sign up for GitHub

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

Merged
mchrome merged 3 commits into from
May 26, 2025
Merged

fix(tagged): mark tagged terms with empty values with HasWildcard when using useCarbonBehavior feature flag #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aefb2d
mark tagged terms with empty values with HasWildcard when using useCa…
mchrome May 21, 2025
e3f7bf4
Merge branch 'master' into fix/unoptimal-sql-with-useCarbonBehaviour
mchrome May 23, 2025
aa00237
fix linter errors
mchrome May 23, 2025
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
4 changes: 2 additions & 2 deletions finder/tagged.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ func ParseTaggedConditions(conditions []string, config *config.Config, autocompl
terms[i].HasWildcard = where.HasWildcard(terms[i].Value)
// special case when using useCarbonBehaviour = true
// which matches everything that does not have that tag
emptyValue := config.FeatureFlags.UseCarbonBehavior && terms[i].Value == ""
if !terms[i].HasWildcard && !emptyValue {
terms[i].HasWildcard = terms[i].HasWildcard || config.FeatureFlags.UseCarbonBehavior && terms[i].Value == ""
if !terms[i].HasWildcard {
nonWildcards++
}
case "!=":
Expand Down
47 changes: 32 additions & 15 deletions finder/tagged_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,14 +943,16 @@ func TestParseSeriesByTagWithCostsFromCountTable(t *testing.T) {

func TestTaggedFinder_whereFilter(t *testing.T) {
tests := []struct {
name string
query string
from int64
until int64
dailyEnabled bool
taggedCosts map[string]*config.Costs
want string
wantPre string
name string
query string
from int64
until int64
dailyEnabled bool
useCarbonBehavior bool
dontMatchMissingTags bool
taggedCosts map[string]*config.Costs
want string
wantPre string
}{
{
name: "nodaily",
Expand All @@ -972,29 +974,44 @@ func TestTaggedFinder_whereFilter(t *testing.T) {
date.FromTimestampToDaysFormat(1668124800) + "' AND Date <= '" + date.UntilTimestampToDaysFormat(1668124810) + "')",
wantPre: "",
},
{
name: "",
query: "seriesByTag('emptyval=', 'what=value')",
from: 1668124800, // 2022-11-11 00:00:00 UTC
until: 1668124810, // 2022-11-11 00:00:10 UTC
dailyEnabled: true,
useCarbonBehavior: true,
want: "((Tag1='what=value') AND (NOT arrayExists((x) -> x LIKE 'emptyval=%', Tags))) AND (Date >='" +
date.FromTimestampToDaysFormat(1668124800) + "' AND Date <= '" + date.UntilTimestampToDaysFormat(1668124810) + "')",
wantPre: "",
},
}
for _, tt := range tests {
t.Run(tt.name+" "+time.Unix(tt.from, 0).Format(time.RFC3339), func(t *testing.T) {
config := config.New()
config.ClickHouse.TaggedCosts = tt.taggedCosts

terms, err := ParseSeriesByTag(tt.query, config)
if err != nil {
t.Fatal(err)
}
config.FeatureFlags.UseCarbonBehavior = tt.useCarbonBehavior
config.FeatureFlags.DontMatchMissingTags = tt.dontMatchMissingTags

f := NewTagged(
"http://localhost:8123/",
"graphite_tags",
"",
tt.dailyEnabled,
false,
false,
tt.useCarbonBehavior,
tt.dontMatchMissingTags,
false,
clickhouse.Options{},
tt.taggedCosts,
)

stat := &FinderStat{}

terms, err := f.PrepareTaggedTerms(context.Background(), config, tt.query, tt.from, tt.until, stat)
if err != nil {
t.Fatal(err)
}

got, gotDate, err := f.whereFilter(terms, tt.from, tt.until)
if err != nil {
t.Fatal(err)
Expand Down
Loading