Skip to content

Commit 0640127

Browse files
Thomas Delbendecavanierc
Thomas Delbende
authored and
cavanierc
committed
Pull request #18: Go1.24, upgrade dependencies
Merge in PRODUCT/squirreldb-ingestor from upgrade-deps-2025-03-13 to main * commit 'a90db75ef855a2e4a0939885e8a61b2e8aa84ef7': fix: actually use Go1.24 chore: update linter & releaser chore: upgrade Go to 1.24 as well as dependencies
2 parents 801ae43 + a90db75 commit 0640127

File tree

7 files changed

+228
-162
lines changed

7 files changed

+228
-162
lines changed

‎.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
go: "1.23"
2+
go: "1.24"
33
timeout: 5m
44

55
linters:
@@ -15,7 +15,7 @@ linters:
1515
- nonamedreturns # Warn for every named return, not useful.
1616
- interfacebloat # Warn when an interface has too many methods, not useful.
1717
# Deprecated and replaced linter.
18-
- exportloopref
18+
- tenv
1919
# We use maintidx to lint function complexity.
2020
- gocyclo
2121
- cyclop

‎.goreleaser.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ before:
88
- go mod download
99
- go mod tidy
1010
builds:
11-
- env:
12-
- CGO_ENABLED=0
13-
targets:
14-
- linux_amd64
15-
- linux_386
16-
- linux_arm_6
17-
- linux_arm64
18-
- windows_amd64
19-
- windows_386
11+
- env:
12+
- CGO_ENABLED=0
13+
targets:
14+
- linux_amd64
15+
- linux_386
16+
- linux_arm_6
17+
- linux_arm64
18+
- windows_amd64
19+
- windows_386
2020
archives:
21-
- format: binary
21+
- formats: [ binary ]
2222
checksum:
2323
name_template: 'checksums.txt'
2424
changelog:
2525
sort: asc
2626
filters:
2727
exclude:
28-
- '^docs:'
29-
- '^test:'
28+
- '^docs:'
29+
- '^test:'
3030
release:
3131
# Don't try to modify Github
3232
disable: true

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
GORELEASER_VERSION="v2.5.1"
5+
GORELEASER_VERSION="v2.8.0"
66
USER_UID=$(id -u)
77

88
case "$1" in

‎go.mod

+52-38
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,99 @@
11
module github.com/bleemeo/squirreldb-ingestor
22

3-
go 1.23.0
4-
5-
toolchain go1.23.1
3+
go 1.24
64

75
require (
86
github.com/alexflint/go-arg v1.5.1
97
github.com/eclipse/paho.mqtt.golang v1.5.0
108
github.com/gogo/protobuf v1.3.2
11-
github.com/golang/snappy v0.0.4
9+
github.com/golang/snappy v1.0.0
1210
github.com/prometheus/common v0.62.0
13-
github.com/prometheus/prometheus v0.301.0
11+
github.com/prometheus/prometheus v0.302.1
1412
github.com/rs/zerolog v1.33.0
1513
)
1614

