Skip to content

[cassandra] Refactor TagFilter to accept dbmodel.Span #7707

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

Jump to bottom
Merged
yurishkuro merged 11 commits into from
Dec 16, 2025
Merged

[cassandra] Refactor TagFilter to accept dbmodel.Span #7707

yurishkuro merged 11 commits into from
Dec 16, 2025

Conversation

@Manik2708
Copy link
Contributor

@Manik2708 Manik2708 commented Dec 7, 2025

Which problem is this PR solving?

Description of the changes

How was this change tested?

  • Unit And Integration Tests

Checklist

@Manik2708
[cassandra] Refactor TagFilter to accept dbmodel Span
5c26d69 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708
cleanup
12e1627 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708
add test
57ac8d8 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708
add test
12a5e33 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708 Manik2708 requested a review from a team as a code owner December 7, 2025 09:05
@Manik2708 Manik2708 requested a review from albertteoh December 7, 2025 09:05
@codecov
Copy link

codecov bot commented Dec 7, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.59%. Comparing base (970078f) to head (a1423a7).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #7707      +/-   ##
==========================================
+ Coverage   95.58%   95.59%   +0.01%     
==========================================
  Files         311      311              
  Lines       15545    15610      +65     
==========================================
+ Hits        14858    14923      +65     
  Misses        538      538              
  Partials      149      149
Flag Coverage Δ
badger_v1 9.79% <0.00%> (-0.08%) ⬇️
badger_v2 2.04% <0.00%> (-0.02%) ⬇️
cassandra-4.x-v1-manual 14.17% <37.07%> (+0.17%) ⬆️
cassandra-4.x-v2-auto 2.03% <0.00%> (-0.02%) ⬇️
cassandra-4.x-v2-manual 2.03% <0.00%> (-0.02%) ⬇️
cassandra-5.x-v1-manual 14.17% <37.07%> (+0.17%) ⬆️
cassandra-5.x-v2-auto 2.03% <0.00%> (-0.02%) ⬇️
cassandra-5.x-v2-manual 2.03% <0.00%> (-0.02%) ⬇️
clickhouse 1.96% <0.00%> (-0.02%) ⬇️
elasticsearch-6.x-v1 18.70% <0.00%> (-0.15%) ⬇️
elasticsearch-7.x-v1 18.73% <0.00%> (-0.15%) ⬇️
elasticsearch-8.x-v1 18.89% <0.00%> (-0.15%) ⬇️
elasticsearch-8.x-v2 2.04% <0.00%> (-0.02%) ⬇️
elasticsearch-9.x-v2 2.04% <0.00%> (-0.02%) ⬇️
grpc_v1 9.61% <0.00%> (-0.08%) ⬇️
grpc_v2 2.04% <0.00%> (-0.02%) ⬇️
kafka-3.x-v2 2.04% <0.00%> (-0.02%) ⬇️
memory_v2 2.04% <0.00%> (-0.02%) ⬇️
opensearch-1.x-v1 18.78% <0.00%> (-0.15%) ⬇️
opensearch-2.x-v1 18.78% <0.00%> (-0.15%) ⬇️
opensearch-2.x-v2 2.04% <0.00%> (-0.02%) ⬇️
opensearch-3.x-v2 2.04% <0.00%> (-0.02%) ⬇️
query 2.04% <0.00%> (-0.02%) ⬇️
tailsampling-processor 0.59% <0.00%> (-0.01%) ⬇️
unittests 94.17% <100.00%> (+0.02%) ⬆️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions
Copy link

github-actions bot commented Dec 7, 2025 •
edited
Loading

Metrics Comparison Summary

Total changes across all snapshots: 53

Detailed changes per snapshot

summary_metrics_snapshot_cassandra

📊 Metrics Diff Summary

Total Changes: 53

  • 🆕 Added: 0 metrics
  • ❌ Removed: 53 metrics
  • 🔄 Modified: 0 metrics

❌ Removed Metrics

  • http_server_request_body_size_bytes (18 variants)
