Remove redundant alias (#530)

0xPoe · web-flow · commit 404cec35e61f · 2023-02-21T15:48:47.000+01:00
diff --git a/pkg/agent/api.go b/pkg/agent/api.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/bufbuild/connect-go"
 	"github.com/pkg/errors"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
-	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	"google.golang.org/protobuf/types/known/durationpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 
 	agentv1 "github.com/grafana/phlare/api/gen/proto/go/agent/v1"
 	"github.com/grafana/phlare/api/gen/proto/go/agent/v1/agentv1connect"
diff --git a/pkg/objstore/client/factory_test.go b/pkg/objstore/client/factory_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/grafana/dskit/flagext"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/phlare/pkg/objstore/providers/filesystem"
 )
diff --git a/pkg/objstore/providers/azure/bucket_client.go b/pkg/objstore/providers/azure/bucket_client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/thanos-io/objstore"
 	"github.com/thanos-io/objstore/providers/azure"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 )
 
 func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucket, error) {
diff --git a/pkg/objstore/providers/gcs/bucket_client.go b/pkg/objstore/providers/gcs/bucket_client.go
@@ -11,7 +11,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/thanos-io/objstore"
 	"github.com/thanos-io/objstore/providers/gcs"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 )
 
 // NewBucketClient creates a new GCS bucket client
diff --git a/pkg/objstore/providers/swift/bucket_client.go b/pkg/objstore/providers/swift/bucket_client.go
@@ -10,7 +10,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/thanos-io/objstore"
 	"github.com/thanos-io/objstore/providers/swift"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 )
 
 // NewBucketClient creates a new Swift bucket client
