Skip to content
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

[cassandra] Blacklisting/Whitelisting Tags for Indexing #1904

Merged
merged 23 commits into from
Nov 9, 2019
Merged

[cassandra] Blacklisting/Whitelisting Tags for Indexing #1904

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3fdbae6
Added configuration and CLI support
joe-elliott Nov 6, 2019
8310715
Added filters
joe-elliott Nov 7, 2019
e67acd9
Create White and Blacklist filters based on options
joe-elliott Nov 7, 2019
d75054c
make fmt
joe-elliott Nov 7, 2019
1c49ef7
Expanded filter tests
joe-elliott Nov 7, 2019
c691d2d
Expanded factory tests
joe-elliott Nov 7, 2019
84fb987
Merge branch 'master' into tag-filter
joe-elliott Nov 7, 2019
67b98ec
Merge branch 'master' into tag-filter
joe-elliott Nov 7, 2019
9726f1f
Moved tag filters out of cassandra connection config
joe-elliott Nov 8, 2019
9893b3e
Merge branch 'master' into tag-filter
joe-elliott Nov 8, 2019
9ffdb9b
Addressed review items
joe-elliott Nov 8, 2019
e86345b
Combined white and blacklist filters
joe-elliott Nov 8, 2019
eca658a
Added exact match tests
joe-elliott Nov 8, 2019
63834ab
processTags => tags
joe-elliott Nov 8, 2019
08f3487
Create exact match tag filters
joe-elliott Nov 8, 2019
6b4866a
Better var name
joe-elliott Nov 8, 2019
83c5e22
Merge branch 'master' into tag-filter
joe-elliott Nov 8, 2019
ed29bb6
Reverted submodule
joe-elliott Nov 8, 2019
0d3ba34
Created convenience factory methods for white/blacklist
joe-elliott Nov 8, 2019
8f042cc
Hid original factory method
joe-elliott Nov 8, 2019
b80d70c
Clarified tests
joe-elliott Nov 8, 2019
2f6fed6
Fixed submodule?
joe-elliott Nov 8, 2019
a0bfe43
Removed blank line
joe-elliott Nov 8, 2019
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
Prev Previous commit
Next Next commit
processTags => tags 
Signed-off-by: Joe Elliott <number101010@gmail.com>
  • Loading branch information
@joe-elliott
joe-elliott committed Nov 8, 2019
commit 63834ab20d32d457a9206399ca1a263d611c17c5
4 changes: 2 additions & 2 deletions plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func (tf ExactMatchTagFilter) FilterLogFields(span *model.Span, logFields model.
return tf.filter(logFields)
}

func (tf ExactMatchTagFilter) filter(processTags model.KeyValues) model.KeyValues {
func (tf ExactMatchTagFilter) filter(tags model.KeyValues) model.KeyValues {
var kvs model.KeyValues
for _, t := range processTags {
for _, t := range tags {
if _, ok := tf.tags[t.Key]; ok == !tf.dropMatches {
kvs = append(kvs, t)
}
Expand Down