diff --git a/Jenkinsfile-gosec b/Jenkinsfile-gosec index d62f3a2..32159df 100644 --- a/Jenkinsfile-gosec +++ b/Jenkinsfile-gosec @@ -15,7 +15,7 @@ pipeline { ln -s ${WORKSPACE} ace-golang-sdk cd $GOPATH/src/github.com/Axway/ace-golang-sdk dep ensure -v - gosec -severity medium -fmt=json -out=$GOPATH/src/github.com/Axway/ace-golang-sdk/gosec-results.json ./... + gosec -exclude=G104 -severity medium -fmt=json -out=$GOPATH/src/github.com/Axway/ace-golang-sdk/gosec-results.json ./... ''' } } diff --git a/README.md b/README.md index 7f650bb..df5397a 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,15 @@ ACE SDK allows developers to implement microservices that can be used as executable step in a choreography. # Service Implemenation and Using the SDK + ## Implement the callback method ### The callback method signature + Implement the callback method that will process the received message. Below is the signature of the method ``` - func businessMessageProcessor(ctx context.Context, businessMsg *messaging.BusinessMessage, msgProducer linker.MsgProducer) error +func businessMessageProcessor(ctx context.Context, businessMsg *messaging.BusinessMessage, msgProducer linker.MsgProducer) error ``` ### Input processing @@ -27,41 +29,49 @@ The payload [type messaging.Payload] can be actual payload (use messaging.Payloa The metadata can be retrieved using the interface method GetMetaData() on businessMsg object which returns map of string key/value pairs identifying the metadata associated with the payload. ### Output processing + The output of the processing can be responded by generating new message(s). To create a new message construct business message and setup metadata. The new message can then be produced using clientRelay parameter. #### Creating new ACE business message -- Construct the metadata - Constructing the metadata is done by setting up a map of string key/value pairs +- Construct the metadata + + Constructing the metadata is done by setting up a map of string key/value pairs + +- Contruct the payload + + Create the payload with content as demonstrated below. The newContent in the example below is a byte array holding the raw content -- Contruct the payload + ``` + newPayload := messaging.Payload{Body: newContent} + ``` - Create the payload with content as demonstrated below. The newContent in the example below is a byte array holding the raw content - ``` - newPayload := messaging.Payload{Body: newContent} - ``` + OR - OR + Create the payload with location reference as demonstrated below. The newContent in the example below is a byte array holding the the location reference. - Create the payload with location reference as demonstrated below. The newContent in the example below is a byte array holding the the location reference. - ``` - newPayload := messaging.Payload{Body: newContent, LocationReference: true} - ``` + ``` + newPayload := messaging.Payload{Body: newContent, LocationReference: true} + ``` -- Construct the ACE business message +- Construct the ACE business message - Create new business message object as demonstrated below. The "newMetadata" and "newPayload" in the example below identifies the metadata and payload for the new business message - ``` - newBusinessMsg := messaging.BusinessMessage{ MetaData: newMetadata, Payload: &newPayload} - ``` + Create new business message object as demonstrated below. The "newMetadata" and "newPayload" in the example below identifies the metadata and payload for the new business message + + ``` + newBusinessMsg := messaging.BusinessMessage{ MetaData: newMetadata, Payload: &newPayload} + ``` #### Producing message + To produce messages use the Send method on msgProducer parameter as demostrated below + ``` - msgProducer.Send(&newBusinessMsg) +msgProducer.Send(&newBusinessMsg) ``` ## Add trace for service execution (Optional) + ACE SDK has instrumentation for OpenTracing(https://opentracing.io/specification/) built-in and provides ability to allow the business service to inject the tracing spans. To start a span as child of span managed by ACE, use StartSpanFromContext method from opentracing package. Using the created span the business service can log details as demonstrated below. @@ -73,39 +83,61 @@ span.Finish() ``` ## Handling errors in the service execution + ACE SDK had three error types defined. SendingError - Can be returned from calling send method on the MsgProducer. + ``` - error := msgProducer.Send(&newBusinessMsg) +error := msgProducer.Send(&newBusinessMsg) ``` ProcessingError - Returned by the BusinessMessageProcessor. + ``` - return linker.NewProcessingError(fmt.Errorf("processing error)")) +return linker.NewProcessingError(fmt.Errorf("processing error)")) ``` SystemError - Returned by the BusinessMessageProcessor to clientRelay. + ``` - return linker.NewSystemError(fmt.Errorf("system error)")) +return linker.NewSystemError(fmt.Errorf("system error)")) ``` ## Register the service callback method with ACE + ACE business service must register the service info and callback method for making it usable as a step to build choreographies The service registration needs following details -- Service Name -- Service Version -- Service Description -- Callback method + +- Service Name +- Service Version +- Service Description +- Callback method + +The business service may also define config parameters to be used when using the service in a choreography. These +parameters need to be added prior to registering the callback method + +``` +# String Parmeters (name, default value, isRequired) +AddStringConfigParam("parameterName", "defaultValue", true) + +# Integer Parmeters (name, default value, isRequired) +AddIntConfigParam("parameterName", 123, false) + +# Boolean Parmeters (name, default value) +AddBooleanConfigParam("parameterName", false) +``` Below is an example of Registering the service info & callback method and then starting the ACE processing + ``` -aceAgent, err := linker.Register(serviceName, serviceVersion, serviceDescription, businessMessageProcessor) +aceAgent, err := linker.Register(serviceName, serviceVersion, serviceDescription, serviceType, businessMessageProcessor) aceAgent.Start() ``` The provided template reads the serviceName, serviceVersion and serviceDescription from following environment variables respectively, but its the implemenation choice on how to setup these details. -- SERVICE_NAME -- SERVICE_VERSION -- SERVICE_DESCRIPTION + +- SERVICE_NAME +- SERVICE_VERSION +- SERVICE_DESCRIPTION diff --git a/linker/linker.go b/linker/linker.go index f191b03..3de9692 100644 --- a/linker/linker.go +++ b/linker/linker.go @@ -3,6 +3,7 @@ package linker import ( "context" "fmt" + "strconv" "go.uber.org/zap" @@ -60,6 +61,7 @@ type Link struct { var link *Link var traceLogging tracing.TraceLogging var log = logging.Logger() +var serviceConfigParamTemplates []*rpc.ConfigParameter // MsgProducer - what is exposed to client business function type MsgProducer interface { @@ -69,6 +71,68 @@ type MsgProducer interface { // BusinessMessageProcessor type of 'business' function used to process paylod relayed to Linker type BusinessMessageProcessor func(context.Context, []*messaging.BusinessMessage, MsgProducer) error +// Add config parameter to list +func addConfigParam(configParam *rpc.ConfigParameter) { + serviceConfigParamTemplates = append(serviceConfigParamTemplates, configParam) +} + +func checkDuplicateConfigParam(name string) error { + for _, cfgParam := range serviceConfigParamTemplates { + if cfgParam.Name == name { + return fmt.Errorf("Duplicate definition for config parameter : %s", name) + } + } + return nil +} + +// AddStringConfigParam - Add String config parameter for the service +func AddStringConfigParam(name, defaultValue string, required bool) error { + err := checkDuplicateConfigParam(name) + if err != nil { + return err + } + stringConfigParam := &rpc.ConfigParameter{ + Name: name, + Type: "string", + DefaultValue: defaultValue, + IsRequired: required, + } + addConfigParam(stringConfigParam) + return nil +} + +// AddIntConfigParam - Add integer config parameter for the service +func AddIntConfigParam(name string, defaultValue int, required bool) error { + err := checkDuplicateConfigParam(name) + if err != nil { + return err + } + intConfigParam := &rpc.ConfigParameter{ + Name: name, + Type: "int", + DefaultValue: strconv.Itoa(defaultValue), + IsRequired: required, + } + addConfigParam(intConfigParam) + return nil +} + +// AddBooleanConfigParam - Add boolean config parameter for the service +func AddBooleanConfigParam(name string, defaultValue bool) error { + err := checkDuplicateConfigParam(name) + if err != nil { + return err + } + boolConfigParam := &rpc.ConfigParameter{ + Name: name, + Type: "boolean", + DefaultValue: strconv.FormatBool(defaultValue), + IsRequired: true, + } + addConfigParam(boolConfigParam) + return nil +} + // Register -Registers the business service with linker func Register(name, version, description, serviceType string, fn BusinessMessageProcessor) (*Link, error) { if link != nil { @@ -167,7 +231,6 @@ func (link Link) OnRelay(aceMessage *rpc.Message) { panic(fmt.Sprintf("MsgProcessor of %s agent is not of expected BusinessMessageProcessor type, actual: %T\n", link.name, msgProcessor)) } - } // OnSidecarRegistrationComplete can perform Linker-specific post registration actions @@ -238,12 +301,13 @@ func (link Link) onRelayComplete(msg *rpc.Message) { func (link Link) registerWithSidecar() (bool, error) { serviceInfo := rpc.ServiceInfo{ - ServiceName: link.name, - ServiceVersion: link.version, - ServiceDescription: link.description, - ServiceType: rpc.ServiceInfo_ServiceType(rpc.ServiceInfo_ServiceType_value[link.serviceType]), - ServiceHost: link.cfg.ServerHost, - ServicePort: uint32(link.cfg.ServerPort), + ServiceName: link.name, + ServiceVersion: link.version, + ServiceDescription: link.description, + ServiceType: rpc.ServiceInfo_ServiceType(rpc.ServiceInfo_ServiceType_value[link.serviceType]), + ServiceHost: link.cfg.ServerHost, + ServicePort: uint32(link.cfg.ServerPort), + ServiceConfigTemplate: serviceConfigParamTemplates, } log.Info("Registering with sidecar", diff --git a/linker/linker_test.go b/linker/linker_test.go index c791630..d82eca1 100644 --- a/linker/linker_test.go +++ b/linker/linker_test.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "io" + "strconv" "testing" "github.com/Axway/ace-golang-sdk/linker/rpcclient" @@ -47,6 +48,74 @@ func TestRegister(t *testing.T) { } } +func TestAddParams(t *testing.T) { + AddStringConfigParam("string", "default", false) + + if len(serviceConfigParamTemplates) != 1 { + t.Errorf("incorrect number of parameters, expected %s got %s", "1", strconv.Itoa(len(serviceConfigParamTemplates))) + } + + if serviceConfigParamTemplates[0].GetType() != "string" { + t.Errorf("incorrect type of string parameter, expected %s got %s", "string", serviceConfigParamTemplates[0].GetType()) + } + + if serviceConfigParamTemplates[0].GetName() != "string" { + t.Errorf("incorrect name of string parameter, expected %s got %s", "string", serviceConfigParamTemplates[0].GetName()) + } + + if serviceConfigParamTemplates[0].GetDefaultValue() != "default" { + t.Errorf("incorrect default value of string parameter, expected %s got %s", "default", serviceConfigParamTemplates[0].GetDefaultValue()) + } + + if serviceConfigParamTemplates[0].GetIsRequired() != false { + t.Errorf("incorrect IsRequired of string parameter, expected %s got %s", "false", strconv.FormatBool(serviceConfigParamTemplates[0].GetIsRequired())) + } + + AddIntConfigParam("integer", 123, true) + + if len(serviceConfigParamTemplates) != 2 { + t.Errorf("incorrect number of parameters, expected %s got %s", "2", strconv.Itoa(len(serviceConfigParamTemplates))) + } + + if serviceConfigParamTemplates[1].GetType() != "int" { + t.Errorf("incorrect type of integer parameter, expected %s got %s", "int", serviceConfigParamTemplates[1].GetType()) + } + + if serviceConfigParamTemplates[1].GetName() != "integer" { + t.Errorf("incorrect name of integer parameter, expected %s got %s", "integer", serviceConfigParamTemplates[1].GetName()) + } + + if serviceConfigParamTemplates[1].GetDefaultValue() != "123" { + t.Errorf("incorrect default value of integer parameter, expected %s got %s", "123", serviceConfigParamTemplates[1].GetDefaultValue()) + } + + if serviceConfigParamTemplates[1].GetIsRequired() != true { + t.Errorf("incorrect IsRequired of integer parameter, expected %s got %s", "true", strconv.FormatBool(serviceConfigParamTemplates[1].GetIsRequired())) + } + + AddBooleanConfigParam("boolean", false) + + if len(serviceConfigParamTemplates) != 3 { + t.Errorf("incorrect number of parameters, expected %s got %s", "3", strconv.Itoa(len(serviceConfigParamTemplates))) + } + + if serviceConfigParamTemplates[2].GetType() != "boolean" { + t.Errorf("incorrect type of boolean parameter, expected %s got %s", "boolean", serviceConfigParamTemplates[2].GetType()) + } + + if serviceConfigParamTemplates[2].GetName() != "boolean" { + t.Errorf("incorrect name of boolean parameter, expected %s got %s", "boolean", serviceConfigParamTemplates[2].GetName()) + } + + if serviceConfigParamTemplates[2].GetDefaultValue() != "false" { + t.Errorf("incorrect default value of boolean parameter, expected %s got %s", "false", serviceConfigParamTemplates[2].GetDefaultValue()) + } + + if serviceConfigParamTemplates[2].GetIsRequired() != true { + t.Errorf("incorrect IsRequired of boolean parameter, expected %s got %s", "true", strconv.FormatBool(serviceConfigParamTemplates[2].GetIsRequired())) + } +} + type mockClient struct { buildClientRelayCalled bool clientRegisterCalled bool diff --git a/rpc/ace.pb.go b/rpc/ace.pb.go index acc2f92..1bdc78e 100644 --- a/rpc/ace.pb.go +++ b/rpc/ace.pb.go @@ -8,12 +8,13 @@ package rpc import ( context "context" fmt "fmt" + math "math" + messaging "github.com/Axway/ace-golang-sdk/messaging" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -49,7 +50,7 @@ func (x ServiceInfo_ServiceType) String() string { } func (ServiceInfo_ServiceType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{0, 0} + return fileDescriptor_671d051cacda6b9d, []int{1, 0} } type Message_ErrorType int32 @@ -77,27 +78,100 @@ func (x Message_ErrorType) String() string { } func (Message_ErrorType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{1, 0} + return fileDescriptor_671d051cacda6b9d, []int{2, 0} +} + +// Service Config Parameter Template +type ConfigParameter struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` + Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` + DefaultValue string `protobuf:"bytes,4,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + IsRequired bool `protobuf:"varint,5,opt,name=is_required,json=isRequired,proto3" json:"is_required,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *ConfigParameter) Reset() { *m = ConfigParameter{} } +func (m *ConfigParameter) String() string { return proto.CompactTextString(m) } +func (*ConfigParameter) ProtoMessage() {} +func (*ConfigParameter) Descriptor() ([]byte, []int) { + return fileDescriptor_671d051cacda6b9d, []int{0} +} + +func (m *ConfigParameter) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ConfigParameter.Unmarshal(m, b) +} +func (m *ConfigParameter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ConfigParameter.Marshal(b, m, deterministic) +} +func (m *ConfigParameter) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConfigParameter.Merge(m, src) +} +func (m *ConfigParameter) XXX_Size() int { + return xxx_messageInfo_ConfigParameter.Size(m) +} +func (m *ConfigParameter) XXX_DiscardUnknown() { + xxx_messageInfo_ConfigParameter.DiscardUnknown(m) +} + +var xxx_messageInfo_ConfigParameter proto.InternalMessageInfo + +func (m *ConfigParameter) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *ConfigParameter) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *ConfigParameter) GetValue() string { + if m != nil { + return m.Value + } + return "" +} + +func (m *ConfigParameter) GetDefaultValue() string { + if m != nil { + return m.DefaultValue + } + return "" +} + +func (m *ConfigParameter) GetIsRequired() bool { + if m != nil { + return m.IsRequired + } + return false } // Service info specified in business logic and passed to sidecar for registration. type ServiceInfo struct { - ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` - ServiceVersion string `protobuf:"bytes,2,opt,name=service_version,json=serviceVersion,proto3" json:"service_version,omitempty"` - ServiceType ServiceInfo_ServiceType `protobuf:"varint,3,opt,name=service_type,json=serviceType,proto3,enum=rpc.ServiceInfo_ServiceType" json:"service_type,omitempty"` - ServiceDescription string `protobuf:"bytes,4,opt,name=service_description,json=serviceDescription,proto3" json:"service_description,omitempty"` - ServiceHost string `protobuf:"bytes,5,opt,name=service_host,json=serviceHost,proto3" json:"service_host,omitempty"` - ServicePort uint32 `protobuf:"varint,6,opt,name=service_port,json=servicePort,proto3" json:"service_port,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` + ServiceVersion string `protobuf:"bytes,2,opt,name=service_version,json=serviceVersion,proto3" json:"service_version,omitempty"` + ServiceType ServiceInfo_ServiceType `protobuf:"varint,3,opt,name=service_type,json=serviceType,proto3,enum=rpc.ServiceInfo_ServiceType" json:"service_type,omitempty"` + ServiceDescription string `protobuf:"bytes,4,opt,name=service_description,json=serviceDescription,proto3" json:"service_description,omitempty"` + ServiceHost string `protobuf:"bytes,5,opt,name=service_host,json=serviceHost,proto3" json:"service_host,omitempty"` + ServicePort uint32 `protobuf:"varint,6,opt,name=service_port,json=servicePort,proto3" json:"service_port,omitempty"` + ServiceConfigTemplate []*ConfigParameter `protobuf:"bytes,7,rep,name=service_config_template,json=serviceConfigTemplate,proto3" json:"service_config_template,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ServiceInfo) Reset() { *m = ServiceInfo{} } func (m *ServiceInfo) String() string { return proto.CompactTextString(m) } func (*ServiceInfo) ProtoMessage() {} func (*ServiceInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{0} + return fileDescriptor_671d051cacda6b9d, []int{1} } func (m *ServiceInfo) XXX_Unmarshal(b []byte) error { @@ -160,6 +234,13 @@ func (m *ServiceInfo) GetServicePort() uint32 { return 0 } +func (m *ServiceInfo) GetServiceConfigTemplate() []*ConfigParameter { + if m != nil { + return m.ServiceConfigTemplate + } + return nil +} + // Root structure for all STOMP messages. type Message struct { // Unique ID of the message containing this payload. @@ -190,7 +271,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{1} + return fileDescriptor_671d051cacda6b9d, []int{2} } func (m *Message) XXX_Unmarshal(b []byte) error { @@ -310,25 +391,27 @@ func (m *Message) GetBusinessMessage() []*messaging.BusinessMessage { } type StepPattern struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Address of the name and version of the service this message is intended for. - ServiceName string `protobuf:"bytes,1,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` - ServiceVersion string `protobuf:"bytes,2,opt,name=service_version,json=serviceVersion,proto3" json:"service_version,omitempty"` + ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` + ServiceVersion string `protobuf:"bytes,3,opt,name=service_version,json=serviceVersion,proto3" json:"service_version,omitempty"` // Placeholder fields for payload transformation, routing, and validation. - Validation string `protobuf:"bytes,3,opt,name=validation,proto3" json:"validation,omitempty"` - Evaluation string `protobuf:"bytes,4,opt,name=evaluation,proto3" json:"evaluation,omitempty"` - Transformation string `protobuf:"bytes,5,opt,name=transformation,proto3" json:"transformation,omitempty"` + Validation string `protobuf:"bytes,4,opt,name=validation,proto3" json:"validation,omitempty"` + Evaluation string `protobuf:"bytes,5,opt,name=evaluation,proto3" json:"evaluation,omitempty"` + Transformation string `protobuf:"bytes,6,opt,name=transformation,proto3" json:"transformation,omitempty"` // Recursion of StepPattern to provide the overall structure of the choreography. - Child []*StepPattern `protobuf:"bytes,6,rep,name=child,proto3" json:"child,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Child []*StepPattern `protobuf:"bytes,7,rep,name=child,proto3" json:"child,omitempty"` + ServiceConfig []*ConfigParameter `protobuf:"bytes,8,rep,name=service_config,json=serviceConfig,proto3" json:"service_config,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *StepPattern) Reset() { *m = StepPattern{} } func (m *StepPattern) String() string { return proto.CompactTextString(m) } func (*StepPattern) ProtoMessage() {} func (*StepPattern) Descriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{2} + return fileDescriptor_671d051cacda6b9d, []int{3} } func (m *StepPattern) XXX_Unmarshal(b []byte) error { @@ -349,6 +432,13 @@ func (m *StepPattern) XXX_DiscardUnknown() { var xxx_messageInfo_StepPattern proto.InternalMessageInfo +func (m *StepPattern) GetId() string { + if m != nil { + return m.Id + } + return "" +} + func (m *StepPattern) GetServiceName() string { if m != nil { return m.ServiceName @@ -391,6 +481,13 @@ func (m *StepPattern) GetChild() []*StepPattern { return nil } +func (m *StepPattern) GetServiceConfig() []*ConfigParameter { + if m != nil { + return m.ServiceConfig + } + return nil +} + // Simple confirmation structure for RPC calls. type Receipt struct { IsOk bool `protobuf:"varint,1,opt,name=is_ok,json=isOk,proto3" json:"is_ok,omitempty"` @@ -404,7 +501,7 @@ func (m *Receipt) Reset() { *m = Receipt{} } func (m *Receipt) String() string { return proto.CompactTextString(m) } func (*Receipt) ProtoMessage() {} func (*Receipt) Descriptor() ([]byte, []int) { - return fileDescriptor_671d051cacda6b9d, []int{3} + return fileDescriptor_671d051cacda6b9d, []int{4} } func (m *Receipt) XXX_Unmarshal(b []byte) error { @@ -442,6 +539,7 @@ func (m *Receipt) GetError() string { func init() { proto.RegisterEnum("rpc.ServiceInfo_ServiceType", ServiceInfo_ServiceType_name, ServiceInfo_ServiceType_value) proto.RegisterEnum("rpc.Message_ErrorType", Message_ErrorType_name, Message_ErrorType_value) + proto.RegisterType((*ConfigParameter)(nil), "rpc.ConfigParameter") proto.RegisterType((*ServiceInfo)(nil), "rpc.ServiceInfo") proto.RegisterType((*Message)(nil), "rpc.Message") proto.RegisterMapType((map[string]string)(nil), "rpc.Message.MetaDataEntry") @@ -452,58 +550,66 @@ func init() { func init() { proto.RegisterFile("ace.proto", fileDescriptor_671d051cacda6b9d) } var fileDescriptor_671d051cacda6b9d = []byte{ - // 812 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x5d, 0x73, 0xe3, 0x34, - 0x14, 0xad, 0x9b, 0xef, 0x9b, 0x8f, 0x1a, 0xed, 0xc2, 0x98, 0x0e, 0x1f, 0x21, 0x3b, 0x2c, 0x61, - 0x99, 0x4d, 0x4b, 0x81, 0x81, 0x81, 0x07, 0x26, 0x6d, 0x32, 0x6d, 0x06, 0x9a, 0x66, 0x9c, 0x74, - 0x67, 0xe1, 0xc5, 0xa3, 0x38, 0xb7, 0xa9, 0x27, 0xb1, 0x64, 0x24, 0xa5, 0x34, 0xff, 0x80, 0x3f, - 0xc5, 0x0b, 0xff, 0x86, 0x7f, 0xc1, 0x48, 0xb2, 0x53, 0xb7, 0xbc, 0xee, 0x9b, 0x74, 0xce, 0xb1, - 0xee, 0xf5, 0xb9, 0x47, 0x82, 0x1a, 0x0d, 0xb1, 0x97, 0x08, 0xae, 0x38, 0x29, 0x88, 0x24, 0x3c, - 0x6c, 0xcd, 0x37, 0x32, 0x62, 0x28, 0xa5, 0x05, 0x3b, 0x7f, 0xef, 0x43, 0x7d, 0x8a, 0xe2, 0x2e, - 0x0a, 0x71, 0xc4, 0x6e, 0x38, 0xf9, 0x0c, 0x1a, 0xd2, 0x6e, 0x03, 0x46, 0x63, 0xf4, 0x9c, 0xb6, - 0xd3, 0xad, 0xf9, 0xf5, 0x14, 0x1b, 0xd3, 0x18, 0xc9, 0x17, 0x70, 0x90, 0x49, 0xee, 0x50, 0xc8, - 0x88, 0x33, 0x6f, 0xdf, 0xa8, 0x5a, 0x29, 0xfc, 0xc6, 0xa2, 0xe4, 0xe7, 0x87, 0xb3, 0xd4, 0x36, - 0x41, 0xaf, 0xd0, 0x76, 0xba, 0xad, 0x93, 0x8f, 0x7a, 0x22, 0x09, 0x7b, 0xb9, 0x9a, 0xd9, 0x7a, - 0xb6, 0x4d, 0x70, 0x57, 0x49, 0x6f, 0xc8, 0x11, 0x3c, 0xcb, 0x0e, 0x58, 0xa0, 0x0c, 0x45, 0x94, - 0x28, 0x5d, 0xad, 0x68, 0xaa, 0x91, 0x94, 0x1a, 0x3c, 0x30, 0xf9, 0xee, 0x6f, 0xb9, 0x54, 0x5e, - 0xe9, 0x51, 0xf7, 0x17, 0x5c, 0xaa, 0xbc, 0x24, 0xe1, 0x42, 0x79, 0xe5, 0xb6, 0xd3, 0x6d, 0xee, - 0x24, 0x13, 0x2e, 0x54, 0xe7, 0xd5, 0xce, 0x12, 0xd3, 0x05, 0x40, 0x79, 0xdc, 0x9f, 0x8d, 0xde, - 0x0c, 0xdd, 0x3d, 0x72, 0x00, 0xf5, 0xfe, 0xf9, 0xb9, 0x3f, 0x3c, 0xef, 0xcf, 0x46, 0x57, 0x63, - 0xd7, 0xe9, 0xfc, 0x53, 0x82, 0xca, 0x25, 0x4a, 0x49, 0x97, 0x48, 0x08, 0x14, 0xaf, 0xaf, 0x47, - 0x83, 0xd4, 0x33, 0xb3, 0x26, 0x9f, 0x42, 0x3d, 0xa1, 0x02, 0x99, 0x0a, 0x0c, 0x65, 0x8d, 0x02, - 0x0b, 0x19, 0xc1, 0x0b, 0x68, 0x4a, 0xfc, 0x63, 0x83, 0x4c, 0xbb, 0x84, 0x22, 0x36, 0x2e, 0x15, - 0xfd, 0x46, 0x06, 0xce, 0x50, 0xc4, 0xe4, 0x18, 0x9e, 0xef, 0x44, 0x9b, 0x24, 0x41, 0x11, 0xcc, - 0xf9, 0x86, 0x2d, 0x8c, 0x13, 0x45, 0xed, 0x84, 0xe5, 0xae, 0x35, 0x75, 0xaa, 0x19, 0xf2, 0x21, - 0x54, 0xcf, 0x2e, 0xc6, 0xb6, 0xa8, 0x75, 0xa1, 0x72, 0x76, 0x31, 0x36, 0x15, 0x0d, 0xf5, 0xd6, - 0x52, 0xe5, 0x8c, 0x7a, 0x6b, 0xa8, 0x57, 0x50, 0x49, 0xa8, 0x52, 0x28, 0x98, 0x57, 0x69, 0x3b, - 0xdd, 0xfa, 0x89, 0x6b, 0x87, 0xa5, 0x30, 0x99, 0x58, 0xdc, 0xcf, 0x04, 0xe4, 0x63, 0x00, 0xc5, - 0x93, 0x28, 0xb4, 0x39, 0xa9, 0x9a, 0x83, 0x6a, 0x06, 0x31, 0x29, 0xf9, 0x1c, 0x5a, 0x21, 0x67, - 0x72, 0x13, 0x9b, 0xc9, 0x04, 0xa3, 0x81, 0x57, 0x33, 0x92, 0x66, 0x0e, 0x1d, 0x0d, 0xf4, 0x88, - 0x79, 0x82, 0x4c, 0x09, 0x1a, 0x46, 0x6c, 0x19, 0x84, 0x9c, 0x29, 0xbc, 0x57, 0x1e, 0xd8, 0x11, - 0xe7, 0xa8, 0x33, 0xcb, 0x90, 0xef, 0xa1, 0x16, 0xa3, 0xa2, 0xc1, 0x82, 0x2a, 0xea, 0xd5, 0xdb, - 0x85, 0x6e, 0xfd, 0xe4, 0xd0, 0x34, 0x99, 0x4e, 0xa1, 0x77, 0x89, 0x8a, 0x0e, 0xa8, 0xa2, 0x43, - 0xa6, 0xc4, 0xd6, 0xaf, 0xc6, 0xe9, 0x96, 0x7c, 0x07, 0x80, 0x42, 0x70, 0x61, 0xb3, 0xd8, 0x30, - 0x59, 0xfc, 0xe0, 0xd1, 0x97, 0x43, 0x4d, 0x9b, 0x14, 0xd6, 0x30, 0x5b, 0x92, 0xaf, 0xe0, 0x3d, - 0xfb, 0x59, 0x3e, 0x81, 0x4d, 0xd3, 0x9e, 0x6b, 0x88, 0x7c, 0xfe, 0x86, 0xe0, 0x66, 0xf7, 0x2b, - 0x88, 0xed, 0xa9, 0x5e, 0x2b, 0xed, 0xd1, 0xee, 0x23, 0xb6, 0xec, 0x9d, 0xa6, 0x92, 0xb4, 0xae, - 0x7f, 0x30, 0x7f, 0x0c, 0x1c, 0xfe, 0x04, 0xcd, 0x47, 0x7f, 0x41, 0x5c, 0x28, 0xac, 0x70, 0x9b, - 0x06, 0x4b, 0x2f, 0xc9, 0x73, 0x28, 0xdd, 0xd1, 0xf5, 0x06, 0xd3, 0x44, 0xd9, 0xcd, 0x8f, 0xfb, - 0x3f, 0x38, 0x9d, 0xaf, 0xa1, 0xb6, 0xfb, 0x11, 0x52, 0x85, 0xe2, 0xf8, 0x6a, 0xac, 0x93, 0xdb, - 0x02, 0x98, 0xf8, 0x57, 0x67, 0xc3, 0xe9, 0x74, 0x34, 0x3e, 0x77, 0x1d, 0x9d, 0xea, 0xe9, 0x6f, - 0xd3, 0xd9, 0xf0, 0xd2, 0xdd, 0xef, 0xfc, 0xeb, 0x40, 0x3d, 0x37, 0xe3, 0x77, 0xfa, 0x08, 0x7c, - 0x02, 0x70, 0x47, 0xd7, 0xd1, 0x82, 0x1a, 0xe3, 0x0a, 0x36, 0xff, 0x0f, 0x88, 0xe6, 0x51, 0x37, - 0x4f, 0x73, 0x57, 0x3b, 0x87, 0x90, 0x97, 0xd0, 0x52, 0x82, 0x32, 0x79, 0xc3, 0x45, 0x6c, 0x35, - 0x36, 0xce, 0x4f, 0x50, 0xf2, 0x12, 0x4a, 0xe1, 0x6d, 0xb4, 0x5e, 0x78, 0x65, 0xe3, 0xf7, 0xff, - 0x83, 0x6b, 0xe9, 0xce, 0xb7, 0x50, 0xf1, 0x31, 0xc4, 0x28, 0x51, 0xe4, 0x19, 0x94, 0x22, 0x19, - 0xf0, 0x95, 0xf9, 0xbf, 0xaa, 0x5f, 0x8c, 0xe4, 0xd5, 0x4a, 0x1b, 0x6b, 0xc6, 0x9a, 0x19, 0x6b, - 0x36, 0x27, 0x37, 0x50, 0xf9, 0x35, 0x62, 0x2b, 0x7d, 0xcb, 0x8f, 0xa1, 0xe1, 0xe3, 0x32, 0x92, - 0x4a, 0xd8, 0xc2, 0xee, 0xd3, 0xf7, 0xec, 0xb0, 0x61, 0x90, 0xb4, 0x4a, 0x67, 0x8f, 0x7c, 0x09, - 0x25, 0x1f, 0xd7, 0x74, 0x4b, 0x1a, 0xf9, 0xb8, 0x3d, 0x95, 0x75, 0x9d, 0x63, 0xe7, 0xf4, 0x17, - 0x78, 0x3f, 0xe4, 0x71, 0x8f, 0xde, 0xff, 0x49, 0xb7, 0x3d, 0xfd, 0x74, 0xcb, 0xc5, 0x4a, 0xcb, - 0x4e, 0xab, 0xfd, 0x10, 0x27, 0xfa, 0xc5, 0x9e, 0x38, 0xbf, 0xbf, 0x58, 0x46, 0xea, 0x76, 0x33, - 0xef, 0x85, 0x3c, 0x3e, 0xea, 0x6b, 0xe5, 0x11, 0x0d, 0xf1, 0xf5, 0x92, 0xaf, 0x29, 0x5b, 0xbe, - 0x96, 0x8b, 0xd5, 0x91, 0x48, 0xc2, 0xbf, 0x9c, 0xbd, 0x79, 0xd9, 0x3c, 0xf1, 0xdf, 0xfc, 0x17, - 0x00, 0x00, 0xff, 0xff, 0x4e, 0xa4, 0x67, 0xc8, 0x04, 0x06, 0x00, 0x00, + // 940 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xd9, 0x6e, 0x23, 0x45, + 0x14, 0x4d, 0x7b, 0x89, 0xed, 0xeb, 0x25, 0xa6, 0x26, 0x03, 0x4d, 0xc4, 0x12, 0x1c, 0x31, 0x98, + 0x41, 0xe3, 0x84, 0x00, 0x02, 0x31, 0x0f, 0x28, 0xb1, 0xad, 0xc4, 0x62, 0xe2, 0x58, 0x6d, 0x27, + 0x1a, 0x78, 0x69, 0x95, 0xbb, 0xaf, 0x9d, 0x92, 0xdd, 0xcb, 0x54, 0x95, 0xc3, 0xf8, 0x0f, 0x90, + 0x78, 0xe6, 0x57, 0xf8, 0x00, 0xbe, 0x0c, 0x55, 0x55, 0xb7, 0xd3, 0xce, 0x20, 0xc4, 0x5b, 0xd5, + 0x39, 0xa7, 0xeb, 0x6e, 0x47, 0xb7, 0xa1, 0x42, 0x3d, 0xec, 0xc4, 0x3c, 0x92, 0x11, 0xc9, 0xf3, + 0xd8, 0x3b, 0x68, 0x4c, 0x57, 0x82, 0x85, 0x28, 0x84, 0x01, 0x5b, 0x7f, 0x5a, 0xb0, 0xd7, 0x8d, + 0xc2, 0x19, 0x9b, 0x8f, 0x28, 0xa7, 0x01, 0x4a, 0xe4, 0x84, 0x40, 0x21, 0xa4, 0x01, 0xda, 0xd6, + 0xa1, 0xd5, 0xae, 0x38, 0xfa, 0xac, 0x30, 0xb9, 0x8e, 0xd1, 0xce, 0x19, 0x4c, 0x9d, 0xc9, 0x3e, + 0x14, 0xef, 0xe9, 0x72, 0x85, 0x76, 0x5e, 0x83, 0xe6, 0x42, 0x8e, 0xa0, 0xee, 0xe3, 0x8c, 0xae, + 0x96, 0xd2, 0x35, 0x6c, 0x41, 0xb3, 0xb5, 0x04, 0xbc, 0xd5, 0xa2, 0x4f, 0xa1, 0xca, 0x84, 0xcb, + 0xf1, 0xcd, 0x8a, 0x71, 0xf4, 0xed, 0xe2, 0xa1, 0xd5, 0x2e, 0x3b, 0xc0, 0x84, 0x93, 0x20, 0xad, + 0x3f, 0xf2, 0x50, 0x1d, 0x23, 0xbf, 0x67, 0x1e, 0x0e, 0xc2, 0x59, 0x44, 0x3e, 0x83, 0x9a, 0x30, + 0x57, 0x37, 0x93, 0x5b, 0x35, 0xc1, 0x86, 0x2a, 0xc5, 0x2f, 0x60, 0x2f, 0x95, 0xdc, 0x23, 0x17, + 0x2c, 0x0a, 0x93, 0x6c, 0x1b, 0x09, 0x7c, 0x6b, 0x50, 0xf2, 0xd3, 0xc3, 0x5b, 0xba, 0x26, 0x95, + 0x7e, 0xe3, 0xf4, 0xa3, 0x0e, 0x8f, 0xbd, 0x4e, 0x26, 0x66, 0x7a, 0x9e, 0xac, 0x63, 0xdc, 0x44, + 0x52, 0x17, 0x72, 0x0c, 0x4f, 0xd2, 0x07, 0x7c, 0x14, 0x1e, 0x67, 0xb1, 0x54, 0xd1, 0x4c, 0xa1, + 0x24, 0xa1, 0x7a, 0x0f, 0x4c, 0x36, 0xfb, 0xbb, 0x48, 0x48, 0x5d, 0xef, 0x43, 0xf6, 0x97, 0x91, + 0x90, 0x59, 0x49, 0x1c, 0x71, 0x69, 0xef, 0x1e, 0x5a, 0xed, 0xfa, 0x46, 0x32, 0x8a, 0xb8, 0x24, + 0xaf, 0xe0, 0x83, 0x54, 0xe2, 0xe9, 0x91, 0xb9, 0x12, 0x83, 0x78, 0x49, 0x25, 0xda, 0xa5, 0xc3, + 0x7c, 0xbb, 0x7a, 0xba, 0xaf, 0x4b, 0x78, 0x34, 0x4e, 0xe7, 0x69, 0xf2, 0x91, 0xc1, 0x27, 0xc9, + 0x27, 0xad, 0xe7, 0x9b, 0x06, 0xeb, 0x9a, 0x00, 0x76, 0x87, 0x67, 0x93, 0xc1, 0x6d, 0xbf, 0xb9, + 0x43, 0xf6, 0xa0, 0x7a, 0x76, 0x71, 0xe1, 0xf4, 0x2f, 0xce, 0x26, 0x83, 0xeb, 0x61, 0xd3, 0x6a, + 0xfd, 0x5d, 0x84, 0xd2, 0x15, 0x0a, 0x41, 0xe7, 0xda, 0x09, 0x37, 0x37, 0x83, 0x5e, 0xea, 0x0e, + 0x75, 0x56, 0xe3, 0x8c, 0x29, 0xc7, 0x50, 0xba, 0x9a, 0x32, 0x6d, 0x07, 0x03, 0x69, 0xc1, 0x11, + 0xd4, 0x05, 0xbe, 0x59, 0x61, 0xa8, 0x7a, 0x8e, 0x3c, 0xd0, 0x3d, 0x2f, 0x38, 0xb5, 0x14, 0x9c, + 0x20, 0x0f, 0xc8, 0x09, 0xec, 0x6f, 0x44, 0xab, 0x38, 0x46, 0xee, 0x4e, 0xa3, 0x55, 0xe8, 0xeb, + 0xbe, 0x16, 0x54, 0x5f, 0x0d, 0x77, 0xa3, 0xa8, 0x73, 0xc5, 0x90, 0x0f, 0xa1, 0xdc, 0xbd, 0x1c, + 0x9a, 0xa0, 0xa6, 0xa7, 0xa5, 0xee, 0xe5, 0x50, 0x47, 0xd4, 0xd4, 0x6b, 0x43, 0xed, 0xa6, 0xd4, + 0x6b, 0x4d, 0x3d, 0x87, 0x52, 0x4c, 0xa5, 0x44, 0x1e, 0xda, 0xa5, 0x43, 0xab, 0x5d, 0x3d, 0x6d, + 0x9a, 0xd1, 0x4b, 0x8c, 0x47, 0x06, 0x77, 0x52, 0x01, 0xf9, 0x18, 0x40, 0x46, 0x31, 0xf3, 0x8c, + 0xeb, 0xca, 0xfa, 0xa1, 0x8a, 0x46, 0xb4, 0xe7, 0x3e, 0x87, 0x86, 0x17, 0x85, 0x62, 0x15, 0xe8, + 0x39, 0xbb, 0x83, 0x9e, 0x5d, 0xd1, 0x92, 0x7a, 0x06, 0x1d, 0xf4, 0x94, 0x61, 0xa2, 0x18, 0x43, + 0xc9, 0xa9, 0xc7, 0xc2, 0xb9, 0x9a, 0x9e, 0xc4, 0xb7, 0xd2, 0x06, 0x63, 0x98, 0x0c, 0xd5, 0x35, + 0x0c, 0xf9, 0x1e, 0x2a, 0x01, 0x4a, 0xea, 0xfa, 0x54, 0x52, 0xbb, 0xaa, 0x87, 0x7b, 0xa0, 0x93, + 0x4c, 0xa6, 0xd0, 0xb9, 0x42, 0x49, 0x7b, 0x54, 0xd2, 0x7e, 0x28, 0xf9, 0xda, 0x29, 0x07, 0xc9, + 0x95, 0x7c, 0x07, 0x80, 0x9c, 0x47, 0xdc, 0x38, 0xbb, 0xa6, 0x9d, 0xfd, 0xfe, 0xd6, 0x97, 0x7d, + 0x45, 0x6b, 0x4f, 0x57, 0x30, 0x3d, 0x92, 0xaf, 0xe0, 0x3d, 0xf3, 0x59, 0xd6, 0xcf, 0x75, 0x9d, + 0x5e, 0x53, 0x13, 0x59, 0x37, 0xf7, 0xa1, 0x99, 0x6e, 0x11, 0x37, 0x30, 0xaf, 0xda, 0x8d, 0x24, + 0x47, 0x73, 0x67, 0xe1, 0xbc, 0x73, 0x9e, 0x48, 0x92, 0xb8, 0xce, 0xde, 0x74, 0x1b, 0x38, 0x78, + 0x09, 0xf5, 0xad, 0x2a, 0x48, 0x13, 0xf2, 0x0b, 0x5c, 0x27, 0xc6, 0x52, 0xc7, 0x87, 0x0d, 0x93, + 0xcb, 0x6c, 0x98, 0x1f, 0x73, 0x3f, 0x58, 0xad, 0xaf, 0xa1, 0xb2, 0x29, 0x84, 0x94, 0xa1, 0x30, + 0xbc, 0x1e, 0x2a, 0xe7, 0x36, 0x00, 0x46, 0xce, 0x75, 0xb7, 0x3f, 0x1e, 0x0f, 0x86, 0x17, 0x4d, + 0x4b, 0xb9, 0x7a, 0xfc, 0xcb, 0x78, 0xd2, 0xbf, 0x6a, 0xe6, 0x5a, 0x7f, 0xe5, 0xa0, 0x9a, 0x99, + 0x31, 0x69, 0x40, 0x8e, 0xf9, 0x49, 0xb4, 0x1c, 0xf3, 0xdf, 0x59, 0x31, 0xb9, 0xff, 0xb5, 0x62, + 0xf2, 0xff, 0xba, 0x62, 0x3e, 0x01, 0xb8, 0xa7, 0x4b, 0xe6, 0xd3, 0xcc, 0x62, 0xc8, 0x20, 0x8a, + 0x47, 0x55, 0x8c, 0xe1, 0x8d, 0x75, 0x33, 0x08, 0x79, 0x06, 0x0d, 0xc9, 0x69, 0x28, 0x66, 0x11, + 0x0f, 0x8c, 0xc6, 0x78, 0xf8, 0x11, 0x4a, 0x9e, 0x41, 0xd1, 0xbb, 0x63, 0x4b, 0x3f, 0x59, 0x00, + 0xef, 0x1a, 0xd9, 0xd0, 0xe4, 0x25, 0x34, 0xb6, 0x57, 0x87, 0x5d, 0xfe, 0x8f, 0x8d, 0x51, 0xdf, + 0xda, 0x18, 0xad, 0x6f, 0xa1, 0xe4, 0xa0, 0x87, 0x2c, 0x96, 0xe4, 0x09, 0x14, 0x99, 0x70, 0xa3, + 0x85, 0x6e, 0x5b, 0xd9, 0x29, 0x30, 0x71, 0xbd, 0x50, 0x53, 0xd2, 0x1e, 0x49, 0xa7, 0xa4, 0x2f, + 0xa7, 0x33, 0x28, 0xbd, 0x62, 0xe1, 0x42, 0xad, 0x8c, 0x13, 0xa8, 0x39, 0x38, 0x67, 0x42, 0x72, + 0x93, 0x75, 0xf3, 0xf1, 0xaa, 0x3d, 0xa8, 0x69, 0x24, 0x89, 0xd2, 0xda, 0x21, 0x5f, 0x42, 0xd1, + 0xc1, 0x25, 0x5d, 0x93, 0x5a, 0xd6, 0xbb, 0x8f, 0x65, 0x6d, 0xeb, 0xc4, 0x3a, 0xff, 0x19, 0x9e, + 0x7a, 0x51, 0xd0, 0xa1, 0x6f, 0x7f, 0xa3, 0xeb, 0x8e, 0xfa, 0xdb, 0x09, 0x7f, 0xa1, 0x64, 0xe7, + 0xe5, 0x33, 0x0f, 0x47, 0xea, 0x27, 0x37, 0xb2, 0x7e, 0x3d, 0x9a, 0x33, 0x79, 0xb7, 0x9a, 0x76, + 0xbc, 0x28, 0x38, 0x3e, 0x53, 0xca, 0x63, 0xea, 0xe1, 0x8b, 0x79, 0xb4, 0xa4, 0xe1, 0xfc, 0x85, + 0xf0, 0x17, 0xc7, 0x3c, 0xf6, 0x7e, 0xb7, 0x76, 0xa6, 0xbb, 0xfa, 0xaf, 0xf8, 0xcd, 0x3f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xd6, 0xfd, 0x2e, 0x7f, 0x37, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/util/logging/logging.go b/util/logging/logging.go index c82c4b3..2611b76 100644 --- a/util/logging/logging.go +++ b/util/logging/logging.go @@ -25,13 +25,13 @@ func init() { "outputPaths": ["stdout"], "errorOutputPaths": ["stderr"], "encoderConfig": { - "messageKey": "msg", - "levelKey": "level", - "levelEncoder": "capital", - "timeKey": "time", - "timeEncoder": "iso8601" + "messageKey": "msg", + "levelKey": "level", + "levelEncoder": "capital", + "timeKey": "@timestamp", + "timeEncoder": "iso8601" } - }`) + }`) var cfg zap.Config if err = json.Unmarshal(rawJSON, &cfg); err != nil {