Skip to content

Commit 117bd62

Browse files
authored
Merge pull request #534 from databuddy-analytics/staging
Promote staging to main
2 parents 1e42f7d + 148136e commit 117bd62

118 files changed

Lines changed: 2841 additions & 763 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cache-benchmark.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
contents: read
1717
packages: write
1818
steps:
19-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
19+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
2020

2121
- name: Mount Docker build cache
22-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
22+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
2323
with:
2424
key: ${{ github.repository }}-cache-bench-gha
2525
path: /tmp/docker-build-cache
2626

2727
- name: Set up Docker Builder
28-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
28+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
2929

3030
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
3131
with:
@@ -34,7 +34,7 @@ jobs:
3434
password: ${{ secrets.GITHUB_TOKEN }}
3535

3636
- name: Build with GHA cache
37-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
37+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
3838
with:
3939
context: .
4040
file: links.Dockerfile
@@ -52,16 +52,16 @@ jobs:
5252
contents: read
5353
packages: write
5454
steps:
55-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
55+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
5656

5757
- name: Mount Docker build cache
58-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
58+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
5959
with:
6060
key: ${{ github.repository }}-cache-bench-registry
6161
path: /tmp/docker-build-cache
6262

6363
- name: Set up Docker Builder
64-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
64+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
6565

6666
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
6767
with:
@@ -70,7 +70,7 @@ jobs:
7070
password: ${{ secrets.GITHUB_TOKEN }}
7171

7272
- name: Build with registry cache
73-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
73+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
7474
with:
7575
context: .
7676
file: links.Dockerfile

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: blacksmith-2vcpu-ubuntu-2404
2828
timeout-minutes: 10
2929
steps:
30-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
30+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
3131
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
3232
with:
3333
bun-version: "1.3.14"
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: blacksmith-4vcpu-ubuntu-2404
4545
timeout-minutes: 15
4646
steps:
47-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
47+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
4848
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
4949
with:
5050
bun-version: "1.3.14"
@@ -113,7 +113,7 @@ jobs:
113113
--health-retries 5
114114
115115
steps:
116-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
116+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
117117
with:
118118
fetch-depth: 2
119119
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
contents: read
2525

2626
steps:
27-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
27+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
2828

2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4

.github/workflows/dashboard-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
--health-retries 20
8888
8989
steps:
90-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
90+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
9191
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
9292
with:
9393
bun-version: "1.3.14"

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: blacksmith-2vcpu-ubuntu-2404
1414
timeout-minutes: 10
1515
steps:
16-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
16+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
1717
- uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4
1818
with:
1919
comment-summary-in-pr: always
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: blacksmith-2vcpu-ubuntu-2404
2525
timeout-minutes: 10
2626
steps:
27-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
27+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
2828
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
2929
with:
3030
bun-version: "1.3.14"

.github/workflows/docker-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
outputs:
3333
services: ${{ steps.detect.outputs.services }}
3434
steps:
35-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
35+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
3636
with:
3737
fetch-depth: 0
3838
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
@@ -111,16 +111,16 @@ jobs:
111111
description: "Databuddy Uptime service - availability monitoring"
112112

113113
steps:
114-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
114+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
115115

116116
- name: Mount Docker build cache
117-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
117+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
118118
with:
119119
key: ${{ github.repository }}-${{ matrix.service }}-${{ matrix.platform.arch }}
120120
path: /tmp/docker-build-cache
121121

122122
- name: Set up Docker Builder
123-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
123+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
124124

125125
- uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
126126
with:
@@ -157,7 +157,7 @@ jobs:
157157
158158
- name: Build and push
159159
id: build
160-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
160+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
161161
with:
162162
context: .
163163
file: ${{ matrix.service }}.Dockerfile
@@ -178,7 +178,7 @@ jobs:
178178
if: always() && steps.build.outcome != 'cancelled'
179179
env:
180180
TRIVY_PLATFORM: ${{ matrix.platform.os }}
181-
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0
181+
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # 0.36.0
182182
with:
183183
image-ref: ${{ env.IMAGE_PREFIX }}-${{ matrix.service }}:${{ steps.version.outputs.tag }}-${{ matrix.platform.arch }}
184184
format: sarif

.github/workflows/health-check.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ jobs:
6767
6868
steps:
6969
- name: Checkout repository
70-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
70+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
7171

