Feat: add event setter

Author: mhd999

README.md

@@ -76,7 +76,10 @@ data := map[string]interface{}{
 
 json, _ := json.Marshal(data)
 
-logger.Error("Hello World", rootle.String(string(json)), &rootle.Downstream{
+// can be chained in the New function.
+logger.WithEvent(string(json))
+
+logger.Error("Hello World", &rootle.Downstream{
   Http: &rootle.Http{
     Method:     "GET",
     StatusCode: rootle.INTERNAL_SERVER_ERROR,
@@ -133,18 +136,18 @@ val logger = Rootle("ac12Cd-Aevd-12Grx-235f4", "Billing-lambda")
 logger.info("Hello World")
 logger.warn("Hello World")
 
+  val jsonObject = JsonObject()
+  jsonObject.addProperty("foo", "bar")
+  // Can be set in Rootle initlization `Rootle(id, application, event)`
+  logger.setEvent(jsonObject.toString())
 
-val logger = Rootle("ac12Cd-Aevd-12Grx-235f4", "billing")
-
-val jsonObject = JsonObject()
-jsonObject.addProperty("foo", "bar")
+  logger.error("Error message", rootle.Downstream(rootle.Http("GET", StatusCode.InternalServerError.code, "http://localhost:8080/invoice/123",
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
+          "http://localhost:8080/",  jsonObject.toString()),
+          rootle.Grpc("GetInvoice", GrpcCodes.internalError.code, "invoice",
+                  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
+                  "http://localhost:8080/", jsonObject.toString())), "billing/user", 0);
 
-logger.error("Error message", jsonObject.toString(), rootle.Downstream(rootle.Http("GET", StatusCode.InternalServerError.code, "http://localhost:8080/invoice/123",
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
-        "http://localhost:8080/",  jsonObject.toString()),
-        rootle.Grpc("GetInvoice", GrpcCodes.internalError.code, "invoice",
-                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
-                "http://localhost:8080/", jsonObject.toString())), "billing/user", 0);
 ```
 ## Output example
 ```

config.go

@@ -3,6 +3,7 @@ package rootle
 type Config struct {
 	ID          *string
 	Application *string
+	Event       *string
 }
 
 func NewConfig() *Config {
@@ -18,3 +19,8 @@ func (c *Config) WithApplication(application string) *Config {
 	c.Application = &application
 	return c
 }
+
+func (c *Config) WithEvent(event string) *Config {
+	c.Event = &event
+	return c
+}

example/main.go

@@ -19,7 +19,9 @@ func main() {
 
 	json, _ := json.Marshal(data)
 
-	logger.Error("Hello World", rootle.String(string(json)), &rootle.Downstream{
+	logger.WithEvent(string(json))
+
+	logger.Error("Hello World", &rootle.Downstream{
 		Http: &rootle.Http{
 			Method:     "GET",
 			StatusCode: rootle.INTERNAL_SERVER_ERROR,

example/main.ts

@@ -5,11 +5,15 @@ const logger = new Rootle("ac12Cd-Aevd-12Grx-235f4", "billing-Lambda");
 logger.info("Info, hello world!");
 logger.warn("Warn, hello world!");
 
+
 const json = {
     "foo": "bar"
 };
 
-logger.error("Error, hello world!", JSON.stringify(json), {
+// Can be set in Rootle initlization `new Rootle(id, application, event)`
+logger.setEvent(JSON.stringify(json))
+
+logger.error("Error, hello world!", {
     http: {
         method: "GET",
         statusCode: HttpStatusCode.INTERNAL_SERVER_ERROR,

kotlin/gradle.properties

@@ -1,2 +1,2 @@
-version = 0.2.0
+version = 0.3.0
 group = no.telia

kotlin/lib/src/main/kotlin/rootle/Library.kt

@@ -1,6 +1,7 @@
 package rootle
 
 import com.google.gson.Gson
+import com.google.gson.JsonObject
 
 enum class GrpcCodes(val code: Int) {
     Ok(0),
@@ -90,7 +91,7 @@ enum class StatusCode(val code: Int) {
 }
 
 
-class Rootle(private val id: String, private val application: String)  {
+class Rootle(private val id: String, private val application: String, private var event: String? = null)  {
 
     inner class Http (val method: String? = null, val statusCode: Int? = null, val url: String? = null, val useragent: String? = null, val referer: String? = null, val payload: String? = null) {}
     inner class Grpc (val procedure: String? = null, val code: Int? = null, val service: String? = null, val useragent: String? = null, val referer: String? = null, val payload: String? = null) {}
@@ -115,11 +116,14 @@ class Rootle(private val id: String, private val application: String)  {
         println(logJsonString)
     }
 
-    fun error(message: String, event: String? = null, downstream: Downstream? = null, stackTrace: String? = null, code: Int? = null) {
+    fun error(message: String, downstream: Downstream? = null, stackTrace: String? = null, code: Int? = null) {
         val log = Log(this.id, this.application, System.currentTimeMillis().toString(), message,
-                "ERROR", event, downstream, stackTrace, code)
+                "ERROR", this.event, downstream, stackTrace, code)
         val logJsonString = Gson().toJson(log)
         println(logJsonString)
     }
-}
 
+    fun setEvent(event: String) {
+        this.event = event
+    }
+}

rootle.go

@@ -162,8 +162,8 @@ func (c *Config) Warn(message string) {
 	})
 }
 
-func (c *Config) Error(message string, event *string, downstream *Downstream, stackTrace *string, code *int) {
-	logMessage(*c, message, "ERROR", event, downstream, stackTrace, code, func(logJSON string) {
+func (c *Config) Error(message string, downstream *Downstream, stackTrace *string, code *int) {
+	logMessage(*c, message, "ERROR", c.Event, downstream, stackTrace, code, func(logJSON string) {
 		log.Println(logJSON)
 	})
 }

typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rootle",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "TS implementation of Rootle structured log",
   "main": "dist/rootle.js",
   "types": "./dist/rootle.d.ts",

typescript/src/rootle.ts

@@ -123,14 +123,16 @@ declare interface Logger {
 export default class Rootle {
     private id: string;
     private application: string;
+    private event?: string;
 
-    constructor(id: string, application: string) {
+    constructor(id: string, application: string, event?: string) {
         this.id = id;
         this.application = application;
+        this.event = event;
     }
 
     // @ts-ignore
-    private logMessage(message: string, level: string, event?: string, downstream?: Downstream, stackTrace?: string, code?: number, callback: Logger) {
+    private logMessage(message: string, level: string, downstream?: Downstream, stackTrace?: string, code?: number, callback: Logger) {
         const log: Log = {
             id: this.id,
             application: this.application,
@@ -139,7 +141,7 @@ export default class Rootle {
             level: level
         };
         if (level === "ERROR") {
-            log.event = event;
+            log.event = this.event;
             log.downstream = downstream;
             log.stackTrace = stackTrace;
             log.code = code;
@@ -149,22 +151,25 @@ export default class Rootle {
 
     }
     public info(message: string) {
-        this.logMessage(message, "INFO", undefined,undefined, undefined, undefined, (logJson) => {
+        this.logMessage(message, "INFO", undefined, undefined, undefined, (logJson) => {
             console.log(logJson);
         });
     }
 
     public warn(message: string) {
-        this.logMessage(message, "WARN", undefined, undefined, undefined, undefined, (logJson) => {
+        this.logMessage(message, "WARN", undefined, undefined, undefined, (logJson) => {
             console.log(logJson);
         });
     }
 
-    public error(message: string, event?: string, downstream?: Downstream, stackTrace?: string, code?: number) {
-        this.logMessage(message, "ERROR", event, downstream, stackTrace, code, (logJson) => {
+    public error(message: string, downstream?: Downstream, stackTrace?: string, code?: number) {
+        this.logMessage(message, "ERROR", downstream, stackTrace, code, (logJson) => {
             console.log(logJson);
         });
     }
 
+    public setEvent(event: string) {
+        this.event = event;
+    }
 
 }