diff --git a/pkg/phlare/modules.go b/pkg/phlare/modules.go
@@ -29,14 +29,14 @@ import (
 
 	agentv1 "github.com/grafana/phlare/api/gen/proto/go/agent/v1"
 	"github.com/grafana/phlare/api/gen/proto/go/agent/v1/agentv1connect"
-	ingesterv1connect "github.com/grafana/phlare/api/gen/proto/go/ingester/v1/ingesterv1connect"
+	"github.com/grafana/phlare/api/gen/proto/go/ingester/v1/ingesterv1connect"
 	"github.com/grafana/phlare/api/gen/proto/go/push/v1/pushv1connect"
 	"github.com/grafana/phlare/api/gen/proto/go/querier/v1/querierv1connect"
 	statusv1 "github.com/grafana/phlare/api/gen/proto/go/status/v1"
 	"github.com/grafana/phlare/api/openapiv2"
 	"github.com/grafana/phlare/pkg/agent"
 	"github.com/grafana/phlare/pkg/distributor"
-	frontend "github.com/grafana/phlare/pkg/frontend"
+	"github.com/grafana/phlare/pkg/frontend"
 	"github.com/grafana/phlare/pkg/frontend/frontendpb/frontendpbconnect"
 	"github.com/grafana/phlare/pkg/ingester"
 	objstoreclient "github.com/grafana/phlare/pkg/objstore/client"
diff --git a/pkg/phlare/phlare.go b/pkg/phlare/phlare.go
@@ -30,11 +30,11 @@ import (
 	"github.com/weaveworks/common/signals"
 	wwtracing "github.com/weaveworks/common/tracing"
 
-	pushv1connect "github.com/grafana/phlare/api/gen/proto/go/push/v1/pushv1connect"
+	"github.com/grafana/phlare/api/gen/proto/go/push/v1/pushv1connect"
 	"github.com/grafana/phlare/pkg/agent"
 	"github.com/grafana/phlare/pkg/cfg"
 	"github.com/grafana/phlare/pkg/distributor"
-	frontend "github.com/grafana/phlare/pkg/frontend"
+	"github.com/grafana/phlare/pkg/frontend"
 	"github.com/grafana/phlare/pkg/ingester"
 	"github.com/grafana/phlare/pkg/objstore"
 	objstoreclient "github.com/grafana/phlare/pkg/objstore/client"
diff --git a/pkg/phlaredb/block_querier.go b/pkg/phlaredb/block_querier.go
@@ -37,7 +37,7 @@ import (
 	phlareobjstore "github.com/grafana/phlare/pkg/objstore"
 	phlarecontext "github.com/grafana/phlare/pkg/phlare/context"
 	"github.com/grafana/phlare/pkg/phlaredb/block"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 	schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"
 	"github.com/grafana/phlare/pkg/phlaredb/tsdb/index"
 )
diff --git a/pkg/phlaredb/head_queriers.go b/pkg/phlaredb/head_queriers.go
@@ -14,7 +14,7 @@ import (
 	ingestv1 "github.com/grafana/phlare/api/gen/proto/go/ingester/v1"
 	typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"
 	"github.com/grafana/phlare/pkg/iter"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 	schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"
 )
 
diff --git a/pkg/phlaredb/metrics.go b/pkg/phlaredb/metrics.go
@@ -7,7 +7,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	phlarecontext "github.com/grafana/phlare/pkg/phlare/context"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 )
 
 type contextKey uint8
diff --git a/pkg/phlaredb/profile_store.go b/pkg/phlaredb/profile_store.go
@@ -20,7 +20,7 @@ import (
 	phlaremodel "github.com/grafana/phlare/pkg/model"
 	phlarecontext "github.com/grafana/phlare/pkg/phlare/context"
 	"github.com/grafana/phlare/pkg/phlaredb/block"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 	schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"
 	"github.com/grafana/phlare/pkg/util/build"
 )
diff --git a/pkg/phlaredb/profiles.go b/pkg/phlaredb/profiles.go
@@ -20,7 +20,7 @@ import (
 	ingestv1 "github.com/grafana/phlare/api/gen/proto/go/ingester/v1"
 	"github.com/grafana/phlare/pkg/iter"
 	phlaremodel "github.com/grafana/phlare/pkg/model"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 	schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"
 	"github.com/grafana/phlare/pkg/phlaredb/tsdb"
 	"github.com/grafana/phlare/pkg/phlaredb/tsdb/index"
diff --git a/pkg/phlaredb/sample_merge.go b/pkg/phlaredb/sample_merge.go
@@ -16,7 +16,7 @@ import (
 	typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"
 	"github.com/grafana/phlare/pkg/iter"
 	phlaremodel "github.com/grafana/phlare/pkg/model"
-	query "github.com/grafana/phlare/pkg/phlaredb/query"
+	"github.com/grafana/phlare/pkg/phlaredb/query"
 )
 
 func (b *singleBlockQuerier) MergeByStacktraces(ctx context.Context, rows iter.Iterator[Profile]) (*ingestv1.MergeProfilesStacktracesResult, error) {
diff --git a/pkg/util/httpgrpc/httpgrpc.go b/pkg/util/httpgrpc/httpgrpc.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
 )

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/grafana/dskit/flagext"`
`18`	`18`	`"github.com/stretchr/testify/assert"`
`19`	`19`	`"github.com/stretchr/testify/require"`
`20`		`- yaml "gopkg.in/yaml.v3"`
	`20`	`+ "gopkg.in/yaml.v3"`
`21`	`21`
`22`	`22`	`"github.com/grafana/phlare/pkg/objstore/providers/filesystem"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/go-kit/log"`
`10`	`10`	`"github.com/thanos-io/objstore"`
`11`	`11`	`"github.com/thanos-io/objstore/providers/azure"`
`12`		`- yaml "gopkg.in/yaml.v3"`
	`12`	`+ "gopkg.in/yaml.v3"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucket, error) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/go-kit/log"`
`12`	`12`	`"github.com/thanos-io/objstore"`
`13`	`13`	`"github.com/thanos-io/objstore/providers/gcs"`
`14`		`- yaml "gopkg.in/yaml.v3"`
	`14`	`+ "gopkg.in/yaml.v3"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// NewBucketClient creates a new GCS bucket client`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/prometheus/common/model"`
`11`	`11`	`"github.com/thanos-io/objstore"`
`12`	`12`	`"github.com/thanos-io/objstore/providers/swift"`
`13`		`- yaml "gopkg.in/yaml.v3"`
	`13`	`+ "gopkg.in/yaml.v3"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// NewBucketClient creates a new Swift bucket client`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import (`
`37`	`37`	`phlareobjstore "github.com/grafana/phlare/pkg/objstore"`
`38`	`38`	`phlarecontext "github.com/grafana/phlare/pkg/phlare/context"`
`39`	`39`	`"github.com/grafana/phlare/pkg/phlaredb/block"`
`40`		`- query "github.com/grafana/phlare/pkg/phlaredb/query"`
	`40`	`+ "github.com/grafana/phlare/pkg/phlaredb/query"`
`41`	`41`	`schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"`
`42`	`42`	`"github.com/grafana/phlare/pkg/phlaredb/tsdb/index"`
`43`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`ingestv1 "github.com/grafana/phlare/api/gen/proto/go/ingester/v1"`
`15`	`15`	`typesv1 "github.com/grafana/phlare/api/gen/proto/go/types/v1"`
`16`	`16`	`"github.com/grafana/phlare/pkg/iter"`
`17`		`- query "github.com/grafana/phlare/pkg/phlaredb/query"`
	`17`	`+ "github.com/grafana/phlare/pkg/phlaredb/query"`
`18`	`18`	`schemav1 "github.com/grafana/phlare/pkg/phlaredb/schemas/v1"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/prometheus/client_golang/prometheus/promauto"`
`8`	`8`
`9`	`9`	`phlarecontext "github.com/grafana/phlare/pkg/phlare/context"`
`10`		`- query "github.com/grafana/phlare/pkg/phlaredb/query"`
	`10`	`+ "github.com/grafana/phlare/pkg/phlaredb/query"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type contextKey uint8`