build: migrate to CircleCI 2.0

.circleci/config.yml

@@ -0,0 +1,90 @@
+version: 2
+jobs:
+ build:
+ working_directory: /go/src/github.com/DataDog/dd-trace-go
+ resource_class: xlarge
+
+ docker:
+ - image: circleci/golang:latest
+ - image: cassandra:3.7
+ - image: circleci/mysql:5.7
+ environment:
+ - MYSQL_ROOT_PASSWORD=admin
+ - MYSQL_PASSWORD=test
+ - MYSQL_USER=test
+ - MYSQL_DATABASE=test
+ - image: circleci/postgres:9.5
+ environment:
+ - POSTGRES_PASSWORD=postgres
+ - POSTGRES_USER=postgres
+ - POSTGRES_DB=postgres
+ - image: redis:3.2
+ - image: elasticsearch:2
+ environment:
+ - ES_JAVA_OPTS: "-Xms750m -Xmx750m" # https://github.com/10up/wp-local-docker/issues/6
+ - image: elasticsearch:5
+ environment:
+ - ES_JAVA_OPTS: "-Xms750m -Xmx750m" # https://github.com/10up/wp-local-docker/issues/6
+ - image: datadog/docker-dd-agent
+ environment:
+ - DD_APM_ENABLED=true
+ - DD_BIND_HOST=0.0.0.0
+ - DD_API_KEY=invalid_key_but_this_is_fine
+
+ steps:
+ - checkout
+
+ - run:
+ name: Wait for MySQL
+ command: dockerize -wait tcp://localhost:3306 -timeout 1m
+
+ - run:
+ name: Wait for Postgres
+ command: dockerize -wait tcp://localhost:5432 -timeout 1m
+
+ - run:
+ name: Wait for Redis
+ command: dockerize -wait tcp://localhost:6379 -timeout 1m
+
+ - run:
+ name: Wait for ElasticSearch (1)
+ command: dockerize -wait http://localhost:9200 -timeout 1m
+
+ - run:
+ name: Wait for ElasticSearch (2)
+ command: dockerize -wait http://localhost:9201 -timeout 1m
+
+ - run:
+ name: Wait for Datadog Agent
+ command: dockerize -wait tcp://127.0.0.1:8126 -timeout 1m
+
+ - run:
+ name: Wait for Cassandra
+ command: dockerize -wait tcp://localhost:9042 -timeout 2m
+
+ - run:
+ name: Vendor gRPC v1.5.2
+ # This step vendors gRPC v1.5.2 inside our gRPCv.12 contrib
+ # to allow running the tests against that specific version
+ # of the gRPC library. In a real-world use case we don't want
+ # this vendoring to exist because users might be running this
+ # integration against older versions that they might have in
+ # their $GOPATH.
+ environment:
+ GRPC_PATH: /go/src/google.golang.org/grpc
+ GRPC_DEST: contrib/google.golang.org/grpc.v12/vendor/google.golang.org/
+ command: |
+ go get google.golang.org/grpc
+ mkdir -p $GRPC_DEST
+ cp -r $GRPC_PATH $GRPC_DEST
+ cd $GRPC_DEST/grpc && git checkout v1.5.2
+
+ - run:
+ name: Fetching dependencies
+ command: |
+ go get github.com/opentracing/opentracing-go
+ go get -t ./contrib/...
+
+ - run:
+ name: Testing
+ command: go test -race ./opentracing ./tracer ./contrib/...

