Files
o11y/pkg/querier/promql_query_parser.go
zeekay b9f9cdf918 feat: bump o11y fork to latest SigNoz — full re-sync, builds green (§4c retained)
Re-sync the entire SigNoz-derived Go tree to a clean fork of latest SigNoz
main (upstream 3e6339019), eliminating the version-skew that broke
`go build ./...` (mixed-era packages, ~14 imported-but-absent packages,
partial signoz->o11y / clickhouse->datastore rebrands, self-import cycle,
duplicate package decls).

- pkg/ + cmd/ wholesale replaced with latest SigNoz; imports rewritten
  github.com/SigNoz/signoz/ -> github.com/hanzoai/o11y/.
- Adopt SigNoz's CURRENT structure (resourcefilter->telemetryresourcefilter,
  integrationtypes->cloudintegrationtypes, roletypes/grammar/times folded in
  upstream); old paths dropped.
- Fork deps repathed to hanzoai + bumped: signoz-otel-collector v0.144.6,
  clickhouse-go-mock v0.14.1, govaluate v0.1.0; expr-lang/expr => hanzoai/expr
  v1.17.8 (replace). go.mod reconciled from latest SigNoz; go.sum re-tidied.
- ee/ + cmd/enterprise stripped — o11y stays MIT-only; community edition
  imports no ee packages.
- Preserved o11y additions: module path github.com/hanzoai/o11y, mount.go
  (cloud.Register/zip mount adapter, HIP-0106), NOTICE + LICENSE (SigNoz §4c
  attribution retained; upstream pkg files are headerless per SigNoz convention).
- Reverted o11y cosmetic renames (o11y*/datastore*) and experimental originals
  (authz/iamauthz, billing, zapreceiver, zapmetricreceiver) to SigNoz canonical
  to kill the skew; snapshots retained in git history for re-layering.

go build ./... = exit 0. go vet clean except benign "unreachable code" in
generated ANTLR parser files (inherited from upstream).
2026-07-02 14:20:32 -07:00

67 lines
1.8 KiB
Go

package querier
import (
"strings"
"github.com/prometheus/prometheus/model/labels"
"github.com/prometheus/prometheus/promql/parser"
)
// allVarRemover is a visitor that removes label matchers referencing variables with __all__ value.
// This must run before variable substitution so it can detect variable references in their original form.
type allVarRemover struct {
allVars map[string]bool // map of variable names that have __all__ value
}
// Visit implements the parser.Visitor interface to traverse and modify the PromQL AST.
func (v *allVarRemover) Visit(node parser.Node, path []parser.Node) (parser.Visitor, error) {
if node == nil {
return v, nil
}
switch n := node.(type) {
case *parser.VectorSelector:
// Remove matchers that reference variables with __all__ value
var keptMatchers []*labels.Matcher
for _, matcher := range n.LabelMatchers {
if !v.shouldRemoveMatcher(matcher.Value) {
keptMatchers = append(keptMatchers, matcher)
}
}
// Update the label matchers
n.LabelMatchers = keptMatchers
}
return v, nil
}
// shouldRemoveMatcher checks if a matcher value contains a variable reference that has __all__ value.
func (v *allVarRemover) shouldRemoveMatcher(value string) bool {
// Check for $var pattern
if strings.Contains(value, "$") {
keyValue := strings.TrimPrefix(value, "$")
if _, ok := v.allVars[keyValue]; ok {
return true
}
}
// Check for {{var}} pattern
if strings.Contains(value, "{{") {
keyValue := strings.TrimPrefix(value, "{{")
keyValue = strings.TrimSuffix(keyValue, "}}")
if _, ok := v.allVars[keyValue]; ok {
return true
}
}
// Check for [[var]] pattern
if strings.Contains(value, "[[") {
keyValue := strings.TrimPrefix(value, "[[")
keyValue = strings.TrimSuffix(keyValue, "]]")
if _, ok := v.allVars[keyValue]; ok {
return true
}
}
return false
}