7272
- name: Mount Docker build cache
73-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
73+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
7474
with:
7575
key: ${{ github.repository }}-docker-build-cache
7676
path: /tmp/docker-build-cache
7777

7878
- name: Set up Docker Builder
79-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
79+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
8080

8181
- name: Build API Docker image
82-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
82+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
8383
with:
8484
context: .
8585
file: ./api.Dockerfile
@@ -169,19 +169,19 @@ jobs:
169169
170170
steps:
171171
- name: Checkout repository
172-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
172+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
173173

174174
- name: Mount Docker build cache
175-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
175+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
176176
with:
177177
key: ${{ github.repository }}-docker-build-cache
178178
path: /tmp/docker-build-cache
179179

180180
- name: Set up Docker Builder
181-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
181+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
182182

183183
- name: Build Basket Docker image
184-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
184+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
185185
with:
186186
context: .
187187
file: ./basket.Dockerfile
@@ -301,19 +301,19 @@ jobs:
301301
302302
steps:
303303
- name: Checkout repository
304-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
304+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
305305

306306
- name: Mount Docker build cache
307-
uses: useblacksmith/stickydisk@41873b1513bb679f9c115504cbd13d3660432504 # v1
307+
uses: useblacksmith/stickydisk@4c034ba57b706cf0e3b4b0ce098c2a3b1071580c # v1
308308
with:
309309
key: ${{ github.repository }}-docker-build-cache
310310
path: /tmp/docker-build-cache
311311

312312
- name: Set up Docker Builder
313-
uses: useblacksmith/setup-docker-builder@ac083cc84672d01c60d5e8561d0a939b697de542 # v1
313+
uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
314314

315315
- name: Build Insights Docker image
316-
uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2
316+
uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
317317
with:
318318
context: .
319319
file: ./insights.Dockerfile

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
id-token: write
1919
timeout-minutes: 15
2020
steps:
21-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
21+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
2222
with:
2323
fetch-depth: 0
2424

2525
- uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2
2626
with:
2727
bun-version: "1.3.14"
2828

29-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
29+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
3030
with:
3131
node-version: "22"
3232
registry-url: "https://registry.npmjs.org"
@@ -42,7 +42,7 @@ jobs:
4242

4343
- run: bun install --frozen-lockfile --ignore-scripts
4444

45-
- uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba # v1
45+
- uses: changesets/action@63a615b9cd06ba9a3e6d13796c7fbcb080a60a0b # v1
4646
id: changesets
4747
with:
4848
version: bun run version-packages

apps/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@elysiajs/server-timing": "^1.4.0",
3030
"@modelcontextprotocol/sdk": "^1.26.0",
3131
"@opentelemetry/resources": "^2.4.0",
32-
"@opentelemetry/sdk-node": "0.217.0",
32+
"@opentelemetry/sdk-node": "0.219.0",
3333
"@opentelemetry/semantic-conventions": "^1.29.0",
3434
"@orpc/openapi": "^1.14.0",
3535
"@orpc/server": "^1.14.0",
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import { describe, expect, it } from "vitest";
2+
import { buildAgentStreamRedisWarningPayload } from "./agent-stream-errors";
3+
4+
describe("buildAgentStreamRedisWarningPayload", () => {
5+
it("builds a consistent warning payload for Redis side effects", () => {
6+
const payload = buildAgentStreamRedisWarningPayload(
7+
new Error("redis timeout"),
8+
"append_stream_chunk",
9+
{ chatId: "chat_1", websiteId: "web_1" }
10+
);
11+
12+
expect(payload).toEqual(
13+
expect.objectContaining({
14+
agent_chat_id: "chat_1",
15+
agent_stream_operation: "append_stream_chunk",
16+
agent_stream_redis_error: true,
17+
agent_website_id: "web_1",
18+
error_message: "redis timeout",
19+
error_name: "Error",
20+
service: "api",
21+
})
22+
);
23+
expect(typeof payload.error_stack).toBe("string");
24+
});
25+
26+
it("omits the website field when no website is in scope", () => {
27+
const payload = buildAgentStreamRedisWarningPayload(
28+
"redis unavailable",
29+
"clear_active_stream",
30+
{ chatId: "chat_1", websiteId: null }
31+
);
32+
33+
expect(payload.agent_website_id).toBeUndefined();
34+
expect(payload.error_message).toBe("redis unavailable");
35+
});
36+
});

0 commit comments

Comments
 (0)