chore: enable linting of package import order, and fix existing issues

wavefrontHQ · Sep 7, 2023 · f5977c2 · f5977c2
1 parent 5fef1bf
commit f5977c2
Show file tree

Hide file tree

Showing 29 changed files with 58 additions and 34 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -5,7 +5,7 @@ linters:
 #  - gosimple
   - govet
   - gofmt
-#  - gci
+  - gci
 #  - revive
 #  - ineffassign
 #  - staticcheck

diff --git a/internal/auth/csp_service.go b/internal/auth/csp_service.go
@@ -1,11 +1,12 @@
 package auth
 
 import (
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 	"log"
 	"net/http"
 	"sync"
 	"time"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 )
 
 type tokenResult struct {

diff --git a/internal/auth/csp_service_test.go b/internal/auth/csp_service_test.go
@@ -1,12 +1,13 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/assert"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 )
 
 func TestCSPService_MultipleCSPRequests(t *testing.T) {

diff --git a/internal/auth/ticker_interval_test.go b/internal/auth/ticker_interval_test.go
@@ -1,9 +1,10 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCalculateNewTickerInterval(t *testing.T) {

diff --git a/internal/event/formatter.go b/internal/event/formatter.go
@@ -3,9 +3,10 @@ package event
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
+
 	"github.com/wavefronthq/wavefront-sdk-go/event"
 	"github.com/wavefronthq/wavefront-sdk-go/internal"
-	"strconv"
 )
 
 // Line encode the event to a wf proxy format

diff --git a/internal/histogram/formatter.go b/internal/histogram/formatter.go
@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"strconv"
+
 	"github.com/wavefronthq/wavefront-sdk-go/histogram"
 	"github.com/wavefronthq/wavefront-sdk-go/internal"
-	"strconv"
 )
 
 // Gets a histogram line in the Wavefront histogram data format:

diff --git a/internal/histogram/formatter_test.go b/internal/histogram/formatter_test.go
@@ -1,9 +1,10 @@
 package histogram
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/wavefronthq/wavefront-sdk-go/histogram"
-	"testing"
 )
 
 var line string

