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

Integrate Google Analytics into Search Page #220

Merged
merged 3 commits into from
Jun 25, 2018

Conversation

davit-y
Copy link
Contributor

@davit-y davit-y commented Jun 21, 2018

Which problem is this PR solving?

Short description of the changes

  • Upon submitting a search, useful details about the form inputs are sent to GA
  • Changing 'sort by' is sent to GA

Data sent to GA per field:

Operation:

  • default
  • set

Tags:

  • clear
  • set

Lookback:

  • $actualvalue

Min/Max Duration:

  • clear
  • set

Limit:

  • default
  • set

Sort:

  • $actualvalue

Signed-off-by: Davit Yeghshatyan <[email protected]>
@codecov
Copy link

codecov bot commented Jun 21, 2018

Codecov Report

Merging #220 into master will increase coverage by 0.2%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #220     +/-   ##
=========================================
+ Coverage   89.08%   89.29%   +0.2%     
=========================================
  Files         104      106      +2     
  Lines        2291     2317     +26     
  Branches      466      472      +6     
=========================================
+ Hits         2041     2069     +28     
+ Misses        211      209      -2     
  Partials       39       39
Impacted Files Coverage Δ
packages/jaeger-ui/src/middlewares/track.js 42.85% <100%> (+9.52%) ⬆️
...er-ui/src/components/SearchTracePage/SearchForm.js 87.5% <100%> (+0.13%) ⬆️
packages/jaeger-ui/src/constants/search-form.js 100% <100%> (ø)
...src/components/SearchTracePage/SearchForm.track.js 100% <100%> (ø)
...neViewer/TimelineHeaderRow/TimelineViewingLayer.js 90.74% <0%> (+3.7%) ⬆️

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 d251d6b...953b988. Read the comment docs.

Copy link
Member

@tiffon tiffon left a comment

Choose a reason for hiding this comment

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

Looks great, few minor changes / questions

@@ -32,6 +32,8 @@ import { formatDate, formatTime } from '../../utils/date';
import reduxFormFieldAdapter from '../../utils/redux-form-field-adapter';

import './SearchForm.css';
import { trackEvent } from '../../utils/tracking';
import { CATEGORY_BASE } from './SearchForm.track';
Copy link
Member

Choose a reason for hiding this comment

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

Imports are sorted alphabetically with more dots under less dots and css files that are imported for the side effect go below the other imports

import a from './a';
import z from './z';
import b from '../b';

import 'a.css';

Please adjust this in all cases

@@ -40,6 +42,21 @@ const AdaptedInput = reduxFormFieldAdapter(Input);
const AdaptedSelect = reduxFormFieldAdapter(Select);
const AdaptedVirtualSelect = reduxFormFieldAdapter(VirtSelect, option => (option ? option.value : null));

const DEFAULT_OPERATION = 'all';
const DEFAULT_LOOKBACK = '1h';
const DEFAULT_LIMIT = 20;
Copy link
Member

Choose a reason for hiding this comment

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

Please move these constants into ./src/constants/search-form.js

trackEvent(CATEGORY_MAX_DURATION, maxDuration ? ACTION_SET : ACTION_CLEAR, maxDuration);
trackEvent(CATEGORY_MIN_DURATION, minDuration ? ACTION_SET : ACTION_CLEAR, minDuration);
trackEvent(CATEGORY_LOOKBACK, lookback);
}
Copy link
Member

Choose a reason for hiding this comment

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

Please move this and the related constants SearchForm.track.js

trackEvent(CATEGORY_LIMIT, resultsLimit === DEFAULT_LIMIT ? ACTION_DEFAULT : ACTION_SET, resultsLimit);
trackEvent(CATEGORY_TAGS, tags ? ACTION_SET : ACTION_CLEAR, tags);
trackEvent(CATEGORY_MAX_DURATION, maxDuration ? ACTION_SET : ACTION_CLEAR, maxDuration);
trackEvent(CATEGORY_MIN_DURATION, minDuration ? ACTION_SET : ACTION_CLEAR, minDuration);
Copy link
Member

Choose a reason for hiding this comment

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

Hm, why are the values being passed into traceEvent(...)?

