Skip to content

Commit 2da2962

Browse files
gfyraggfyrag
committed
feat: upgrade golibs under v2
1 parent ea8e584 commit 2da2962

File tree

202 files changed

+754
-800
lines changed

Some content is hidden

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

202 files changed

+754
-800
lines changed

‎cmd/buckets_upgrade.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cmd
22

33
import (
4-
"github.com/formancehq/go-libs/bun/bunconnect"
5-
"github.com/formancehq/go-libs/logging"
6-
"github.com/formancehq/go-libs/service"
4+
"github.com/formancehq/go-libs/v2/bun/bunconnect"
5+
"github.com/formancehq/go-libs/v2/logging"
6+
"github.com/formancehq/go-libs/v2/service"
77
"github.com/formancehq/ledger/internal/storage/driver"
88
"github.com/spf13/cobra"
99
)

‎cmd/buckets_upgrade_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"io"
77
"testing"
88

9-
"github.com/formancehq/go-libs/bun/bunconnect"
10-
"github.com/formancehq/go-libs/logging"
11-
"github.com/formancehq/go-libs/testing/docker"
12-
"github.com/formancehq/go-libs/testing/platform/pgtesting"
9+
"github.com/formancehq/go-libs/v2/bun/bunconnect"
10+
"github.com/formancehq/go-libs/v2/logging"
11+
"github.com/formancehq/go-libs/v2/testing/docker"
12+
"github.com/formancehq/go-libs/v2/testing/platform/pgtesting"
1313
"github.com/stretchr/testify/require"
1414
)
1515

‎cmd/root.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cmd
22

