Merge branch 'main' into speedup-trace-statistics-calculation

Author: maxgaponov

.github/workflows/lint-build.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: '18'

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: '18'

.github/workflows/unit-tests.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: '18'

CHANGELOG.md

@@ -1,10 +1,35 @@
 # Releases
 
-## Next (unreleased)
+<details>
+<summary>next release template</summary>
 
-### Enhancements
+## v1.xx.0 (202x-xx-xx)
 
-### Fixes
+Run `make changelog` to generate content.
+
+</details>
+
+## v1.35.0 (2023-11-02)
+
+#### ✨ New Features:
+
+* Add tooltip when hovering critical path ([@GLVSKiriti](https://github.com/GLVSKiriti) in [#1871](https://github.com/jaegertracing/jaeger-ui/pull/1871))
+* Added tooltip when hovered on header column of tracestatistics view ([@GLVSKiriti](https://github.com/GLVSKiriti) in [#1902](https://github.com/jaegertracing/jaeger-ui/pull/1902))
+
+#### 🐞 Bug fixes, Minor Improvements:
+
+* Upgrade ant-design to v5.x ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1907](https://github.com/jaegertracing/jaeger-ui/pull/1907))
+* [refactor]: enhancement to selftime calculation logic in tracestatistics view ([@GLVSKiriti](https://github.com/GLVSKiriti) in [#1901](https://github.com/jaegertracing/jaeger-ui/pull/1901))
+* Fix: disregard malformed references pointing to the same span ([@zimv](https://github.com/zimv) in [#823](https://github.com/jaegertracing/jaeger-ui/pull/823))
+* Fix: add style for ioarrowforward ([@NineKama](https://github.com/NineKama) in [#1869](https://github.com/jaegertracing/jaeger-ui/pull/1869))
+* Replace deprecated ant-design props from referencebutton and keyvaluestable ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1864](https://github.com/jaegertracing/jaeger-ui/pull/1864))
+* Remove deprecated usages from antd dropdown, tooltip, and tab components ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1859](https://github.com/jaegertracing/jaeger-ui/pull/1859))
+* Replace deprecated visible prop of ant-design v3 with open prop of ant-design v4 ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1855](https://github.com/jaegertracing/jaeger-ui/pull/1855))
+* Replace deprecated usage of ant-design tabs component from searchtracepage ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1857](https://github.com/jaegertracing/jaeger-ui/pull/1857))
+
+#### 👷 CI Improvements:
+
+* Ci: add the label-check workflow to verify changelog labels on each pr ([@anshgoyalevil](https://github.com/anshgoyalevil) in [#1897](https://github.com/jaegertracing/jaeger-ui/pull/1897))
 
 ## v1.34.0 (2023-10-04)
 

package.json

@@ -9,26 +9,24 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.19.1",
-    "@typescript-eslint/eslint-plugin": "6.9.0",
-    "@typescript-eslint/parser": "6.9.0",
-    "eslint": "8.52.0",
+    "@typescript-eslint/eslint-plugin": "6.11.0",
+    "@typescript-eslint/parser": "6.11.0",
+    "eslint": "8.53.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "7.33.2",
     "husky": "8.0.3",
     "jsdom": "22.1.0",
-    "lerna": "7.4.1",
+    "lerna": "7.4.2",
     "npm-run-all": "4.1.5",
-    "prettier": "3.0.3",
+    "prettier": "3.1.0",
     "rxjs-compat": "6.6.7",
     "typescript": "5.2.2"
   },
   "resolutions": {
-    "**/lodash": "4.17.21",
-    "**/@types/react": "16.14.35",
-    "**/@types/react-dom": "16.9.18"
+    "**/lodash": "^4.17.21"
   },
   "workspaces": {
     "packages": [

packages/jaeger-ui/README.md

@@ -0,0 +1,15 @@
+# Jaeger UI
+
+## Configuration
+
+The UI supports customization via a `Config` object (see [src/types/config.tsx](./src/types/config.tsx) for the complete schema). This object is returned by the top-level function `getJaegerUiConfig` defined in [index.html](./index.html). By default this function just returns null, but its source is manipulated by the `query-service` such that the values are injected dynamically via search-replace. The returned value is then merged with [defaults](./src/utils/config/get-config.js) into the redux `state.config`.
+
+`query-service` allows specifying custom configuration as either JSON or Javascript file.
+
+### Configuration as JSON
+
+When the config file has `.json` extension, `query-service` looks for the statement `JAEGER_CONFIG = DEFAULT_CONFIG` and replaces the right-hand side with the content of the loaded config file, which must contain a valid JSON.
+
+### Configuration as Javascript
+
+When the config file has `.js` extension, `query-service` looks for the comment `// JAEGER_CONFIG_JS` and replaces it with a function `UIConfig()` whose body is the content of the loaded file, which must contain a valid Javascript code that returns a Config object. This allows more complex integrations by actually executing some custom code. For example, `tracking.customWebAnalytics` allows to hook up a different implementation of the tracking component.

packages/jaeger-ui/index.html

@@ -16,21 +16,33 @@
     <title>Jaeger UI</title>
     <script>
       // Jaeger UI config data is embedded by the query-service via search-replace.
-      // This is later merged with defaults into the redux `state.config` via
-      // src/utils/config/get-config.js.
+      // Please see ./README.md#configuration for details.
+
+      // TODO the JSON/JS bifurcation below could be avoided by using a single template function like:
+      // function getJaegerUiConfig() { return null; }
+
+      // Important! Do not alter the following line; query-service looks for that exact pattern.
       // JAEGER_CONFIG_JS
-      // the line above may be replaced by user-provided JS file that should define a UIConfig function.
+
       function getJaegerUiConfig() {
         if(typeof window.UIConfig === 'function') {
           return UIConfig();
         }
         const DEFAULT_CONFIG = null;
+        // Important! Do not alter the following line; query-service looks for that exact pattern.
         const JAEGER_CONFIG = DEFAULT_CONFIG;
         return JAEGER_CONFIG;
       }
+      // Jaeger storage compabilities data is embedded by the query-service via search-replace.
+      function getJaegerStorageCapabilities() {
+        const DEFAULT_STORAGE_CAPABILITIES = { "archiveStorage": false };
+        const JAEGER_STORAGE_CAPABILITIES = DEFAULT_STORAGE_CAPABILITIES;
+        return JAEGER_STORAGE_CAPABILITIES;
+      }
       // Jaeger version data is embedded by the query-service via search/replace.
       function getJaegerVersion() {
-        const DEFAULT_VERSION = {"gitCommit":"", "gitVersion":"", "buildDate":""};
+        const DEFAULT_VERSION = {'gitCommit':'', 'gitVersion':'', 'buildDate':''};
+        // Important! Do not alter the following line; query-service looks for that exact pattern.
         const JAEGER_VERSION = DEFAULT_VERSION;
         return JAEGER_VERSION;
       }

packages/jaeger-ui/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "jaeger-ui",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "main": "src/index.tsx",
   "license": "Apache-2.0",
   "homepage": ".",
@@ -17,11 +17,11 @@
     "@babel/preset-typescript": "^7.21.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
-    "@types/react": "16.14.35",
+    "@types/react": "^18.2.33",
     "@types/react-window": "^1.8.0",
     "@types/redux-form": "^8.3.5",
     "@types/rollup-plugin-visualizer": "^4.2.1",
-    "@vitejs/plugin-legacy": "^4.0.1",
+    "@vitejs/plugin-legacy": "^5.0.0",
     "@vitejs/plugin-react": "^4.0.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "babel-jest": "^29.5.0",
@@ -37,7 +37,7 @@
     "rollup-plugin-visualizer": "^5.9.0",
     "sinon": "^17.0.0",
     "terser": "^5.16.5",
-    "vite": "^4.1.4",
+    "vite": "^5.0.0",
     "vite-plugin-imp": "^2.3.1"
   },
   "dependencies": {
@@ -81,9 +81,10 @@
     "react-helmet": "^6.1.0",
     "react-icons": "^4.10.1",
     "react-is": "^18.2.0",
-    "react-json-view-lite": "1.1.0",
+    "react-json-view-lite": "1.2.0",
     "react-redux": "^8.1.2",
-    "react-router-dom": "5.2.0",
+    "react-router-dom": "5.3.4",
+    "react-router-dom-v5-compat": "^6.18.0",
     "react-vis": "^1.7.2",
     "react-vis-force": "^0.3.1",
     "react-window": "^1.8.3",

packages/jaeger-ui/src/components/DeepDependencies/Header/ChevronDown.test.js

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import React from 'react';
-import { shallow } from 'enzyme';
-import { IoChevronDown } from 'react-icons/io5';
+import { render } from '@testing-library/react';
+import '@testing-library/jest-dom';
 
 import ChevronDown from './ChevronDown';
 
@@ -24,14 +24,14 @@ describe('ChevronDown', () => {
     const style = {
       border: 'black solid 1px',
     };
-    const wrapper = shallow(<ChevronDown className={className} style={style} />);
+    const { container } = render(<ChevronDown className={className} style={style} />);
 
-    expect(wrapper.hasClass(className)).toBe(true);
-    expect(wrapper.find(IoChevronDown).prop('style')).toBe(style);
+    expect(container.firstChild).toHaveClass(className);
+    expect(container.firstChild).toHaveStyle(style);
   });
 
   it('does not add `undefined` as a className when not given a className', () => {
-    const wrapper = shallow(<ChevronDown />);
-    expect(wrapper.hasClass('undefined')).toBe(false);
+    const { container } = render(<ChevronDown />);
+    expect(container.firstChild).not.toHaveClass('undefined');
   });
 });

packages/jaeger-ui/src/components/DependencyGraph/index.jsx

@@ -82,7 +82,19 @@ export class DependencyGraphPageImpl extends Component {
     }
 
     if (!nodes || !links) {
-      return <div className="u-simple-card ub-m3">No service dependencies found.</div>;
+      return (
+        <div className="u-simple-card ub-m3">
+          No service dependencies found.{' '}
+          <a
+            href="https://www.jaegertracing.io/docs/latest/faq/#why-is-the-dependencies-page-empty"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            See FAQ
+          </a>
+          .
+        </div>
+      );
     }
 
     const GRAPH_TYPE_OPTIONS = [GRAPH_TYPES.FORCE_DIRECTED];