chore: fixes vanity import.

elastic · May 21, 2021 · 7f1cc95 · 7f1cc95
1 parent d72ef83
commit 7f1cc95
Show file tree

Hide file tree

Showing 165 changed files with 169 additions and 164 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ GO_LICENSER_EXCLUDE=stacktrace/testdata
 check: precheck check-modules test
 
 .PHONY: precheck
-precheck: check-goimports check-lint check-vet check-dockerfile-testing check-licenses
+precheck: check-goimports check-lint check-vanity-import check-vet check-dockerfile-testing check-licenses
 
 .PHONY: check-goimports
 .PHONY: check-dockerfile-testing
@@ -79,3 +79,7 @@ endif
 .PHONY: update-licenses
 update-licenses:
 	go-licenser $(patsubst %, -exclude %, $(GO_LICENSER_EXCLUDE)) .
+
+.PHONY: check-vanity-import
+check-vanity-import:
+	@if [[ $(porto -l . | wc -c) -ne 0 ]]; then echo "Vanity imports are not up to date" ; exit 1 ; fi
diff --git a/apmconfig/doc.go b/apmconfig/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmconfig provides an API for watching agent config
 // changes.
-package apmconfig
+package apmconfig // import "go.elastic.co/apm/apmconfig"
diff --git a/apmconfig/watcher.go b/apmconfig/watcher.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmconfig
+package apmconfig // import "go.elastic.co/apm/apmconfig"
 
 import (
 	"context"

diff --git a/apmtest/configwatcher.go b/apmtest/configwatcher.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"

diff --git a/apmtest/discard.go b/apmtest/discard.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"log"

diff --git a/apmtest/env.go b/apmtest/env.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import "os"
 

diff --git a/apmtest/httpsuite.go b/apmtest/httpsuite.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"net/http"

diff --git a/apmtest/recorder.go b/apmtest/recorder.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"

diff --git a/apmtest/recordlogger.go b/apmtest/recordlogger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import "fmt"
 

diff --git a/apmtest/testlogger.go b/apmtest/testlogger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 // TestLogger is an implementation of apm.Logger,
 // logging to a testing.T.

diff --git a/apmtest/withtransaction.go b/apmtest/withtransaction.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmtest
+package apmtest // import "go.elastic.co/apm/apmtest"
 
 import (
 	"context"

diff --git a/breakdown.go b/breakdown.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"fmt"

diff --git a/builtin_metrics.go b/builtin_metrics.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"

diff --git a/capturebody.go b/capturebody.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"

diff --git a/config.go b/config.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"os"

diff --git a/context.go b/context.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"fmt"

diff --git a/error.go b/error.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"crypto/rand"

diff --git a/error_unix.go b/error_unix.go
@@ -17,7 +17,7 @@
 
 // +build !windows
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"syscall"

diff --git a/error_windows.go b/error_windows.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"syscall"

diff --git a/fmt.go b/fmt.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"

diff --git a/fnv.go b/fnv.go
@@ -21,7 +21,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 const (
 	offset64 = 14695981039346656037

diff --git a/gocontext.go b/gocontext.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"

diff --git a/gofuzz.go b/gofuzz.go
@@ -17,7 +17,7 @@
 
 // +build gofuzz
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"bytes"

diff --git a/logger.go b/logger.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 // Logger is an interface for logging, used by the tracer
 // to log tracer errors and other interesting events.

diff --git a/metrics.go b/metrics.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"context"

diff --git a/model/doc.go b/model/doc.go
@@ -18,4 +18,4 @@
 // Package model provides the Elastic APM model types.
 //
 // https://www.elastic.co/guide/en/apm/server/current/intake-api.html
-package model
+package model // import "go.elastic.co/apm/model"
diff --git a/model/gofuzz.go b/model/gofuzz.go
@@ -17,7 +17,7 @@
 
 // +build gofuzz
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"bytes"

diff --git a/model/maps.go b/model/maps.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 // StringMap is a slice-representation of map[string]string,
 // optimized for fast JSON encoding.

diff --git a/model/marshal.go b/model/marshal.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"encoding/hex"

diff --git a/model/model.go b/model/model.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package model
+package model // import "go.elastic.co/apm/model"
 
 import (
 	"net/http"

diff --git a/modelwriter.go b/modelwriter.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apm
+package apm // import "go.elastic.co/apm"
 
 import (
 	"go.elastic.co/apm/internal/ringbuffer"

diff --git a/module/apmbeego/doc.go b/module/apmbeego/doc.go
@@ -16,4 +16,4 @@
 // under the License.
 
 // Package apmbeego provides tracing and error-reporting middleware for Beego applications.
-package apmbeego
+package apmbeego // import "go.elastic.co/apm/module/apmbeego"
diff --git a/module/apmbeego/filter.go b/module/apmbeego/filter.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmbeego
+package apmbeego // import "go.elastic.co/apm/module/apmbeego"
 
 import (
 	"context"

diff --git a/module/apmchi/doc.go b/module/apmchi/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmchi provides middleware for the Chi router,
 // for tracing HTTP requests.
-package apmchi
+package apmchi // import "go.elastic.co/apm/module/apmchi"
diff --git a/module/apmchi/middleware.go b/module/apmchi/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmchi
+package apmchi // import "go.elastic.co/apm/module/apmchi"
 
 import (
 	"net/http"

diff --git a/module/apmecho/doc.go b/module/apmecho/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmecho provides middleware for the Echo framework,
 // for tracing HTTP requests.
-package apmecho
+package apmecho // import "go.elastic.co/apm/module/apmecho"
diff --git a/module/apmecho/middleware.go b/module/apmecho/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmecho
+package apmecho // import "go.elastic.co/apm/module/apmecho"
 
 import (
 	"errors"

diff --git a/module/apmechov4/doc.go b/module/apmechov4/doc.go
@@ -19,4 +19,4 @@
 
 // Package apmechov4 provides middleware for the version 4 of Echo framework,
 // for tracing HTTP requests.
-package apmechov4
+package apmechov4 // import "go.elastic.co/apm/module/apmechov4"
diff --git a/module/apmechov4/middleware.go b/module/apmechov4/middleware.go
@@ -17,7 +17,7 @@
 
 // +build go1.9
 
-package apmechov4
+package apmechov4 // import "go.elastic.co/apm/module/apmechov4"
 
 import (
 	"errors"

diff --git a/module/apmelasticsearch/client.go b/module/apmelasticsearch/client.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"bytes"

diff --git a/module/apmelasticsearch/doc.go b/module/apmelasticsearch/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmelasticsearch provides support for tracing the
 // HTTP transport layer of Elasticsearch clients.
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
diff --git a/module/apmelasticsearch/requestname.go b/module/apmelasticsearch/requestname.go
@@ -17,7 +17,7 @@
 
 // +build go1.10
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"net/http"

diff --git a/module/apmelasticsearch/requestname_go19.go b/module/apmelasticsearch/requestname_go19.go
@@ -17,7 +17,7 @@
 
 // +build !go1.10
 
-package apmelasticsearch
+package apmelasticsearch // import "go.elastic.co/apm/module/apmelasticsearch"
 
 import (
 	"fmt"

diff --git a/module/apmgin/doc.go b/module/apmgin/doc.go
@@ -17,4 +17,4 @@
 
 // Package apmgin provides middleware for the Gin framework,
 // for tracing HTTP requests.
-package apmgin
+package apmgin // import "go.elastic.co/apm/module/apmgin"
diff --git a/module/apmgin/middleware.go b/module/apmgin/middleware.go
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package apmgin
+package apmgin // import "go.elastic.co/apm/module/apmgin"
 
 import (
 	"net/http"

diff --git a/module/apmgocql/doc.go b/module/apmgocql/doc.go
@@ -18,4 +18,4 @@
 // +build go1.9
 
 // Package apmgocql provides an observer for tracing gocql (Cassandra) query spans.
-package apmgocql
+package apmgocql // import "go.elastic.co/apm/module/apmgocql"