contrib/database/sql/mysql_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestMySQL(t *testing.T) {
  trc, transport := tracertest.GetTestTracer()
- db, err := OpenTraced(&mysql.MySQLDriver{}, "test:test@tcp(127.0.0.1:53306)/test", "mysql-test", trc)
+ db, err := OpenTraced(&mysql.MySQLDriver{}, "test:test@tcp(127.0.0.1:3306)/test", "mysql-test", trc)
  if err != nil {
  log.Fatal(err)
  }
@@ -33,7 +33,7 @@ func TestMySQL(t *testing.T) {
  expectedSpan.Meta = map[string]string{
  "db.user": "test",
  "out.host": "127.0.0.1",
- "out.port": "53306",
+ "out.port": "3306",
  "db.name": "test",
  }
 

contrib/database/sql/pq_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestPostgres(t *testing.T) {
  trc, transport := tracertest.GetTestTracer()
- db, err := OpenTraced(&pq.Driver{}, "postgres://postgres:[email protected]:55432/postgres?sslmode=disable", "postgres-test", trc)
+ db, err := OpenTraced(&pq.Driver{}, "postgres://postgres:[email protected]:5432/postgres?sslmode=disable", "postgres-test", trc)
  if err != nil {
  log.Fatal(err)
  }
@@ -33,7 +33,7 @@ func TestPostgres(t *testing.T) {
  expectedSpan.Meta = map[string]string{
  "db.user": "postgres",
  "out.host": "127.0.0.1",
- "out.port": "55432",
+ "out.port": "5432",
  "db.name": "postgres",
  }
 

contrib/database/sql/sql.go

@@ -1,5 +1,5 @@
 // Package sqltraced provides a traced version of any driver implementing the database/sql/driver interface.
-// To trace jmoiron/sqlx, see https://godoc.org/github.com/DataDog/dd-trace-go/tracer/contrib/sqlxtraced.
+// To trace jmoiron/sqlx, see https://godoc.org/github.com/DataDog/dd-trace-go/contrib/jmoiron/sqlx.
 package sql
 
 import (
@@ -10,8 +10,8 @@ import (
 
  log "github.com/cihub/seelog"
 
+ "github.com/DataDog/dd-trace-go/contrib/database/sql/sqlutils"
  "github.com/DataDog/dd-trace-go/tracer"
- "github.com/DataDog/dd-trace-go/tracer/contrib/sqltraced/sqlutils"
  "github.com/DataDog/dd-trace-go/tracer/ext"
 )
 

contrib/garyburd/redigo/redigo.go

@@ -5,13 +5,14 @@ import (
  "bytes"
  "context"
  "fmt"
- "github.com/DataDog/dd-trace-go/tracer"
- "github.com/DataDog/dd-trace-go/tracer/ext"
- redis "github.com/garyburd/redigo/redis"
  "net"
  "net/url"
  "strconv"
  "strings"
+
+ "github.com/DataDog/dd-trace-go/tracer"
+ "github.com/DataDog/dd-trace-go/tracer/ext"
+ redis "github.com/garyburd/redigo/redis"
 )
 
 // TracedConn is an implementation of the redis.Conn interface that supports tracing

contrib/garyburd/redigo/redigo_test.go

@@ -3,11 +3,12 @@ package redigo
 import (
  "context"
  "fmt"
+ "net/http"
+ "testing"
+
  "github.com/DataDog/dd-trace-go/tracer"
  "github.com/garyburd/redigo/redis"
  "github.com/stretchr/testify/assert"
- "net/http"
- "testing"
 )
 
 const (
@@ -19,7 +20,7 @@ func TestClient(t *testing.T) {
  testTracer, testTransport := getTestTracer()
  testTracer.SetDebugLogging(debug)
 
- c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:56379")
+ c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:6379")
  c.Do("SET", 1, "truck")
 
  testTracer.ForceFlush()
@@ -33,7 +34,7 @@ func TestClient(t *testing.T) {
  assert.Equal(span.Service, "my-service")
  assert.Equal(span.Resource, "SET")
  assert.Equal(span.GetMeta("out.host"), "127.0.0.1")
- assert.Equal(span.GetMeta("out.port"), "56379")
+ assert.Equal(span.GetMeta("out.port"), "6379")
  assert.Equal(span.GetMeta("redis.raw_command"), "SET 1 truck")
  assert.Equal(span.GetMeta("redis.args_length"), "2")
 }
@@ -43,7 +44,7 @@ func TestCommandError(t *testing.T) {
  testTracer, testTransport := getTestTracer()
  testTracer.SetDebugLogging(debug)
 
- c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:56379")
+ c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:6379")
  _, err := c.Do("NOT_A_COMMAND", context.Background())
 
  testTracer.ForceFlush()
@@ -59,7 +60,7 @@ func TestCommandError(t *testing.T) {
  assert.Equal(span.Service, "my-service")
  assert.Equal(span.Resource, "NOT_A_COMMAND")
  assert.Equal(span.GetMeta("out.host"), "127.0.0.1")
- assert.Equal(span.GetMeta("out.port"), "56379")
+ assert.Equal(span.GetMeta("out.port"), "6379")
  assert.Equal(span.GetMeta("redis.raw_command"), "NOT_A_COMMAND")
 }
 
@@ -82,7 +83,7 @@ func TestInheritance(t *testing.T) {
  ctx := context.Background()
  parent_span := testTracer.NewChildSpanFromContext("parent_span", ctx)
  ctx = tracer.ContextWithSpan(ctx, parent_span)
- client, _ := TracedDial("my_service", testTracer, "tcp", "127.0.0.1:56379")
+ client, _ := TracedDial("my_service", testTracer, "tcp", "127.0.0.1:6379")
  client.Do("SET", "water", "bottle", ctx)
  parent_span.Finish()
 
@@ -107,7 +108,7 @@ func TestInheritance(t *testing.T) {
 
  assert.Equal(child_span.ParentID, pspan.SpanID)
  assert.Equal(child_span.GetMeta("out.host"), "127.0.0.1")
- assert.Equal(child_span.GetMeta("out.port"), "56379")
+ assert.Equal(child_span.GetMeta("out.port"), "6379")
 }
 
 func TestCommandsToSring(t *testing.T) {
@@ -116,7 +117,7 @@ func TestCommandsToSring(t *testing.T) {
  testTracer.SetDebugLogging(debug)
 
  stringify_test := TestStruct{Cpython: 57, Cgo: 8}
- c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:56379")
+ c, _ := TracedDial("my-service", testTracer, "tcp", "127.0.0.1:6379")
  c.Do("SADD", "testSet", "a", int(0), int32(1), int64(2), stringify_test, context.Background())
 
  testTracer.ForceFlush()
@@ -130,7 +131,7 @@ func TestCommandsToSring(t *testing.T) {
  assert.Equal(span.Service, "my-service")
  assert.Equal(span.Resource, "SADD")
  assert.Equal(span.GetMeta("out.host"), "127.0.0.1")
- assert.Equal(span.GetMeta("out.port"), "56379")
+ assert.Equal(span.GetMeta("out.port"), "6379")
  assert.Equal(span.GetMeta("redis.raw_command"), "SADD testSet a 0 1 2 [57, 8]")
 }
 
@@ -145,7 +146,7 @@ func TestPool(t *testing.T) {
  IdleTimeout: 23,
  Wait: true,
  Dial: func() (redis.Conn, error) {
- return TracedDial("my-service", testTracer, "tcp", "127.0.0.1:56379")
+ return TracedDial("my-service", testTracer, "tcp", "127.0.0.1:6379")
  },
  }
 
@@ -164,7 +165,7 @@ func TestTracingDialUrl(t *testing.T) {
  assert := assert.New(t)
  testTracer, testTransport := getTestTracer()
  testTracer.SetDebugLogging(debug)
- url := "redis://127.0.0.1:56379"
+ url := "redis://127.0.0.1:6379"
  client, _ := TracedDialURL("redis-service", testTracer, url)
  client.Do("SET", "ONE", " TWO", context.Background())
 

contrib/go-redis/redis/example_test.go

@@ -3,12 +3,13 @@ package redis_test
 import (
  "context"
  "fmt"
+ "time"
+
+ gintrace "github.com/DataDog/dd-trace-go/contrib/gin-gonic/gin"
  redistrace "github.com/DataDog/dd-trace-go/contrib/go-redis/redis"
  "github.com/DataDog/dd-trace-go/tracer"
- "github.com/DataDog/dd-trace-go/tracer/contrib/gin-gonic/gintrace"
  "github.com/gin-gonic/gin"
  "github.com/go-redis/redis"
- "time"
 )
 
 // To start tracing Redis commands, use the NewTracedClient function to create a traced Redis clienty,