Skip to content

Commit dc1d35e

Browse files
vihangmcopybaranaut
vihangm
authored and
copybaranaut
committed
Upgrade segmentio to latest version
Summary: segmentio is finally a properly versioned go module so we can use the `/v3` path. Test Plan: Minor version bump, watch out to ensure analytics still show up after a release. Reviewers: michelle, zasgar, #third_party_approvers Reviewed By: michelle, #third_party_approvers Signed-off-by: Vihang Mehta <vihang@pixielabs.ai> Differential Revision: https://phab.corp.pixielabs.ai/D12951 GitOrigin-RevId: 806e3318f3b8182df52d6b3014384534957c051f
1 parent 752cda5 commit dc1d35e

29 files changed

Lines changed: 50 additions & 51 deletions

File tree

‎.golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ linters:
5050
linters-settings:
5151
errcheck:
5252
# yamllint disable-line rule:line-length
53-
ignore: io:Close,github.com/fatih/color,github.com/spf13/pflag:MarkHidden,github.com/spf13/viper:(BindEnv|BindPFlag),github.com/spf13/cobra:(Help|MarkFlagRequired|Usage),gopkg.in/segmentio/analytics-go.v3:Enqueue,database/sql:Rollback,github.com/nats-io/nats.go:Unsubscribe
53+
ignore: io:Close,github.com/fatih/color,github.com/spf13/pflag:MarkHidden,github.com/spf13/viper:(BindEnv|BindPFlag),github.com/spf13/cobra:(Help|MarkFlagRequired|Usage),github.com/segmentio/analytics-go/v3:Enqueue,database/sql:Rollback,github.com/nats-io/nats.go:Unsubscribe
5454
goimports:
5555
local-prefixes: px.dev
5656
nakedret:

