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

Restore "operation" name in the metrics response #5673

Merged
merged 1 commit into from
Jun 22, 2024

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jun 22, 2024

Which problem is this PR solving?

Description of the changes

  • Revert those changes

How was this change tested?

(cd docker-compose/monitor/ && make build dev)

image

Checklist

Signed-off-by: Yuri Shkuro <github@ysh.us>
Copy link

codecov bot commented Jun 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.39%. Comparing base (cd1b4ea) to head (582460c).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5673      +/-   ##
==========================================
+ Coverage   92.35%   96.39%   +4.03%     
==========================================
  Files         163      329     +166     
  Lines        8413    16056    +7643     
==========================================
+ Hits         7770    15477    +7707     
+ Misses        523      403     -120     
- Partials      120      176      +56     
Flag Coverage Δ
badger_v1 8.04% <ø> (ø)
badger_v2 1.92% <ø> (ø)
cassandra-3.x-v1 16.60% <ø> (ø)
cassandra-3.x-v2 1.84% <ø> (ø)
cassandra-4.x-v1 16.60% <ø> (ø)
cassandra-4.x-v2 1.84% <ø> (?)
elasticsearch-7.x-v1 18.87% <ø> (+0.01%) ⬆️
elasticsearch-8.x-v1 19.06% <ø> (ø)
elasticsearch-8.x-v2 19.06% <ø> (+0.01%) ⬆️
grpc_v1 9.46% <ø> (-0.02%) ⬇️
grpc_v2 7.49% <ø> (-84.32%) ⬇️
kafka 9.76% <ø> (ø)
opensearch-1.x-v1 18.92% <ø> (ø)
opensearch-2.x-v1 18.92% <ø> (?)
opensearch-2.x-v2 18.92% <ø> (+0.01%) ⬆️
unittests 94.24% <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.

Copy link
Contributor

@Wise-Wizard Wise-Wizard left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

Thanks!

@yurishkuro yurishkuro merged commit 108c29b into jaegertracing:main Jun 22, 2024
41 of 42 checks passed
@yurishkuro yurishkuro deleted the fix-5672 branch June 22, 2024 19:58
yurishkuro added a commit that referenced this pull request Jun 22, 2024
## Which problem is this PR solving?
- Resolves #5672
- Due to oversight, a bug was introduced in #5539 which changed the
attribute name expected by the UI from `operation` to `span_name`

## Description of the changes
- Revert those changes

## How was this change tested?
`(cd docker-compose/monitor/ && make build dev)`

<img width="1910" alt="image"
src="https://github.com/jaegertracing/jaeger/assets/3523016/79400073-75f1-4db5-8bef-9a4c439d2852">


## 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`: `yarn lint` and `yarn test`

Signed-off-by: Yuri Shkuro <github@ysh.us>
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]: Operation metrics do not show up in SPM
3 participants