[chore] adopt GCI to manage imports

.github/workflows/build-and-test.yml

@@ -178,6 +178,10 @@ jobs:
  git diff --exit-code ':!*go.sum' || (echo 'Generated code is out of date, please run "make generate" and commit the changes in this PR.' && exit 1)
  - name: Impi
  run: make -j2 goimpi
+ - name: GCI
+ run: |
+ make -j2 gogci
+ git diff --exit-code || (echo 'Imports are not formatted properly, please run "make gogci" and commit the changes in this PR' && exit 1)
  - name: MultimodVerify
  run: make multimod-verify
  - name: Components dropdown in issue templates

Makefile

@@ -108,6 +108,10 @@ golint:
 goimpi: install-tools
  @$(MAKE) $(FOR_GROUP_TARGET) TARGET="impi"
 
+.PHONY: gogci
+gogci: install-tools
+ @$(MAKE) $(FOR_GROUP_TARGET) TARGET="gci"
+
 .PHONY: goporto
 goporto: install-tools
  porto -w --include-internal --skip-dirs "^cmd$$" ./
@@ -218,6 +222,7 @@ install-tools:
  cd $(TOOLS_MOD_DIR) && $(GOCMD) install go.opentelemetry.io/build-tools/multimod
  cd $(TOOLS_MOD_DIR) && $(GOCMD) install github.com/jcchavezs/porto/cmd/porto
  cd $(TOOLS_MOD_DIR) && $(GOCMD) install go.opentelemetry.io/build-tools/crosslink
+ cd $(TOOLS_MOD_DIR) && $(GOCMD) install github.com/daixiang0/gci
 
 .PHONY: run
 run:

Makefile.Common

@@ -28,6 +28,7 @@ MISSPELL=misspell -error
 MISSPELL_CORRECTION=misspell -w
 LINT=golangci-lint
 IMPI=impi
+GCI=gci
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release
 RUNNING_ON_GITHUB_ACTION=$(GITHUB_ACTIONS)
@@ -131,6 +132,7 @@ checklinks:
 fmt:
  gofmt -w -s ./
  goimports -w -local github.com/open-telemetry/opentelemetry-collector-contrib ./
+ @$(GCI) write ./ -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)"
 
 .PHONY: lint
 lint: checklicense misspell
@@ -154,6 +156,10 @@ misspell-correction:
 impi:
  @$(IMPI) --local github.com/open-telemetry/opentelemetry-collector-contrib --scheme stdThirdPartyLocal ./...
 
+.PHONY: gci
+gci:
+ @$(GCI) write ./ -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)"
+
 .PHONY: moddownload
 moddownload:
  $(GOCMD) mod download

exporter/azuremonitorexporter/time_utils.go

@@ -15,6 +15,7 @@
 package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"
 
 // Contains code common to both trace and metrics exporters
+
 import (
  "fmt"
  "time"

exporter/azuremonitorexporter/trace_to_envelope.go

@@ -15,6 +15,7 @@
 package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"
 
 // Contains code common to both trace and metrics exporters
+
 import (
  "errors"
  "net/url"

extension/storage/dbstorage/config_test.go

@@ -17,6 +17,7 @@
 // +build !windows
 
 package dbstorage // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage"
+
 import (
  "errors"
  "testing"

internal/coreinternal/attraction/hasher.go

@@ -15,8 +15,7 @@
 package attraction // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction"
 
 import (
- // #nosec
- "crypto/sha1"
+ "crypto/sha1" // #nosec
  "encoding/binary"
  "encoding/hex"
  "math"

internal/tools/go.mod

@@ -4,6 +4,7 @@ go 1.18
 
 require (
  github.com/client9/misspell v0.3.4
+ github.com/daixiang0/gci v0.9.0
  github.com/golangci/golangci-lint v1.50.1
  github.com/google/addlicense v1.1.0
  github.com/jcchavezs/porto v0.4.0
@@ -49,7 +50,6 @@ require (
  github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
  github.com/cloudflare/circl v1.1.0 // indirect
  github.com/curioswitch/go-reassign v0.2.0 // indirect
- github.com/daixiang0/gci v0.8.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/denis-tingaikin/go-header v0.4.3 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect

internal/tools/tools.go

@@ -24,6 +24,7 @@ package tools // import "github.com/open-telemetry/opentelemetry-collector-contr
 
 import (
  _ "github.com/client9/misspell/cmd/misspell"
+ _ "github.com/daixiang0/gci"
  _ "github.com/golangci/golangci-lint/cmd/golangci-lint"
  _ "github.com/google/addlicense"
  _ "github.com/jcchavezs/porto/cmd/porto"

pkg/ottl/contexts/ottlresource/resource.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package ottlresource // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlresource"
+
 import (
  "fmt"
 

pkg/ottl/grammar.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package ottl // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
+
 import (
  "encoding/hex"
  "fmt"

pkg/stanza/adapter/register.go

@@ -15,7 +15,6 @@
 package adapter // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter"
 
 import (
- // Register parsers and transformers for stanza-based log receivers
  _ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/output/file"
  _ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/output/stdout"
  _ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/operator/parser/csv"

processor/transformprocessor/internal/common/config.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package common // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor/internal/common"
+
 import (
  "fmt"
  "strings"

receiver/awsfirehosereceiver/internal/unmarshaler/cwmetricstream/metricsbuilder.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package cwmetricstream // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/unmarshaler/cwmetricstream"
+
 import (
  "fmt"
  "strings"

receiver/azureeventhubreceiver/config.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
+
 import (
  "errors"
  "fmt"

receiver/azureeventhubreceiver/persister.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
+
 import (
  "context"
  "fmt"

receiver/azureeventhubreceiver/persister_test.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package azureeventhubreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver"
+
 import (
  "context"
  "errors"

receiver/nsxtreceiver/client.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package nsxtreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver"
+
 import (
  "context"
  "encoding/json"

receiver/nsxtreceiver/client_mock_test.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package nsxtreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver"
+
 import (
  context "context"
  testing "testing"

receiver/nsxtreceiver/client_test.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package nsxtreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver"
+
 import (
  "context"
  "fmt"

receiver/nsxtreceiver/config.go

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package nsxtreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver"
+
 import (
  "errors"
  "fmt"

receiver/purefareceiver/factory.go

@@ -15,6 +15,7 @@
 package purefareceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver"
 
 // This file implements Factory for Array scraper.
+
 import (
  "context"
  "fmt"