@@ -139,6 +147,7 @@ describe('submitForm()', () => {
resultsLimit: 20,
service: 'svc-a',
};
trackEvent.mockClear();
Copy link
Member

Choose a reason for hiding this comment

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

I'd say this might be better if it's in the test case... To make it clear it is only relevant in one test case?

import { trackEvent } from '../../utils/tracking';

export const CATEGORY_BASE = 'jaeger/ux/trace/search';
export const CATEGORY_SORTBY = `${CATEGORY_BASE}/sortby`;
Copy link
Member

Choose a reason for hiding this comment

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

Upon reflection, please change this category to include results, e.g.

jaeger/ux/search/results/sortby

export const CATEGORY_TAGS = `${CATEGORY_BASE}/tags`;
export const CATEGORY_MIN_DURATION = `${CATEGORY_BASE}/min_duration`;
export const CATEGORY_MAX_DURATION = `${CATEGORY_BASE}/max_duration`;
export const CATEGORY_LIMIT = `${CATEGORY_BASE}/limit`;
Copy link
Member

Choose a reason for hiding this comment

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

Upon reflection, please add form to these categories, e.g.

jaeger/ux/search/form/operation

import type { Store } from 'redux';
import { trackEvent } from '../../utils/tracking';

export const CATEGORY_BASE = 'jaeger/ux/trace/search';
Copy link
Member

Choose a reason for hiding this comment

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

Please remove the /trace from the category base

@@ -0,0 +1,28 @@
// Copyright (c) 2017 Uber Technologies, Inc.
Copy link
Member

Choose a reason for hiding this comment

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

Typo in the file name, F SearchForm.track.test

Signed-off-by: Davit Yeghshatyan <[email protected]>
Copy link
Member

@tiffon tiffon left a comment

Choose a reason for hiding this comment

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

Thanks for making the changes. I don't think I was clear in a couple of my comments, I've elaborated...

@@ -30,6 +30,8 @@ import VirtSelect from '../common/VirtSelect';
import * as jaegerApiActions from '../../actions/jaeger-api';
import { formatDate, formatTime } from '../../utils/date';
import reduxFormFieldAdapter from '../../utils/redux-form-field-adapter';
import { trackFormInput } from './SearchForm.track';
Copy link
Member

Choose a reason for hiding this comment

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

Sort order is not quite right

// limitations under the License.

import type { Store } from 'redux';
import * as constants from '../../constants/search-form';
Copy link
Member

Choose a reason for hiding this comment

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

Please separate local resources from npm packages with a new line

import z from 'z';

import { a } from './a';

minDuration ? constants.ACTION_SET : constants.ACTION_CLEAR,
minDuration
);
trackEvent(constants.CATEGORY_TAGS, tags ? constants.ACTION_SET : constants.ACTION_CLEAR, tags);
Copy link
Member

Choose a reason for hiding this comment

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

We don't need to track any of the values (besides lookback)

export const DEFAULT_LOOKBACK = '1h';
export const DEFAULT_LIMIT = 20;

export const ACTION_SET = 'set';
Copy link
Member

Choose a reason for hiding this comment

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

Please move the tracking related constants to SearchForm.track.js

Signed-off-by: Davit Yeghshatyan <[email protected]>
Copy link
Member

@tiffon tiffon left a comment

Choose a reason for hiding this comment

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

Looks great

import VirtSelect from '../common/VirtSelect';
import * as jaegerApiActions from '../../actions/jaeger-api';
import { formatDate, formatTime } from '../../utils/date';
import reduxFormFieldAdapter from '../../utils/redux-form-field-adapter';
import { DEFAULT_OPERATION, DEFAULT_LIMIT, DEFAULT_LOOKBACK } from '../../constants/search-form';
Copy link
Member

Choose a reason for hiding this comment

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

../../constants/etc... is out of order

Copy link
Member

Choose a reason for hiding this comment

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

why are we not using something like Prettier to auto-format?

Copy link
Member

Choose a reason for hiding this comment

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

We are. My remark refers to the order of the lines.

Copy link
Member

Choose a reason for hiding this comment

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

no auto-formatter for order? Go and Java both have that for imports.

Copy link
Member

Choose a reason for hiding this comment

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

Not in prettier, which is the auto-formatter we're using. There might be something around that fits the bill, thought...

@tiffon tiffon merged commit fa0f161 into jaegertracing:master Jun 25, 2018
tiffon added a commit that referenced this pull request Jul 31, 2018
* Prep the repo for separately developed components
* Fix uberinternal yarn.lock issues
* Upgrade react to 16.3.2
* Update readme to account for on Lerna changes

Signed-off-by: Joe Farro <[email protected]>

