resolve conflict
All checks were successful
lint / lint (pull_request) Successful in 1m13s
test / test (pull_request) Successful in 2m2s

This commit is contained in:
2025-03-03 09:44:35 +03:00
parent 7ad92816ef
commit 36c52990ee
5 changed files with 12 additions and 8 deletions

10
grpc.go
View File

@@ -5,11 +5,6 @@ import (
"context"
"crypto/tls"
"fmt"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/semconv"
"go.unistack.org/micro/v4/tracer"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"net"
"reflect"
"strconv"
@@ -21,12 +16,17 @@ import (
"go.unistack.org/micro/v4/codec"
"go.unistack.org/micro/v4/errors"
"go.unistack.org/micro/v4/metadata"
"go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/selector"
"go.unistack.org/micro/v4/semconv"
"go.unistack.org/micro/v4/tracer"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/encoding"
gmetadata "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
)
const (