From bde91212ab586fe818fba2e76fbfb7591357c162 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 23:48:16 +0000 Subject: [PATCH 1/9] chore(release): bump HyperDX app/package versions (beta) --- .changeset/pre.json | 9 +++++++++ .env | 4 ++-- packages/api/CHANGELOG.md | 19 +++++++++++++++++++ packages/api/package.json | 4 ++-- packages/app/CHANGELOG.md | 16 ++++++++++++++++ packages/app/package.json | 4 ++-- packages/common-utils/CHANGELOG.md | 12 ++++++++++++ packages/common-utils/package.json | 2 +- yarn.lock | 6 +++--- 9 files changed, 66 insertions(+), 10 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 7c2e7e73a..feb33a151 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -10,16 +10,21 @@ "big-rules-think", "breezy-humans-crash", "breezy-ligers-divide", + "clean-dingos-divide", "clever-paws-rush", + "curly-ducks-jump", "dull-radios-wink", "famous-laws-laugh", "famous-poets-rush", "fast-phones-scream", + "few-teachers-deny", "fifty-pugs-nail", "fifty-walls-wink", "five-glasses-live", "forty-ducks-invite", + "forty-hounds-grin", "forty-mails-deliver", + "happy-hornets-join", "healthy-carpets-applaud", "hip-dolls-reply", "honest-balloons-walk", @@ -30,6 +35,8 @@ "metal-doors-burn", "mighty-crabs-fry", "moody-chefs-juggle", + "moody-guests-smell", + "neat-badgers-matter", "neat-scissors-hope", "nervous-steaks-bathe", "nervous-timers-dream", @@ -38,6 +45,7 @@ "old-rules-check", "olive-peaches-marry", "perfect-nails-doubt", + "plenty-pumas-taste", "popular-ants-ring", "quiet-dryers-taste", "rotten-cheetahs-argue", @@ -51,6 +59,7 @@ "sweet-kiwis-cheer", "taco-cat-v2", "tasty-bats-refuse", + "ten-pandas-cough", "thirty-ghosts-drop", "twelve-ladybugs-confess", "twenty-trains-turn", diff --git a/.env b/.env index b871977f4..f1481519c 100644 --- a/.env +++ b/.env @@ -6,8 +6,8 @@ LOCAL_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-local LOCAL_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-local OTEL_COLLECTOR_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-otel-collector OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-otel-collector -CHANGESET_TAG=2.0.0-beta.14 -IMAGE_VERSION_SUB_TAG=.14 +CHANGESET_TAG=2.0.0-beta.15 +IMAGE_VERSION_SUB_TAG=.15 IMAGE_VERSION=2-beta IMAGE_NIGHTLY_TAG=2-nightly diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index 62df25887..fea87a80e 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -1,5 +1,24 @@ # @hyperdx/api +## 2.0.0-beta.15 + +### Minor Changes + +- 79fe30f: Queries depending on numeric aggregates now use the type's default value (e.g. 0) instead of null when dealing with non-numeric data. + +### Patch Changes + +- 9a9581b: Adds external API for alerts and dashboards +- 293a2af: Adds openapidoc annotations for spec generation and swagger route for development +- 92a4800: feat: move rrweb event fetching to the client instead of an api route +- 7f0b397: feat: queryChartConfig method + events chart ratio +- b4b5f6b: style: remove unused routes/components + clickhouse utils (api) +- Updated dependencies [79fe30f] +- Updated dependencies [cfdd523] +- Updated dependencies [92a4800] +- Updated dependencies [7f0b397] + - @hyperdx/common-utils@0.2.0-beta.4 + ## 2.0.0-beta.14 ### Patch Changes diff --git a/packages/api/package.json b/packages/api/package.json index 744b5afef..5d49715eb 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@hyperdx/api", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "license": "MIT", "private": true, "engines": { @@ -8,7 +8,7 @@ }, "dependencies": { "@clickhouse/client": "^0.2.10", - "@hyperdx/common-utils": "^0.2.0-beta.3", + "@hyperdx/common-utils": "^0.2.0-beta.4", "@hyperdx/lucene": "^3.1.1", "@hyperdx/node-opentelemetry": "^0.8.1", "@opentelemetry/api": "^1.8.0", diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md index 1823de0be..e9aa03c14 100644 --- a/packages/app/CHANGELOG.md +++ b/packages/app/CHANGELOG.md @@ -1,5 +1,21 @@ # @hyperdx/app +## 2.0.0-beta.15 + +### Patch Changes + +- 7de8916: Removes trailing slash for connection urls +- cfdd523: feat: clickhouse queries are by default conducted through the clickhouse library via POST request. localMode still uses GET for CORS purposes +- 6dc6989: feat: Automatically use last used source when loading search page +- 92a4800: feat: move rrweb event fetching to the client instead of an api route +- 7f0b397: feat: queryChartConfig method + events chart ratio +- b4b5f6b: style: remove unused routes/components + clickhouse utils (api) +- Updated dependencies [79fe30f] +- Updated dependencies [cfdd523] +- Updated dependencies [92a4800] +- Updated dependencies [7f0b397] + - @hyperdx/common-utils@0.2.0-beta.4 + ## 2.0.0-beta.14 ### Patch Changes diff --git a/packages/app/package.json b/packages/app/package.json index f408eebcf..d4cbeadbd 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@hyperdx/app", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "private": true, "license": "MIT", "engines": { @@ -28,7 +28,7 @@ "@codemirror/lang-sql": "^6.7.0", "@hookform/resolvers": "^3.9.0", "@hyperdx/browser": "^0.21.1", - "@hyperdx/common-utils": "^0.2.0-beta.3", + "@hyperdx/common-utils": "^0.2.0-beta.4", "@hyperdx/node-opentelemetry": "^0.8.1", "@lezer/highlight": "^1.2.0", "@mantine/core": "7.9.2", diff --git a/packages/common-utils/CHANGELOG.md b/packages/common-utils/CHANGELOG.md index 437521761..5b32c6390 100644 --- a/packages/common-utils/CHANGELOG.md +++ b/packages/common-utils/CHANGELOG.md @@ -1,5 +1,17 @@ # @hyperdx/common-utils +## 0.2.0-beta.4 + +### Minor Changes + +- 79fe30f: Queries depending on numeric aggregates now use the type's default value (e.g. 0) instead of null when dealing with non-numeric data. + +### Patch Changes + +- cfdd523: feat: clickhouse queries are by default conducted through the clickhouse library via POST request. localMode still uses GET for CORS purposes +- 92a4800: feat: move rrweb event fetching to the client instead of an api route +- 7f0b397: feat: queryChartConfig method + events chart ratio + ## 0.2.0-beta.3 ### Patch Changes diff --git a/packages/common-utils/package.json b/packages/common-utils/package.json index cfb362728..df968a5bd 100644 --- a/packages/common-utils/package.json +++ b/packages/common-utils/package.json @@ -1,7 +1,7 @@ { "name": "@hyperdx/common-utils", "description": "Common utilities for HyperDX application", - "version": "0.2.0-beta.3", + "version": "0.2.0-beta.4", "license": "MIT", "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 5e0625a8a..ba36292ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4258,7 +4258,7 @@ __metadata: resolution: "@hyperdx/api@workspace:packages/api" dependencies: "@clickhouse/client": "npm:^0.2.10" - "@hyperdx/common-utils": "npm:^0.2.0-beta.3" + "@hyperdx/common-utils": "npm:^0.2.0-beta.4" "@hyperdx/lucene": "npm:^3.1.1" "@hyperdx/node-opentelemetry": "npm:^0.8.1" "@opentelemetry/api": "npm:^1.8.0" @@ -4348,7 +4348,7 @@ __metadata: "@hookform/devtools": "npm:^4.3.1" "@hookform/resolvers": "npm:^3.9.0" "@hyperdx/browser": "npm:^0.21.1" - "@hyperdx/common-utils": "npm:^0.2.0-beta.3" + "@hyperdx/common-utils": "npm:^0.2.0-beta.4" "@hyperdx/node-opentelemetry": "npm:^0.8.1" "@jedmao/location": "npm:^3.0.0" "@lezer/highlight": "npm:^1.2.0" @@ -4474,7 +4474,7 @@ __metadata: languageName: node linkType: hard -"@hyperdx/common-utils@npm:^0.2.0-beta.3, @hyperdx/common-utils@workspace:packages/common-utils": +"@hyperdx/common-utils@npm:^0.2.0-beta.4, @hyperdx/common-utils@workspace:packages/common-utils": version: 0.0.0-use.local resolution: "@hyperdx/common-utils@workspace:packages/common-utils" dependencies: From d054f13d95275d22a2803b80853e2f400a4b3331 Mon Sep 17 00:00:00 2001 From: Warren Lee <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 18:23:59 -0700 Subject: [PATCH 2/9] fix: specify owner for notify step + update PR title --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e96148ca9..e73f9f330 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: uses: changesets/action@v1 with: commit: 'chore(release): bump HyperDX app/package versions' - title: 'chore(release): bump HyperDX app/package versions' + title: 'Release HyperDX' version: yarn run version publish: yarn release env: @@ -84,6 +84,7 @@ jobs: with: app-id: ${{ secrets.DOWNSTREAM_CH_APP_ID }} private-key: ${{ secrets.DOWNSTREAM_CH_APP_PRIVATE_KEY }} + owner: ${{ secrets.DOWNSTREAM_CH_OWNER }} - name: Notify Downstream if: needs.publish_common_utils.outputs.changeset_outputs_hasChangesets == From 6388fe7e18368da329b40367be983c75fae80490 Mon Sep 17 00:00:00 2001 From: Warren Lee <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 18:34:46 -0700 Subject: [PATCH 3/9] fix: create api/app tags as well --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3191dbb42..b6fb06bf7 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dev": "docker compose -f docker-compose.dev.yml up -d && yarn app:dev && docker compose -f docker-compose.dev.yml down", "lint": "npx nx run-many -t ci:lint", "version": "make version", - "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset publish" + "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset tag && npx changeset publish" }, "lint-staged": { "**/*.{ts,tsx}": [ From 4ac75df2941204ed72a77a9fcede8d5c5a0f2ba7 Mon Sep 17 00:00:00 2001 From: Warren Lee <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 18:40:58 -0700 Subject: [PATCH 4/9] ci: test run --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e73f9f330..ea5074d02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,8 @@ name: Release on: push: branches: [v2] + pull_request: + branches: [v2] concurrency: ${{ github.workflow }}-${{ github.ref }} permissions: contents: write From 2ac63de8750062c0eff209f110d60ed74475460b Mon Sep 17 00:00:00 2001 From: Warren Lee <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 18:56:03 -0700 Subject: [PATCH 5/9] fix: publish tags afterwards --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6fb06bf7..faaae3e7a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dev": "docker compose -f docker-compose.dev.yml up -d && yarn app:dev && docker compose -f docker-compose.dev.yml down", "lint": "npx nx run-many -t ci:lint", "version": "make version", - "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset tag && npx changeset publish" + "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset publish --no-git-tag && npx changeset tag && git push --follow-tags" }, "lint-staged": { "**/*.{ts,tsx}": [ From d876a66de613470fc9d8b5bd62982b1c6775bb43 Mon Sep 17 00:00:00 2001 From: Warren Lee <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 19:00:30 -0700 Subject: [PATCH 6/9] ci: run even if the tags failed to push --- .github/workflows/release.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea5074d02..eca469eb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,7 @@ jobs: - name: Install root dependencies run: yarn install - name: Create Release Pull Request or Publish to npm + if: always() id: changesets uses: changesets/action@v1 with: diff --git a/package.json b/package.json index faaae3e7a..b6fb06bf7 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dev": "docker compose -f docker-compose.dev.yml up -d && yarn app:dev && docker compose -f docker-compose.dev.yml down", "lint": "npx nx run-many -t ci:lint", "version": "make version", - "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset publish --no-git-tag && npx changeset tag && git push --follow-tags" + "release": "npx nx run-many --target=build --projects=@hyperdx/common-utils && npx changeset tag && npx changeset publish" }, "lint-staged": { "**/*.{ts,tsx}": [ From 887edaaa3e3311f148e1e1d3005b7e28c347f19d Mon Sep 17 00:00:00 2001 From: Warren <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 19:59:05 -0700 Subject: [PATCH 7/9] ci: one more --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eca469eb8..b099b39c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,7 @@ jobs: run: yarn install - name: Create Release Pull Request or Publish to npm if: always() + continue-on-error: true id: changesets uses: changesets/action@v1 with: From b8241f4396632725aa68b45c4df71a7b2e9bb0bf Mon Sep 17 00:00:00 2001 From: Warren <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 21:06:03 -0700 Subject: [PATCH 8/9] ci: seperate downstream notify job --- .github/workflows/release.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b099b39c4..07505ec6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,6 +82,18 @@ jobs: needs.publish_common_utils.outputs.changeset_outputs_hasChangesets == 'false' run: make ${{ matrix.release }} + notify_downstream: + name: Notify Downstream + needs: [publish_common_utils, release] + runs-on: ubuntu-24.04 + if: + needs.publish_common_utils.outputs.changeset_outputs_hasChangesets == + 'false' + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Load Environment Variables from .env + uses: xom9ikk/dotenv@v2 - name: Get Downstream App Installation Token id: auth uses: actions/create-github-app-token@v2 @@ -90,9 +102,6 @@ jobs: private-key: ${{ secrets.DOWNSTREAM_CH_APP_PRIVATE_KEY }} owner: ${{ secrets.DOWNSTREAM_CH_OWNER }} - name: Notify Downstream - if: - needs.publish_common_utils.outputs.changeset_outputs_hasChangesets == - 'false' uses: actions/github-script@v7 env: TAG: ${{ env.IMAGE_VERSION }}.${{ env.IMAGE_VERSION_SUB_TAG }} From 059200e725b599008b1b6a452965a20bb43293d2 Mon Sep 17 00:00:00 2001 From: Warren <5959690+wrn14897@users.noreply.github.com> Date: Tue, 6 May 2025 21:07:26 -0700 Subject: [PATCH 9/9] fix: update tag --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07505ec6e..c6f353cf9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,6 @@ name: Release on: push: branches: [v2] - pull_request: - branches: [v2] concurrency: ${{ github.workflow }}-${{ github.ref }} permissions: contents: write @@ -104,7 +102,7 @@ jobs: - name: Notify Downstream uses: actions/github-script@v7 env: - TAG: ${{ env.IMAGE_VERSION }}.${{ env.IMAGE_VERSION_SUB_TAG }} + TAG: ${{ env.IMAGE_VERSION }}${{ env.IMAGE_VERSION_SUB_TAG }} with: github-token: ${{ steps.auth.outputs.token }} script: |