‎go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ require (
5656
github.com/rivo/tview v0.0.0-20200404204604-ca37f83cb2e7
5757
github.com/rivo/uniseg v0.1.0
5858
github.com/sahilm/fuzzy v0.1.0
59+
github.com/segmentio/analytics-go/v3 v3.2.1
5960
github.com/sercand/kuberesolver/v3 v3.0.0
6061
github.com/sirupsen/logrus v1.9.0
6162
github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e
@@ -83,7 +84,6 @@ require (
8384
google.golang.org/grpc v1.43.0
8485
gopkg.in/launchdarkly/go-sdk-common.v2 v2.5.0
8586
gopkg.in/launchdarkly/go-server-sdk.v5 v5.8.1
86-
gopkg.in/segmentio/analytics-go.v3 v3.1.0
8787
gopkg.in/src-d/go-git.v4 v4.13.1
8888
gopkg.in/yaml.v2 v2.4.0
8989
k8s.io/api v0.23.4
@@ -235,7 +235,7 @@ require (
235235
github.com/prometheus/procfs v0.7.3 // indirect
236236
github.com/russross/blackfriday v1.5.2 // indirect
237237
github.com/satori/go.uuid v1.2.0 // indirect
238-
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
238+
github.com/segmentio/backo-go v1.0.0 // indirect
239239
github.com/sergi/go-diff v1.1.0 // indirect
240240
github.com/shopspring/decimal v1.2.0 // indirect
241241
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -251,7 +251,6 @@ require (
251251
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
252252
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
253253
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
254-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
255254
go.etcd.io/bbolt v1.3.6 // indirect
256255
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
257256
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,10 @@ github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZ
902902
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
903903
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
904904
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
905-
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE=
906-
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
905+
github.com/segmentio/analytics-go/v3 v3.2.1 h1:G+f90zxtc1p9G+WigVyTR0xNfOghOGs/PYAlljLOyeg=
906+
github.com/segmentio/analytics-go/v3 v3.2.1/go.mod h1:p8owAF8X+5o27jmvUognuXxdtqvSGtD0ZrfY2kcS9bE=
907+
github.com/segmentio/backo-go v1.0.0 h1:kbOAtGJY2DqOR0jfRkYEorx/b18RgtepGtY3+Cpe6qA=
908+
github.com/segmentio/backo-go v1.0.0/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M=
907909
github.com/sercand/kuberesolver/v3 v3.0.0 h1:3PY7ntZyEzUhMri5sc9uX83mZ0QnlNAqlXS7l0anRiA=
908910
github.com/sercand/kuberesolver/v3 v3.0.0/go.mod h1:OSHRdFT97s/dOQaqdb1FXP/xG84i/aalrrsMphNh12Q=
909911
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@@ -1018,8 +1020,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
10181020
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
10191021
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
10201022
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
1021-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
1022-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
10231023
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
10241024
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
10251025
github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
@@ -1152,8 +1152,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24
11521152
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
11531153
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
11541154
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
1155-
gopkg.in/segmentio/analytics-go.v3 v3.1.0 h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U=
1156-
gopkg.in/segmentio/analytics-go.v3 v3.1.0/go.mod h1:4QqqlTlSSpVlWA9/9nDcPw+FkM2yv1NQoYjUbL9/JAw=
11571155
gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
11581156
gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
11591157
gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=

‎go_deps.bzl‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3084,13 +3084,29 @@ def pl_go_dependencies():
30843084
sum = "h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y=",
30853085
version = "v0.9.2-0.20210429002308-3879420cc921",
30863086
)
3087+
go_repository(
3088+
name = "com_github_segmentio_analytics_go_v3",
3089+
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
3090+
importpath = "github.com/segmentio/analytics-go/v3",
3091+
sum = "h1:G+f90zxtc1p9G+WigVyTR0xNfOghOGs/PYAlljLOyeg=",
3092+
version = "v3.2.1",
3093+
)
3094+
30873095
go_repository(
30883096
name = "com_github_segmentio_backo_go",
30893097
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
30903098
importpath = "github.com/segmentio/backo-go",
3091-
sum = "h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE=",
3092-
version = "v0.0.0-20200129164019-23eae7c10bd3",
3099+
sum = "h1:kbOAtGJY2DqOR0jfRkYEorx/b18RgtepGtY3+Cpe6qA=",
3100+
version = "v1.0.0",
30933101
)
3102+
go_repository(
3103+
name = "com_github_segmentio_conf",
3104+
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
3105+
importpath = "github.com/segmentio/conf",
3106+
sum = "h1:5OT9+6OyVHLsFLsiJa/2KlqiA1m7mpdUBlkB/qYTMts=",
3107+
version = "v1.2.0",
3108+
)
3109+
30943110
go_repository(
30953111
name = "com_github_sercand_kuberesolver_v3",
30963112
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
@@ -3489,13 +3505,6 @@ def pl_go_dependencies():
34893505
version = "v0.0.3-0.20170626215501-b2862e3d0a77",
34903506
)
34913507

3492-
go_repository(
3493-
name = "com_github_xtgo_uuid",
3494-
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
3495-
importpath = "github.com/xtgo/uuid",
3496-
sum = "h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=",
3497-
version = "v0.0.0-20140804021211-a0b114877d4c",
3498-
)
34993508
go_repository(
35003509
name = "com_github_yalp_jsonpath",
35013510
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
@@ -3736,13 +3745,6 @@ def pl_go_dependencies():
37363745
version = "v1.12.0",
37373746
)
37383747

3739-
go_repository(
3740-
name = "in_gopkg_segmentio_analytics_go_v3",
3741-
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],
3742-
importpath = "gopkg.in/segmentio/analytics-go.v3",
3743-
sum = "h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U=",
3744-
version = "v3.1.0",
3745-
)
37463748
go_repository(
37473749
name = "in_gopkg_square_go_jose_v2",
37483750
build_directives = ["gazelle:map_kind go_binary pl_go_binary @px//bazel:pl_build_system.bzl", "gazelle:map_kind go_test pl_go_test @px//bazel:pl_build_system.bzl"],

‎src/cloud/api/controllers/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ go_library(
8484
"@com_github_graph_gophers_graphql_go//:graphql-go",
8585
"@com_github_graph_gophers_graphql_go//relay",
8686
"@com_github_lestrrat_go_jwx//jwt",
87+
"@com_github_segmentio_analytics_go_v3//:analytics-go",
8788
"@com_github_sirupsen_logrus//:logrus",
8889
"@com_github_spf13_pflag//:pflag",
8990
"@com_github_spf13_viper//:viper",
90-
"@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3",
9191
"@org_golang_google_grpc//:go_default_library",
9292
"@org_golang_google_grpc//codes",
9393
"@org_golang_google_grpc//metadata",

‎src/cloud/api/controllers/auth.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828

2929
"github.com/gorilla/sessions"
3030
"github.com/lestrrat-go/jwx/jwt"
31+
"github.com/segmentio/analytics-go/v3"
3132
log "github.com/sirupsen/logrus"
3233
"github.com/spf13/viper"
3334
"google.golang.org/grpc/codes"
3435
"google.golang.org/grpc/metadata"
3536
"google.golang.org/grpc/status"
36-
"gopkg.in/segmentio/analytics-go.v3"
3737

3838
"px.dev/pixie/src/cloud/api/apienv"
3939
"px.dev/pixie/src/cloud/auth/authpb"

‎src/cloud/api/controllers/org_grpc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323

2424
"github.com/gofrs/uuid"
2525
"github.com/gogo/protobuf/types"
26+
"github.com/segmentio/analytics-go/v3"
2627
"google.golang.org/grpc/codes"
2728
"google.golang.org/grpc/status"
28-
"gopkg.in/segmentio/analytics-go.v3"
2929

3030
"px.dev/pixie/src/api/proto/cloudpb"
3131
"px.dev/pixie/src/api/proto/uuidpb"

‎src/cloud/api/controllers/session_middleware.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"net/url"
2727
"strings"
2828

29+
"github.com/segmentio/analytics-go/v3"
2930
"github.com/spf13/viper"
3031
"google.golang.org/grpc/codes"
3132
"google.golang.org/grpc/metadata"
3233
"google.golang.org/grpc/status"
33-
"gopkg.in/segmentio/analytics-go.v3"
3434

3535
"px.dev/pixie/src/cloud/api/apienv"
3636
"px.dev/pixie/src/cloud/auth/authpb"

‎src/cloud/plugin/controllers/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ go_library(
3636
"@com_github_gofrs_uuid//:uuid",
3737
"@com_github_gogo_protobuf//types",
3838
"@com_github_jmoiron_sqlx//:sqlx",
39+
"@com_github_segmentio_analytics_go_v3//:analytics-go",
3940
"@com_github_sirupsen_logrus//:logrus",
40-
"@in_gopkg_segmentio_analytics_go_v3//:analytics-go_v3",
4141
"@in_gopkg_yaml_v2//:yaml_v2",
4242
"@org_golang_google_grpc//codes",
4343
"@org_golang_google_grpc//metadata",

‎src/cloud/plugin/controllers/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"github.com/gofrs/uuid"
2929
"github.com/gogo/protobuf/types"
3030
"github.com/jmoiron/sqlx"
31+
"github.com/segmentio/analytics-go/v3"
3132
log "github.com/sirupsen/logrus"
3233
"google.golang.org/grpc/codes"
3334
"google.golang.org/grpc/metadata"
3435
"google.golang.org/grpc/status"
35-
"gopkg.in/segmentio/analytics-go.v3"
3636
"gopkg.in/yaml.v2"
3737

3838
"px.dev/pixie/src/api/proto/uuidpb"

0 commit comments

Comments
 (0)