Bump google.golang.org/grpc from 1.52.3 to 1.53.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.52.3 to 1.53.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.52.3...v1.53.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

generate.go

@@ -1,5 +1,3 @@
 package service
 
-//go:generate protoc -I./proto -I. --go_out=paths=source_relative:./proto proto/service.proto
-//go:generate protoc -I./proto -I. --go-micro_out=components=micro,standalone=false,debug=true,paths=source_relative:./proto proto/service.proto
-//go:generate protoc -I./proto -I. --go-micro_out=components=grpc,standalone=true,debug=true,paths=source_relative:./micro proto/service.proto
+//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components=micro|rpc,standalone=true,debug=true,paths=source_relative:./micro proto/service.proto

go.mod

@@ -1,14 +1,10 @@
-module go.unistack.org/micro-config-service/v4
+module go.unistack.org/micro-config-service/v3
 
-go 1.20
+go 1.16
 
 require (
-	dario.cat/mergo v1.0.0
-	go.unistack.org/micro/v4 v4.0.17
-	google.golang.org/protobuf v1.33.0
-)
-
-require (
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/imdario/mergo v0.3.13
+	go.unistack.org/micro/v3 v3.10.11
+	google.golang.org/grpc v1.53.0
+	google.golang.org/protobuf v1.28.1
 )

micro/service_micro.pb.go

@@ -0,0 +1,32 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: service.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-config-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+)
+
+var (
+	ConfigName = "Config"
+
+	ConfigEndpoints = []api.Endpoint{}
+)
+
+func NewConfigEndpoints() []api.Endpoint {
+	return ConfigEndpoints
+}
+
+type ConfigClient interface {
+	Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error)
+	Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error)
+}
+
+type ConfigServer interface {
+	Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
+	Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
+}

micro/service_micro_grpc.pb.go

