Skip to content

Commit 54c2bb1

Browse files
update uptrace dependencies to fix docker build (#264)
Co-authored-by: Federico Tedin <[email protected]>
1 parent 888f6fc commit 54c2bb1

File tree

624 files changed

+4617818
-2017037
lines changed

Some content is hidden

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

624 files changed

+4617818
-2017037
lines changed
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# NOTE:
2+
# It is important that these actions are run for every PR, no matter what
3+
# other actions are added. The ones here are testing the actual code pushed
4+
# instead of a possibly outdated image. Additionally, we also run formatters
5+
# and linters here.
6+
# Do not modify this file unless you really need to. You very likely don't need to.
7+
8+
name: Build and Test (without Docker)
9+
on: [push]
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
runner-job:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
22+
- name: Setup Go
23+
uses: actions/setup-go@v5
24+
25+
- name: Setup Goimports
26+
run: go install golang.org/x/tools/cmd/goimports@latest
27+
28+
- uses: actions/setup-node@v4
29+
with:
30+
node-version: 22
31+
32+
- name: Check Formatting (Go)
33+
run: make format-check
34+
35+
- name: Build Binary
36+
run: make build
37+
38+
- name: Run Biome Checks
39+
run: cd pkg/web && npm run biome-check
40+
41+
- name: Start Server
42+
# Use enable these features in our own deployment, so we might as well
43+
# "enable" them during testing as well to simulate a more realistic setup.
44+
env:
45+
QUICKPIZZA_OTLP_ENDPOINT: "http://localhost"
46+
QUICKPIZZA_TRUST_CLIENT_TRACEID: "1"
47+
QUICKPIZZA_PYROSCOPE_ENDPOINT: "http://localhost"
48+
run: ./bin/quickpizza &
49+
50+
- name: Setup k6
51+
uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2 # v1
52+
53+
- name: Install jq
54+
uses: dcarbone/install-jq-action@e397bd87438d72198f81efd21f876461183d383a # v3.0.1
55+
56+
- name: Run k6 foundations tests
57+
run: ./scripts/run-tests.sh -t **/k6/foundations/*.js -u http://localhost:3333
58+
59+
- name: Run k6 foundations TS tests
60+
run: ./scripts/run-tests.sh -t **/k6/foundations/*.ts -u http://localhost:3333
61+
62+
- name: Run k6 internal tests
63+
run: ./scripts/run-tests.sh -t **/k6/internal/*.js -u http://localhost:3333
64+
65+
- name: Run k6 browser tests
66+
run: ./scripts/run-tests.sh -t **/k6/browser/*.js -u http://localhost:3333
67+
68+
- name: Stop Server
69+
run: pkill -9 quickpizza

CLAUDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ QuickPizza is a demonstration web application that generates pizza recommendatio
1717
- `cd pkg/web && npm install` - Install frontend dependencies
1818
- `cd pkg/web && npm run dev` - Start development server
1919
- `cd pkg/web && npm run build` - Build production frontend
20-
- `cd pkg/web && npm run lint` - Lint frontend code
21-
- `cd pkg/web && npm run format` - Format frontend code
20+
- `cd pkg/web && npm run biome-check` - Check frontend code
21+
- `cd pkg/web && npm run biome-format` - Format frontend code
2222

2323
### Go Development
2424
- `make format` - Format Go code with goimports

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ format-go: # Format Go code with goimports
3131

3232
.PHONY: format-web
3333
format-web: # Format frontend code
34-
cd pkg/web/ && npm run format
34+
cd pkg/web/ && npm run biome-format
3535

3636
.PHONY: format-check
3737
format-check: # Check Go code formatting

go.mod

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ require (
1616
github.com/prometheus/client_golang v1.14.1-0.20221122130035-8b6e68085b10
1717
github.com/rs/xid v1.4.0
1818
github.com/uptrace/bun v1.2.15
19-
github.com/uptrace/bun/dbfixture v1.1.14
20-
github.com/uptrace/bun/dialect/pgdialect v1.1.14
21-
github.com/uptrace/bun/dialect/sqlitedialect v1.1.14
19+
github.com/uptrace/bun/dbfixture v1.2.15
20+
github.com/uptrace/bun/dialect/pgdialect v1.2.15
21+
github.com/uptrace/bun/dialect/sqlitedialect v1.2.15
2222
github.com/uptrace/bun/driver/pgdriver v1.2.15
23-
github.com/uptrace/bun/driver/sqliteshim v1.1.14
24-
github.com/uptrace/bun/extra/bunotel v1.1.14
23+
github.com/uptrace/bun/driver/sqliteshim v1.2.15
24+
github.com/uptrace/bun/extra/bunotel v1.2.15
2525
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
2626
go.opentelemetry.io/otel v1.37.0
2727
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
@@ -30,7 +30,7 @@ require (
3030
go.opentelemetry.io/otel/sdk v1.28.0
3131
go.opentelemetry.io/otel/trace v1.37.0
3232
golang.org/x/crypto v0.40.0
33-
golang.org/x/net v0.41.0
33+
golang.org/x/net v0.42.0
3434
google.golang.org/grpc v1.65.0
3535
google.golang.org/protobuf v1.34.2
3636
)
@@ -50,40 +50,32 @@ require (
5050
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5151
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5252
github.com/jinzhu/inflection v1.0.0 // indirect
53-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
5453
github.com/klauspost/compress v1.17.9 // indirect
5554
github.com/mattn/go-isatty v0.0.20 // indirect
56-
github.com/mattn/go-sqlite3 v1.14.17 // indirect
55+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
5756
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
57+
github.com/ncruces/go-strftime v0.1.9 // indirect
5858
github.com/prometheus/client_model v0.3.0 // indirect
5959
github.com/prometheus/common v0.37.0 // indirect
6060
github.com/prometheus/procfs v0.8.0 // indirect
6161
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
6262
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
6363
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
64-
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.1 // indirect
64+
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
6565
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
6666
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
6767
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6868
go.opentelemetry.io/otel/metric v1.37.0 // indirect
6969
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
70-
golang.org/x/mod v0.25.0 // indirect
71-
golang.org/x/sync v0.16.0 // indirect
70+
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc // indirect
7271
golang.org/x/sys v0.34.0 // indirect
7372
golang.org/x/text v0.27.0 // indirect
74-
golang.org/x/tools v0.34.0 // indirect
7573
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
7674
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
7775
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
lukechampine.com/uint128 v1.3.0 // indirect
7976
mellium.im/sasl v0.3.2 // indirect
80-
modernc.org/cc/v3 v3.40.0 // indirect
81-
modernc.org/ccgo/v3 v3.16.13 // indirect
82-
modernc.org/libc v1.22.6 // indirect
83-
modernc.org/mathutil v1.5.0 // indirect
84-
modernc.org/memory v1.5.0 // indirect
85-
modernc.org/opt v0.1.3 // indirect
86-
modernc.org/sqlite v1.22.1 // indirect
87-
modernc.org/strutil v1.1.3 // indirect
88-
modernc.org/token v1.1.0 // indirect
77+
modernc.org/libc v1.66.3 // indirect
78+
modernc.org/mathutil v1.7.1 // indirect
79+
modernc.org/memory v1.11.0 // indirect
80+
modernc.org/sqlite v1.38.0 // indirect
8981
)

0 commit comments

Comments
 (0)