ci: use reviewdog and use gci linter for imports instead of goimports (DataDog#2010)

Author: rarguelloF

.github/workflows/unit-integration-tests.yml

@@ -30,9 +30,11 @@ jobs:
         with:
           repository: 'DataDog/dd-trace-go'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: reviewdog/action-golangci-lint@v2
         with:
-          version: v1.52.2
+          golangci_lint_version: v1.52.2
+          fail_on_error: true
+          reporter: github-pr-review
 
   test-core:
     runs-on: ubuntu-latest
@@ -47,7 +49,7 @@ jobs:
           DD_APM_ENABLED: true
           DD_BIND_HOST: "0.0.0.0"
           DD_API_KEY: "invalid_key_but_this_is_fine"
-        # We need to specify a custom health-check. By default, this container will remain "unhealthy" since 
+        # We need to specify a custom health-check. By default, this container will remain "unhealthy" since
         # we don't fully configure it with a valid API key (and possibly other reasons)
         # This command just checks for our ability to connect to port 8126
         options: >-
@@ -99,7 +101,7 @@ jobs:
           DD_APM_ENABLED: true
           DD_BIND_HOST: "0.0.0.0"
           DD_API_KEY: "invalid_key_but_this_is_fine"
-        # We need to specify a custom health-check. By default, this container will remain "unhealthy" since 
+        # We need to specify a custom health-check. By default, this container will remain "unhealthy" since
         # we don't fully configure it with a valid API key (and possibly other reasons)
         # This command just checks for our ability to connect to port 8126
         options: >-

.golangci.yml

@@ -7,6 +7,14 @@ linters:
   disable-all: true
   enable:
   - gofmt
-  - goimports
+  - gci
   - revive
   - bodyclose
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - prefix(gopkg.in/DataDog/dd-trace-go.v1)
+      - default
+    skip-generated: true
+    custom-order: true

appsec/appsec_test.go

@@ -9,12 +9,12 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/appsec"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 	privateAppsec "gopkg.in/DataDog/dd-trace-go.v1/internal/appsec"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestTrackUserLoginSuccessEvent(t *testing.T) {

contrib/Shopify/sarama/example_test.go

@@ -8,10 +8,10 @@ package sarama_test
 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"
+
+	"github.com/Shopify/sarama"
 )
 
 func Example_asyncProducer() {

contrib/aws/aws-sdk-go-v2/aws/example_test.go

@@ -9,10 +9,10 @@ import (
 	"context"
 	"log"
 
+	awstrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/aws/aws-sdk-go-v2/aws"
+
 	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"
 )
 
 func Example() {

contrib/aws/aws-sdk-go/aws/example_test.go

@@ -6,11 +6,11 @@
 package aws_test
 
 import (
+	awstrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/aws/aws-sdk-go/aws"
+
 	"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"
 )
 
 // To start tracing requests, wrap the AWS session.Session by invoking

contrib/bradfitz/gomemcache/memcache/example_test.go

@@ -8,10 +8,10 @@ package memcache_test
 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"
+
+	"github.com/bradfitz/gomemcache/memcache"
 )
 
 func Example() {

contrib/bradfitz/gomemcache/memcache/memcache.go

@@ -15,13 +15,13 @@ import (
 	"context"
 	"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"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/log"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/telemetry"
+
+	"github.com/bradfitz/gomemcache/memcache"
 )
 
 const componentName = "bradfitz/gomemcache/memcache"

contrib/bradfitz/gomemcache/memcache/memcache_test.go

@@ -15,15 +15,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bradfitz/gomemcache/memcache"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/contrib/internal/namingschematest"
 	"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"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+
+	"github.com/bradfitz/gomemcache/memcache"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestMemcache(t *testing.T) {

contrib/confluentinc/confluent-kafka-go/kafka/example_test.go

@@ -8,10 +8,10 @@ package kafka_test
 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"
+
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 )
 
 var (

contrib/confluentinc/confluent-kafka-go/kafka/option_test.go

@@ -9,9 +9,9 @@ import (
 	"math"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAnalyticsSettings(t *testing.T) {

contrib/database/sql/example_test.go

@@ -9,14 +9,13 @@ import (
 	"context"
 	"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"
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/lib/pq"
+	sqlite "github.com/mattn/go-sqlite3" // Setup application to use Sqlite
 )
 
 func Example() {

contrib/database/sql/internal/dsn_test.go

@@ -8,9 +8,9 @@ package internal
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseDSN(t *testing.T) {

contrib/database/sql/propagation_test.go

@@ -11,13 +11,13 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/contrib/database/sql/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/mocktracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/globalconfig"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDBMPropagation(t *testing.T) {

contrib/elastic/go-elasticsearch.v6/elastictrace_v6_test.go

@@ -11,13 +11,13 @@ import (
 	"strings"
 	"testing"
 
-	elasticsearch6 "github.com/elastic/go-elasticsearch/v6"
-	esapi6 "github.com/elastic/go-elasticsearch/v6/esapi"
-	"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"
+
+	elasticsearch6 "github.com/elastic/go-elasticsearch/v6"
+	esapi6 "github.com/elastic/go-elasticsearch/v6/esapi"
+	"github.com/stretchr/testify/assert"
 )
 
 func checkGETTraceV6(assert *assert.Assertions, mt mocktracer.Tracer) {

contrib/elastic/go-elasticsearch.v6/elastictrace_v7_test.go

@@ -11,13 +11,13 @@ import (
 	"strings"
 	"testing"
 
-	elasticsearch7 "github.com/elastic/go-elasticsearch/v7"
-	esapi7 "github.com/elastic/go-elasticsearch/v7/esapi"
-	"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"
+
+	elasticsearch7 "github.com/elastic/go-elasticsearch/v7"
+	esapi7 "github.com/elastic/go-elasticsearch/v7/esapi"
+	"github.com/stretchr/testify/assert"
 )
 
 func checkGETTraceV7(assert *assert.Assertions, mt mocktracer.Tracer) {

contrib/elastic/go-elasticsearch.v6/example_test.go

@@ -9,11 +9,11 @@ import (
 	"log"
 	"strings"
 
-	elasticsearch "github.com/elastic/go-elasticsearch/v8"
-	"github.com/elastic/go-elasticsearch/v8/esapi"
-
 	elastictrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/elastic/go-elasticsearch.v6"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+
+	elasticsearch "github.com/elastic/go-elasticsearch/v8"
+	"github.com/elastic/go-elasticsearch/v8/esapi"
 )
 
 func Example_v8() {

contrib/emicklei/go-restful/example_test.go

@@ -10,10 +10,10 @@ import (
 	"log"
 	"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"
+
+	"github.com/emicklei/go-restful"
 )
 
 // To start tracing requests, add the trace filter to your go-restful router.

contrib/globalsign/mgo/pipe.go

@@ -6,9 +6,9 @@
 package mgo
 
 import (
-	"github.com/globalsign/mgo"
-
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+
+	"github.com/globalsign/mgo"
 )
 
 // Pipe is an mgo.Pipe instance along with the data necessary for tracing.

contrib/go-chi/chi.v5/example_test.go

@@ -8,10 +8,10 @@ package chi_test
 import (
 	"net/http"
 
-	"github.com/go-chi/chi/v5"
-
 	chitrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-chi/chi.v5"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+
+	"github.com/go-chi/chi/v5"
 )
 
 func handler(w http.ResponseWriter, _ *http.Request) {

contrib/go-chi/chi/example_test.go

@@ -8,10 +8,10 @@ package chi_test
 import (
 	"net/http"
 
-	"github.com/go-chi/chi"
-
 	chitrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-chi/chi"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+
+	"github.com/go-chi/chi"
 )
 
 func handler(w http.ResponseWriter, _ *http.Request) {

contrib/go-redis/redis.v7/example_test.go

@@ -9,11 +9,11 @@ import (
 	"context"
 	"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"
+
+	"github.com/go-redis/redis/v7"
 )
 
 // To start tracing Redis, simply create a new client using the library and continue

contrib/go-redis/redis.v8/example_test.go

@@ -9,11 +9,11 @@ import (
 	"context"
 	"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"
+
+	"github.com/go-redis/redis/v8"
 )
 
 // To start tracing Redis, simply create a new client using the library and continue

contrib/go-redis/redis/example_test.go

@@ -9,11 +9,11 @@ import (
 	"context"
 	"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"
+
+	"github.com/go-redis/redis"
 )
 
 // To start tracing Redis, simply create a new client using the library and continue

contrib/go.mongodb.org/mongo-driver/mongo/example_test.go

@@ -8,11 +8,11 @@ package mongo_test
 import (
 	"context"
 
+	mongotrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go.mongodb.org/mongo-driver/mongo"
+
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	mongotrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/go.mongodb.org/mongo-driver/mongo"
 )
 
 func Example() {

contrib/gocql/gocql/example_test.go

@@ -8,11 +8,11 @@ package gocql_test
 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"
+
+	"github.com/gocql/gocql"
 )
 
 // To trace Cassandra commands, use our query wrapper WrapQuery.