Fix tag handling in nested functions #76
Merged
Conversation
This file contains 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 comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
I am on board with this, I just was trying to figure out if there is any situation were we wouldn't want to copy the tags. |
This comment has been minimized.
This comment has been minimized.
expr/types/types.go
Outdated
Comment on lines
457
to
460
| tags := make(map[string]string) | ||
| for k, v := range r.Tags { | ||
| tags[k] = v | ||
| } |
There was a problem hiding this comment.
We would need to add/overwrite the "name" tag after that.
Actually, I think the whole function body could be replaced by this, to delete the duplicate code:
func (r *MetricData) CopyName(name string) *MetricData {
res := r.CopyLink()
if name == "" {
res.Name = name
res.Tags["name"] = name
}
return res
}That would also mean we can delete all the r.Tags["name"] = name after calling CopyName.
What do you think?
There was a problem hiding this comment.
I think that sounds like a good plan! I will make that change
This comment has been minimized.
This comment has been minimized.
carrieedwards
force-pushed
the
cedwards/fix-nested-tag-names
branch
from
b407f71
to
4c3b76a
Compare
This comment has been minimized.
This comment has been minimized.
npazosmendez
approved these changes
Aug 23, 2022
| @@ -34,7 +34,6 @@ func (f *aliasByMetric) Do(ctx context.Context, e parser.Expr, from, until int64 | |||
| part := strings.Split(metric, ".") | |||
| name := part[len(part)-1] | |||
| ret := a.CopyName(name) | |||
| ret.PathExpression = name | |||
carrieedwards
force-pushed
the
cedwards/fix-nested-tag-names
branch
from
b456026
to
c106ba9
Compare
This comment has been minimized.
This comment has been minimized.
1 similar comment
|
Go coverage report: Click to expand.
Go lint report: No issues found. 😎 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes an issue in which tags were not being properly set for the results of the outer function when Graphite web functions are nested. Previously, for certain functions, if there is another function is an argument that returns results, the tags that had been assigned to the resulting series are not included in the final result of the query. This is because some functions do not copy over tags. Some examples of such functions include aliasByNode, alias, and aggregateLine.
Example:
aliasByNode(absolute(testMetric),1))
The results of this query should now return the "name" tag and the "absolute" tag, instead of just the "name" tag.