Skip to content

Commit

Permalink
rebase and changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@ie-pham
ie-pham committed Jun 25, 2024
1 parent c4d98e9 commit 2d03712
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* [CHANGE] Update Go to 1.22.4 [#3757](https://github.com/grafana/tempo/pull/3757) [#3793](https://github.com/grafana/tempo/pull/3793) (@joe-elliott, @mapno)
* [FEATURE] TraceQL support for link scope and link:traceID and link:spanID [#3741](https://github.com/grafana/tempo/pull/3741) (@stoewer)
* [FEATURE] TraceQL support for event scope and event:name intrinsic [#3708](https://github.com/grafana/tempo/pull/3708) (@stoewer)
* [FEATURE] TraecQL support for event attributes [#3708](https://github.com/grafana/tempo/pull/3748) (@ie-pham)
* [FEATURE] Flush and query RF1 blocks for TraceQL metric queries [#3628](https://github.com/grafana/tempo/pull/3628) [#3691](https://github.com/grafana/tempo/pull/3691) [#3723](https://github.com/grafana/tempo/pull/3723) (@mapno)
* [FEATURE] Add new compare() metrics function [#3695](https://github.com/grafana/tempo/pull/3695) (@mdisibio)
* [ENHANCEMENT] Tag value lookup use protobuf internally for improved latency [#3731](https://github.com/grafana/tempo/pull/3731) (@mdisibio)
Expand Down
59 changes: 35 additions & 24 deletions tempodb/encoding/vparquet4/block_traceql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1369,27 +1369,38 @@ func (i *mergeSpansetIterator) Close() {
//
// Diagram:
//
// Span attribute iterator: key -----------------------------
// ... -------------------------- |
// Span attribute iterator: valueN ----------------------| | |
// | | |
// V V V
// -------------
// | attribute |
// | collector |
// -------------
// |
// | List of attributes
// |
// |
// Span column iterator 1 --------------------------- |
// ... ------------------------ | |
// Span column iterator N --------------------- | | |
// (ex: name, status) | | | |
// V V V V
// ------------------
// | span collector |
// ------------------
// Event attribute iterator: key --------------------------------------------
// | |
// Event attribute iterator: valunN --------------------------------------- | |
// | | |
// V V V
// ------------
// Event column iterator 1 --------------------------------------------- | attribute |
// (ex: name, time since) | | collector |
// | ------------
// | |
// V V
// Span attribute iterator: key ------------------------- ------------
// ... ----------------------- | | event |
// Span attribute iterator: valueN -------------------| | | | collector |
// | | | -------------
// V V V |
// ------------- |
// | attribute | |
// | collector | |
// ------------- |
// | |
// | List |
// | of span |
// | attributes |
// Span column iterator 1 --------------------------- | |
// ... ------------------------ | | |
// Span column iterator N --------------------- | | | |
// (ex: name, status) | | | | |
// V V V V V
// -------------------------------------------------
// | span collector |
// -------------------------------------------------
// |
// | List of Spans
// Resource attribute |
Expand Down Expand Up @@ -1534,7 +1545,7 @@ func createAllIterator(ctx context.Context, primaryIter parquetquery.Iterator, c
innerIterators = append(innerIterators, primaryIter)
}

eventIter, err := createEventIterator(makeIter, primaryIter, catConditions.event, allConditions)
eventIter, err := createEventIterator(makeIter, primaryIter, catConditions.event, allConditions, selectAll)
if err != nil {
return nil, fmt.Errorf("creating event iterator: %w", err)
}
Expand Down Expand Up @@ -1563,7 +1574,7 @@ func createAllIterator(ctx context.Context, primaryIter parquetquery.Iterator, c
return createTraceIterator(makeIter, resourceIter, catConditions.trace, start, end, shardID, shardCount, allConditions, selectAll)
}

func createEventIterator(makeIter makeIterFn, primaryIter parquetquery.Iterator, conditions []traceql.Condition, allConditions bool) (parquetquery.Iterator, error) {
func createEventIterator(makeIter makeIterFn, primaryIter parquetquery.Iterator, conditions []traceql.Condition, allConditions bool, selectAll bool) (parquetquery.Iterator, error) {
if len(conditions) == 0 {
return nil, nil
}
Expand All @@ -1585,7 +1596,7 @@ func createEventIterator(makeIter makeIterFn, primaryIter parquetquery.Iterator,
}

attrIter, err := createAttributeIterator(makeIter, genericConditions, DefinitionLevelResourceSpansILSSpanEventAttrs,
columnPathEventAttrKey, columnPathEventAttrString, columnPathEventAttrInt, columnPathEventAttrDouble, columnPathEventAttrBool, allConditions)
columnPathEventAttrKey, columnPathEventAttrString, columnPathEventAttrInt, columnPathEventAttrDouble, columnPathEventAttrBool, allConditions, selectAll)
if err != nil {
return nil, fmt.Errorf("creating span attribute iterator: %w", err)
}
Expand Down

0 comments on commit 2d03712

Please sign in to comment.