Skip to content

Commit 39c5e6d

Browse files
AchoArnoldAchoArnold
committed
Merge remote-tracking branch 'origin/main' into feat/migrate-nuxt4-vuetify4
# Conflicts: # .gitignore # web/package.json # web/pages/billing/index.vue # web/pages/messages/index.vue # web/plugins/filters.ts # web/pnpm-lock.yaml
2 parents 8b64bea + 2bc97d1 commit 39c5e6d

18 files changed

Lines changed: 449 additions & 113 deletions

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ SECURITY_AUDIT_REPORT.md
1414
*.exe
1515

1616
docs/
17-
.agents
17+
.output
18+
.agents/
19+
skills-lock.json

‎.mcp.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
"type": "stdio",
1818
"command": "npx",
1919
"args": ["@upstash/context7-mcp@latest"]
20+
},
21+
"axiom": {
22+
"type": "stdio",
23+
"command": "npx",
24+
"args": ["-y", "mcp-remote", "https://mcp.axiom.co/mcp"]
2025
}
2126
}
2227
}

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ repos:
1414
- id: trailing-whitespace
1515

1616
- repo: https://github.com/pre-commit/mirrors-prettier
17-
rev: v3.0.0
17+
rev: v3.1.0
1818
hooks:
1919
- id: prettier
20+
exclude: ^web/

‎api/.env.docker‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ENV=production
1+
ENV=local
22

33
# This is the project-id of the firebase project you created in the setup instructions
44
GCP_PROJECT_ID=httpsms-docker
@@ -55,9 +55,13 @@ REDIS_URL=redis://@redis:6379
5555
# Google Cloud Storage bucket for MMS attachments. Leave empty to use in-memory storage.
5656
GCS_BUCKET_NAME=
5757

58-
# [optional] If you would like to use uptrace.dev for distributed tracing, you can set the DSN here.
59-
# This is optional and you can leave it empty if you don't want to use uptrace
60-
UPTRACE_DSN=
58+
# [Optional] Axiom observability configuration
59+
# API token for Axiom (required for logging, traces, and metrics in production)
60+
AXIOM_TOKEN=
61+
# Dataset for logs and traces (e.g. "events")
62+
AXIOM_DATASET_EVENTS=
63+
# Dataset for metrics (e.g. "metrics")
64+
AXIOM_DATASET_METRICS=
6165

6266

6367
# [optional] Websocket configuration for https://pusher.com if you will like to frontend to update in real time

‎api/go.mod‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
github.com/NdoleStudio/lemonsqueezy-go v1.3.1
1313
github.com/NdoleStudio/plunk-go v0.0.2
1414
github.com/avast/retry-go/v5 v5.0.0
15+
github.com/axiomhq/axiom-go v0.32.0
1516
github.com/carlmjohnson/requests v0.25.1
1617
github.com/cloudevents/sdk-go/v2 v2.16.2
1718
github.com/cockroachdb/cockroach-go/v2 v2.4.3
@@ -28,7 +29,6 @@ require (
2829
github.com/hashicorp/go-retryablehttp v0.7.8
2930
github.com/hirosassa/zerodriver v0.1.4
3031
github.com/jaswdr/faker/v2 v2.9.1
31-
github.com/jinzhu/now v1.1.5
3232
github.com/joho/godotenv v1.5.1
3333
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
3434
github.com/jszwec/csvutil v1.10.0
@@ -48,11 +48,13 @@ require (
4848
github.com/xuri/excelize/v2 v2.10.1
4949
go.mongodb.org/mongo-driver/v2 v2.6.0
5050
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/v2/mongo/otelmongo v0.0.0-20260513205827-ba143fc95a5e
51-
go.opentelemetry.io/otel v1.43.0
52-
go.opentelemetry.io/otel/metric v1.43.0
53-
go.opentelemetry.io/otel/sdk v1.43.0
54-
go.opentelemetry.io/otel/sdk/metric v1.43.0
55-
go.opentelemetry.io/otel/trace v1.43.0
51+
go.opentelemetry.io/otel v1.44.0
52+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0
53+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0
54+
go.opentelemetry.io/otel/metric v1.44.0
55+
go.opentelemetry.io/otel/sdk v1.44.0
56+
go.opentelemetry.io/otel/sdk/metric v1.44.0
57+
go.opentelemetry.io/otel/trace v1.44.0
5658
golang.org/x/sync v0.20.0
5759
google.golang.org/api v0.277.0
5860
google.golang.org/protobuf v1.36.11
@@ -95,6 +97,8 @@ require (
9597
github.com/PuerkitoBio/goquery v1.12.0 // indirect
9698
github.com/andybalholm/brotli v1.2.1 // indirect
9799
github.com/andybalholm/cascadia v1.3.3 // indirect
100+
github.com/buger/jsonparser v1.1.2 // indirect
101+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
98102
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
99103
github.com/cespare/xxhash/v2 v2.3.0 // indirect
100104
github.com/clipperhouse/displaywidth v0.11.0 // indirect
@@ -122,6 +126,7 @@ require (
122126
github.com/go-sql-driver/mysql v1.10.0 // indirect
123127
github.com/goccy/go-json v0.10.6 // indirect
124128
github.com/golang/protobuf v1.5.4 // indirect
129+
github.com/google/go-querystring v1.2.0 // indirect
125130
github.com/google/s2a-go v0.1.9 // indirect
126131
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
127132
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
@@ -135,6 +140,7 @@ require (
135140
github.com/jackc/pgx/v5 v5.9.2 // indirect
136141
github.com/jackc/puddle/v2 v2.2.2 // indirect
137142
github.com/jinzhu/inflection v1.0.0 // indirect
143+
github.com/jinzhu/now v1.1.5 // indirect
138144
github.com/json-iterator/go v1.1.12 // indirect
139145
github.com/klauspost/compress v1.18.6 // indirect
140146
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -177,9 +183,7 @@ require (
177183
go.opentelemetry.io/contrib/instrumentation/runtime v0.68.0 // indirect
178184
go.opentelemetry.io/contrib/processors/minsev v0.16.0 // indirect
179185
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0 // indirect
180-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
186+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
183187
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0 // indirect
184188
go.opentelemetry.io/otel/log v0.19.0 // indirect
185189
go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
@@ -190,17 +194,17 @@ require (
190194
go.yaml.in/yaml/v3 v3.0.4 // indirect
191195
golang.org/x/crypto v0.51.0 // indirect
192196
golang.org/x/mod v0.35.0 // indirect
193-
golang.org/x/net v0.53.0 // indirect
197+
golang.org/x/net v0.55.0 // indirect
194198
golang.org/x/oauth2 v0.36.0 // indirect
195-
golang.org/x/sys v0.44.0 // indirect
199+
golang.org/x/sys v0.45.0 // indirect
196200
golang.org/x/text v0.37.0 // indirect
197201
golang.org/x/time v0.15.0 // indirect
198202
golang.org/x/tools v0.44.0 // indirect
199203
google.golang.org/appengine v1.6.8 // indirect
200204
google.golang.org/genproto v0.0.0-20260504160031-60b97b32f348 // indirect
201-
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 // indirect
202-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect
203-
google.golang.org/grpc v1.81.0 // indirect
205+
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
207+
google.golang.org/grpc v1.81.1 // indirect
204208
gopkg.in/yaml.v3 v3.0.1 // indirect
205209
gorm.io/driver/clickhouse v0.7.0 // indirect
206210
gorm.io/driver/mysql v1.6.0 // indirect

0 commit comments

Comments
 (0)