[cassandra] Refactor `TagFilter` to accept `dbmodel.Span` by Manik2708 · Pull Request #7707 · jaegertracing/jaeger

Manik2708 · 2025-12-07T09:05:13Z

Which problem is this PR solving?

Fixes a part of: Upgrade Storage Backends to V2 Storage API #6458

Description of the changes

This is a blocker of [storage][cassandra] Make v1 SpanWriter reusable for v2 #7699, we need to refactor TagFilter to accept dbmodel.Span rather than model.Span

How was this change tested?

Unit And Integration Tests

Checklist

I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
I have signed all commits
I have added unit tests for the new functionality
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 <mehtamanik96@gmail.com>

codecov · 2025-12-07T09:13:21Z

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 · 2025-12-07T09:15:21Z

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

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

Manik2708 · 2025-12-15T11:51:27Z

@yurishkuro Is this good to go?

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

yurishkuro · 2025-12-16T01:02:36Z

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

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


Suggested change

if t.ValueInt64 != that.ValueInt64 {

if t.ValueInt64 < that.ValueInt64 {

return -1

}

return 1

}

return t.ValueInt64 < that.ValueInt64

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

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

yurishkuro · 2025-12-16T01:09:56Z

internal/storage/v1/cassandra/spanstore/dbmodel/model.go

+	return t.Compare(that) == 0
+}
+
+func (t *KeyValue) AsString() string {


why is this needed?

TagInsertion accepts TagValue only in form of string

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

…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 <mehtamanik96@gmail.com> Signed-off-by: SoumyaRaikwar <somuraik@gmail.com>

Manik2708 added 4 commits December 7, 2025 13:27

[cassandra] Refactor TagFilter to accept dbmodel Span

5c26d69

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

cleanup

12e1627

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

add test

57ac8d8

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

add test

12a5e33

Signed-off-by: Manik Mehta <mehtamanik96@gmail.com>

Manik2708 requested a review from a team as a code owner December 7, 2025 09:05

Manik2708 requested a review from albertteoh December 7, 2025 09:05

Merge branch 'main' into tag-filter

f51c3c4

dosubot bot added area/storage enhancement storage/cassandra labels Dec 7, 2025

yurishkuro reviewed Dec 7, 2025

View reviewed changes