33
import (
4-
"github.com/formancehq/go-libs/bun/bunmigrate"
5-
"github.com/formancehq/go-libs/service"
4+
"github.com/formancehq/go-libs/v2/bun/bunmigrate"
5+
"github.com/formancehq/go-libs/v2/service"
66
"github.com/uptrace/bun"
77

88
"github.com/spf13/cobra"

‎cmd/serve.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
package cmd
22

33
import (
4-
apilib "github.com/formancehq/go-libs/api"
5-
"github.com/formancehq/go-libs/health"
6-
"github.com/formancehq/go-libs/httpserver"
7-
"github.com/formancehq/go-libs/otlp"
4+
apilib "github.com/formancehq/go-libs/v2/api"
5+
"github.com/formancehq/go-libs/v2/health"
6+
"github.com/formancehq/go-libs/v2/httpserver"
7+
"github.com/formancehq/go-libs/v2/otlp"
88
"github.com/formancehq/ledger/internal/storage/driver"
99
"github.com/go-chi/chi/v5"
1010
"go.opentelemetry.io/otel/sdk/metric"
1111
"net/http"
1212
"net/http/pprof"
1313
"time"
1414

15-
"github.com/formancehq/go-libs/auth"
16-
"github.com/formancehq/go-libs/aws/iam"
17-
"github.com/formancehq/go-libs/bun/bunconnect"
18-
"github.com/formancehq/go-libs/otlp/otlpmetrics"
19-
"github.com/formancehq/go-libs/otlp/otlptraces"
20-
"github.com/formancehq/go-libs/publish"
15+
"github.com/formancehq/go-libs/v2/auth"
16+
"github.com/formancehq/go-libs/v2/aws/iam"
17+
"github.com/formancehq/go-libs/v2/bun/bunconnect"
18+
"github.com/formancehq/go-libs/v2/otlp/otlpmetrics"
19+
"github.com/formancehq/go-libs/v2/otlp/otlptraces"
20+
"github.com/formancehq/go-libs/v2/publish"
2121
"github.com/formancehq/ledger/internal/api"
2222
"github.com/formancehq/ledger/internal/bus"
2323
ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
2424
systemcontroller "github.com/formancehq/ledger/internal/controller/system"
2525
"github.com/formancehq/ledger/internal/storage"
2626

27-
"github.com/formancehq/go-libs/ballast"
28-
"github.com/formancehq/go-libs/service"
27+
"github.com/formancehq/go-libs/v2/ballast"
28+
"github.com/formancehq/go-libs/v2/service"
2929
"github.com/spf13/cobra"
3030
"go.uber.org/fx"
3131
)

‎go.mod

+42-48
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ require (
1313
github.com/alitto/pond v1.9.2
1414
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10
1515
github.com/bluele/gcache v0.0.2
16-
github.com/formancehq/go-libs v1.7.2-0.20241014102030-f397c44a5d47
16+
github.com/formancehq/go-libs/v2 v2.1.3-0.20241015114549-ea3d600bc087
1717
github.com/formancehq/stack/ledger/client v0.0.0-00010101000000-000000000000
1818
github.com/go-chi/chi/v5 v5.1.0
1919
github.com/go-chi/cors v1.2.1
2020
github.com/google/go-cmp v0.6.0
2121
github.com/google/uuid v1.6.0
22-
github.com/grafana/otel-profiling-go v0.5.1
23-
github.com/grafana/pyroscope-go/godeltaprof v0.1.8
2422
github.com/invopop/jsonschema v0.12.0
25-
github.com/jackc/pgx/v5 v5.7.1
2623
github.com/jamiealquiza/tachymeter v2.0.0+incompatible
2724
github.com/logrusorgru/aurora v2.0.3+incompatible
2825
github.com/nats-io/nats.go v1.37.0
@@ -38,8 +35,10 @@ require (
3835
github.com/uptrace/bun/dialect/pgdialect v1.2.3
3936
github.com/xeipuuv/gojsonschema v1.2.0
4037
github.com/xo/dburl v0.23.2
41-
go.opentelemetry.io/otel v1.30.0
42-
go.opentelemetry.io/otel/trace v1.30.0
38+
go.opentelemetry.io/otel v1.31.0
39+
go.opentelemetry.io/otel/metric v1.31.0
40+
go.opentelemetry.io/otel/sdk/metric v1.31.0
41+
go.opentelemetry.io/otel/trace v1.31.0
4342
go.uber.org/fx v1.22.2
4443
go.uber.org/mock v0.4.0
4544
golang.org/x/oauth2 v0.23.0
@@ -58,20 +57,20 @@ require (
5857
github.com/ThreeDotsLabs/watermill-nats/v2 v2.1.1 // indirect
5958
github.com/ajg/form v1.5.1 // indirect
6059
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 // indirect
61-
github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
62-
github.com/aws/aws-sdk-go-v2/config v1.27.37 // indirect
63-
github.com/aws/aws-sdk-go-v2/credentials v1.17.35 // indirect
64-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
65-
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.18 // indirect
66-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect
67-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect
60+
github.com/aws/aws-sdk-go-v2 v1.32.2 // indirect
61+
github.com/aws/aws-sdk-go-v2/config v1.27.43 // indirect
62+
github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
63+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
64+
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.21 // indirect
65+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
66+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
6867
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
71-
github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 // indirect
72-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 // indirect
73-
github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 // indirect
74-
github.com/aws/smithy-go v1.21.0 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
72+
github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
73+
github.com/aws/smithy-go v1.22.0 // indirect
7574
github.com/bahlo/generic-list-go v0.2.0 // indirect
7675
github.com/buger/jsonparser v1.1.1 // indirect
7776
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -85,6 +84,7 @@ require (
8584
github.com/eapache/go-resiliency v1.7.0 // indirect
8685
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
8786
github.com/eapache/queue v1.1.0 // indirect
87+
github.com/ebitengine/purego v0.8.0 // indirect
8888
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect
8989
github.com/felixge/httpsnoop v1.0.4 // indirect
9090
github.com/go-chi/chi v4.1.2+incompatible // indirect
@@ -109,9 +109,6 @@ require (
109109
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
110110
github.com/hashicorp/go-uuid v1.0.3 // indirect
111111
github.com/inconshreveable/mousetrap v1.1.0 // indirect
112-
github.com/jackc/pgpassfile v1.0.0 // indirect
113-
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
114-
github.com/jackc/puddle/v2 v2.2.2 // indirect
115112
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
116113
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
117114
github.com/jcmturner/gofork v1.7.6 // indirect
@@ -129,7 +126,7 @@ require (
129126
github.com/muhlemmer/gu v0.3.1 // indirect
130127
github.com/muhlemmer/httpforwarded v0.1.0 // indirect
131128
github.com/nats-io/jwt/v2 v2.7.0 // indirect
132-
github.com/nats-io/nats-server/v2 v2.10.20 // indirect
129+
github.com/nats-io/nats-server/v2 v2.10.21 // indirect
133130
github.com/nats-io/nkeys v0.4.7 // indirect
134131
github.com/nats-io/nuid v1.0.1 // indirect
135132
github.com/oklog/ulid v1.3.1 // indirect
@@ -144,12 +141,11 @@ require (
144141
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
145142
github.com/riandyrn/otelchi v0.10.0 // indirect
146143
github.com/rs/cors v1.11.1 // indirect
147-
github.com/shirou/gopsutil/v4 v4.24.8 // indirect
148-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
144+
github.com/shirou/gopsutil/v4 v4.24.9 // indirect
149145
github.com/shomali11/util v0.0.0-20180607005212-e0f70fd665ff // indirect
150146
github.com/sirupsen/logrus v1.9.3 // indirect
151147
github.com/tklauser/go-sysconf v0.3.14 // indirect
152-
github.com/tklauser/numcpus v0.8.0 // indirect
148+
github.com/tklauser/numcpus v0.9.0 // indirect
153149
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
154150
github.com/uptrace/bun/extra/bunotel v1.2.3 // indirect
155151
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.3.2 // indirect
@@ -165,35 +161,33 @@ require (
165161
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
166162
github.com/yusufpapurcu/wmi v1.2.4 // indirect
167163
github.com/zitadel/oidc/v2 v2.12.2 // indirect
168-
go.opentelemetry.io/contrib/instrumentation/host v0.55.0 // indirect
169-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
170-
go.opentelemetry.io/contrib/instrumentation/runtime v0.55.0 // indirect
171-
go.opentelemetry.io/contrib/propagators/b3 v1.30.0 // indirect
172-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0 // indirect
173-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0 // indirect
174-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
175-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect
176-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 // indirect
177-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.30.0 // indirect
178-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 // indirect
164+
go.opentelemetry.io/contrib/instrumentation/host v0.56.0 // indirect
165+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
166+
go.opentelemetry.io/contrib/instrumentation/runtime v0.56.0 // indirect
167+
go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect
168+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
169+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect
170+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
171+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
172+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
173+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.31.0 // indirect
174+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 // indirect
179175
go.opentelemetry.io/otel/log v0.6.0 // indirect
180-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
181-
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
182-
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
176+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
183177
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
184178
go.uber.org/dig v1.18.0 // indirect
185179
go.uber.org/multierr v1.11.0 // indirect
186180
go.uber.org/zap v1.27.0 // indirect
187-
golang.org/x/crypto v0.27.0 // indirect
188-
golang.org/x/net v0.29.0 // indirect
189-
golang.org/x/sys v0.25.0 // indirect
190-
golang.org/x/text v0.18.0 // indirect
181+
golang.org/x/crypto v0.28.0 // indirect
182+
golang.org/x/net v0.30.0 // indirect
183+
golang.org/x/sys v0.26.0 // indirect
184+
golang.org/x/text v0.19.0 // indirect
191185
golang.org/x/time v0.6.0 // indirect
192186
golang.org/x/tools v0.25.0 // indirect
193-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
194-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
195-
google.golang.org/grpc v1.67.0 // indirect
196-
google.golang.org/protobuf v1.34.2 // indirect
187+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
188+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
189+
google.golang.org/grpc v1.67.1 // indirect
190+
google.golang.org/protobuf v1.35.1 // indirect
197191
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
198192
gopkg.in/yaml.v2 v2.4.0 // indirect
199193
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)