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.

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

Fix span deduplication via correct ordering of adjusters #6116

Merged
merged 5 commits into from
Oct 27, 2024

Conversation

cdanis
Copy link
Contributor

@cdanis cdanis commented Oct 23, 2024

Which problem is this PR solving?

Description of the changes

  • Change the order of Adjusters so that DedupeBySpanHash runs before ClockSkew

How was this change tested?

  • In production, lightly
  • Also unit tested

Checklist

@cdanis cdanis requested a review from a team as a code owner October 23, 2024 20:44
@dosubot dosubot bot added the bug label Oct 23, 2024
@cdanis
Copy link
Contributor Author

cdanis commented Oct 23, 2024

I am not sure how to add unittests for this and would welcome advice.

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.41%. Comparing base (bf06acf) to head (b5703ea).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6116   +/-   ##
=======================================
  Coverage   96.41%   96.41%           
=======================================
  Files         353      353           
  Lines       20135    20135           
=======================================
  Hits        19414    19414           
  Misses        535      535           
  Partials      186      186           
Flag Coverage Δ
badger_v1 8.32% <0.00%> (ø)
badger_v2 1.68% <0.00%> (ø)
cassandra-4.x-v1 14.39% <0.00%> (ø)
cassandra-4.x-v2 1.62% <0.00%> (ø)
cassandra-5.x-v1 14.39% <0.00%> (ø)
cassandra-5.x-v2 1.62% <0.00%> (ø)
elasticsearch-6.x-v1 18.51% <0.00%> (ø)
elasticsearch-7.x-v1 18.59% <0.00%> (+<0.01%) ⬆️
elasticsearch-8.x-v1 18.76% <0.00%> (ø)
elasticsearch-8.x-v2 1.67% <0.00%> (ø)
grpc_v1 9.52% <0.00%> (-0.01%) ⬇️
grpc_v2 7.01% <0.00%> (ø)
kafka-v1 8.88% <0.00%> (ø)
kafka-v2 1.68% <0.00%> (ø)
memory_v2 1.68% <0.00%> (ø)
opensearch-1.x-v1 18.64% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v1 18.64% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v2 1.67% <0.00%> (ø)
tailsampling-processor 0.47% <0.00%> (ø)
unittests 95.33% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@yurishkuro
Copy link
Member

Resolves 6001 (again)

can you elaborate why "again"? Are we missing a unit test that should catch the issue of ordering?

@cdanis
Copy link
Contributor Author

cdanis commented Oct 23, 2024 via email

@yurishkuro
Copy link
Member

Can be a new test, we have several in the directory

Signed-off-by: Chris Danis <cdanis@wikimedia.org>
Signed-off-by: Chris Danis <cdanis@wikimedia.org>
Signed-off-by: Chris Danis <cdanis@wikimedia.org>
@cdanis
Copy link
Contributor Author

cdanis commented Oct 24, 2024

ok @yurishkuro ptal

yurishkuro and others added 2 commits October 27, 2024 10:30
Signed-off-by: Yuri Shkuro <github@ysh.us>
@yurishkuro yurishkuro changed the title fix span deduplication Fix span deduplication via correct ordering of adjusters Oct 27, 2024
@yurishkuro yurishkuro enabled auto-merge (squash) October 27, 2024 14:37
@yurishkuro yurishkuro merged commit f0c5a1d into jaegertracing:main Oct 27, 2024
49 checks passed
yurishkuro added a commit to yurishkuro/jaeger that referenced this pull request Nov 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: ElasticSearch storage not deduplicating multiply-archived spans
2 participants