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

Trace Analytics support for custom sources #2112

Merged
merged 11 commits into from
Sep 4, 2024

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Sep 3, 2024

Description

Experimental feature for Trace Analytics support of custom sources

Issues Resolved

#2052

  • Update mode picker with custom trace source
Screenshot 2024-09-03 at 5 33 59 PM
  • Flyout to manage/update custom trace source
Screenshot 2024-09-03 at 5 34 07 PM
  • Add service filtering widgets to traces view
Screenshot 2024-09-03 at 5 34 24 PM
  • Lazy load red metrics
Screenshot 2024-09-03 at 5 34 52 PM
  • Hide/Show attribute columns
Screenshot 2024-09-03 at 5 36 01 PM
  • Added custom trace indices in user settings
Screenshot 2024-09-03 at 5 37 43 PM

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

joshuali925 and others added 3 commits September 3, 2024 12:21
Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 2e052f2)
Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit d832ea1)
@ps48 ps48 marked this pull request as draft September 3, 2024 21:22
@ps48 ps48 added enhancement New feature or request v2.17.0 labels Sep 3, 2024
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
@ps48 ps48 marked this pull request as ready for review September 4, 2024 00:45
Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: Shenoy Pratik <[email protected]>
includeMetricsCallback();
}
}
// console.log('value[0].id', value);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Missed deleting console log comment.

@TackAdam
Copy link
Collaborator

TackAdam commented Sep 4, 2024

UI looks correct / functional under the new navigation.
Screenshot 2024-09-03 at 6 41 35 PM

@TackAdam
Copy link
Collaborator

TackAdam commented Sep 4, 2024

Screenshot 2024-09-03 at 6 35 58 PM

Under the new navigation when services and traces are broken apart, do we need to change this drop down for services?

@TackAdam
Copy link
Collaborator

TackAdam commented Sep 4, 2024

Screenshot 2024-09-03 at 6 44 08 PM

Spacing seems a little off between the drop downs. Not sure if we have a reference for multiple bars.
Not blocking.

Copy link
Collaborator

@TackAdam TackAdam left a comment

Choose a reason for hiding this comment

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

Great work!

@ps48
Copy link
Member Author

ps48 commented Sep 4, 2024

@TackAdam @RyanL1997 Thanks for the review.

Spacing seems a little off between the drop downs. Not sure if we have a reference for multiple bars.

  • Updated spacing for flex items
Screenshot 2024-09-03 at 9 42 05 PM

Under the new navigation when services and traces are broken apart, do we need to change this drop down for services?

  • Changed it to custom source

Copy link

codecov bot commented Sep 4, 2024

Codecov Report

Attention: Patch coverage is 36.18234% with 224 lines in your changes missing coverage. Please review.

Project coverage is 56.59%. Comparing base (c3ab50f) to head (850a8c8).
Report is 74 commits behind head on main.

Files with missing lines Patch % Lines
.../components/traces/traces_custom_indices_table.tsx 0.00% 69 Missing ⚠️
...trace_analytics/requests/traces_request_handler.ts 15.38% 33 Missing ⚠️
...ace_analytics/components/traces/traces_content.tsx 45.23% 22 Missing and 1 partial ⚠️
...race_analytics/components/traces/services_list.tsx 4.76% 20 Missing ⚠️
...nalytics/components/common/custom_index_flyout.tsx 46.87% 17 Missing ⚠️
...e_analytics/components/common/helper_functions.tsx 66.66% 10 Missing ⚠️
...trace_analytics/requests/queries/traces_queries.ts 41.17% 10 Missing ⚠️
..._analytics/components/common/plots/service_map.tsx 50.00% 8 Missing ⚠️
...ace_analytics/components/services/service_view.tsx 33.33% 8 Missing ⚠️
...analytics/components/traces/span_detail_flyout.tsx 42.85% 7 Missing and 1 partial ⚠️
... and 4 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2112      +/-   ##
==========================================
- Coverage   57.85%   56.59%   -1.26%     
==========================================
  Files         372      389      +17     
  Lines       14081    14938     +857     
  Branches     3712     4049     +337     
==========================================
+ Hits         8146     8454     +308     
- Misses       5871     6422     +551     
+ Partials       64       62       -2     
Flag Coverage Δ
dashboards-observability 56.59% <36.18%> (-1.26%) ⬇️

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.

@ps48 ps48 merged commit ec67ad1 into opensearch-project:main Sep 4, 2024
10 of 20 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-2112-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ec67ad1ce6a6d20c0e316a09488d907161931472
# Push it to GitHub
git push --set-upstream origin backport/backport-2112-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2112-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-observability/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.17
# Create a new branch
git switch --create backport/backport-2112-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ec67ad1ce6a6d20c0e316a09488d907161931472
# Push it to GitHub
git push --set-upstream origin backport/backport-2112-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-2112-to-2.17.

ps48 added a commit to ps48/dashboards-observability that referenced this pull request Sep 4, 2024
* improve traces table

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 2e052f2)

* improve queries

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit d832ea1)

* add support for custom trace indices

Signed-off-by: Shenoy Pratik <[email protected]>

* update mode picker

Signed-off-by: Shenoy Pratik <[email protected]>

* added services view for custom trace source

Signed-off-by: Shenoy Pratik <[email protected]>

* updated snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update DSL filter tests

Signed-off-by: Shenoy Pratik <[email protected]>

* update app analytics snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log

Signed-off-by: Shenoy Pratik <[email protected]>

* update service map inputs, remove commented code

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log, update copy and tests

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
(cherry picked from commit ec67ad1)
ps48 added a commit that referenced this pull request Sep 4, 2024
)

* Trace Analytics support for custom sources (#2112)

* improve traces table

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 2e052f2)

* improve queries

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit d832ea1)

* add support for custom trace indices

Signed-off-by: Shenoy Pratik <[email protected]>

* update mode picker

Signed-off-by: Shenoy Pratik <[email protected]>

* added services view for custom trace source

Signed-off-by: Shenoy Pratik <[email protected]>

* updated snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update DSL filter tests

Signed-off-by: Shenoy Pratik <[email protected]>

* update app analytics snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log

Signed-off-by: Shenoy Pratik <[email protected]>

* update service map inputs, remove commented code

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log, update copy and tests

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
(cherry picked from commit ec67ad1)

* update snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshots from upstream changes

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
ps48 added a commit that referenced this pull request Sep 4, 2024
…2117)

* fix badge size for counters, change notebook delete, update test (#2110) (#2114)

(cherry picked from commit 1c6ff11)

Signed-off-by: Adam Tackett <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Tackett <[email protected]>

* Trace Analytics support for custom sources (#2112)

* improve traces table

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit 2e052f2)

* improve queries

Signed-off-by: Joshua Li <[email protected]>
(cherry picked from commit d832ea1)

* add support for custom trace indices

Signed-off-by: Shenoy Pratik <[email protected]>

* update mode picker

Signed-off-by: Shenoy Pratik <[email protected]>

* added services view for custom trace source

Signed-off-by: Shenoy Pratik <[email protected]>

* updated snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update DSL filter tests

Signed-off-by: Shenoy Pratik <[email protected]>

* update app analytics snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log

Signed-off-by: Shenoy Pratik <[email protected]>

* update service map inputs, remove commented code

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console.log, update copy and tests

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
Co-authored-by: Joshua Li <[email protected]>
(cherry picked from commit ec67ad1)

* update snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshots from upstream changes

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Adam Tackett <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Shenoy Pratik <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Tackett <[email protected]>
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.

4 participants