Fix: Go APIs

telia-oss · Feb 21, 2023 · 5a6fb2c · 5a6fb2c
1 parent f160eae
commit 5a6fb2c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/example/interceptor.go → example/interceptor/interceptor.go b/example/interceptor.go → example/interceptor/interceptor.go
diff --git a/example/rootle.go → example/rootle/rootle.go b/example/rootle.go → example/rootle/rootle.go
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/telia-oss/rootle
 go 1.18
 
 require (
+	github.com/google/uuid v1.3.0
 	github.com/telia-oss/rootle/interceptor v0.0.0-20221026105925-b6b93b7b1e2b
 	google.golang.org/grpc v1.53.0
 )

diff --git a/go.sum b/go.sum
@@ -3,6 +3,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/telia-oss/rootle/interceptor v0.0.0-20221026105925-b6b93b7b1e2b h1:5cVeYwZv1rq6tI328L7sTMLNfEkbr3MfQrhVG+TVT7E=
 github.com/telia-oss/rootle/interceptor v0.0.0-20221026105925-b6b93b7b1e2b/go.mod h1:k275qThNlhdR5qbcoH2xOL1C/eV5dvIa+TkDVpjtBo8=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=

diff --git a/go.work b/go.work
diff --git a/go.work.sum b/go.work.sum
diff --git a/rootle.go b/rootle.go
@@ -5,13 +5,15 @@ import (
 	"encoding/json"
 	"log"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type Log struct {
 	ID          string      `json:"id"`
 	Application string      `json:"application"`
 	Timestamp   int64       `json:"timestamp"`
-	Message     string      `json:"message"`
+	Message     any         `json:"message"`
 	Level       string      `json:"level"`
 	Event       *string     `json:"event,omitempty"`
 	Downstream  *Downstream `json:"downstream,omitempty"`
@@ -133,14 +135,17 @@ var localRootle *Config
 
 func New(ctx context.Context, conf Config) *Config {
 	localRootle = &conf
+	if conf.ID == nil {
+		conf.ID = String(uuid.New().String())
+	}
 	return &conf
 }
 
 func GetRootle() *Config {
 	return localRootle
 }
 
-func logMessage(c Config, message string, level string, event *string, downstream *Downstream, stackTrace *string, code *int, callback func(logJSON string)) {
+func logMessage(c Config, message any, level string, event *string, downstream *Downstream, stackTrace *string, code *int, callback func(logJSON string)) {
 	rootleLog := Log{
 		ID:          *c.ID,
 		Application: *c.Application,
@@ -158,19 +163,19 @@ func logMessage(c Config, message string, level string, event *string, downstrea
 	callback(string(jsonLog))
 }
 
-func (c *Config) Info(message string) {
+func (c *Config) Info(message any) {
 	logMessage(*c, message, "INFO", nil, nil, nil, nil, func(logJSON string) {
 		log.Println(logJSON)
 	})
 }
 
-func (c *Config) Warn(message string) {
+func (c *Config) Warn(message any) {
 	logMessage(*c, message, "WARN", nil, nil, nil, nil, func(logJSON string) {
 		log.Println(logJSON)
 	})
 }
 
-func (c *Config) Error(message string, event *string, downstream *Downstream, stackTrace *string, code *int) {
+func (c *Config) Error(message any, event *string, downstream *Downstream, stackTrace *string, code *int) {
 	logMessage(*c, message, "ERROR", event, downstream, stackTrace, code, func(logJSON string) {
 		log.Println(logJSON)
 	})