Directed graph layout and presentation (#212)

* Prep the repo for separately developed components

Signed-off-by: Joe Farro <[email protected]>

* WIP - Very rough graph layout functionality

Signed-off-by: Joe Farro <[email protected]>

* Graph layout functionality is in solid shape

Outstanding:
* tests
* calculate edges via several workers when there are many edges

Signed-off-by: Joe Farro <[email protected]>

* Fix minor misc issues with plexus layout

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Upgrade react to 16.3.2

Signed-off-by: Joe Farro <[email protected]>

* Upgrade flow to 0.71.0

Signed-off-by: Joe Farro <[email protected]>

* Very rough React graph component

Signed-off-by: Joe Farro <[email protected]>

* Enable custom props for graph elements

Signed-off-by: Joe Farro <[email protected]>

* The graph refreshes when it gets new data

Signed-off-by: Joe Farro <[email protected]>

* Make the jaeger-ui package private

Signed-off-by: Joe Farro <[email protected]>

* Misc cleanup for plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Fix issues with plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Don't output a CSS file for plexus

Signed-off-by: Joe Farro <[email protected]>

* Increase plexus node spacing for neato layouts

Signed-off-by: Joe Farro <[email protected]>

* Update plexus to 0.0.1-dev.2

Signed-off-by: Joe Farro <[email protected]>

* Adding new issue and pull request template (#219)

Signed-off-by: Prakriti <[email protected]>

* plexus readme, remove `LayoutManager.dispose()`

Signed-off-by: Joe Farro <[email protected]>

* remove unecessary package

Signed-off-by: Joe Farro <[email protected]>

* Add more complex graphs to plexus demo

Signed-off-by: Joe Farro <[email protected]>

* Start the worker ID at 0

Signed-off-by: Joe Farro <[email protected]>

Search page functionality for trace diffs

Signed-off-by: Joe Farro <[email protected]>

Stub for trace diff page, update redux state shape

- Better redux state shape for trace diff
  - Refer to traces selected for comparison as trace diff cohort
- Better redux state shape for fetched trace data
  - Before: One loading prop to keep track of all search and individual
    trace fetching
  - After: Loading is tracked separately for serach and for each
    individual trace being fetched
  - This is better all around and lays the ground-work for fetching
    multiple individual traces which will be necessary for trace diff
    page when hit directly via URL (will need to fetch two or more
    traces)

Signed-off-by: Joe Farro <[email protected]>

Optimization for trace mini-map rendering

On a trace with ~16k spans reduced minimap rendering from ~250ms to
~20ms. For context, the initial render of the trace was around 1.22s.

Signed-off-by: Joe Farro <[email protected]>

Redux cleanup, hydrate diff cohort on search page

- Merge TraceSummary into Trace
- Redux action to fetch multiple traces by ID
- Create a small-sized variation of the loading indicator
- SearchTracePage loads trace data for traces in the diff cohort
  - Show loading indicator when trace data is being loaded
  - Show inline error when trace loading fails
  - Strip failed traces from diff cohort when linking to diff page
- Diff page forces redux state based on URL params

Signed-off-by: Joe Farro <[email protected]>

Trace diff page header functionality

- Fetch traces that need to be loaded
- Keep the URL and redux state in sync after changes to A or B
- Allow entering traces by ID
- Allow selecting other traces in the cohort
- Indicate when loading a trace failed

Signed-off-by: Joe Farro <[email protected]>

Convert trace to a DAG

Apply three transforms to spans when converting to DAG:

- Adopt peer.service for service name when a client span is missing
  the corresponding server span
- Ignore client spans when the only child is a reasonable server span
- Try to figure out a better operation name when operation === the
  http.method tag

The conversion can be optimized; it takes about 230ms on a trace with
~35k spans. A trace with ~9k spans takes about 50ms.

Signed-off-by: Joe Farro <[email protected]>

Add useDotEdges and totalMemory options to plexus

- Option in plexus to set the totalMemory viz.js uses
  - Sometimes viz.js runs out of memory on large graphs, especially
    when using the neato engine, increasing the total memeory can help
- Option in plexus to use dot edges in plexus graphs
  - Useful for trees (neato and plexus are very similar) or large
    graphs (neato is too slow)

Signed-off-by: Joe Farro <[email protected]>

Initial trace diff graph

- Ability to create diff of two TraceDag instances
- Additional transforms to trim superfluous nodes
  - skipAnnotationSpans
  - skipClientSpans

Signed-off-by: Joe Farro <[email protected]>

Add zoom and pan to plexus

- Zoom and pan
- Add graph state as param to setOn* props
- Enable scaling edge stroke based on zoom level

Signed-off-by: Joe Farro <[email protected]>

Add zoom to trace diff and increase color contrast

- Add zoom pan to trace diff
- On node hover show node @ 1x zoom (useful when zoomed out)
- Higher contrast colors for trace diff DAG
- Allowing scrolling for errors
- Fix issue with node sizing during measurement phase

Signed-off-by: Joe Farro <[email protected]>

Add a minimap to plexus to help zoom and pan

Also added to trace-diffs

Signed-off-by: Joe Farro <[email protected]>

Guard plexus zoom functionality with a flag

Signed-off-by: Joe Farro <[email protected]>

Fixes and optimizations to plexus and trace diffs

- Bug fix: Each graph should have a unique edge arrow def IRI

- Keep strokes from scaling into invisibility when zooming

  - Remove redundant root node

  - Apply zoom transforms to the node and edge containers

  - Scale the arrow def based on the current zoom (when zoom is
    enabled) by scaling the coords in the marker and path definitions

- Add a convenience prop-factory that toggles a class, "is-small",
  based on the current zoom level

  - Use "is-small" to toggle the visibility of node text and edge
    stroke width based on the current zoom level

- Change prop factories to be grouped by feature instead of context

  - In many cases the prop factory can be applied to multiple contexts,
    e.g. to both the edges container and an edge path

- Make Node and EdgePath components PureComponents

- Wrap rendering the nodes and edges in a PureComponent to prevent
  unnecessary renders

- Remove DirectedGraphState from the edge and node factory prop
  functions to prevent rendering with every transform change

Signed-off-by: Joe Farro <[email protected]>

Add additional layout options to plexus

Signed-off-by: Joe Farro <[email protected]>

Lighten trace diff color scheme

Signed-off-by: Joe Farro <[email protected]>

Use green instead of blue in trace diff coloring

Green is more commonly used to show additions

Signed-off-by: Joe Farro <[email protected]>

Add "Compare" to the top nav and other small fixes

Signed-off-by: Joe Farro <[email protected]>

Adding new issue and pull request template (#219)

Signed-off-by: Prakriti <[email protected]>

Integrate Google Analytics into Search Page (#220)

* Integrate GA into search page

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove tracking of actual values

Signed-off-by: Davit Yeghshatyan <[email protected]>

Timeline Expand and Collapse Features (#221)

* Add expansion and collapsing features

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use Icon component

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use spans upstream

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Improve css

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Rotate collapse buttons

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove debug logging

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove spans from TimelineHeaderRow

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add unit test for TimelineCollapser

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use popover

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add TimelineCollapser test

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Revert "Use popover"

This reverts commit 6152402

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for index.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add keyboard shortcuts

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Update changelog

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Make review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

Squashed commits from develop-directed-graph (#224)

Signed-off-by: Joe Farro <[email protected]>

Lazily initialize the first worker in plexus

Signed-off-by: Joe Farro <[email protected]>

Fix issue with trace diff URL from auth redirects

The trace diff url was of the form:

    /trace/<trace-a-id>:diff?b=<trace-b-id>

But, during OneLogin / SAML auth redirects it would get URL encoded
and then not URL decoded resulting in it being interpreted as a trace
ID.

Move to the following form with three literal periods between the IDs:

    /trace/<trace-a-id>...<trace-b-id>

Other misc fixes and tweaks:

- Fix an issue where selecting a cohort of traces and then clicking the
  "Compare" button in the top nav cleared the cohort

- Fix an issue where removing a trace from the cohort on the search
  page would not clear the trace from A or B, effectively preventing
  traces set as A or B from ever being removed

- Clean up route definitions

Signed-off-by: Joe Farro <[email protected]>

Fix trace detail tracking for revised redux shape

Signed-off-by: Joe Farro <[email protected]>
yurishkuro pushed a commit that referenced this pull request Aug 14, 2018
* Use Lerna (#209)

* Prep the repo for separately developed components
* Fix uberinternal yarn.lock issues
* Upgrade react to 16.3.2
* Update readme to account for on Lerna changes

Signed-off-by: Joe Farro <[email protected]>

Directed graph layout and presentation (#212)

* Prep the repo for separately developed components

Signed-off-by: Joe Farro <[email protected]>

* WIP - Very rough graph layout functionality

Signed-off-by: Joe Farro <[email protected]>

* Graph layout functionality is in solid shape

Outstanding:
* tests
* calculate edges via several workers when there are many edges

Signed-off-by: Joe Farro <[email protected]>

* Fix minor misc issues with plexus layout

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Upgrade react to 16.3.2

Signed-off-by: Joe Farro <[email protected]>

* Upgrade flow to 0.71.0

Signed-off-by: Joe Farro <[email protected]>

* Very rough React graph component

Signed-off-by: Joe Farro <[email protected]>

* Enable custom props for graph elements

Signed-off-by: Joe Farro <[email protected]>

* The graph refreshes when it gets new data

Signed-off-by: Joe Farro <[email protected]>

* Make the jaeger-ui package private

Signed-off-by: Joe Farro <[email protected]>

* Misc cleanup for plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Fix issues with plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Don't output a CSS file for plexus

Signed-off-by: Joe Farro <[email protected]>

* Increase plexus node spacing for neato layouts

Signed-off-by: Joe Farro <[email protected]>

* Update plexus to 0.0.1-dev.2

Signed-off-by: Joe Farro <[email protected]>

* Adding new issue and pull request template (#219)

Signed-off-by: Prakriti <[email protected]>

* plexus readme, remove `LayoutManager.dispose()`

Signed-off-by: Joe Farro <[email protected]>

* remove unecessary package

Signed-off-by: Joe Farro <[email protected]>

* Add more complex graphs to plexus demo

Signed-off-by: Joe Farro <[email protected]>

* Start the worker ID at 0

Signed-off-by: Joe Farro <[email protected]>

Search page functionality for trace diffs

Signed-off-by: Joe Farro <[email protected]>

Stub for trace diff page, update redux state shape

- Better redux state shape for trace diff
  - Refer to traces selected for comparison as trace diff cohort
- Better redux state shape for fetched trace data
  - Before: One loading prop to keep track of all search and individual
    trace fetching
  - After: Loading is tracked separately for serach and for each
    individual trace being fetched
  - This is better all around and lays the ground-work for fetching
    multiple individual traces which will be necessary for trace diff
    page when hit directly via URL (will need to fetch two or more
    traces)

Signed-off-by: Joe Farro <[email protected]>

Optimization for trace mini-map rendering

On a trace with ~16k spans reduced minimap rendering from ~250ms to
~20ms. For context, the initial render of the trace was around 1.22s.

Signed-off-by: Joe Farro <[email protected]>

Redux cleanup, hydrate diff cohort on search page

- Merge TraceSummary into Trace
- Redux action to fetch multiple traces by ID
- Create a small-sized variation of the loading indicator
- SearchTracePage loads trace data for traces in the diff cohort
  - Show loading indicator when trace data is being loaded
  - Show inline error when trace loading fails
  - Strip failed traces from diff cohort when linking to diff page
- Diff page forces redux state based on URL params

Signed-off-by: Joe Farro <[email protected]>

Trace diff page header functionality

- Fetch traces that need to be loaded
- Keep the URL and redux state in sync after changes to A or B
- Allow entering traces by ID
- Allow selecting other traces in the cohort
- Indicate when loading a trace failed

Signed-off-by: Joe Farro <[email protected]>

Convert trace to a DAG

Apply three transforms to spans when converting to DAG:

- Adopt peer.service for service name when a client span is missing
  the corresponding server span
- Ignore client spans when the only child is a reasonable server span
- Try to figure out a better operation name when operation === the
  http.method tag

The conversion can be optimized; it takes about 230ms on a trace with
~35k spans. A trace with ~9k spans takes about 50ms.

Signed-off-by: Joe Farro <[email protected]>

Add useDotEdges and totalMemory options to plexus

- Option in plexus to set the totalMemory viz.js uses
  - Sometimes viz.js runs out of memory on large graphs, especially
    when using the neato engine, increasing the total memeory can help
- Option in plexus to use dot edges in plexus graphs
  - Useful for trees (neato and plexus are very similar) or large
    graphs (neato is too slow)

Signed-off-by: Joe Farro <[email protected]>

Initial trace diff graph

- Ability to create diff of two TraceDag instances
- Additional transforms to trim superfluous nodes
  - skipAnnotationSpans
  - skipClientSpans

Signed-off-by: Joe Farro <[email protected]>

Add zoom and pan to plexus

- Zoom and pan
- Add graph state as param to setOn* props
- Enable scaling edge stroke based on zoom level

Signed-off-by: Joe Farro <[email protected]>

Add zoom to trace diff and increase color contrast

- Add zoom pan to trace diff
- On node hover show node @ 1x zoom (useful when zoomed out)
- Higher contrast colors for trace diff DAG
- Allowing scrolling for errors
- Fix issue with node sizing during measurement phase

Signed-off-by: Joe Farro <[email protected]>

Add a minimap to plexus to help zoom and pan

Also added to trace-diffs

Signed-off-by: Joe Farro <[email protected]>

Guard plexus zoom functionality with a flag

Signed-off-by: Joe Farro <[email protected]>

Fixes and optimizations to plexus and trace diffs

- Bug fix: Each graph should have a unique edge arrow def IRI

- Keep strokes from scaling into invisibility when zooming

  - Remove redundant root node

  - Apply zoom transforms to the node and edge containers

  - Scale the arrow def based on the current zoom (when zoom is
    enabled) by scaling the coords in the marker and path definitions

- Add a convenience prop-factory that toggles a class, "is-small",
  based on the current zoom level

  - Use "is-small" to toggle the visibility of node text and edge
    stroke width based on the current zoom level

- Change prop factories to be grouped by feature instead of context

  - In many cases the prop factory can be applied to multiple contexts,
    e.g. to both the edges container and an edge path

- Make Node and EdgePath components PureComponents

- Wrap rendering the nodes and edges in a PureComponent to prevent
  unnecessary renders

- Remove DirectedGraphState from the edge and node factory prop
  functions to prevent rendering with every transform change

Signed-off-by: Joe Farro <[email protected]>

Add additional layout options to plexus

Signed-off-by: Joe Farro <[email protected]>

Lighten trace diff color scheme

Signed-off-by: Joe Farro <[email protected]>

Use green instead of blue in trace diff coloring

Green is more commonly used to show additions

Signed-off-by: Joe Farro <[email protected]>

Add "Compare" to the top nav and other small fixes

Signed-off-by: Joe Farro <[email protected]>

Adding new issue and pull request template (#219)

Signed-off-by: Prakriti <[email protected]>

Integrate Google Analytics into Search Page (#220)

* Integrate GA into search page

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove tracking of actual values

Signed-off-by: Davit Yeghshatyan <[email protected]>

Timeline Expand and Collapse Features (#221)

* Add expansion and collapsing features

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use Icon component

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use spans upstream

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Improve css

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Rotate collapse buttons

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove debug logging

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove spans from TimelineHeaderRow

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add unit test for TimelineCollapser

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use popover

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add TimelineCollapser test

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Revert "Use popover"

This reverts commit 6152402

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for index.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add keyboard shortcuts

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Update changelog

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Make review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

Squashed commits from develop-directed-graph (#224)

Signed-off-by: Joe Farro <[email protected]>

Lazily initialize the first worker in plexus

Signed-off-by: Joe Farro <[email protected]>

Fix issue with trace diff URL from auth redirects

The trace diff url was of the form:

    /trace/<trace-a-id>:diff?b=<trace-b-id>

But, during OneLogin / SAML auth redirects it would get URL encoded
and then not URL decoded resulting in it being interpreted as a trace
ID.

Move to the following form with three literal periods between the IDs:

    /trace/<trace-a-id>...<trace-b-id>

Other misc fixes and tweaks:

- Fix an issue where selecting a cohort of traces and then clicking the
  "Compare" button in the top nav cleared the cohort

- Fix an issue where removing a trace from the cohort on the search
  page would not clear the trace from A or B, effectively preventing
  traces set as A or B from ever being removed

- Clean up route definitions

Signed-off-by: Joe Farro <[email protected]>

Fix trace detail tracking for revised redux shape

Signed-off-by: Joe Farro <[email protected]>

* Typo

Signed-off-by: Joe Farro <[email protected]>

* Fix #232 Split leaf from parent nodes in the tree

Signed-off-by: Joe Farro <[email protected]>

* plexus - Fix chart style issues and bump version

Also tweak the demo a bit.

Signed-off-by: Joe Farro <[email protected]>

* Fix yarn workspace based install

Signed-off-by: Joe Farro <[email protected]>

* In CI, fail if an update to yarn.lock is needed

Signed-off-by: Joe Farro <[email protected]>

* Misc cleanup

Signed-off-by: Joe Farro <[email protected]>

* Use stable yarn in CI

Signed-off-by: Joe Farro <[email protected]>

* Use yarn in package.json scripts

Signed-off-by: Joe Farro <[email protected]>

* Use newly downloaded yarn in CI

Signed-off-by: Joe Farro <[email protected]>
vvvprabhakar pushed a commit to vvvprabhakar/jaeger-ui that referenced this pull request Jul 5, 2021
* Integrate GA into search page

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove tracking of actual values

Signed-off-by: Davit Yeghshatyan <[email protected]>

Signed-off-by: vvvprabhakar <[email protected]>
vvvprabhakar pushed a commit to vvvprabhakar/jaeger-ui that referenced this pull request Jul 5, 2021
* Use Lerna (jaegertracing#209)

* Prep the repo for separately developed components
* Fix uberinternal yarn.lock issues
* Upgrade react to 16.3.2
* Update readme to account for on Lerna changes

Signed-off-by: Joe Farro <[email protected]>

Directed graph layout and presentation (jaegertracing#212)

* Prep the repo for separately developed components

Signed-off-by: Joe Farro <[email protected]>

* WIP - Very rough graph layout functionality

Signed-off-by: Joe Farro <[email protected]>

* Graph layout functionality is in solid shape

Outstanding:
* tests
* calculate edges via several workers when there are many edges

Signed-off-by: Joe Farro <[email protected]>

* Fix minor misc issues with plexus layout

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Fix uberinternal yarn.lock issues

Signed-off-by: Joe Farro <[email protected]>

* Upgrade react to 16.3.2

Signed-off-by: Joe Farro <[email protected]>

* Upgrade flow to 0.71.0

Signed-off-by: Joe Farro <[email protected]>

* Very rough React graph component

Signed-off-by: Joe Farro <[email protected]>

* Enable custom props for graph elements

Signed-off-by: Joe Farro <[email protected]>

* The graph refreshes when it gets new data

Signed-off-by: Joe Farro <[email protected]>

* Make the jaeger-ui package private

Signed-off-by: Joe Farro <[email protected]>

* Misc cleanup for plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Fix issues with plexus package.json

Signed-off-by: Joe Farro <[email protected]>

* Don't output a CSS file for plexus

Signed-off-by: Joe Farro <[email protected]>

* Increase plexus node spacing for neato layouts

Signed-off-by: Joe Farro <[email protected]>

* Update plexus to 0.0.1-dev.2

Signed-off-by: Joe Farro <[email protected]>

* Adding new issue and pull request template (jaegertracing#219)

Signed-off-by: Prakriti <[email protected]>

* plexus readme, remove `LayoutManager.dispose()`

Signed-off-by: Joe Farro <[email protected]>

* remove unecessary package

Signed-off-by: Joe Farro <[email protected]>

* Add more complex graphs to plexus demo

Signed-off-by: Joe Farro <[email protected]>

* Start the worker ID at 0

Signed-off-by: Joe Farro <[email protected]>

Search page functionality for trace diffs

Signed-off-by: Joe Farro <[email protected]>

Stub for trace diff page, update redux state shape

- Better redux state shape for trace diff
  - Refer to traces selected for comparison as trace diff cohort
- Better redux state shape for fetched trace data
  - Before: One loading prop to keep track of all search and individual
    trace fetching
  - After: Loading is tracked separately for serach and for each
    individual trace being fetched
  - This is better all around and lays the ground-work for fetching
    multiple individual traces which will be necessary for trace diff
    page when hit directly via URL (will need to fetch two or more
    traces)

Signed-off-by: Joe Farro <[email protected]>

Optimization for trace mini-map rendering

On a trace with ~16k spans reduced minimap rendering from ~250ms to
~20ms. For context, the initial render of the trace was around 1.22s.

Signed-off-by: Joe Farro <[email protected]>

Redux cleanup, hydrate diff cohort on search page

- Merge TraceSummary into Trace
- Redux action to fetch multiple traces by ID
- Create a small-sized variation of the loading indicator
- SearchTracePage loads trace data for traces in the diff cohort
  - Show loading indicator when trace data is being loaded
  - Show inline error when trace loading fails
  - Strip failed traces from diff cohort when linking to diff page
- Diff page forces redux state based on URL params

Signed-off-by: Joe Farro <[email protected]>

Trace diff page header functionality

- Fetch traces that need to be loaded
- Keep the URL and redux state in sync after changes to A or B
- Allow entering traces by ID
- Allow selecting other traces in the cohort
- Indicate when loading a trace failed

Signed-off-by: Joe Farro <[email protected]>

Convert trace to a DAG

Apply three transforms to spans when converting to DAG:

- Adopt peer.service for service name when a client span is missing
  the corresponding server span
- Ignore client spans when the only child is a reasonable server span
- Try to figure out a better operation name when operation === the
  http.method tag

The conversion can be optimized; it takes about 230ms on a trace with
~35k spans. A trace with ~9k spans takes about 50ms.

Signed-off-by: Joe Farro <[email protected]>

Add useDotEdges and totalMemory options to plexus

- Option in plexus to set the totalMemory viz.js uses
  - Sometimes viz.js runs out of memory on large graphs, especially
    when using the neato engine, increasing the total memeory can help
- Option in plexus to use dot edges in plexus graphs
  - Useful for trees (neato and plexus are very similar) or large
    graphs (neato is too slow)

Signed-off-by: Joe Farro <[email protected]>

Initial trace diff graph

- Ability to create diff of two TraceDag instances
- Additional transforms to trim superfluous nodes
  - skipAnnotationSpans
  - skipClientSpans

Signed-off-by: Joe Farro <[email protected]>

Add zoom and pan to plexus

- Zoom and pan
- Add graph state as param to setOn* props
- Enable scaling edge stroke based on zoom level

Signed-off-by: Joe Farro <[email protected]>

Add zoom to trace diff and increase color contrast

- Add zoom pan to trace diff
- On node hover show node @ 1x zoom (useful when zoomed out)
- Higher contrast colors for trace diff DAG
- Allowing scrolling for errors
- Fix issue with node sizing during measurement phase

Signed-off-by: Joe Farro <[email protected]>

Add a minimap to plexus to help zoom and pan

Also added to trace-diffs

Signed-off-by: Joe Farro <[email protected]>

Guard plexus zoom functionality with a flag

Signed-off-by: Joe Farro <[email protected]>

Fixes and optimizations to plexus and trace diffs

- Bug fix: Each graph should have a unique edge arrow def IRI

- Keep strokes from scaling into invisibility when zooming

  - Remove redundant root node

  - Apply zoom transforms to the node and edge containers

  - Scale the arrow def based on the current zoom (when zoom is
    enabled) by scaling the coords in the marker and path definitions

- Add a convenience prop-factory that toggles a class, "is-small",
  based on the current zoom level

  - Use "is-small" to toggle the visibility of node text and edge
    stroke width based on the current zoom level

- Change prop factories to be grouped by feature instead of context

  - In many cases the prop factory can be applied to multiple contexts,
    e.g. to both the edges container and an edge path

- Make Node and EdgePath components PureComponents

- Wrap rendering the nodes and edges in a PureComponent to prevent
  unnecessary renders

- Remove DirectedGraphState from the edge and node factory prop
  functions to prevent rendering with every transform change

Signed-off-by: Joe Farro <[email protected]>

Add additional layout options to plexus

Signed-off-by: Joe Farro <[email protected]>

Lighten trace diff color scheme

Signed-off-by: Joe Farro <[email protected]>

Use green instead of blue in trace diff coloring

Green is more commonly used to show additions

Signed-off-by: Joe Farro <[email protected]>

Add "Compare" to the top nav and other small fixes

Signed-off-by: Joe Farro <[email protected]>

Adding new issue and pull request template (jaegertracing#219)

Signed-off-by: Prakriti <[email protected]>

Integrate Google Analytics into Search Page (jaegertracing#220)

* Integrate GA into search page

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove tracking of actual values

Signed-off-by: Davit Yeghshatyan <[email protected]>

Timeline Expand and Collapse Features (jaegertracing#221)

* Add expansion and collapsing features

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use Icon component

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use spans upstream

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Improve css

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Rotate collapse buttons

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove debug logging

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Remove spans from TimelineHeaderRow

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add unit test for TimelineCollapser

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Use popover

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add TimelineCollapser test

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Revert "Use popover"

This reverts commit 6152402

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for duck.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add more tests for index.js

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Add keyboard shortcuts

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Update changelog

Signed-off-by: Davit Yeghshatyan <[email protected]>

* Make review changes

Signed-off-by: Davit Yeghshatyan <[email protected]>

Squashed commits from develop-directed-graph (jaegertracing#224)

Signed-off-by: Joe Farro <[email protected]>

Lazily initialize the first worker in plexus

Signed-off-by: Joe Farro <[email protected]>

Fix issue with trace diff URL from auth redirects

The trace diff url was of the form:

    /trace/<trace-a-id>:diff?b=<trace-b-id>

But, during OneLogin / SAML auth redirects it would get URL encoded
and then not URL decoded resulting in it being interpreted as a trace
ID.

Move to the following form with three literal periods between the IDs:

    /trace/<trace-a-id>...<trace-b-id>

Other misc fixes and tweaks:

- Fix an issue where selecting a cohort of traces and then clicking the
  "Compare" button in the top nav cleared the cohort

- Fix an issue where removing a trace from the cohort on the search
  page would not clear the trace from A or B, effectively preventing
  traces set as A or B from ever being removed

- Clean up route definitions

Signed-off-by: Joe Farro <[email protected]>

Fix trace detail tracking for revised redux shape

Signed-off-by: Joe Farro <[email protected]>

* Typo

Signed-off-by: Joe Farro <[email protected]>

* Fix jaegertracing#232 Split leaf from parent nodes in the tree

Signed-off-by: Joe Farro <[email protected]>

* plexus - Fix chart style issues and bump version

Also tweak the demo a bit.

Signed-off-by: Joe Farro <[email protected]>

* Fix yarn workspace based install

Signed-off-by: Joe Farro <[email protected]>

* In CI, fail if an update to yarn.lock is needed

Signed-off-by: Joe Farro <[email protected]>

* Misc cleanup

Signed-off-by: Joe Farro <[email protected]>

* Use stable yarn in CI

Signed-off-by: Joe Farro <[email protected]>

* Use yarn in package.json scripts

Signed-off-by: Joe Farro <[email protected]>

* Use newly downloaded yarn in CI

Signed-off-by: Joe Farro <[email protected]>

Signed-off-by: vvvprabhakar <[email protected]>
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.

3 participants