all: commit full go.mod and go.sum files

.circleci/config.yml

@@ -127,11 +127,6 @@ jobs:
       - restore_cache: # restores saved cache if no changes are detected since last run
           keys:
             - go-mod-v5-core-{{ checksum "go.sum.orig" }}
-      - run:
-          name: Enforce some dependencies
-          command: |
-            # last version compatible with go1.14, needed for testtraceprof
-            echo 'replace golang.org/x/net => golang.org/x/net d418f374d30933c6c7db22cf349625c295a5afaa' >> go.mod
       - run:
           name: Testing
           command: |
@@ -258,31 +253,6 @@ jobs:
           paths:
           - /tmp/librdkafka-v1.3.0
 
-      - run:
-          name: Enforce some dependencies
-          command: |
-            go get k8s.io/client-go@v0.17.0
-            go get k8s.io/apimachinery@v0.17.0
-            go get cloud.google.com/go/pubsub@v1.6.1
-            # Temporarily enforce this version. 1.9.0 is incompatible with go < 1.16
-            go get github.com/hashicorp/consul/api@v1.8.1
-            # github.com/hashicorp/vault/sdk > v0.2.0 doesn't compile with go1.14
-            go get github.com/hashicorp/vault/sdk@v0.2.0
-            # Shopify/sarama > v1.22 doesn't compile with go1.14
-            go get github.com/Shopify/sarama@v1.22.0
-            # Temporary enforcing gorm to v1.22.4 to avoid the problems of v1.22.5
-            go get -v gorm.io/gorm@v1.22.4
-            # gofiber >= v2.27.0 has a transitive dependency on a newer version of
-            # golang.org/x/net that requires Go >= 1.15, breaking our build
-            go get github.com/gofiber/fiber/v2@v2.26.0
-            # The following gorm drivers need to be pinned, or newer versions
-            # will force an update to gorm.io/gorm, which we are also trying to
-            # pin above.
-            go get gorm.io/driver/mysql@v1.2.3
-            go get gorm.io/driver/postgres@v1.2.3
-            go get gorm.io/driver/sqlserver@v1.2.1
-            go get github.com/zenazn/goji@v1.0.1
-
       - run:
           name: Wait for MySQL
           command: dockerize -wait tcp://localhost:3306 -timeout 1m

go.mod

@@ -3,16 +3,85 @@ module gopkg.in/DataDog/dd-trace-go.v1
 go 1.12
 
 require (
+	cloud.google.com/go/pubsub v1.6.1
 	github.com/DataDog/datadog-agent/pkg/obfuscate v0.0.0-20211129110424-6491aa3bf583
 	github.com/DataDog/datadog-go/v5 v5.0.2
 	github.com/DataDog/gostackparse v0.5.0
 	github.com/DataDog/sketches-go v1.0.0
+	github.com/Shopify/sarama v1.22.0
+	github.com/aws/aws-sdk-go v1.30.27
+	github.com/aws/aws-sdk-go-v2 v1.14.0
+	github.com/aws/aws-sdk-go-v2/config v1.14.0
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.17.0
+	github.com/aws/smithy-go v1.11.0
+	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
+	github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
+	github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
+	github.com/confluentinc/confluent-kafka-go v1.8.2
+	github.com/denisenkom/go-mssqldb v0.11.0
+	github.com/elastic/go-elasticsearch/v6 v6.8.10
+	github.com/elastic/go-elasticsearch/v7 v7.17.1
+	github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633
+	github.com/envoyproxy/go-control-plane v0.9.8 // indirect
+	github.com/garyburd/redigo v1.6.3
+	github.com/gin-gonic/gin v1.7.7
+	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
+	github.com/go-chi/chi v1.5.4
+	github.com/go-chi/chi/v4 v4.0.0-rc1
+	github.com/go-chi/chi/v5 v5.0.7
+	github.com/go-pg/pg/v10 v10.10.6
+	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/go-redis/redis/v7 v7.4.1
+	github.com/go-redis/redis/v8 v8.11.4
+	github.com/go-sql-driver/mysql v1.6.0
+	github.com/gocql/gocql v0.0.0-20220224095938-0eacd3183625
+	github.com/gofiber/fiber/v2 v2.26.0
+	github.com/golang/protobuf v1.5.2
+	github.com/gomodule/redigo v1.8.8
 	github.com/google/pprof v0.0.0-20210423192551-a2663126120b
 	github.com/google/uuid v1.3.0
+	github.com/gorilla/mux v1.7.4
+	github.com/graph-gophers/graphql-go v1.3.0
+	github.com/grpc-ecosystem/grpc-gateway v1.15.2 // indirect
+	github.com/hashicorp/consul/api v1.8.1
+	github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f
+	github.com/hashicorp/vault/sdk v0.2.0
+	github.com/jackc/pgx/v4 v4.14.0
+	github.com/jinzhu/gorm v1.9.16
+	github.com/jmoiron/sqlx v1.3.4
+	github.com/julienschmidt/httprouter v1.2.0
+	github.com/labstack/echo v3.3.10+incompatible
+	github.com/labstack/echo/v4 v4.6.3
+	github.com/lib/pq v1.10.2
+	github.com/mattn/go-sqlite3 v1.14.12
+	github.com/miekg/dns v1.1.26
+	github.com/opentracing/opentracing-go v1.2.0
 	github.com/philhofer/fwd v1.1.1 // indirect
+	github.com/segmentio/kafka-go v0.4.29
 	github.com/stretchr/testify v1.7.0
+	github.com/syndtr/goleveldb v1.0.0
+	github.com/tidwall/buntdb v1.2.9
 	github.com/tinylib/msgp v1.1.2
+	github.com/twitchtv/twirp v8.1.1+incompatible
+	github.com/urfave/negroni v1.0.0
+	github.com/zenazn/goji v1.0.1
+	go.mongodb.org/mongo-driver v1.8.3
+	golang.org/x/net v0.0.0-20211020060615-d418f374d309
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
-	google.golang.org/protobuf v1.25.0
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+	google.golang.org/api v0.29.0
+	google.golang.org/grpc v1.32.0
+	google.golang.org/protobuf v1.27.1
+	gopkg.in/jinzhu/gorm.v1 v1.9.2
+	gopkg.in/olivere/elastic.v3 v3.0.75
+	gopkg.in/olivere/elastic.v5 v5.0.86
+	gorm.io/driver/mysql v1.2.3
+	gorm.io/driver/postgres v1.2.3
+	gorm.io/driver/sqlserver v1.2.1
+	gorm.io/gorm v1.22.4
+	k8s.io/apimachinery v0.17.0
+	k8s.io/client-go v0.17.0
 )