Skip to content

Conversation

@Don-Assamongkol1
Copy link
Contributor

@Don-Assamongkol1 Don-Assamongkol1 commented Jan 4, 2026

Which problem is this PR solving?

Partially resolves #5608:

we need to test that the response also contains the right labels, specifically to catch this issue: #5673

Description of the changes

  • Made a change inside the existing validate_service_metrics function: grab the response from querying the metrics API then verify that the spans emitted have names for what we'd expect for that service.

How was this change tested?

Run the e2e test locally:
(had to change registry port on my machine, but did not add that code change here)

REGISTRY_PORT=5001 bash scripts/e2e/spm.sh -b jaeger -m prometheus  

Log excerpts:

Checking operations for service: driver
Expected operations for service 'driver': [/FindNearest] | Found operations: [/FindNearest]
✅ Operation validation passed for service 'driver'
✅ Found all expected metrics for service 'driver'
Processing service: customer
⏳ Metrics data points found: 4 zero, 4 non-zero
Checking operations for service: customer
Expected operations for service 'customer': [/customer] | Found operations: [/customer]
✅ Operation validation passed for service 'customer'
✅ Found all expected metrics for service 'customer'

Checklist

@Don-Assamongkol1 Don-Assamongkol1 force-pushed the 5608-SPM-verify-labels-PR branch 3 times, most recently from ffaee83 to f336dcb Compare January 4, 2026 02:26
@Don-Assamongkol1 Don-Assamongkol1 marked this pull request as ready for review January 4, 2026 02:28
@Don-Assamongkol1 Don-Assamongkol1 requested a review from a team as a code owner January 4, 2026 02:28
@Don-Assamongkol1 Don-Assamongkol1 force-pushed the 5608-SPM-verify-labels-PR branch from f336dcb to 100fe52 Compare January 4, 2026 15:48
Comment on lines +129 to +153
case "$service" in
"driver")
echo "/FindNearest"
;;
"customer")
echo "/customer"
;;
"mysql")
echo "/sql_select"
;;
"redis")
echo "/FindDriverIDs /GetDriver"
;;
"frontend")
echo "/dispatch"
;;
"route")
echo "/GetShortestRoute"
;;
"ui")
echo "/"
;;
*)
echo ""
;;
esac
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure if I could've made this cleaner -- would've used a hashmap but I believe there's no such thing in bash


set -x
# Enable verbose logs if you want to debug the script. Else, keep logs clean.
# set -x
Copy link
Member

Choose a reason for hiding this comment

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

but the time the script fails in CI it's too late to enable logs. I prefer this option on.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense. Reverted to on

@yurishkuro
Copy link
Member

lgtm

@yurishkuro yurishkuro added the changelog:ci Change related to continuous integration / testing label Jan 7, 2026
@codecov
Copy link

codecov bot commented Jan 7, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.51%. Comparing base (4c75af5) to head (f632102).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7830      +/-   ##
==========================================
+ Coverage   95.49%   95.51%   +0.01%     
==========================================
  Files         307      307              
  Lines       15911    15911              
==========================================
+ Hits        15195    15197       +2     
+ Misses        562      561       -1     
+ Partials      154      153       -1     
Flag Coverage Δ
badger_v1 9.18% <ø> (ø)
badger_v2 1.93% <ø> (ø)
cassandra-4.x-v1-manual 13.58% <ø> (ø)
cassandra-4.x-v2-auto 1.92% <ø> (ø)
cassandra-4.x-v2-manual 1.92% <ø> (ø)
cassandra-5.x-v1-manual 13.58% <ø> (ø)
cassandra-5.x-v2-auto 1.92% <ø> (ø)
cassandra-5.x-v2-manual 1.92% <ø> (ø)
clickhouse 1.97% <ø> (ø)
elasticsearch-6.x-v1 17.54% <ø> (ø)
elasticsearch-7.x-v1 17.57% <ø> (ø)
elasticsearch-8.x-v1 17.73% <ø> (ø)
elasticsearch-8.x-v2 1.93% <ø> (ø)
elasticsearch-9.x-v2 1.93% <ø> (ø)
grpc_v1 8.84% <ø> (ø)
grpc_v2 1.93% <ø> (ø)
kafka-3.x-v2 1.93% <ø> (ø)
memory_v2 1.93% <ø> (ø)
opensearch-1.x-v1 17.62% <ø> (ø)
opensearch-2.x-v1 17.62% <ø> (ø)
opensearch-2.x-v2 1.93% <ø> (ø)
opensearch-3.x-v2 1.93% <ø> (ø)
query 1.93% <ø> (ø)
tailsampling-processor 0.55% <ø> (ø)
unittests 94.14% <ø> (+0.01%) ⬆️

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 Jan 7, 2026

Metrics Comparison Summary

Total changes across all snapshots: 0

Detailed changes per snapshot

summary_metrics_snapshot_cassandra

📊 Metrics Diff Summary

Total Changes: 0

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

summary_metrics_snapshot_cassandra

📊 Metrics Diff Summary

Total Changes: 0

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

➡️ View full metrics file

@yurishkuro
Copy link
Member

please rebase on main

@Don-Assamongkol1 Don-Assamongkol1 force-pushed the 5608-SPM-verify-labels-PR branch from 100fe52 to f632102 Compare January 7, 2026 22:39
@yurishkuro
Copy link
Member

I will override the dco-lint, but you may want to fix your git vs. github settings to use the full name

Missing sign-off(s):

	f63210225c23d7e9a8c9857479357d0fb8e8bece
		sign-off not found for commit author: donassamongkol [email protected]; 
		found: ['Don Assamongkol <[email protected]>']

@yurishkuro yurishkuro merged commit cb60fb4 into jaegertracing:main Jan 8, 2026
58 of 59 checks passed
@yurishkuro
Copy link
Member

thanks

@Don-Assamongkol1
Copy link
Contributor Author

I will override the dco-lint, but you may want to fix your git vs. github settings to use the full name

Missing sign-off(s):

	f63210225c23d7e9a8c9857479357d0fb8e8bece
		sign-off not found for commit author: donassamongkol [email protected]; 
		found: ['Don Assamongkol <[email protected]>']

Ah! Thanks for pointing that out. Will do

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:ci Change related to continuous integration / testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Create integration tests for SPM

2 participants