diff --git a/meter/handler/handler.go b/meter/handler/handler.go index 4bff85fa..681a239c 100644 --- a/meter/handler/handler.go +++ b/meter/handler/handler.go @@ -24,7 +24,7 @@ func NewHandler(meter meter.Meter, opts ...meter.Option) *handler { return &handler{meter: meter, opts: opts} } -func (h *handler) Metrics(ctx context.Context, req *Empty, rsp *codec.Frame) error { +func (h *handler) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error { buf := bytes.NewBuffer(nil) if err := h.meter.Write(buf, h.opts...); err != nil { return err diff --git a/meter/handler/handler.proto b/meter/handler/handler.proto index 54e8a44b..eeee2e4b 100644 --- a/meter/handler/handler.proto +++ b/meter/handler/handler.proto @@ -8,7 +8,7 @@ import "openapiv2/annotations.proto"; import "codec/frame.proto"; service Meter { - rpc Metrics(Empty) returns (micro.codec.Frame) { + rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) { option (micro.openapiv2.openapiv2_operation) = { operation_id: "Metrics"; responses: { @@ -26,5 +26,3 @@ service Meter { option (micro.api.http) = { get: "/metrics"; }; }; }; - -message Empty{}; diff --git a/meter/handler/handler_micro.pb.go b/meter/handler/handler_micro.pb.go index 38edd8e6..a3bb9400 100644 --- a/meter/handler/handler_micro.pb.go +++ b/meter/handler/handler_micro.pb.go @@ -20,5 +20,5 @@ func NewMeterEndpoints() []*api.Endpoint { } type MeterServer interface { - Metrics(ctx context.Context, req *Empty, rsp *codec.Frame) error + Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error } diff --git a/meter/handler/handler_micro_http.pb.go b/meter/handler/handler_micro_http.pb.go index 6497b0da..a82a198a 100644 --- a/meter/handler/handler_micro_http.pb.go +++ b/meter/handler/handler_micro_http.pb.go @@ -13,13 +13,13 @@ type meterServer struct { MeterServer } -func (h *meterServer) Metrics(ctx context.Context, req *Empty, rsp *codec.Frame) error { +func (h *meterServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error { return h.MeterServer.Metrics(ctx, req, rsp) } func RegisterMeterServer(s server.Server, sh MeterServer, opts ...server.HandlerOption) error { type meter interface { - Metrics(ctx context.Context, req *Empty, rsp *codec.Frame) error + Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error } type Meter struct { meter