From ef400f7e092a927c1138af1f75ee03b9d6bb6dda Mon Sep 17 00:00:00 2001 From: Reuven Harrison Date: Sat, 4 May 2024 11:43:56 +0300 Subject: [PATCH] remove telemetry (#537) Co-authored-by: Reuven --- README.md | 5 ----- go.mod | 2 -- go.sum | 9 --------- internal/run.go | 43 ++----------------------------------------- 4 files changed, 2 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index db30cbb7..5bfdcf6a 100644 --- a/README.md +++ b/README.md @@ -310,11 +310,6 @@ References are normally resolved automatically when you load the spec. In other If you have other ideas, please [let us know](https://github.com/Tufin/oasdiff/discussions/new?category=ideas). -## Telemetry -The oasdiff tool collects data in order to help us, the development team, understand how it is being used and what we can to do to continue improving it. -We use this data in compliance with our [privacy policy](https://www.oasdiff.com/about/privacy-policy). -To disable telemetry, add the environment variable: `OASDIFF_NO_TELEMETRY=1` - ## Credits This project relies on the excellent implementation of OpenAPI 3.0 for Go: [kin-openapi](https://github.com/getkin/kin-openapi). diff --git a/go.mod b/go.mod index d4324319..6abea2c2 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( cloud.google.com/go v0.112.2 github.com/TwiN/go-color v1.4.1 github.com/getkin/kin-openapi v0.124.0 - github.com/oasdiff/go-common v0.3.4 github.com/oasdiff/telemetry v0.1.2 github.com/stretchr/testify v1.9.0 github.com/yargevad/filepathx v1.0.0 @@ -18,7 +17,6 @@ require ( require ( github.com/denisbrodbeck/machineid v1.0.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tidwall/gjson v1.17.1 // indirect github.com/tidwall/match v1.1.1 // indirect diff --git a/go.sum b/go.sum index 60345415..37d20838 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ cloud.google.com/go v0.112.2/go.mod h1:iEqjp//KquGIJV/m+Pk3xecgKNhV+ry+vVTsy4TbD github.com/TwiN/go-color v1.4.1 h1:mqG0P/KBgHKVqmtL5ye7K0/Gr4l6hTksPgTgMk3mUzc= github.com/TwiN/go-color v1.4.1/go.mod h1:WcPf/jtiW95WBIsEeY1Lc/b8aaWoiqQpu5cf8WFxu+s= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ= @@ -34,8 +33,6 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/oasdiff/go-common v0.3.4 h1:9QZkF9yR6XS3zybErOn1k4Z/F/XyjXSDnATcnqhlaOs= -github.com/oasdiff/go-common v0.3.4/go.mod h1:4bNglJ4cMeBQVMZqQpYK+JTKYFxzgI/Y9ttU9bmT4nE= github.com/oasdiff/telemetry v0.1.2 h1:hkmA5YTISVF2/zWa23y29WdPws1Q53pyLOFYMHXoZ1U= github.com/oasdiff/telemetry v0.1.2/go.mod h1:Y0DaW/CasxZ+vzR54btj430XsL6DGF+rMbJkRld6u3M= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= @@ -45,14 +42,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -75,12 +68,10 @@ github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/run.go b/internal/run.go index 0dd35f26..7f5241e1 100644 --- a/internal/run.go +++ b/internal/run.go @@ -1,30 +1,18 @@ package internal import ( - "context" "io" - "os" "strconv" - "time" - "github.com/oasdiff/go-common/util" - "github.com/oasdiff/telemetry/client" - "github.com/oasdiff/telemetry/model" "github.com/spf13/cobra" "github.com/tufin/oasdiff/build" ) func Run(args []string, stdout io.Writer, stderr io.Writer) int { - ctx, cancelCtx := context.WithDeadline(context.Background(), time.Now().Add(model.DefaultTimeout)) - defer cancelCtx() - - chanPreRun := make(chan int) rootCmd := &cobra.Command{ - Use: "oasdiff", - Short: "OpenAPI specification diff", - PersistentPreRun: func(cmd *cobra.Command, args []string) { preRun(chanPreRun, cmd) }, - PersistentPostRun: func(*cobra.Command, []string) { postRun(ctx, chanPreRun) }, + Use: "oasdiff", + Short: "OpenAPI specification diff", } rootCmd.SetArgs(args[1:]) @@ -45,33 +33,6 @@ func Run(args []string, stdout io.Writer, stderr io.Writer) int { return run(rootCmd) } -func preRun(c chan int, cmd *cobra.Command) { - - go func(c chan int) { - defer close(c) - if os.Getenv(model.EnvNoTelemetry) != "1" { - _ = client.NewCollector(util.NewStringSet().Add("err-ignore"). - Add("warn-ignore"). - Add("match-path"). - Add("prefix-base"). - Add("prefix-revision"). - Add("strip-prefix-base"). - Add("strip-prefix-revision"). - Add("filter-extension")).SendCommand(cmd) - } - }(c) -} - -func postRun(ctx context.Context, c chan int) { - - select { - case <-c: - break - case <-ctx.Done(): - break - } -} - func setReturnValue(cmd *cobra.Command, code int) { if cmd.Root().Annotations == nil { cmd.Root().Annotations = map[string]string{}