fix lint

go-kratos · Oct 22, 2024 · b63ff1a · b63ff1a
1 parent ec91876
commit b63ff1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/middleware/logging/logging.go b/middleware/logging/logging.go
@@ -3,14 +3,15 @@ package logging
 import (
 	"context"
 	"fmt"
-	httpstatus "github.com/go-kratos/kratos/v2/transport/http/status"
-	"google.golang.org/grpc/codes"
 	"time"
 
+	"google.golang.org/grpc/codes"
+
 	"github.com/go-kratos/kratos/v2/errors"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/go-kratos/kratos/v2/middleware"
 	"github.com/go-kratos/kratos/v2/transport"
+	"github.com/go-kratos/kratos/v2/transport/http/status"
 )
 
 // Redacter defines how to log an object
@@ -30,7 +31,7 @@ func Server(logger log.Logger) middleware.Middleware {
 			)
 
 			// default code
-			code = int32(httpstatus.FromGRPCCode(codes.OK))
+			code = int32(status.FromGRPCCode(codes.OK))
 
 			startTime := time.Now()
 			if info, ok := transport.FromServerContext(ctx); ok {
@@ -70,7 +71,7 @@ func Client(logger log.Logger) middleware.Middleware {
 			)
 
 			// default code
-			code = int32(httpstatus.FromGRPCCode(codes.OK))
+			code = int32(status.FromGRPCCode(codes.OK))
 
 			startTime := time.Now()
 			if info, ok := transport.FromClientContext(ctx); ok {

diff --git a/middleware/metrics/metrics.go b/middleware/metrics/metrics.go
@@ -2,17 +2,17 @@ package metrics
 
 import (
 	"context"
-	httpstatus "github.com/go-kratos/kratos/v2/transport/http/status"
-	"google.golang.org/grpc/codes"
 	"time"
 
-	"github.com/go-kratos/kratos/v2/errors"
-	"github.com/go-kratos/kratos/v2/middleware"
-	"github.com/go-kratos/kratos/v2/transport"
-
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 	metricsdk "go.opentelemetry.io/otel/sdk/metric"
+	"google.golang.org/grpc/codes"
+
+	"github.com/go-kratos/kratos/v2/errors"
+	"github.com/go-kratos/kratos/v2/middleware"
+	"github.com/go-kratos/kratos/v2/transport"
+	"github.com/go-kratos/kratos/v2/transport/http/status"
 )
 
 const (
@@ -119,7 +119,7 @@ func Server(opts ...Option) middleware.Middleware {
 			)
 
 			// default code
-			code = httpstatus.FromGRPCCode(codes.OK)
+			code = status.FromGRPCCode(codes.OK)
 
 			startTime := time.Now()
 			if info, ok := transport.FromServerContext(ctx); ok {
@@ -172,7 +172,7 @@ func Client(opts ...Option) middleware.Middleware {
 			)
 
 			// default code
-			code = httpstatus.FromGRPCCode(codes.OK)
+			code = status.FromGRPCCode(codes.OK)
 
 			startTime := time.Now()
 			if info, ok := transport.FromClientContext(ctx); ok {