Merge branch 'v1' into withlogstartup

DataDog · Aug 30, 2021 · 42731b1 · 42731b1
2 parents 08763f8 + 9f17fc7
commit 42731b1
Show file tree

Hide file tree

Showing 71 changed files with 1,089 additions and 328 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,6 +60,16 @@ jobs:
             exit 1
           fi
 
+    - run:
+        name: goimports
+        command: |
+          go install golang.org/x/tools/cmd/goimports
+          if [ "$(~/go/bin/goimports -e -l -local gopkg.in/DataDog/dd-trace-go.v1 . | wc -l)" -gt 0 ]; then
+            echo "Run 'goimports -w -local gopkg.in/DataDog/dd-trace-go.v1 .' to format code."
+            ~/go/bin/goimports -d -local gopkg.in/DataDog/dd-trace-go.v1 .
+            exit 1
+          fi
+
     - run:
         name: lint
         command: |

diff --git a/checkcopyright.go b/checkcopyright.go
@@ -9,18 +9,19 @@
 package main
 
 import (
-	"bytes"
-	"fmt"
 	"io"
 	"log"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 )
 
 func main() {
 	var missing bool
-	copyrightText := []byte(fmt.Sprintf("// Copyright 2016 Datadog, Inc."))
+	// copyrightRegexp matches years or year ranges like "2016", "2016-2019",
+	// "2016,2018-2020" in the copyright header.
+	copyrightRegexp := regexp.MustCompile(`// Copyright 20[0-9]{2}[0-9,\-]* Datadog, Inc.`)
 	if err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -39,7 +40,7 @@ func main() {
 		if err != nil && err != io.EOF {
 			return err
 		}
-		if !bytes.Contains(snip, copyrightText) {
+		if !copyrightRegexp.Match(snip) {
 			// report missing header
 			missing = true
 			log.Printf("Copyright header missing in %q.\n", path)

diff --git a/contrib/Shopify/sarama/example_test.go b/contrib/Shopify/sarama/example_test.go
@@ -9,6 +9,7 @@ import (
 	"log"
 
 	"github.com/Shopify/sarama"
+
 	saramatrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/Shopify/sarama"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

diff --git a/contrib/aws/aws-sdk-go-v2/aws/example_test.go b/contrib/aws/aws-sdk-go-v2/aws/example_test.go
@@ -11,6 +11,7 @@ import (
 
 	awscfg "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
+
 	awstrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/aws/aws-sdk-go-v2/aws"
 )
 

diff --git a/contrib/aws/aws-sdk-go/aws/aws_test.go b/contrib/aws/aws-sdk-go/aws/aws_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/aws/aws-sdk-go/aws/example_test.go b/contrib/aws/aws-sdk-go/aws/example_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
+
 	awstrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/aws/aws-sdk-go/aws"
 )
 

diff --git a/contrib/bradfitz/gomemcache/memcache/example_test.go b/contrib/bradfitz/gomemcache/memcache/example_test.go
@@ -9,6 +9,7 @@ import (
 	"context"
 
 	"github.com/bradfitz/gomemcache/memcache"
+
 	memcachetrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/bradfitz/gomemcache/memcache"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

diff --git a/contrib/bradfitz/gomemcache/memcache/memcache.go b/contrib/bradfitz/gomemcache/memcache/memcache.go
@@ -16,6 +16,7 @@ import (
 	"math"
 
 	"github.com/bradfitz/gomemcache/memcache"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/bradfitz/gomemcache/memcache/memcache_test.go b/contrib/bradfitz/gomemcache/memcache/memcache_test.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/bradfitz/gomemcache/memcache"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/confluentinc/confluent-kafka-go/kafka/example_test.go b/contrib/confluentinc/confluent-kafka-go/kafka/example_test.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
+
 	kafkatrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/confluentinc/confluent-kafka-go/kafka"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

diff --git a/contrib/confluentinc/confluent-kafka-go/kafka/option_test.go b/contrib/confluentinc/confluent-kafka-go/kafka/option_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )
 

diff --git a/contrib/database/sql/example_test.go b/contrib/database/sql/example_test.go
@@ -10,6 +10,7 @@ import (
 	"log"
 
 	sqlite "github.com/mattn/go-sqlite3" // Setup application to use Sqlite
+
 	sqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/database/sql/internal/dsn_test.go b/contrib/database/sql/internal/dsn_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 )
 

diff --git a/contrib/emicklei/go-restful/example_test.go b/contrib/emicklei/go-restful/example_test.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 
 	"github.com/emicklei/go-restful"
+
 	restfultrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/emicklei/go-restful"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

diff --git a/contrib/emicklei/go-restful/restful_test.go b/contrib/emicklei/go-restful/restful_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/emicklei/go-restful"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/gin-gonic/gin/option.go b/contrib/gin-gonic/gin/option.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
 )

diff --git a/contrib/globalsign/mgo/mgo_test.go b/contrib/globalsign/mgo/mgo_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/globalsign/mgo"
 	"github.com/globalsign/mgo/bson"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/globalsign/mgo/pipe.go b/contrib/globalsign/mgo/pipe.go
@@ -7,6 +7,7 @@ package mgo
 
 import (
 	"github.com/globalsign/mgo"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )
 

diff --git a/contrib/go-redis/redis.v7/example_test.go b/contrib/go-redis/redis.v7/example_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/go-redis/redis/v7"
+
 	redistrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-redis/redis.v7"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/go-redis/redis.v8/example_test.go b/contrib/go-redis/redis.v8/example_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/go-redis/redis/v8"
+
 	redistrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-redis/redis.v8"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/go-redis/redis/example_test.go b/contrib/go-redis/redis/example_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/go-redis/redis"
+
 	redistrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-redis/redis"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/gocql/gocql/example_test.go b/contrib/gocql/gocql/example_test.go
@@ -9,6 +9,7 @@ import (
 	"context"
 
 	"github.com/gocql/gocql"
+
 	gocqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gocql/gocql"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/gofiber/fiber.v2/fiber.go b/contrib/gofiber/fiber.v2/fiber.go
@@ -64,7 +64,9 @@ func Middleware(opts ...Option) func(c *fiber.Ctx) error {
 		}
 		span.SetTag(ext.HTTPCode, strconv.Itoa(status))
 
-		if cfg.isStatusError(status) {
+		if err != nil {
+			span.SetTag(ext.Error, err)
+		} else if cfg.isStatusError(status) {
 			// mark 5xx server error
 			span.SetTag(ext.Error, fmt.Errorf("%d: %s", status, http.StatusText(status)))
 		}

diff --git a/contrib/gofiber/fiber.v2/fiber_test.go b/contrib/gofiber/fiber.v2/fiber_test.go
@@ -94,7 +94,7 @@ func TestTrace200(t *testing.T) {
 	})
 }
 
-func TestError(t *testing.T) {
+func TestStatusError(t *testing.T) {
 	assert := assert.New(t)
 	mt := mocktracer.Start()
 	defer mt.Stop()
@@ -128,6 +128,36 @@ func TestError(t *testing.T) {
 	assert.Equal(wantErr, span.Tag(ext.Error).(error).Error())
 }
 
+func TestCustomError(t *testing.T) {
+	assert := assert.New(t)
+	mt := mocktracer.Start()
+	defer mt.Stop()
+
+	router := fiber.New()
+	router.Use(Middleware(WithServiceName("foobar")))
+
+	router.Get("/err", func(c *fiber.Ctx) error {
+		c.SendStatus(400)
+		return fiber.ErrBadRequest
+	})
+	r := httptest.NewRequest("GET", "/err", nil)
+
+	response, err := router.Test(r, 100)
+	assert.Equal(nil, err)
+	assert.Equal(response.StatusCode, 400)
+
+	spans := mt.FinishedSpans()
+	assert.Len(spans, 1)
+	if len(spans) < 1 {
+		t.Fatalf("no spans")
+	}
+	span := spans[0]
+	assert.Equal("http.request", span.OperationName())
+	assert.Equal("foobar", span.Tag(ext.ServiceName))
+	assert.Equal("400", span.Tag(ext.HTTPCode))
+	assert.Equal(fiber.ErrBadRequest, span.Tag(ext.Error).(*fiber.Error))
+}
+
 func TestGetSpanNotInstrumented(t *testing.T) {
 	assert := assert.New(t)
 	router := fiber.New()

diff --git a/contrib/gomodule/redigo/example_test.go b/contrib/gomodule/redigo/example_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/gomodule/redigo/redis"
+
 	redigotrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gomodule/redigo"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )

diff --git a/contrib/gomodule/redigo/redigo_test.go b/contrib/gomodule/redigo/redigo_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/gomodule/redigo/redis"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"

diff --git a/contrib/google.golang.org/api/api_test.go b/contrib/google.golang.org/api/api_test.go
@@ -15,6 +15,7 @@ import (
 	books "google.golang.org/api/books/v1"
 	civicinfo "google.golang.org/api/civicinfo/v2"
 	urlshortener "google.golang.org/api/urlshortener/v1"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"

diff --git a/contrib/google.golang.org/api/example_test.go b/contrib/google.golang.org/api/example_test.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 
 	cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1"
+
 	apitrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/google.golang.org/api"
 )
 

diff --git a/contrib/google.golang.org/api/make_endpoints.go b/contrib/google.golang.org/api/make_endpoints.go
@@ -21,6 +21,7 @@ import (
 	"text/template"
 
 	"github.com/yosida95/uritemplate"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/contrib/google.golang.org/api/internal"
 )
 

diff --git a/contrib/google.golang.org/grpc.v12/fixtures_test.pb.go b/contrib/google.golang.org/grpc.v12/fixtures_test.pb.go
diff --git a/contrib/google.golang.org/grpc/fixtures_test.pb.go b/contrib/google.golang.org/grpc/fixtures_test.pb.go
diff --git a/contrib/graph-gophers/graphql-go/example_test.go b/contrib/graph-gophers/graphql-go/example_test.go
@@ -11,6 +11,7 @@ import (
 
 	graphql "github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
+
 	graphqltrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/graph-gophers/graphql-go"
 )
 

diff --git a/contrib/graph-gophers/graphql-go/graphql_test.go b/contrib/graph-gophers/graphql-go/graphql_test.go
@@ -14,6 +14,7 @@ import (
 	graphql "github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"

diff --git a/contrib/internal/httputil/trace_gen.go b/contrib/internal/httputil/trace_gen.go
diff --git a/contrib/k8s.io/client-go/kubernetes/example_test.go b/contrib/k8s.io/client-go/kubernetes/example_test.go
@@ -8,11 +8,12 @@ package kubernetes_test
 import (
 	"fmt"
 
-	kubernetestrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/k8s.io/client-go/kubernetes"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 	"k8s.io/client-go/rest"
+
+	kubernetestrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/k8s.io/client-go/kubernetes"
 )
 
 func Example() {

diff --git a/contrib/miekg/dns/dns_test.go b/contrib/miekg/dns/dns_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 )