fix service names in proto

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2023-02-21 13:18:03 +03:00
parent b9dbfb1cfc
commit 09cb998ba4
10 changed files with 40 additions and 39 deletions

View File

@@ -10,7 +10,7 @@ import (
)
// guard to fail early
var _ MeterServer = &Handler{}
var _ MeterServiceServer = &Handler{}
type Handler struct {
opts Options

View File

@@ -7,7 +7,7 @@ import "api/annotations.proto";
import "openapiv3/annotations.proto";
import "codec/frame.proto";
service Meter {
service MeterService {
rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) {
option (micro.openapiv3.openapiv3_operation) = {
operation_id: "Metrics";

View File

@@ -13,10 +13,10 @@ import (
)
var (
MeterName = "Meter"
MeterServiceName = "MeterService"
)
var (
MeterServerEndpoints = map[string]map[string]string{
MeterServiceServerEndpoints = map[string]map[string]string{
"/metrics": map[string]string{
"Method": http.MethodGet,
"Stream": "false",
@@ -24,6 +24,6 @@ var (
}
)
type MeterServer interface {
type MeterServiceServer interface {
Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
}

View File

@@ -11,22 +11,22 @@ import (
server "go.unistack.org/micro/v3/server"
)
type meterServer struct {
MeterServer
type meterServiceServer struct {
MeterServiceServer
}
func (h *meterServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.MeterServer.Metrics(ctx, req, rsp)
func (h *meterServiceServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
return h.MeterServiceServer.Metrics(ctx, req, rsp)
}
func RegisterMeterServer(s server.Server, sh MeterServer, opts ...server.HandlerOption) error {
type meter interface {
func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...server.HandlerOption) error {
type meterService interface {
}
type Meter struct {
meter
type MeterService struct {
meterService
}
h := &meterServer{sh}
h := &meterServiceServer{sh}
var nopts []server.HandlerOption
nopts = append(nopts, v3.HandlerMetadata(MeterServerEndpoints))
return s.Handle(s.NewHandler(&Meter{h}, append(nopts, opts...)...))
nopts = append(nopts, v3.HandlerMetadata(MeterServiceServerEndpoints))
return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
}