View diff sample 
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="+Inf",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="0",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="10",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="100",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="1000",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="10000",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="25",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
...
- `http_server_request_duration_seconds` (17 variants)
View diff sample 
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="+Inf",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.005",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.01",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.025",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.05",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.075",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_request_duration_seconds{http_request_method="GET",http_response_status_code="503",le="0.1",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
...
- `http_server_response_body_size_bytes` (18 variants)
View diff sample 
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="+Inf",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="0",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="10",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="100",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="1000",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="10000",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
-http_server_response_body_size_bytes{http_request_method="GET",http_response_status_code="503",le="25",network_protocol_name="http",network_protocol_version="1.1",otel_scope_name="go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp",otel_scope_schema_url="",otel_scope_version="0.63.0",server_address="localhost",server_port="13133",url_scheme="http"}
...

➡️ View full metrics file

yurishkuro
yurishkuro reviewed Dec 7, 2025
View reviewed changes
@Manik2708 Manik2708 requested a review from yurishkuro December 8, 2025 20:03
yurishkuro
yurishkuro reviewed Dec 9, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 9, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 9, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 9, 2025
View reviewed changes
@Manik2708
minor fix
959a5db 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708
code coverage
a9bc1ac 
Signed-off-by: Manik Mehta <[email protected]>
@Manik2708 Manik2708 requested a review from yurishkuro December 10, 2025 02:39
@Manik2708
Copy link
Contributor Author

Manik2708 commented Dec 15, 2025

@yurishkuro Is this good to go?

yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
internal/storage/v1/cassandra/spanstore/dbmodel/model.go Outdated
Comment on lines 74 to 79
if t.ValueInt64 != that.ValueInt64 {
if t.ValueInt64 < that.ValueInt64 {
return -1
}
return 1
}
Copy link
Member

@yurishkuro yurishkuro Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if t.ValueInt64 != that.ValueInt64 {
if t.ValueInt64 < that.ValueInt64 {
return -1
}
return 1
}
return t.ValueInt64 < that.ValueInt64

Copy link
Contributor Author

@Manik2708 Manik2708 Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this will only give 0 or 1 and would miss the -1 case

yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
yurishkuro
yurishkuro reviewed Dec 16, 2025
View reviewed changes
internal/storage/v1/cassandra/spanstore/dbmodel/model.go
return t.Compare(that) == 0
}

func (t *KeyValue) AsString() string {
Copy link
Member

@yurishkuro yurishkuro Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this needed?

Copy link
Contributor Author

@Manik2708 Manik2708 Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TagInsertion accepts TagValue only in form of string

@Manik2708 Manik2708 requested a review from yurishkuro December 16, 2025 05:18
@yurishkuro yurishkuro added the changelog:refactoring Internal code refactoring without functional changes label Dec 16, 2025
@yurishkuro yurishkuro merged commit 87c4877 into jaegertracing:main Dec 16, 2025
61 of 62 checks passed
SoumyaRaikwar pushed a commit to SoumyaRaikwar/jaeger that referenced this pull request Dec 18, 2025
@Manik2708 @SoumyaRaikwar
[cassandra] Refactor TagFilter to accept dbmodel.Span (jaegertrac…
8d3623f 
…ing#7707)

## Which problem is this PR solving?
- Fixes a part of: jaegertracing#6458

## Description of the changes
- This is a blocker of jaegertracing#7699, we need to refactor `TagFilter` to accept
`dbmodel.Span` rather than `model.Span`

## How was this change tested?
- Unit And Integration Tests

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

---------

Signed-off-by: Manik Mehta <[email protected]>
Signed-off-by: SoumyaRaikwar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yurishkuro yurishkuro yurishkuro approved these changes

@albertteoh albertteoh Awaiting requested review from albertteoh albertteoh is a code owner automatically assigned from jaegertracing/jaeger-maintainers

Assignees

No one assigned

Labels

area/storage changelog:refactoring Internal code refactoring without functional changes enhancement storage/cassandra

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Manik2708 @yurishkuro