@@ -1,65 +0,0 @@
-// Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.0.2
-// source: service.proto
-
-package servicepb
-
-import (
-	context "context"
-	proto "go.unistack.org/micro-config-service/v4/proto"
-	client "go.unistack.org/micro/v4/client"
-	options "go.unistack.org/micro/v4/options"
-	server "go.unistack.org/micro/v4/server"
-)
-
-type configServiceClient struct {
-	c    client.Client
-	name string
-}
-
-func NewConfigServiceClient(name string, c client.Client) proto.ConfigServiceClient {
-	return &configServiceClient{c: c, name: name}
-}
-
-func (c *configServiceClient) Load(ctx context.Context, req *proto.LoadRequest, opts ...options.Option) (*proto.LoadResponse, error) {
-	rsp := &proto.LoadResponse{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "ConfigService.Load", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *configServiceClient) Save(ctx context.Context, req *proto.SaveRequest, opts ...options.Option) (*proto.SaveResponse, error) {
-	rsp := &proto.SaveResponse{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "ConfigService.Save", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-type configServiceServer struct {
-	proto.ConfigServiceServer
-}
-
-func (h *configServiceServer) Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error {
-	return h.ConfigServiceServer.Load(ctx, req, rsp)
-}
-
-func (h *configServiceServer) Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error {
-	return h.ConfigServiceServer.Save(ctx, req, rsp)
-}
-
-func RegisterConfigServiceServer(s server.Server, sh proto.ConfigServiceServer, opts ...options.Option) error {
-	type configService interface {
-		Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
-		Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
-	}
-	type ConfigService struct {
-		configService
-	}
-	h := &configServiceServer{sh}
-	var nopts []options.Option
-	return s.Handle(&ConfigService{h}, append(nopts, opts...)...)
-}

micro/service_micro_rpc.pb.go

@@ -0,0 +1,68 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: service.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-config-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+	server "go.unistack.org/micro/v3/server"
+)
+
+type configClient struct {
+	c    client.Client
+	name string
+}
+
+func NewConfigClient(name string, c client.Client) ConfigClient {
+	return &configClient{c: c, name: name}
+}
+
+func (c *configClient) Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error) {
+	rsp := &proto.LoadResponse{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Load", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *configClient) Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error) {
+	rsp := &proto.SaveResponse{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Save", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+type configServer struct {
+	ConfigServer
+}
+
+func (h *configServer) Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error {
+	return h.ConfigServer.Load(ctx, req, rsp)
+}
+
+func (h *configServer) Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error {
+	return h.ConfigServer.Save(ctx, req, rsp)
+}
+
+func RegisterConfigServer(s server.Server, sh ConfigServer, opts ...server.HandlerOption) error {
+	type config interface {
+		Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
+		Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
+	}
+	type Config struct {
+		config
+	}
+	h := &configServer{sh}
+	var nopts []server.HandlerOption
+	for _, endpoint := range ConfigEndpoints {
+		nopts = append(nopts, api.WithEndpoint(&endpoint))
+	}
+	return s.Handle(s.NewHandler(&Config{h}, append(nopts, opts...)...))
+}

options.go

@@ -1,20 +1,20 @@
 package service
 
 import (
-	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/config"
 )
 
 type clientKey struct{}
 
 // Client to call config service
-func Client(c client.Client) options.Option {
-	return options.ContextOption(clientKey{}, c)
+func Client(c client.Client) config.Option {
+	return config.SetOption(clientKey{}, c)
 }
 
 type serviceKey struct{}
 
 // Service to which data load
-func Service(s string) options.Option {
-	return options.ContextOption(serviceKey{}, s)
+func Service(s string) config.Option {
+	return config.SetOption(serviceKey{}, s)
 }

proto/service.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v4.23.4
+// 	protoc        v3.17.3
 // source: service.proto
 
 package servicepb
@@ -221,19 +221,19 @@ var file_service_proto_rawDesc = []byte{
 	0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x0c, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x0e, 0x0a, 0x0c, 0x53, 0x61,
-	0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x7d, 0x0a, 0x0d, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x35, 0x0a, 0x04, 0x4c,
-	0x6f, 0x61, 0x64, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f,
-	0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x35, 0x0a, 0x04, 0x53, 0x61, 0x76, 0x65, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e,
-	0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63,
-	0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x2f, 0x76, 0x34, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x76, 0x0a, 0x06, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x35, 0x0a, 0x04, 0x4c, 0x6f, 0x61, 0x64, 0x12, 0x14, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4c, 0x6f, 0x61,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x04, 0x53,
+	0x61, 0x76, 0x65, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61,
+	0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63,
+	0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -256,10 +256,10 @@ var file_service_proto_goTypes = []interface{}{
 	(*SaveResponse)(nil), // 3: service.SaveResponse
 }
 var file_service_proto_depIdxs = []int32{
-	0, // 0: service.ConfigService.Load:input_type -> service.LoadRequest
-	2, // 1: service.ConfigService.Save:input_type -> service.SaveRequest
-	1, // 2: service.ConfigService.Load:output_type -> service.LoadResponse
-	3, // 3: service.ConfigService.Save:output_type -> service.SaveResponse
+	0, // 0: service.Config.Load:input_type -> service.LoadRequest
+	2, // 1: service.Config.Save:input_type -> service.SaveRequest
+	1, // 2: service.Config.Load:output_type -> service.LoadResponse
+	3, // 3: service.Config.Save:output_type -> service.SaveResponse
 	2, // [2:4] is the sub-list for method output_type
 	0, // [0:2] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name

proto/service.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 
 package service;
-option go_package="go.unistack.org/micro-config-service/v4/proto;servicepb";
+option go_package="go.unistack.org/micro-config-service/v3/proto;servicepb";
 
-service ConfigService {
+service Config {
 	rpc Load(LoadRequest) returns (LoadResponse) {};
 	rpc Save(SaveRequest) returns (SaveResponse) {};
 }

proto/service_grpc.pb.go

@@ -0,0 +1,137 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+
+package servicepb
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+// ConfigClient is the client API for Config service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type ConfigClient interface {
+	Load(ctx context.Context, in *LoadRequest, opts ...grpc.CallOption) (*LoadResponse, error)
+	Save(ctx context.Context, in *SaveRequest, opts ...grpc.CallOption) (*SaveResponse, error)
+}
+
+type configClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewConfigClient(cc grpc.ClientConnInterface) ConfigClient {
+	return &configClient{cc}
+}
+
+func (c *configClient) Load(ctx context.Context, in *LoadRequest, opts ...grpc.CallOption) (*LoadResponse, error) {
+	out := new(LoadResponse)
+	err := c.cc.Invoke(ctx, "/service.Config/Load", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *configClient) Save(ctx context.Context, in *SaveRequest, opts ...grpc.CallOption) (*SaveResponse, error) {
+	out := new(SaveResponse)
+	err := c.cc.Invoke(ctx, "/service.Config/Save", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// ConfigServer is the server API for Config service.
+// All implementations must embed UnimplementedConfigServer
+// for forward compatibility
+type ConfigServer interface {
+	Load(context.Context, *LoadRequest) (*LoadResponse, error)
+	Save(context.Context, *SaveRequest) (*SaveResponse, error)
+	mustEmbedUnimplementedConfigServer()
+}
+
+// UnimplementedConfigServer must be embedded to have forward compatible implementations.
+type UnimplementedConfigServer struct {
+}
+
+func (UnimplementedConfigServer) Load(context.Context, *LoadRequest) (*LoadResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Load not implemented")
+}
+func (UnimplementedConfigServer) Save(context.Context, *SaveRequest) (*SaveResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Save not implemented")
+}
+func (UnimplementedConfigServer) mustEmbedUnimplementedConfigServer() {}
+
+// UnsafeConfigServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to ConfigServer will
+// result in compilation errors.
+type UnsafeConfigServer interface {
+	mustEmbedUnimplementedConfigServer()
+}
+
+func RegisterConfigServer(s grpc.ServiceRegistrar, srv ConfigServer) {
+	s.RegisterService(&Config_ServiceDesc, srv)
+}
+
+func _Config_Load_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LoadRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ConfigServer).Load(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/service.Config/Load",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ConfigServer).Load(ctx, req.(*LoadRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Config_Save_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SaveRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ConfigServer).Save(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/service.Config/Save",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ConfigServer).Save(ctx, req.(*SaveRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Config_ServiceDesc is the grpc.ServiceDesc for Config service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Config_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "service.Config",
+	HandlerType: (*ConfigServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Load",
+			Handler:    _Config_Load_Handler,
+		},
+		{
+			MethodName: "Save",
+			Handler:    _Config_Save_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "service.proto",
+}

proto/service_micro.pb.go

@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-micro v4.0.2
-// - protoc              v4.23.4
-// source: service.proto
-
-package servicepb
-
-import (
-	context "context"
-	_ "go.unistack.org/micro/v4/client"
-	options "go.unistack.org/micro/v4/options"
-)
-
-var (
-	ConfigServiceName = "ConfigService"
-)
-
-type ConfigServiceClient interface {
-	Load(ctx context.Context, req *LoadRequest, opts ...options.Option) (*LoadResponse, error)
-	Save(ctx context.Context, req *SaveRequest, opts ...options.Option) (*SaveResponse, error)
-}
-
-type ConfigServiceServer interface {
-	Load(ctx context.Context, req *LoadRequest, rsp *LoadResponse) error
-	Save(ctx context.Context, req *SaveRequest, rsp *SaveResponse) error
-}

service.go

@@ -1,16 +1,15 @@
-package service // import "go.unistack.org/micro-config-service/v4"
+package service // import "go.unistack.org/micro-config-service/v3"
 
 import (
 	"context"
 	"fmt"
 
-	"dario.cat/mergo"
-	pbmicro "go.unistack.org/micro-config-service/v4/micro"
-	pb "go.unistack.org/micro-config-service/v4/proto"
-	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	"github.com/imdario/mergo"
+	pbmicro "go.unistack.org/micro-config-service/v3/micro"
+	pb "go.unistack.org/micro-config-service/v3/proto"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/config"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 var _ config.Config = &serviceConfig{}
@@ -20,18 +19,14 @@ var DefaultStructTag = "service"
 type serviceConfig struct {
 	opts    config.Options
 	service string
-	client  pb.ConfigServiceClient
+	client  pbmicro.ConfigClient
 }
 
 func (c *serviceConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *serviceConfig) Init(opts ...options.Option) error {
-	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
+func (c *serviceConfig) Init(opts ...config.Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -48,55 +43,39 @@ func (c *serviceConfig) Init(opts ...options.Option) error {
 
 	if cli == nil {
 		err := fmt.Errorf("missing client option")
+		c.opts.Logger.Error(c.opts.Context, err)
 		if !c.opts.AllowFail {
 			return err
 		}
-
-		if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-
 		return nil
 	}
 
 	if c.service == "" {
 		err := fmt.Errorf("missing Service option")
+		c.opts.Logger.Error(c.opts.Context, err)
 		if !c.opts.AllowFail {
 			return err
 		}
-
-		if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-
 		return nil
 	}
 
-	c.client = pbmicro.NewConfigServiceClient(c.service, cli)
-
-	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
+	c.client = pbmicro.NewConfigClient(c.service, cli)
 
 	return nil
 }
 
-func (c *serviceConfig) Load(ctx context.Context, opts ...options.Option) error {
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+func (c *serviceConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
 		return err
 	}
 
 	rsp, err := c.client.Load(ctx, &pb.LoadRequest{Service: c.service})
 	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service load error: %v", err)
 		if !c.opts.AllowFail {
 			return fmt.Errorf("failed to load config: %w", err)
 		}
-
-		if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-
-		return nil
+		return config.DefaultAfterLoad(ctx, c)
 	}
 
 	options := config.NewLoadOptions(opts...)
@@ -108,51 +87,45 @@ func (c *serviceConfig) Load(ctx context.Context, opts ...options.Option) error
 		mopts = append(mopts, mergo.WithAppendSlice)
 	}
 
-	dst := c.opts.Struct
-	if options.Struct != nil {
-		dst = options.Struct
-	}
-
-	src, err := rutil.Zero(dst)
+	src, err := rutil.Zero(c.opts.Struct)
 	if err == nil {
 		err = c.opts.Codec.Unmarshal(rsp.Config, src)
 		if err == nil {
-			err = mergo.Merge(dst, src, mopts...)
+			err = mergo.Merge(c.opts.Struct, src, mopts...)
 		}
 	}
 
-	if err != nil && !c.opts.AllowFail {
-		return fmt.Errorf("failed to load config: %w", err)
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service load error: %v", err)
+		if !c.opts.AllowFail {
+			return fmt.Errorf("failed to load config: %w", err)
+		}
 	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := config.DefaultAfterLoad(ctx, c); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (c *serviceConfig) Save(ctx context.Context, opts ...options.Option) error {
-	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
+func (c *serviceConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+	if err := config.DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}
 
-	options := config.NewSaveOptions(opts...)
-
-	dst := c.opts.Struct
-	if options.Struct != nil {
-		dst = options.Struct
-	}
-
-	buf, err := c.opts.Codec.Marshal(dst)
+	buf, err := c.opts.Codec.Marshal(c.opts.Struct)
 	if err == nil {
 		_, err = c.client.Save(ctx, &pb.SaveRequest{Service: c.service, Config: buf})
 	}
-	if err != nil && !c.opts.AllowFail {
-		return fmt.Errorf("failed to save config: %w", err)
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service save error: %v", err)
+		if !c.opts.AllowFail {
+			return fmt.Errorf("failed to save config: %w", err)
+		}
 	}
 
-	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := config.DefaultAfterSave(ctx, c); err != nil {
 		return err
 	}
 
@@ -167,11 +140,11 @@ func (c *serviceConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *serviceConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+func (c *serviceConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
 	return nil, fmt.Errorf("not implemented")
 }
 
-func NewConfig(opts ...options.Option) *serviceConfig {
+func NewConfig(opts ...config.Option) *serviceConfig {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag