diff --git a/debug/service/handler/debug.go b/debug/service/handler/debug.go index 757db1cc..ee24b27a 100644 --- a/debug/service/handler/debug.go +++ b/debug/service/handler/debug.go @@ -47,7 +47,7 @@ func (d *Debug) Stats(ctx context.Context, req *proto.StatsRequest, rsp *proto.S return nil } -func (d *Debug) Logs(ctx context.Context, stream server.Stream) error { +func (d *Debug) Log(ctx context.Context, stream server.Stream) error { req := new(proto.LogRequest) if err := stream.Recv(req); err != nil { return err diff --git a/debug/service/proto/debug.pb.go b/debug/service/proto/debug.pb.go index 7d4dfd42..f76bbba3 100644 --- a/debug/service/proto/debug.pb.go +++ b/debug/service/proto/debug.pb.go @@ -371,28 +371,28 @@ func init() { var fileDescriptor_dea322649cde1ef2 = []byte{ // 399 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xc1, 0x6e, 0xd4, 0x30, - 0x10, 0xdd, 0x6c, 0x36, 0x69, 0x77, 0xca, 0x2e, 0xc8, 0x2a, 0xc8, 0x8a, 0x38, 0xac, 0x7c, 0x0a, - 0x42, 0x78, 0xa1, 0x5c, 0x10, 0x5c, 0x41, 0xe2, 0x50, 0x2e, 0xe6, 0x0b, 0xdc, 0x64, 0x94, 0x06, - 0x9a, 0x38, 0xd8, 0x93, 0x4a, 0x7b, 0xe3, 0x57, 0xb8, 0xf3, 0x91, 0x28, 0xb6, 0x97, 0x36, 0x02, - 0xa9, 0xb7, 0x79, 0x6f, 0x9e, 0x9e, 0x67, 0xc6, 0x0f, 0x64, 0xd7, 0x56, 0xd6, 0xec, 0x1b, 0xf3, - 0x2a, 0x14, 0x35, 0x5e, 0x8d, 0xcd, 0xde, 0xa1, 0xbd, 0x6d, 0x2b, 0xdc, 0x0f, 0xd6, 0x50, 0xe4, - 0xa4, 0xaf, 0xc5, 0x0b, 0xd8, 0x7c, 0x46, 0x7d, 0x43, 0xd7, 0x0a, 0x7f, 0x8c, 0xe8, 0x88, 0x71, - 0x38, 0x89, 0x6a, 0x9e, 0xec, 0x92, 0x72, 0xad, 0x8e, 0x50, 0x94, 0xb0, 0x3d, 0x4a, 0xdd, 0x60, - 0x7a, 0x87, 0xec, 0x19, 0xe4, 0x8e, 0x34, 0x8d, 0x2e, 0x4a, 0x23, 0x12, 0x25, 0x3c, 0xfa, 0x4a, - 0x9a, 0xdc, 0xc3, 0x9e, 0xbf, 0x12, 0xd8, 0x44, 0x69, 0xf4, 0x7c, 0x0e, 0x6b, 0x6a, 0x3b, 0x74, - 0xa4, 0xbb, 0xc1, 0xab, 0x57, 0xea, 0x8e, 0xf0, 0x4e, 0xa4, 0x2d, 0x61, 0xcd, 0x97, 0xbe, 0x77, - 0x84, 0xd3, 0x2c, 0xe3, 0x30, 0x09, 0x79, 0xea, 0x1b, 0x11, 0x4d, 0x7c, 0x87, 0x9d, 0xb1, 0x07, - 0xbe, 0x0a, 0x7c, 0x40, 0x93, 0x13, 0x5d, 0x5b, 0xd4, 0xb5, 0xe3, 0x59, 0x70, 0x8a, 0x90, 0x6d, - 0x61, 0xd9, 0x54, 0x3c, 0xf7, 0xe4, 0xb2, 0xa9, 0xc4, 0x37, 0x80, 0x4b, 0xd3, 0x3c, 0xb8, 0x4b, - 0xb8, 0x86, 0x45, 0xdd, 0xf9, 0xd1, 0x4e, 0x55, 0x44, 0xec, 0x1c, 0xb2, 0xca, 0x8c, 0x3d, 0xf9, - 0xc1, 0x52, 0x15, 0xc0, 0xc4, 0xba, 0xb6, 0xaf, 0xd0, 0x8f, 0x95, 0xaa, 0x00, 0xc4, 0xef, 0x04, - 0x72, 0x85, 0x95, 0xb1, 0xf5, 0xbf, 0x87, 0x48, 0xef, 0x1f, 0xe2, 0x1c, 0xb2, 0x5b, 0x7d, 0x33, - 0xa2, 0x7f, 0x6b, 0xad, 0x02, 0x60, 0x6f, 0xe0, 0xb4, 0x43, 0xd2, 0xb5, 0x26, 0xcd, 0xd3, 0x5d, - 0x5a, 0x9e, 0x5d, 0x3c, 0x95, 0xc1, 0x4e, 0x7e, 0x89, 0xfc, 0xa7, 0x9e, 0xec, 0x41, 0xfd, 0x95, - 0x15, 0x1f, 0x60, 0x33, 0x6b, 0xb1, 0x27, 0x90, 0x7e, 0xc7, 0x43, 0x5c, 0x6e, 0x2a, 0xff, 0xff, - 0xd6, 0xfb, 0xe5, 0xbb, 0xe4, 0xe2, 0x67, 0x02, 0xd9, 0xc7, 0x29, 0x4d, 0xec, 0x25, 0xe4, 0x21, - 0x1c, 0x6c, 0x2b, 0x67, 0x81, 0x2a, 0x1e, 0xcb, 0x79, 0x6a, 0xc4, 0x82, 0x95, 0x90, 0xf9, 0x4f, - 0x67, 0x1b, 0x79, 0x3f, 0x27, 0xc5, 0x56, 0xce, 0xb2, 0x20, 0x16, 0x6c, 0x07, 0xab, 0x4b, 0xd3, - 0x38, 0x76, 0x26, 0xef, 0xbe, 0xa0, 0x38, 0x89, 0x3b, 0x89, 0xc5, 0xeb, 0xe4, 0x2a, 0xf7, 0x39, - 0x7e, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xac, 0xb1, 0x40, 0xf9, 0x02, 0x00, 0x00, + 0x10, 0xdd, 0xac, 0x9b, 0xb4, 0x3b, 0x65, 0x17, 0x64, 0x15, 0x64, 0xad, 0x90, 0xa8, 0x7c, 0x0a, + 0x42, 0x78, 0xa1, 0x5c, 0x10, 0x5c, 0x41, 0xe2, 0x50, 0x2e, 0xe6, 0x0b, 0xdc, 0x64, 0x94, 0x2e, + 0x34, 0x71, 0xb0, 0x27, 0x95, 0xf6, 0xc4, 0xb7, 0x70, 0xe7, 0x23, 0x51, 0x6c, 0x2f, 0x6d, 0x44, + 0xa5, 0xbd, 0xcd, 0x7b, 0xf3, 0xf4, 0x3c, 0x33, 0x7e, 0xa0, 0xda, 0x6d, 0xe5, 0xec, 0xa6, 0xb1, + 0xaf, 0x63, 0x51, 0xe3, 0xd5, 0xd0, 0x6c, 0x3c, 0xba, 0xdb, 0x6d, 0x85, 0x9b, 0xde, 0x59, 0x4a, + 0x9c, 0x0a, 0xb5, 0x7c, 0x09, 0xcb, 0x2f, 0x68, 0x6e, 0xe8, 0x5a, 0xe3, 0xcf, 0x01, 0x3d, 0x71, + 0x01, 0xc7, 0x49, 0x2d, 0xb2, 0xf3, 0xac, 0x5c, 0xe8, 0x3d, 0x94, 0x25, 0xac, 0xf6, 0x52, 0xdf, + 0xdb, 0xce, 0x23, 0x7f, 0x06, 0x85, 0x27, 0x43, 0x83, 0x4f, 0xd2, 0x84, 0x64, 0x09, 0x8f, 0xbe, + 0x91, 0x21, 0x7f, 0xd8, 0xf3, 0x77, 0x06, 0xcb, 0x24, 0x4d, 0x9e, 0xcf, 0x61, 0x41, 0xdb, 0x16, + 0x3d, 0x99, 0xb6, 0x0f, 0xea, 0x23, 0x7d, 0x47, 0x04, 0x27, 0x32, 0x8e, 0xb0, 0x16, 0xf3, 0xd0, + 0xdb, 0xc3, 0x71, 0x96, 0xa1, 0x1f, 0x85, 0x82, 0x85, 0x46, 0x42, 0x23, 0xdf, 0x62, 0x6b, 0xdd, + 0x4e, 0x1c, 0x45, 0x3e, 0xa2, 0xd1, 0x89, 0xae, 0x1d, 0x9a, 0xda, 0x8b, 0x3c, 0x3a, 0x25, 0xc8, + 0x57, 0x30, 0x6f, 0x2a, 0x51, 0x04, 0x72, 0xde, 0x54, 0xf2, 0x3b, 0xc0, 0xa5, 0x6d, 0x0e, 0xee, + 0x12, 0xaf, 0xe1, 0xd0, 0xb4, 0x61, 0xb4, 0x13, 0x9d, 0x10, 0x3f, 0x83, 0xbc, 0xb2, 0x43, 0x47, + 0x61, 0x30, 0xa6, 0x23, 0x18, 0x59, 0xbf, 0xed, 0x2a, 0x0c, 0x63, 0x31, 0x1d, 0x81, 0xfc, 0x93, + 0x41, 0xa1, 0xb1, 0xb2, 0xae, 0xfe, 0xff, 0x10, 0xec, 0xfe, 0x21, 0xce, 0x20, 0xbf, 0x35, 0x37, + 0x03, 0x86, 0xb7, 0x16, 0x3a, 0x02, 0xfe, 0x16, 0x4e, 0x5a, 0x24, 0x53, 0x1b, 0x32, 0x82, 0x9d, + 0xb3, 0xf2, 0xf4, 0xe2, 0xa9, 0x8a, 0x76, 0xea, 0x6b, 0xe2, 0x3f, 0x77, 0xe4, 0x76, 0xfa, 0x9f, + 0x6c, 0xfd, 0x11, 0x96, 0x93, 0x16, 0x7f, 0x02, 0xec, 0x07, 0xee, 0xd2, 0x72, 0x63, 0xf9, 0xf0, + 0x5b, 0x1f, 0xe6, 0xef, 0xb3, 0x8b, 0x5f, 0x90, 0x7f, 0x1a, 0xc3, 0xc4, 0x5f, 0x41, 0x11, 0xb3, + 0xc1, 0x57, 0x6a, 0x92, 0xa7, 0xf5, 0x63, 0x35, 0x0d, 0x8d, 0x9c, 0xf1, 0x12, 0xf2, 0xf0, 0xe7, + 0x7c, 0xa9, 0xee, 0xc7, 0x64, 0xbd, 0x52, 0x93, 0x28, 0xc8, 0x19, 0x7f, 0x01, 0xec, 0xd2, 0x36, + 0xfc, 0x54, 0xdd, 0x7d, 0xc0, 0xfa, 0x38, 0x6d, 0x24, 0x67, 0x6f, 0xb2, 0xab, 0x22, 0xa4, 0xf8, + 0xdd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0xdf, 0xa5, 0x1d, 0xf7, 0x02, 0x00, 0x00, } diff --git a/debug/service/proto/debug.pb.micro.go b/debug/service/proto/debug.pb.micro.go index f1789b8d..45a26bac 100644 --- a/debug/service/proto/debug.pb.micro.go +++ b/debug/service/proto/debug.pb.micro.go @@ -36,7 +36,7 @@ var _ server.Option type DebugService interface { Health(ctx context.Context, in *HealthRequest, opts ...client.CallOption) (*HealthResponse, error) Stats(ctx context.Context, in *StatsRequest, opts ...client.CallOption) (*StatsResponse, error) - Logs(ctx context.Context, in *LogRequest, opts ...client.CallOption) (Debug_LogsService, error) + Log(ctx context.Context, in *LogRequest, opts ...client.CallOption) (Debug_LogService, error) } type debugService struct { @@ -77,8 +77,8 @@ func (c *debugService) Stats(ctx context.Context, in *StatsRequest, opts ...clie return out, nil } -func (c *debugService) Logs(ctx context.Context, in *LogRequest, opts ...client.CallOption) (Debug_LogsService, error) { - req := c.c.NewRequest(c.name, "Debug.Logs", &LogRequest{}) +func (c *debugService) Log(ctx context.Context, in *LogRequest, opts ...client.CallOption) (Debug_LogService, error) { + req := c.c.NewRequest(c.name, "Debug.Log", &LogRequest{}) stream, err := c.c.Stream(ctx, req, opts...) if err != nil { return nil, err @@ -86,33 +86,33 @@ func (c *debugService) Logs(ctx context.Context, in *LogRequest, opts ...client. if err := stream.Send(in); err != nil { return nil, err } - return &debugServiceLogs{stream}, nil + return &debugServiceLog{stream}, nil } -type Debug_LogsService interface { +type Debug_LogService interface { SendMsg(interface{}) error RecvMsg(interface{}) error Close() error Recv() (*Record, error) } -type debugServiceLogs struct { +type debugServiceLog struct { stream client.Stream } -func (x *debugServiceLogs) Close() error { +func (x *debugServiceLog) Close() error { return x.stream.Close() } -func (x *debugServiceLogs) SendMsg(m interface{}) error { +func (x *debugServiceLog) SendMsg(m interface{}) error { return x.stream.Send(m) } -func (x *debugServiceLogs) RecvMsg(m interface{}) error { +func (x *debugServiceLog) RecvMsg(m interface{}) error { return x.stream.Recv(m) } -func (x *debugServiceLogs) Recv() (*Record, error) { +func (x *debugServiceLog) Recv() (*Record, error) { m := new(Record) err := x.stream.Recv(m) if err != nil { @@ -126,14 +126,14 @@ func (x *debugServiceLogs) Recv() (*Record, error) { type DebugHandler interface { Health(context.Context, *HealthRequest, *HealthResponse) error Stats(context.Context, *StatsRequest, *StatsResponse) error - Logs(context.Context, *LogRequest, Debug_LogsStream) error + Log(context.Context, *LogRequest, Debug_LogStream) error } func RegisterDebugHandler(s server.Server, hdlr DebugHandler, opts ...server.HandlerOption) error { type debug interface { Health(ctx context.Context, in *HealthRequest, out *HealthResponse) error Stats(ctx context.Context, in *StatsRequest, out *StatsResponse) error - Logs(ctx context.Context, stream server.Stream) error + Log(ctx context.Context, stream server.Stream) error } type Debug struct { debug @@ -154,37 +154,37 @@ func (h *debugHandler) Stats(ctx context.Context, in *StatsRequest, out *StatsRe return h.DebugHandler.Stats(ctx, in, out) } -func (h *debugHandler) Logs(ctx context.Context, stream server.Stream) error { +func (h *debugHandler) Log(ctx context.Context, stream server.Stream) error { m := new(LogRequest) if err := stream.Recv(m); err != nil { return err } - return h.DebugHandler.Logs(ctx, m, &debugLogsStream{stream}) + return h.DebugHandler.Log(ctx, m, &debugLogStream{stream}) } -type Debug_LogsStream interface { +type Debug_LogStream interface { SendMsg(interface{}) error RecvMsg(interface{}) error Close() error Send(*Record) error } -type debugLogsStream struct { +type debugLogStream struct { stream server.Stream } -func (x *debugLogsStream) Close() error { +func (x *debugLogStream) Close() error { return x.stream.Close() } -func (x *debugLogsStream) SendMsg(m interface{}) error { +func (x *debugLogStream) SendMsg(m interface{}) error { return x.stream.Send(m) } -func (x *debugLogsStream) RecvMsg(m interface{}) error { +func (x *debugLogStream) RecvMsg(m interface{}) error { return x.stream.Recv(m) } -func (x *debugLogsStream) Send(m *Record) error { +func (x *debugLogStream) Send(m *Record) error { return x.stream.Send(m) } diff --git a/debug/service/proto/debug.proto b/debug/service/proto/debug.proto index a6cba776..4f639245 100644 --- a/debug/service/proto/debug.proto +++ b/debug/service/proto/debug.proto @@ -3,7 +3,7 @@ syntax = "proto3"; service Debug { rpc Health(HealthRequest) returns (HealthResponse) {}; rpc Stats(StatsRequest) returns (StatsResponse) {}; - rpc Logs(LogRequest) returns (stream Record) {}; + rpc Log(LogRequest) returns (stream Record) {}; } message HealthRequest { diff --git a/debug/service/service.go b/debug/service/service.go index ab2a26c1..8728b556 100644 --- a/debug/service/service.go +++ b/debug/service/service.go @@ -46,7 +46,7 @@ func (d *Debug) Logs(opts ...log.ReadOption) (<-chan log.Record, error) { req.Stream = options.Stream // get the log stream - stream, err := d.dbg.Logs(context.Background(), req) + stream, err := d.dbg.Log(context.Background(), req) if err != nil { return nil, fmt.Errorf("failed getting log stream: %s", err) } @@ -59,7 +59,7 @@ func (d *Debug) Logs(opts ...log.ReadOption) (<-chan log.Record, error) { return logChan, nil } -func (d *Debug) streamLogs(logChan chan log.Record, stream pb.Debug_LogsService) { +func (d *Debug) streamLogs(logChan chan log.Record, stream pb.Debug_LogService) { defer stream.Close() for {