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] Use metrics decorator around MetricStorage #6262

Merged
merged 6 commits into from
Nov 26, 2024

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Nov 26, 2024

Which problem is this PR solving?

  • The SPM Troubleshooting docs were referring to metrics that are supposed to be emitted about MetricStore operations, but no such metrics were present in v2. It turns out the metrics decorator was not applied to MetricStore.

Description of the changes

  • Apply decorator
  • Rename decorator package to metricstoremetrics
  • Use concrete v3.0.0. version of Promethus in the docker-compose file

How was this change tested?

$ curl -s http://localhost:8888/metrics | grep -v '^#' | grep get_call_rates | head -3
metricstore_latency_bucket{operation="get_call_rates",result="ok",service_instance_id="463e3888-a9f8-4b10-8fd7-62aa0ccd6fe3",service_name="jaeger",service_version="v2.0.0",le="0"} 0
metricstore_latency_bucket{operation="get_call_rates",result="ok",service_instance_id="463e3888-a9f8-4b10-8fd7-62aa0ccd6fe3",service_name="jaeger",service_version="v2.0.0",le="5"} 2
metricstore_latency_bucket{operation="get_call_rates",result="ok",service_instance_id="463e3888-a9f8-4b10-8fd7-62aa0ccd6fe3",service_name="jaeger",service_version="v2.0.0",le="10"} 2

@yurishkuro yurishkuro requested a review from a team as a code owner November 26, 2024 19:08
@yurishkuro yurishkuro requested a review from jkowall November 26, 2024 19:08
@dosubot dosubot bot added the area/storage label Nov 26, 2024
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 left a comment

Choose a reason for hiding this comment

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

Just a couple of questions - I also realized I forgot to rename this file (it should be read_metrics_test.go). Can that be fixed in this PR as well? Otherwise I can open a separate PR for it.

docker-compose/monitor/README.md Outdated Show resolved Hide resolved
cmd/query/main.go Outdated Show resolved Hide resolved
Copy link

codecov bot commented Nov 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.45%. Comparing base (16e964d) to head (4c822cb).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6262   +/-   ##
=======================================
  Coverage   96.45%   96.45%           
=======================================
  Files         355      355           
  Lines       20156    20158    +2     
=======================================
+ Hits        19442    19444    +2     
  Misses        526      526           
  Partials      188      188           
Flag Coverage Δ
badger_v1 8.31% <ø> (ø)
badger_v2 1.67% <0.00%> (ø)
cassandra-4.x-v1 14.39% <ø> (ø)
cassandra-4.x-v2 1.61% <0.00%> (ø)
cassandra-5.x-v1 14.39% <ø> (ø)
cassandra-5.x-v2 1.61% <0.00%> (ø)
elasticsearch-6.x-v1 18.60% <ø> (+<0.01%) ⬆️
elasticsearch-7.x-v1 18.67% <ø> (-0.01%) ⬇️
elasticsearch-8.x-v1 18.84% <ø> (ø)
elasticsearch-8.x-v2 1.66% <0.00%> (ø)
grpc_v1 9.44% <ø> (ø)
grpc_v2 6.98% <0.00%> (ø)
kafka-v1 8.88% <ø> (ø)
kafka-v2 1.67% <0.00%> (ø)
memory_v2 1.66% <0.00%> (-0.01%) ⬇️
opensearch-1.x-v1 18.72% <ø> (-0.01%) ⬇️
opensearch-2.x-v1 18.72% <ø> (ø)
opensearch-2.x-v2 1.67% <0.00%> (ø)
tailsampling-processor 0.46% <0.00%> (ø)
unittests 95.37% <100.00%> (+<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.

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro merged commit 7572524 into jaegertracing:main Nov 26, 2024
52 checks passed
@yurishkuro yurishkuro deleted the pass-metrics branch November 26, 2024 23:08
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.

2 participants