From 0edd73edc3a68da156b2516c35164247a289b285 Mon Sep 17 00:00:00 2001 From: Everett Ross Date: Mon, 4 Nov 2019 16:10:42 -0500 Subject: [PATCH 1/3] Prepare Release v1.5.0 Signed-off-by: Everett Ross --- CHANGELOG.md | 22 ++++++++++++++++++++++ packages/jaeger-ui/package.json | 2 +- scripts/get-changelog.js | 20 ++++++++++++++++---- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2855928f8..d9c3a02895 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Releases +## v1.5.0 (November 4, 2019) + +### Enhancements + +- **Deep Dependency Graph:** Implement Service Oriented Dependency Graph (DDG) ([@tiffon](https://github.com/tiffon) in [#442](https://github.com/jaegertracing/jaeger-ui/pull/442), [#441](https://github.com/jaegertracing/jaeger-ui/pull/441), [#440](https://github.com/jaegertracing/jaeger-ui/pull/440), [#439](https://github.com/jaegertracing/jaeger-ui/pull/439), [#438](https://github.com/jaegertracing/jaeger-ui/pull/438), [#437](https://github.com/jaegertracing/jaeger-ui/pull/437), [#431](https://github.com/jaegertracing/jaeger-ui/pull/431), [#406](https://github.com/jaegertracing/jaeger-ui/pull/406), and [#405](https://github.com/jaegertracing/jaeger-ui/pull/405); and [@everett980](https://github.com/everett980) in [#468](https://github.com/jaegertracing/jaeger-ui/pull/468), [#466](https://github.com/jaegertracing/jaeger-ui/pull/466), [#458](https://github.com/jaegertracing/jaeger-ui/pull/458), [#463](https://github.com/jaegertracing/jaeger-ui/pull/463), [#457](https://github.com/jaegertracing/jaeger-ui/pull/457), [#453](https://github.com/jaegertracing/jaeger-ui/pull/453), [#452](https://github.com/jaegertracing/jaeger-ui/pull/452), [#434](https://github.com/jaegertracing/jaeger-ui/pull/434), [#433](https://github.com/jaegertracing/jaeger-ui/pull/433), [#432](https://github.com/jaegertracing/jaeger-ui/pull/432), [#429](https://github.com/jaegertracing/jaeger-ui/pull/429), [#427](https://github.com/jaegertracing/jaeger-ui/pull/427), [#424](https://github.com/jaegertracing/jaeger-ui/pull/424), [#421](https://github.com/jaegertracing/jaeger-ui/pull/421), [#412](https://github.com/jaegertracing/jaeger-ui/pull/412), [#398](https://github.com/jaegertracing/jaeger-ui/pull/398), [#386](https://github.com/jaegertracing/jaeger-ui/pull/386), and [#378](https://github.com/jaegertracing/jaeger-ui/pull/378)) + +- **Deep Dependency Graph:** Derive DDG from search results ([@rubenvp8510](https://github.com/rubenvp8510) in [#445](https://github.com/jaegertracing/jaeger-ui/pull/445)) + +- **Configuration:** Add script tags from config to body ([@everett980](https://github.com/everett980) in [#455](https://github.com/jaegertracing/jaeger-ui/pull/455)) + +- **Plexus:** Sequester zoom concerns to ZoomManager ([@tiffon](https://github.com/tiffon) in [#409](https://github.com/jaegertracing/jaeger-ui/pull/409)) + +- **Plexus:** Support multiple layers ([@tiffon](https://github.com/tiffon) in [#426](https://github.com/jaegertracing/jaeger-ui/pull/426), [#428](https://github.com/jaegertracing/jaeger-ui/pull/428), [#422](https://github.com/jaegertracing/jaeger-ui/pull/422), [#420](https://github.com/jaegertracing/jaeger-ui/pull/420), [#419](https://github.com/jaegertracing/jaeger-ui/pull/419), [#416](https://github.com/jaegertracing/jaeger-ui/pull/416), and [#414](https://github.com/jaegertracing/jaeger-ui/pull/414)) + +- **Google Analytics:** Track filter interactions on trace detail page ([@everett980](https://github.com/everett980) in [#470](https://github.com/jaegertracing/jaeger-ui/pull/470)) + +### Fixes + +- **Google Analytics:** Fix tracking of clear filter & view keyboard shortcut modal ([@everett980](https://github.com/everett980) in [#470](https://github.com/jaegertracing/jaeger-ui/pull/470)) + +- **Codebase:** Fix codecov reporting ([@tiffon](https://github.com/tiffon) in [#418](https://github.com/jaegertracing/jaeger-ui/pull/418), [#417](https://github.com/jaegertracing/jaeger-ui/pull/417), and[#415](https://github.com/jaegertracing/jaeger-ui/pull/415)) + ## v1.4.0 (August 31, 2019) ### Enhancements diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json index da1759c3ac..52fd48c64d 100644 --- a/packages/jaeger-ui/package.json +++ b/packages/jaeger-ui/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "jaeger-ui", - "version": "1.4.0", + "version": "1.5.0", "main": "src/index.js", "license": "Apache-2.0", "homepage": ".", diff --git a/scripts/get-changelog.js b/scripts/get-changelog.js index 8fe74476ad..8372ea25cd 100755 --- a/scripts/get-changelog.js +++ b/scripts/get-changelog.js @@ -15,10 +15,15 @@ // limitations under the License. // This code will generate changelog entries + +const { readFile } = require('fs'); // eslint-disable-next-line import/no-extraneous-dependencies const fetch = require('isomorphic-fetch'); // eslint-disable-next-line import/no-extraneous-dependencies const jsdom = require('jsdom'); +const { promisify } = require('util'); + +const readFilePromise = promisify(readFile); const DOMAIN = 'https://github.com/'; @@ -28,7 +33,7 @@ function getData(elm) { const title = elm.querySelector('[data-hovercard-type="pull_request"]').textContent; const url = elm.querySelector('[data-hovercard-type="pull_request"]').href; const pid = /#\d+/g.exec(elm.querySelector('.opened-by').textContent)[0]; - const user = elm.querySelector('[data-hovercard-type="user"]').textContent; + const user = elm.querySelector('a.muted-link').textContent; const dateMerged = new Date(elm.querySelector('[datetime]').getAttribute('datetime')); return { title, url, pid, user, dateMerged }; } @@ -84,9 +89,16 @@ function getChangelog(pages) { } if (require.main === module) { - getChangelog(process.argv[2] || 1) - // eslint-disable-next-line no-console - .then(items => console.log(items.map(fmtPr).join('\n\n'))) + Promise.all([getChangelog(process.argv[2] || 1), readFilePromise('./CHANGELOG.md', 'utf8')]) + .then(([items, changelog]) => + // eslint-disable-next-line no-console + console.log( + items + .filter(({ pid, url }) => changelog.indexOf(`[${pid}](${url})`) === -1) + .map(fmtPr) + .join('\n\n') + ) + ) // eslint-disable-next-line no-console .catch(error => console.error(error)); } else { From b88a1628829c52d68c3926fa05678002424305de Mon Sep 17 00:00:00 2001 From: Everett Ross Date: Wed, 6 Nov 2019 15:31:16 -0500 Subject: [PATCH 2/3] Use issues to group multiple PRs Signed-off-by: Everett Ross --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9c3a02895..c1705169aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,15 @@ ### Enhancements -- **Deep Dependency Graph:** Implement Service Oriented Dependency Graph (DDG) ([@tiffon](https://github.com/tiffon) in [#442](https://github.com/jaegertracing/jaeger-ui/pull/442), [#441](https://github.com/jaegertracing/jaeger-ui/pull/441), [#440](https://github.com/jaegertracing/jaeger-ui/pull/440), [#439](https://github.com/jaegertracing/jaeger-ui/pull/439), [#438](https://github.com/jaegertracing/jaeger-ui/pull/438), [#437](https://github.com/jaegertracing/jaeger-ui/pull/437), [#431](https://github.com/jaegertracing/jaeger-ui/pull/431), [#406](https://github.com/jaegertracing/jaeger-ui/pull/406), and [#405](https://github.com/jaegertracing/jaeger-ui/pull/405); and [@everett980](https://github.com/everett980) in [#468](https://github.com/jaegertracing/jaeger-ui/pull/468), [#466](https://github.com/jaegertracing/jaeger-ui/pull/466), [#458](https://github.com/jaegertracing/jaeger-ui/pull/458), [#463](https://github.com/jaegertracing/jaeger-ui/pull/463), [#457](https://github.com/jaegertracing/jaeger-ui/pull/457), [#453](https://github.com/jaegertracing/jaeger-ui/pull/453), [#452](https://github.com/jaegertracing/jaeger-ui/pull/452), [#434](https://github.com/jaegertracing/jaeger-ui/pull/434), [#433](https://github.com/jaegertracing/jaeger-ui/pull/433), [#432](https://github.com/jaegertracing/jaeger-ui/pull/432), [#429](https://github.com/jaegertracing/jaeger-ui/pull/429), [#427](https://github.com/jaegertracing/jaeger-ui/pull/427), [#424](https://github.com/jaegertracing/jaeger-ui/pull/424), [#421](https://github.com/jaegertracing/jaeger-ui/pull/421), [#412](https://github.com/jaegertracing/jaeger-ui/pull/412), [#398](https://github.com/jaegertracing/jaeger-ui/pull/398), [#386](https://github.com/jaegertracing/jaeger-ui/pull/386), and [#378](https://github.com/jaegertracing/jaeger-ui/pull/378)) +- **Deep Dependency Graph:** Implement Service-Oriented Deep Dependency Graph (DDG) ([@tiffon](https://github.com/tiffon) and [@everett980](https://github.com/everett980) in [#481](https://github.com/jaegertracing/jaeger-ui/issues/481)) - **Deep Dependency Graph:** Derive DDG from search results ([@rubenvp8510](https://github.com/rubenvp8510) in [#445](https://github.com/jaegertracing/jaeger-ui/pull/445)) -- **Configuration:** Add script tags from config to body ([@everett980](https://github.com/everett980) in [#455](https://github.com/jaegertracing/jaeger-ui/pull/455)) +- **Configuration:** Allow ui-config.json to specify script tags which are added to UI body ([@everett980](https://github.com/everett980) in [#455](https://github.com/jaegertracing/jaeger-ui/pull/455)) - **Plexus:** Sequester zoom concerns to ZoomManager ([@tiffon](https://github.com/tiffon) in [#409](https://github.com/jaegertracing/jaeger-ui/pull/409)) -- **Plexus:** Support multiple layers ([@tiffon](https://github.com/tiffon) in [#426](https://github.com/jaegertracing/jaeger-ui/pull/426), [#428](https://github.com/jaegertracing/jaeger-ui/pull/428), [#422](https://github.com/jaegertracing/jaeger-ui/pull/422), [#420](https://github.com/jaegertracing/jaeger-ui/pull/420), [#419](https://github.com/jaegertracing/jaeger-ui/pull/419), [#416](https://github.com/jaegertracing/jaeger-ui/pull/416), and [#414](https://github.com/jaegertracing/jaeger-ui/pull/414)) +- **Plexus:** Support multiple layers of nodes and edges ([@tiffon](https://github.com/tiffon) in [#482](https://github.com/jaegertracing/jaeger-ui/issues/482)) - **Google Analytics:** Track filter interactions on trace detail page ([@everett980](https://github.com/everett980) in [#470](https://github.com/jaegertracing/jaeger-ui/pull/470)) From 6e02cb0842b7e7b9725995c24260540bc2efcb00 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 6 Nov 2019 21:47:30 -0500 Subject: [PATCH 3/3] Fix UI config link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcd5ec249f..265b627a8d 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ yarn build ## UI Configuration -See the [deployment guide](https://www.jaegertracing.io/docs/latest/deployment/#ui-configuration) for details on configuring Google Analytics tracking and menu customizations. +See the [configuration guide](https://www.jaegertracing.io/docs/latest/frontend-ui/) for details on configuring Google Analytics tracking, menu customizations, and other aspects of UI behavior. ## License