-
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
Move Archive test into shared integration test suite #5207
Move Archive test into shared integration test suite #5207
Conversation
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5207 +/- ##
==========================================
+ Coverage 95.06% 95.09% +0.03%
==========================================
Files 340 340
Lines 16628 16652 +24
==========================================
+ Hits 15808 15836 +28
+ Misses 630 624 -6
- Partials 190 192 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
there should not be submodule changes in this PR
Yeah, actually before making any changes at all. In the main branch after executing git pull, the submodule showed M (Modified) icon automatically. So, I thought those changes were coming from git pull itself? |
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
You can do this: git checkout main
git pull
git submodule update --recursive
git checkout pr-branch
git commit -sm 'fix submodules' Your |
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Saransh Shankar <103821431+Wise-Wizard@users.noreply.github.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
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.
where is the "extract" part of this PR? The ES storage integration test still contains archive logic.
…eger into Test/ArchiveTrace
Yes, I am yet to remove the archive logic from ES Storage Integration. Thought will do that after the logic is approved. |
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Hi, @yurishkuro. I had a query regarding this issue. You mentioned that the archive span reader/writer is not being ued. But, in the existing code of elasticsearch_test.go, the archive trace test is using the same Span Reader/Writer received from integration.go field. So, is that wrong itself? |
Why can't I just extract this to integration.go, and add a condition to check if the specific storage supports archiving and then only execute the test? |
That was exactly the objective of the ticket, but it's not what your PR is doing. "extract" means "move", not duplicate. |
369339c
to
2a5d2d0
Compare
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Saransh Shankar <103821431+Wise-Wizard@users.noreply.github.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Saransh Shankar <103821431+Wise-Wizard@users.noreply.github.com>
Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
Which problem is this PR solving?
This PR addresses the issue #5203
Description of the changes
This PR addresses the issue #5203 by integrating the testArchiveTrace function into the common StorageIntegration type. This modification ensures compatibility with multiple storage backends, allowing the archiving test to be executed across different environments.
How was this change tested?
The changes were tested by running the following command:
make test
Checklist
for jaeger: make lint test
for jaeger-ui: yarn lint
andyarn test