Add lang/parser support for quantile_over_time, fix missing stringify…

… of metrics and hints

pkg/traceql/ast.go

@@ -753,10 +753,16 @@ var (
 	_ pipelineElement = (*GroupOperation)(nil)
 )
 
+// MetricsAggregate is a placeholder in the AST for a metrics aggregation
+// pipeline element. It has a superset of the properties of them all, and
+// builds them later via init() so that appropriate buffers can be allocated
+// for the query time range and step.
 type MetricsAggregate struct {
-	op  MetricsAggregateOp
-	by  []Attribute
-	agg SpanAggregator
+	op     MetricsAggregateOp
+	by     []Attribute
+	attr   Attribute
+	floats []float64
+	agg    SpanAggregator
 }
 
 func newMetricsAggregate(agg MetricsAggregateOp, by []Attribute) *MetricsAggregate {
@@ -766,6 +772,15 @@ func newMetricsAggregate(agg MetricsAggregateOp, by []Attribute) *MetricsAggrega
 	}
 }
 
+func newMetricsAggregateQuantileOverTime(attr Attribute, qs []float64, by []Attribute) *MetricsAggregate {
+	return &MetricsAggregate{
+		op:     metricsAggregateQuantileOverTime,
+		floats: qs,
+		attr:   attr,
+		by:     by,
+	}
+}
+
 func (a *MetricsAggregate) extractConditions(request *FetchSpansRequest) {
 	switch a.op {
 	case metricsAggregateRate, metricsAggregateCountOverTime:

pkg/traceql/ast_stringer.go

@@ -7,7 +7,17 @@ import (
 )
 
 func (r RootExpr) String() string {
-	return r.Pipeline.String()
+	s := strings.Builder{}
+	s.WriteString(r.Pipeline.String())
+	if r.MetricsPipeline != nil {
+		s.WriteString(" | ")
+		s.WriteString(r.MetricsPipeline.String())
+	}
+	if r.Hints != nil {
+		s.WriteString(" ")
+		s.WriteString(r.Hints.String())
+	}
+	return s.String()
 }
 
 func (p Pipeline) String() string {
@@ -126,7 +136,42 @@ func (a Attribute) String() string {
 }
 
 func (a MetricsAggregate) String() string {
-	return a.op.String()
+	s := strings.Builder{}
+
+	s.WriteString(a.op.String())
+	s.WriteString("(")
+	switch a.op {
+	case metricsAggregateQuantileOverTime:
+		s.WriteString(a.attr.String())
+		s.WriteString(",")
+		for i, f := range a.floats {
+			s.WriteString(strconv.FormatFloat(f, 'f', 5, 64))
+			if i < len(a.floats)-1 {
+				s.WriteString(",")
+			}
+		}
+	}
+	s.WriteString(")")
+
+	if len(a.by) > 0 {
+		s.WriteString("by(")
+		for i, b := range a.by {
+			s.WriteString(b.String())
+			if i < len(a.by)-1 {
+				s.WriteString(",")
+			}
+		}
+		s.WriteString(")")
+	}
+	return s.String()
+}
+
+func (h *Hints) String() string {
+	hh := make([]string, 0, len(h.Hints))
+	for _, hn := range h.Hints {
+		hh = append(hh, hn.Name+"="+hn.Value.String())
+	}
+	return "with(" + strings.Join(hh, ",") + ")"
 }
 
 func binaryOp(op Operator, lhs Element, rhs Element) string {

pkg/traceql/ast_stringer_test.go

@@ -19,22 +19,30 @@ func TestStringer(t *testing.T) {
 	err = yaml.Unmarshal(b, queries)
 	require.NoError(t, err)
 
-	for _, q := range queries.Valid {
-		t.Run(q, func(t *testing.T) {
-			pass1, err := Parse(q)
-			require.NoError(t, err)
+	// All of these queries are parseable and valid constructs, and should be roundtrippable.
+	sets := [][]string{
+		queries.Valid,
+		queries.Unsupported,
+	}
 
-			// now parse it a second time and confirm that it parses the same way twice
-			pass2, err := Parse(pass1.String())
-			ok := assert.NoError(t, err)
-			if !ok {
-				t.Logf("\n\t1: %s", pass1.String())
-				return
-			}
+	for _, s := range sets {
+		for _, q := range s {
+			t.Run(q, func(t *testing.T) {
+				pass1, err := Parse(q)
+				require.NoError(t, err)
 
-			assert.Equal(t, pass1, pass2)
-			t.Logf("\n\tq: %s\n\t1: %s\n\t2: %s", q, pass1.String(), pass2.String())
-		})
+				// now parse it a second time and confirm that it parses the same way twice
+				pass2, err := Parse(pass1.String())
+				ok := assert.NoError(t, err)
+				if !ok {
+					t.Logf("\n\t1: %s", pass1.String())
+					return
+				}
+
+				assert.Equal(t, pass1, pass2)
+				t.Logf("\n\tq: %s\n\t1: %s\n\t2: %s", q, pass1.String(), pass2.String())
+			})
+		}
 	}
 }
 

pkg/traceql/ast_validate.go

@@ -255,3 +255,7 @@ func (a Attribute) validate() error {
 
 	return nil
 }
+
+func (h *Hints) validate() error {
+	return nil
+}

pkg/traceql/enum_aggregates.go

@@ -34,6 +34,7 @@ type MetricsAggregateOp int
 const (
 	metricsAggregateRate MetricsAggregateOp = iota
 	metricsAggregateCountOverTime
+	metricsAggregateQuantileOverTime
 )
 
 func (a MetricsAggregateOp) String() string {
@@ -42,6 +43,8 @@ func (a MetricsAggregateOp) String() string {
 		return "rate"
 	case metricsAggregateCountOverTime:
 		return "count_over_time"
+	case metricsAggregateQuantileOverTime:
+		return "quantile_over_time"
 	}
 
 	return fmt.Sprintf("aggregate(%d)", a)

pkg/traceql/enum_hints.go

@@ -95,3 +95,5 @@ func (h *Hints) Get(k string, t StaticType, allowUnsafe bool) (v Static, ok bool
 
 	return
 }
+
+var _ Element = (*Hints)(nil)

pkg/traceql/expr.y

@@ -35,12 +35,14 @@ import (
     static Static
     intrinsicField Attribute
     attributeField Attribute
+    attribute Attribute
 
     binOp       Operator
     staticInt   int
     staticStr   string
     staticFloat float64
     staticDuration time.Duration
+    floatList []float64
 
     hint *Hint
     hintList []*Hint
@@ -73,6 +75,9 @@ import (
 %type <static> static
 %type <intrinsicField> intrinsicField
 %type <attributeField> attributeField
+%type <attribute> attribute
+
+%type <floatList> floatList
 
 %type <hint> hint
 %type <hintList> hintList
@@ -90,7 +95,7 @@ import (
                         COUNT AVG MAX MIN SUM
                         BY COALESCE SELECT
                         END_ATTRIBUTE
-                        RATE COUNT_OVER_TIME
+                        RATE COUNT_OVER_TIME QUANTILE_OVER_TIME
                         WITH
 
 // Operators are listed with increasing precedence.
@@ -161,11 +166,19 @@ selectOperation:
     SELECT OPEN_PARENS attributeList CLOSE_PARENS { $$ = newSelectOperation($3) }
   ;
 
+attribute:
+  intrinsicField    { $$ = $1 }
+  | attributeField  { $$ = $1 }
+  ;
+
 attributeList:
-    intrinsicField                  { $$ = []Attribute{$1} }
-  | attributeField                  { $$ = []Attribute{$1} }
-  | attributeList COMMA intrinsicField { $$ = append($1, $3) }
-  | attributeList COMMA attributeField { $$ = append($1, $3) }
+    attribute                     { $$ = []Attribute{$1} }
+  | attributeList COMMA attribute { $$ = append($1, $3) }
+  ;
+
+floatList:
+  FLOAT                   { $$ = []float64{$1} }
+  | floatList COMMA FLOAT { $$ = append($1, $3) }
   ;
 
 spansetExpression: // shares the same operators as scalarPipelineExpression. split out for readability
@@ -262,9 +275,11 @@ aggregate:
 // **********************
 metricsAggregation:
       RATE            OPEN_PARENS CLOSE_PARENS { $$ = newMetricsAggregate(metricsAggregateRate, nil) }
-    | COUNT_OVER_TIME OPEN_PARENS CLOSE_PARENS { $$ = newMetricsAggregate(metricsAggregateCountOverTime, nil) }
     | RATE            OPEN_PARENS CLOSE_PARENS BY OPEN_PARENS attributeList CLOSE_PARENS { $$ = newMetricsAggregate(metricsAggregateRate, $6) }
+    | COUNT_OVER_TIME OPEN_PARENS CLOSE_PARENS { $$ = newMetricsAggregate(metricsAggregateCountOverTime, nil) }
     | COUNT_OVER_TIME OPEN_PARENS CLOSE_PARENS BY OPEN_PARENS attributeList CLOSE_PARENS { $$ = newMetricsAggregate(metricsAggregateCountOverTime, $6) }
+    | QUANTILE_OVER_TIME OPEN_PARENS attribute COMMA floatList CLOSE_PARENS { $$ = newMetricsAggregateQuantileOverTime($3, $5, nil) }
+    | QUANTILE_OVER_TIME OPEN_PARENS attribute COMMA floatList CLOSE_PARENS BY OPEN_PARENS attributeList CLOSE_PARENS { $$ = newMetricsAggregateQuantileOverTime($3, $5, $9) }
   ;
 
 // **********************