1715
require (
18-
cloud.google.com/go/auth v0.13.0 // indirect
19-
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
16+
cloud.google.com/go/auth v0.15.0 // indirect
17+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
2018
cloud.google.com/go/compute/metadata v0.6.0 // indirect
21-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
22-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
19+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
20+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
2321
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
24-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
22+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1 // indirect
2523
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
2624
github.com/alexflint/go-scalar v1.2.0 // indirect
27-
github.com/aws/aws-sdk-go v1.55.5 // indirect
25+
github.com/aws/aws-sdk-go v1.55.6 // indirect
2826
github.com/beorn7/perks v1.0.1 // indirect
2927
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3028
github.com/dennwc/varint v1.0.0 // indirect
3129
github.com/felixge/httpsnoop v1.0.4 // indirect
3230
github.com/go-logr/logr v1.4.2 // indirect
3331
github.com/go-logr/stdr v1.2.2 // indirect
32+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
3433
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
35-
github.com/google/s2a-go v0.1.8 // indirect
34+
github.com/google/s2a-go v0.1.9 // indirect
3635
github.com/google/uuid v1.6.0 // indirect
37-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
36+
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
3837
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
3938
github.com/gorilla/websocket v1.5.3 // indirect
4039
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
4140
github.com/jmespath/go-jmespath v0.4.0 // indirect
4241
github.com/jpillora/backoff v1.0.0 // indirect
4342
github.com/json-iterator/go v1.1.12 // indirect
44-
github.com/klauspost/compress v1.17.11 // indirect
43+
github.com/klauspost/compress v1.18.0 // indirect
44+
github.com/knadh/koanf/maps v0.1.1 // indirect
45+
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
46+
github.com/knadh/koanf/v2 v2.1.2 // indirect
4547
github.com/kylelemons/godebug v1.1.0 // indirect
46-
github.com/mattn/go-colorable v0.1.13 // indirect
48+
github.com/mattn/go-colorable v0.1.14 // indirect
4749
github.com/mattn/go-isatty v0.0.20 // indirect
50+
github.com/mitchellh/copystructure v1.2.0 // indirect
51+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4852
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4953
github.com/modern-go/reflect2 v1.0.2 // indirect
5054
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5155
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
56+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.121.0 // indirect
57+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.121.0 // indirect
58+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.121.0 // indirect
5259
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
53-
github.com/prometheus/client_golang v1.20.5 // indirect
60+
github.com/prometheus/client_golang v1.21.1 // indirect
5461
github.com/prometheus/client_model v0.6.1 // indirect
5562
github.com/prometheus/procfs v0.15.1 // indirect
56-
github.com/prometheus/sigv4 v0.1.0 // indirect
63+
github.com/prometheus/sigv4 v0.1.2 // indirect
5764
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
58-
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
59-
go.opentelemetry.io/collector/semconv v0.116.0 // indirect
60-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.58.0 // indirect
61-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
62-
go.opentelemetry.io/otel v1.33.0 // indirect
63-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
64-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
65+
go.opentelemetry.io/collector/component v1.27.0 // indirect
66+
go.opentelemetry.io/collector/confmap v1.27.0 // indirect
67+
go.opentelemetry.io/collector/confmap/xconfmap v0.121.0 // indirect
68+
go.opentelemetry.io/collector/consumer v1.27.0 // indirect
69+
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
70+
go.opentelemetry.io/collector/pipeline v0.121.0 // indirect
71+
go.opentelemetry.io/collector/processor v0.121.0 // indirect
72+
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
73+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
75+
go.opentelemetry.io/otel v1.35.0 // indirect
76+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
6578
go.uber.org/atomic v1.11.0 // indirect
6679
go.uber.org/multierr v1.11.0 // indirect
67-
golang.org/x/crypto v0.31.0 // indirect
80+
go.uber.org/zap v1.27.0 // indirect
81+
golang.org/x/crypto v0.36.0 // indirect
6882
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
69-
golang.org/x/net v0.33.0 // indirect
70-
golang.org/x/oauth2 v0.25.0 // indirect
71-
golang.org/x/sync v0.10.0 // indirect
72-
golang.org/x/sys v0.29.0 // indirect
73-
golang.org/x/text v0.21.0 // indirect
74-
golang.org/x/time v0.9.0 // indirect
75-
google.golang.org/api v0.214.0 // indirect
76-
google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
78-
google.golang.org/grpc v1.69.2 // indirect
79-
google.golang.org/protobuf v1.36.1 // indirect
83+
golang.org/x/net v0.37.0 // indirect
84+
golang.org/x/oauth2 v0.28.0 // indirect
85+
golang.org/x/sync v0.12.0 // indirect
86+
golang.org/x/sys v0.31.0 // indirect
87+
golang.org/x/text v0.23.0 // indirect
88+
golang.org/x/time v0.11.0 // indirect
89+
google.golang.org/api v0.225.0 // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250311190419-81fb87f6b8bf // indirect
91+
google.golang.org/grpc v1.71.0 // indirect
92+
google.golang.org/protobuf v1.36.5 // indirect
8093
gopkg.in/yaml.v2 v2.4.0 // indirect
81-
k8s.io/apimachinery v0.32.0 // indirect
82-
k8s.io/client-go v0.32.0 // indirect
94+
gopkg.in/yaml.v3 v3.0.1 // indirect
95+
k8s.io/apimachinery v0.32.3 // indirect
96+
k8s.io/client-go v0.32.3 // indirect
8397
k8s.io/klog/v2 v2.130.1 // indirect
8498
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
8599
)

0 commit comments

Comments
 (0)