Fix duplicate logs from docker containers #6201
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
cstyan
approved these changes
Jan 19, 2024
1 task
MichelHollands
added a commit
to grafana/loki
that referenced
this pull request
Jan 26, 2024
**What this PR does / why we need it**: We ported this fix a few days ago to the Agent via this [PR](grafana/agent#6201) but the added test is often failing in our drone pipeline. I believe that there are two reasons why this test is flaky: - the test expects that the 5 last lines of logs are the expected ones but it seems that other lines might be logged as well (https://drone.grafana.net/grafana/agent/16045/4/2) - we saw that the simulated container did not always have enough time to stop before calling the tgt.startIfNotRunning() to restart it. (https://drone.grafana.net/grafana/agent/16077/4/2) Fix: - the test now uses "assert.EventuallyWithT" and checks that within 5 seconds the expected log lines will be amongst the logs without duplicate. - the test now stops the simulated container before restarting it **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Gordejj
pushed a commit
to Gordejj/loki
that referenced
this pull request
Jan 29, 2024
**What this PR does / why we need it**: We ported this fix a few days ago to the Agent via this [PR](grafana/agent#6201) but the added test is often failing in our drone pipeline. I believe that there are two reasons why this test is flaky: - the test expects that the 5 last lines of logs are the expected ones but it seems that other lines might be logged as well (https://drone.grafana.net/grafana/agent/16045/4/2) - we saw that the simulated container did not always have enough time to stop before calling the tgt.startIfNotRunning() to restart it. (https://drone.grafana.net/grafana/agent/16077/4/2) Fix: - the test now uses "assert.EventuallyWithT" and checks that within 5 seconds the expected log lines will be amongst the logs without duplicate. - the test now stops the simulated container before restarting it **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
BarunKGP
pushed a commit
to BarunKGP/grafana-agent
that referenced
this pull request
Feb 20, 2024
* Fix duplicate logs from docker containers * changelog
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes #6200
Port of https://github.com/grafana/loki/pull/11563/files.