-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
[pkg/stanza][receiver/filelog] Introduce active file grouping mechanism #36518
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
djaglowski
approved these changes
Nov 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, thanks for picking this up
VihasMakwana
approved these changes
Nov 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Also, can you please update the README to reflect new configs?
odubajDT
force-pushed
the
file-grouping
branch
2 times, most recently
from
November 26, 2024 09:20
d8f7829
to
71c6da0
Compare
odubajDT
changed the title
[pkg/stanza] Introduce active file grouping mechanism
[pkg/stanza][receiver/filelog] Introduce active file grouping mechanism
Nov 26, 2024
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
odubajDT
force-pushed
the
file-grouping
branch
from
November 26, 2024 12:11
90a8cdb
to
df49340
Compare
dmitryax
pushed a commit
that referenced
this pull request
Dec 3, 2024
Fixes #36623 We're using a map to store groups and we then do a `for .. range` over keys. https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/6119d51a5a85565c409bb225027d6d1ab353aecc/pkg/stanza/fileconsumer/matcher/matcher.go#L200-L206 For maps, the ordering of keys is not guaranteed. Hence, the check fails. We should instead check with `assert.ElementsMatch` (which was previously the case, but #36518 changed it to `assert.Equal`)
shivanthzen
pushed a commit
to shivanthzen/opentelemetry-collector-contrib
that referenced
this pull request
Dec 5, 2024
…sm (open-telemetry#36518) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description - introduce active file grouping according to the description in ticket - unit tests <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#23787 --------- Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
shivanthzen
pushed a commit
to shivanthzen/opentelemetry-collector-contrib
that referenced
this pull request
Dec 5, 2024
Fixes open-telemetry#36623 We're using a map to store groups and we then do a `for .. range` over keys. https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/6119d51a5a85565c409bb225027d6d1ab353aecc/pkg/stanza/fileconsumer/matcher/matcher.go#L200-L206 For maps, the ordering of keys is not guaranteed. Hence, the check fails. We should instead check with `assert.ElementsMatch` (which was previously the case, but open-telemetry#36518 changed it to `assert.Equal`)
ZenoCC-Peng
pushed a commit
to ZenoCC-Peng/opentelemetry-collector-contrib
that referenced
this pull request
Dec 6, 2024
…sm (open-telemetry#36518) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description - introduce active file grouping according to the description in ticket - unit tests <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#23787 --------- Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
ZenoCC-Peng
pushed a commit
to ZenoCC-Peng/opentelemetry-collector-contrib
that referenced
this pull request
Dec 6, 2024
Fixes open-telemetry#36623 We're using a map to store groups and we then do a `for .. range` over keys. https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/6119d51a5a85565c409bb225027d6d1ab353aecc/pkg/stanza/fileconsumer/matcher/matcher.go#L200-L206 For maps, the ordering of keys is not guaranteed. Hence, the check fails. We should instead check with `assert.ElementsMatch` (which was previously the case, but open-telemetry#36518 changed it to `assert.Equal`)
sbylica-splunk
pushed a commit
to sbylica-splunk/opentelemetry-collector-contrib
that referenced
this pull request
Dec 17, 2024
…sm (open-telemetry#36518) <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description - introduce active file grouping according to the description in ticket - unit tests <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes open-telemetry#23787 --------- Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
sbylica-splunk
pushed a commit
to sbylica-splunk/opentelemetry-collector-contrib
that referenced
this pull request
Dec 17, 2024
Fixes open-telemetry#36623 We're using a map to store groups and we then do a `for .. range` over keys. https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/6119d51a5a85565c409bb225027d6d1ab353aecc/pkg/stanza/fileconsumer/matcher/matcher.go#L200-L206 For maps, the ordering of keys is not guaranteed. Hence, the check fails. We should instead check with `assert.ElementsMatch` (which was previously the case, but open-telemetry#36518 changed it to `assert.Equal`)
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.
Description
Link to tracking issue
Fixes #23787