From 54a4a66e8cc044adb62bdad2fdc454db48124cc5 Mon Sep 17 00:00:00 2001 From: Antoine Gelloz Date: Thu, 29 Dec 2022 11:33:26 +0100 Subject: [PATCH] chore: first --- .github/workflows/main.yml | 4 ++-- .github/workflows/pr-open.yml | 6 +++--- go.sum | 1 + sharedanalytics/go.mod | 3 ++- sharedanalytics/go.sum | 7 ++++--- sharedanalytics/pkg/cli.go | 2 +- sharedanalytics/pkg/segment.go | 2 +- sharedotlp/go.mod | 3 ++- sharedotlp/go.sum | 7 ++++--- sharedotlp/pkg/sharedotlptraces/traces.go | 2 +- 10 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78a1992..413db79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: name: Main jobs: lint: - uses: numary/gh-workflows/.github/workflows/golang-lint.yml@main + uses: formancehq/gh-workflows/.github/workflows/golang-lint.yml@main test: - uses: numary/gh-workflows/.github/workflows/golang-test.yml@main + uses: formancehq/gh-workflows/.github/workflows/golang-test.yml@main diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 433e0f0..90eda00 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -4,10 +4,10 @@ on: types: [assigned, opened, synchronize, reopened] jobs: pr-style: - uses: numary/gh-workflows/.github/workflows/pr-style.yml@main + uses: formancehq/gh-workflows/.github/workflows/pr-style.yml@main lint: - uses: numary/gh-workflows/.github/workflows/golang-lint.yml@main + uses: formancehq/gh-workflows/.github/workflows/golang-lint.yml@main test: - uses: numary/gh-workflows/.github/workflows/golang-test.yml@main + uses: formancehq/gh-workflows/.github/workflows/golang-test.yml@main diff --git a/go.sum b/go.sum index 1686aca..b340a31 100644 --- a/go.sum +++ b/go.sum @@ -110,6 +110,7 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/sharedanalytics/go.mod b/sharedanalytics/go.mod index 527d17c..daa6041 100644 --- a/sharedanalytics/go.mod +++ b/sharedanalytics/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/coreos/go-semver v0.3.0 + github.com/formancehq/go-libs/v2 v2.1.1 github.com/google/uuid v1.3.0 - github.com/numary/go-libs v1.0.1 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/segmentio/analytics-go v3.1.0+incompatible github.com/spf13/cobra v1.6.1 @@ -25,6 +25,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/segmentio/backo-go v1.0.1 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect diff --git a/sharedanalytics/go.sum b/sharedanalytics/go.sum index cfe26ae..1bd8e57 100644 --- a/sharedanalytics/go.sum +++ b/sharedanalytics/go.sum @@ -61,6 +61,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/formancehq/go-libs/v2 v2.1.1 h1:kq7kbZsbDYsV6zbRp9fdj5g6/rVVclMpXd19adjMnRs= +github.com/formancehq/go-libs/v2 v2.1.1/go.mod h1:+JVecYnhf7xTbbz65nwxBDehdMx1JgHIitvnxXYuuAI= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -146,8 +148,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/numary/go-libs v1.0.1 h1:Q41dz+u+inimZMVgSneCzbtoLiPMTjr1gT3D2UeC7IA= -github.com/numary/go-libs v1.0.1/go.mod h1:u9XNKBrHJSCwu13s85GkEg4TWfRm2CF3fknav4TTLn4= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= @@ -161,7 +161,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/segmentio/analytics-go v3.1.0+incompatible h1:IyiOfUgQFVHvsykKKbdI7ZsH374uv3/DfZUo9+G0Z80= github.com/segmentio/analytics-go v3.1.0+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48= diff --git a/sharedanalytics/pkg/cli.go b/sharedanalytics/pkg/cli.go index 10ef57d..a1e7291 100644 --- a/sharedanalytics/pkg/cli.go +++ b/sharedanalytics/pkg/cli.go @@ -5,7 +5,7 @@ import ( "time" "github.com/coreos/go-semver/semver" - "github.com/numary/go-libs/sharedlogging" + "github.com/formancehq/go-libs/v2/sharedlogging" "github.com/spf13/cobra" "github.com/spf13/viper" "go.uber.org/fx" diff --git a/sharedanalytics/pkg/segment.go b/sharedanalytics/pkg/segment.go index 33d1959..5dbfd60 100644 --- a/sharedanalytics/pkg/segment.go +++ b/sharedanalytics/pkg/segment.go @@ -5,7 +5,7 @@ import ( "runtime" "time" - "github.com/numary/go-libs/sharedlogging" + "github.com/formancehq/go-libs/v2/sharedlogging" "github.com/pbnjay/memory" "github.com/segmentio/analytics-go" ) diff --git a/sharedotlp/go.mod b/sharedotlp/go.mod index cdcdc10..278fdb1 100644 --- a/sharedotlp/go.mod +++ b/sharedotlp/go.mod @@ -3,7 +3,7 @@ module github.com/formancehq/go-libs/sharedotlp/v2 go 1.19 require ( - github.com/formancehq/go-libs v1.3.0 + github.com/formancehq/go-libs/v2 v2.1.1 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.14.0 @@ -35,6 +35,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/sharedotlp/go.sum b/sharedotlp/go.sum index 0c00a58..624bf6e 100644 --- a/sharedotlp/go.sum +++ b/sharedotlp/go.sum @@ -70,8 +70,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/formancehq/go-libs v1.3.0 h1:Ogs/B9FcoGHl2yF0TeTrBoGejKQk0G7XH6pFwgCod3U= -github.com/formancehq/go-libs v1.3.0/go.mod h1:9pIcaXQR4O1biXDfhFurYJZw1piU6sJk+0Vqvu+92ng= +github.com/formancehq/go-libs/v2 v2.1.1 h1:kq7kbZsbDYsV6zbRp9fdj5g6/rVVclMpXd19adjMnRs= +github.com/formancehq/go-libs/v2 v2.1.1/go.mod h1:+JVecYnhf7xTbbz65nwxBDehdMx1JgHIitvnxXYuuAI= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -183,7 +183,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= diff --git a/sharedotlp/pkg/sharedotlptraces/traces.go b/sharedotlp/pkg/sharedotlptraces/traces.go index a85d2f5..23bcabc 100644 --- a/sharedotlp/pkg/sharedotlptraces/traces.go +++ b/sharedotlp/pkg/sharedotlptraces/traces.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/formancehq/go-libs/sharedlogging" sharedotlp "github.com/formancehq/go-libs/sharedotlp/v2/pkg" + "github.com/formancehq/go-libs/v2/sharedlogging" "go.opentelemetry.io/contrib/propagators/b3" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute"