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

Add more time ranges #971

Merged
merged 4 commits into from
Jul 14, 2022
Merged

Conversation

jgbernalp
Copy link
Contributor

Which problem is this PR solving?

Short description of the changes

  • Add 5, 15 and 30 minutes time ranges to SPM (defaults to 1h)
  • Add 5, 15 and 30 minutes time ranges to traces search form (defaults to 1h)

SPM:
Screenshot 2022-07-13 at 11 17 17

Search form:
Screenshot 2022-07-13 at 11 17 07

Add 5,15 and 30 minutes time ranges to the monitor tab

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
Add 5,15 and 30 minutes time ranges to the traces search form

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
@@ -86,7 +86,11 @@ const AdaptedVirtualSelect = reduxFormFieldAdapter({

const serviceFormSelector = formValueSelector('serviceForm');
const oneHourInMilliSeconds = 3600000;
const fiveMinutesInMilliSeconds = 300000;
Copy link
Contributor

@albertteoh albertteoh Jul 13, 2022

Choose a reason for hiding this comment

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

Why not do oneMinuteInMilliseconds = 60000 then values would be:

  • 5 * oneMinuteInMilliseconds
  • 15 * oneMinuteInMilliseconds
  • 30 * oneMinuteInMilliseconds?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍🏽

Comment on lines 82 to 83
"label": "Last 5 minutes",
"value": 300000,
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the reason for changing the defaults in tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

my bad, is fixed now.

@codecov
Copy link

codecov bot commented Jul 13, 2022

Codecov Report

Merging #971 (e4d4c86) into main (dc936a6) will increase coverage by 0.13%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #971      +/-   ##
==========================================
+ Coverage   95.30%   95.43%   +0.13%     
==========================================
  Files         242      242              
  Lines        7554     7555       +1     
  Branches     1890     1837      -53     
==========================================
+ Hits         7199     7210      +11     
+ Misses        348      338      -10     
  Partials        7        7              
Impacted Files Coverage Δ
...er-ui/src/components/SearchTracePage/SearchForm.js 92.10% <ø> (ø)
...r-ui/src/components/Monitor/ServicesView/index.tsx 97.27% <100.00%> (+0.02%) ⬆️
...mponents/TracePage/TraceStatistics/tableValues.tsx 96.55% <0.00%> (+2.75%) ⬆️
...nents/TracePage/TraceTimelineViewer/SpanBarRow.tsx 100.00% <0.00%> (+5.55%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc936a6...e4d4c86. Read the comment docs.

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
albertteoh
albertteoh previously approved these changes Jul 14, 2022
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.

LGTM

Comment on lines 91 to 93
{ label: 'Last 5 minutes', value: oneMinuteInMilliSeconds * 5 },
{ label: 'Last 15 minutes', value: oneMinuteInMilliSeconds * 15 },
{ label: 'Last 30 minutes', value: oneMinuteInMilliSeconds * 30 },
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: similar to those below, I would switch the operands to improve readability and consistency. i.e. 5 * oneMinuteInMilliSeconds, etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍🏽

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
Copy link
Member

@yurishkuro yurishkuro 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 enabled auto-merge (squash) July 14, 2022 19:00
@yurishkuro yurishkuro merged commit d39db46 into jaegertracing:main Jul 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add more time ranges to SPM
3 participants