fix(transation): updated transation logger to use built-in Micro-Trace-Id

using go-micro's built-in Trace ID generator

Author: xmlking

cmd/account/main.go

@@ -64,7 +64,7 @@ func getUserList2(limit uint32) {
 
     // New Service
     service := micro.NewService(
-        micro.Name("mkit.client.account"),
+        micro.Name(constants.ACCOUNT_CLIENT),
         micro.Version(config.Version),
         micro.WrapClient(logWrapper.NewClientWrapper()), // Showcase ClientWrapper usage
     )

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v0.1.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.4.2
-	github.com/google/uuid v1.1.1
 	github.com/infobloxopen/atlas-app-toolkit v0.21.1
 	github.com/infobloxopen/protoc-gen-gorm v0.20.0
 	github.com/jinzhu/gorm v1.9.12

service/recorder/subscriber/transaction.subscriber.go

@@ -27,7 +27,7 @@ func NewTransactionSubscriber(repo repository.TransactionRepository) *Transactio
 // Handle is a method to record transaction event, Method can be of any name
 func (s *TransactionSubscriber) Handle(ctx context.Context, event *transactionPB.TransactionEvent) (err error) {
     md, _ := metadata.FromContext(ctx)
-    tranId := md[constants.TransID]
+    tranId := md[constants.TraceIDKey]
 
     if len(tranId) == 0 {
         log.Error().Msg("TransactionSubscriber: missing  TranID")
@@ -40,6 +40,8 @@ func (s *TransactionSubscriber) Handle(ctx context.Context, event *transactionPB
         err = s.repo.Write(ctx, fmt.Sprintf("%s#%s", tranId, from), event)
     case constants.GREETER_SERVICE:
         err = s.repo.Write(ctx, fmt.Sprintf("%s#%s", tranId, from), event)
+    case constants.ACCOUNT_CLIENT:
+        err = s.repo.Write(ctx, fmt.Sprintf("%s#%s", tranId, from), event)
     default:
         log.Error().Msgf("TransactionSubscriber: unknown  from: %s", from)
         return fmt.Errorf("TransactionSubscriber: unknown  from: %s", from)

shared/constants/constants.go

@@ -1,6 +1,7 @@
 package constants
 
 const (
+    ACCOUNT_CLIENT   = "mkit.client.account"
 	ACCOUNT_SERVICE  = "mkit.service.account"
 	GREETER_SERVICE  = "mkit.service.greeter"
 	EMAILER_SERVICE  = "mkit.service.emailer"

shared/constants/metadata.go

@@ -4,6 +4,8 @@ package constants
 
 const (
 	// There are certain requirements for metadata to be passed in the http header:
-	// Just use all capital letters for God's sake
-	TransID = "TRANS-ID"
+	// gRPC recommended Key format: `lowercase alphanumeric characters and hyphen`
+	// but go-micro use `camelcase alphanumeric characters and hyphen`
+    TraceIDKey = "Micro-Trace-Id"
+    TenantIdKey = "Tenant-Id"
 )

shared/wrapper/transaction/transaction.wrapper.go

@@ -1,18 +1,15 @@
 package transaction
 
 import (
-	"context"
+    "context"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/google/uuid"
-	"github.com/micro/go-micro/v2"
-	"github.com/micro/go-micro/v2/metadata"
-	"github.com/micro/go-micro/v2/server"
-	"github.com/rs/zerolog/log"
+    "github.com/golang/protobuf/proto"
+    "github.com/golang/protobuf/ptypes/empty"
+    "github.com/micro/go-micro/v2"
+    "github.com/micro/go-micro/v2/server"
+    "github.com/rs/zerolog/log"
 
-	transactionPB "github.com/xmlking/micro-starter-kit/service/recorder/proto/transaction"
-	"github.com/xmlking/micro-starter-kit/shared/constants"
+    transactionPB "github.com/xmlking/micro-starter-kit/service/recorder/proto/transaction"
 )
 
 func publish(ctx context.Context, publisher micro.Event, req, rsp proto.Message) (err error) {
@@ -37,9 +34,6 @@ func publish(ctx context.Context, publisher micro.Event, req, rsp proto.Message)
 func NewHandlerWrapper(p micro.Event) server.HandlerWrapper {
 	return func(fn server.HandlerFunc) server.HandlerFunc {
 		return func(ctx context.Context, req server.Request, rsp interface{}) (err error) {
-			// add TranID to context if not present
-			// ctx = metadata.Set(ctx, constants.TransID, uuid.New().String())
-			ctx = metadata.MergeContext(ctx, map[string]string{constants.TransID: uuid.New().String()}, false)
 			err = fn(ctx, req, rsp)
 			// we already logged error in Publish. lets ignore error here. # Note: this is blocking call..
 			_ = publish(ctx, p, req.Body().(proto.Message), rsp.(proto.Message))
@@ -53,8 +47,6 @@ func NewHandlerWrapper(p micro.Event) server.HandlerWrapper {
 func NewSubscriberWrapper(p micro.Event) server.SubscriberWrapper {
 	return func(fn server.SubscriberFunc) server.SubscriberFunc {
 		return func(ctx context.Context, req server.Message) (err error) {
-			// add TranID to context if not present
-			ctx = metadata.MergeContext(ctx, map[string]string{constants.TransID: uuid.New().String()}, false)
 			err = fn(ctx, req)
 			// we already logged error in Publish. lets ignore error here.
 			// FIXME: `Micro-From-Service` is not replaced