diff --git a/internal/lines.go b/internal/lines.go
@@ -3,14 +3,15 @@ package internal
 import (
 	"errors"
 	"fmt"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/sdkmetrics"
 	"log"
 	"net/http"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/sdkmetrics"
 )
 
 const (

diff --git a/internal/lines_test.go b/internal/lines_test.go
@@ -2,11 +2,11 @@ package internal
 
 import (
 	"fmt"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 type fakeReporter struct {

diff --git a/internal/metric/formatter.go b/internal/metric/formatter.go
@@ -3,8 +3,9 @@ package metric
 import (
 	"errors"
 	"fmt"
-	"github.com/wavefronthq/wavefront-sdk-go/internal"
 	"strconv"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal"
 )
 
 // Gets a metric line in the Wavefront metrics data format:

diff --git a/internal/metric/formatter_test.go b/internal/metric/formatter_test.go
@@ -1,8 +1,9 @@
 package metric
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var line string

diff --git a/internal/reporter.go b/internal/reporter.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"compress/gzip"
 	"crypto/tls"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"io"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 // The implementation of a Reporter that reports points directly to a Wavefront server.

diff --git a/internal/reporter_test.go b/internal/reporter_test.go
@@ -3,12 +3,13 @@ package internal
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 func TestReporter_BuildRequest(t *testing.T) {

diff --git a/internal/sanitize_test.go b/internal/sanitize_test.go
@@ -1,9 +1,10 @@
 package internal
 
 import (
-	"github.com/stretchr/testify/assert"
 	"strconv"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSanitizeInternal(t *testing.T) {

diff --git a/internal/sdkmetrics/real_registry_test.go b/internal/sdkmetrics/real_registry_test.go
@@ -1,8 +1,9 @@
 package sdkmetrics
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRealMetricRegistry(t *testing.T) {

diff --git a/internal/span/formatter.go b/internal/span/formatter.go
@@ -4,8 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/wavefronthq/wavefront-sdk-go/internal"
 	"strconv"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal"
 )
 
 // Line gets a span line in the Wavefront span data format:

diff --git a/internal/span/formatter_test.go b/internal/span/formatter_test.go
@@ -1,9 +1,10 @@
 package span
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 var line string

diff --git a/internal/utils_test.go b/internal/utils_test.go
@@ -1,8 +1,9 @@
 package internal
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetSemVer(t *testing.T) {

diff --git a/senders/auth.go b/senders/auth.go
@@ -1,8 +1,9 @@
 package senders
 
 import (
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"log"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 func tokenServiceForCfg(cfg *configuration) auth.Service {

diff --git a/senders/configuration.go b/senders/configuration.go
@@ -3,12 +3,13 @@ package senders
 import (
 	"crypto/tls"
 	"fmt"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"log"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 const (

diff --git a/senders/example_newsender_options_test.go b/senders/example_newsender_options_test.go
@@ -2,8 +2,9 @@ package senders_test
 
 import (
 	"crypto/tls"
-	wavefront "github.com/wavefronthq/wavefront-sdk-go/senders"
 	"time"
+
+	wavefront "github.com/wavefronthq/wavefront-sdk-go/senders"
 )
 
 func ExampleNewSender_options() {

diff --git a/senders/integration_test.go b/senders/integration_test.go
@@ -1,9 +1,10 @@
 package senders
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestEndToEnd(t *testing.T) {

diff --git a/senders/live_test.go b/senders/live_test.go
@@ -1,9 +1,10 @@
 package senders
 
 import (
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func skipUnlessVarsAreSet(t *testing.T) {

diff --git a/senders/new_sender.go b/senders/new_sender.go
@@ -2,6 +2,7 @@ package senders
 
 import (
 	"fmt"
+
 	"github.com/wavefronthq/wavefront-sdk-go/internal"
 	"github.com/wavefronthq/wavefront-sdk-go/internal/sdkmetrics"
 )

diff --git a/senders/new_sender_test.go b/senders/new_sender_test.go
@@ -3,12 +3,12 @@ package senders
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 func TestInvalidURL(t *testing.T) {

diff --git a/senders/option.go b/senders/option.go
@@ -2,8 +2,9 @@ package senders
 
 import (
 	"crypto/tls"
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 	"time"
+
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth"
 )
 
 // Option Wavefront client configuration options

diff --git a/senders/real_sender.go b/senders/real_sender.go
@@ -2,6 +2,9 @@ package senders
 
 import (
 	"fmt"
+	"os"
+	"strconv"
+
 	"github.com/wavefronthq/wavefront-sdk-go/event"
 	"github.com/wavefronthq/wavefront-sdk-go/histogram"
 	"github.com/wavefronthq/wavefront-sdk-go/internal"
@@ -11,8 +14,6 @@ import (
 	"github.com/wavefronthq/wavefront-sdk-go/internal/sdkmetrics"
 	"github.com/wavefronthq/wavefront-sdk-go/internal/span"
 	"github.com/wavefronthq/wavefront-sdk-go/version"
-	"os"
-	"strconv"
 )
 
 // Sender Interface for sending metrics, distributions and spans to Wavefront

diff --git a/senders/real_sender_test.go b/senders/real_sender_test.go
@@ -1,15 +1,14 @@
 package senders
 
 import (
-	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 	"net/http/httptest"
 	"net/url"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"github.com/wavefronthq/wavefront-sdk-go/histogram"
+	"github.com/wavefronthq/wavefront-sdk-go/internal/auth/csp"
 )
 
 func TestSendDirect(t *testing.T) {

diff --git a/senders/wavefront_sender_test.go b/senders/wavefront_sender_test.go
@@ -2,10 +2,11 @@ package senders
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/wavefronthq/wavefront-sdk-go/histogram"
 	"github.com/wavefronthq/wavefront-sdk-go/internal/sdkmetrics"
-	"testing"
 )
 
 func TestWavefrontSender_SendMetric(t *testing.T) {