From 1c628d975cb3bb1e55ab4bbb764901bad6d5ff9b Mon Sep 17 00:00:00 2001
From: Mya Pitzeruse <j.mya.pitz@gmail.com>
Date: Mon, 19 Dec 2022 12:15:14 -0600
Subject: [PATCH] port common labels into tag functions

---
 client.go   | 43 ++++++++++++++++++++++++++-----------------
 tags.ext.go |  6 ++++++
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/client.go b/client.go
index 5695056..c42f2c8 100644
--- a/client.go
+++ b/client.go
@@ -144,10 +144,10 @@ func (c Client) Trace(ctxp *context.Context, tags ...Tag) ActiveTrace {
 		With(tags...)
 
 	if c.level <= LevelTrace {
-		c.With(String("bookend", "start"), String("fn", name)).
+		c.With(String("bookend", "start"), level(LevelTrace)).
 			emit(&pb.Entry{
 				Kind:  pb.Kind_Log,
-				Scope: "trace",
+				Scope: name,
 			})
 	}
 
@@ -172,12 +172,13 @@ func (a *active) Done() {
 		a.c = a.c.With(Duration("duration", duration))
 
 		if a.c.level <= LevelTrace {
-			a.c.With(String("bookend", "end"), String("fn", a.name)).emit(
-				&pb.Entry{
-					Kind:  pb.Kind_Log,
-					Scope: "trace",
-				},
-			)
+			a.c.With(String("bookend", "end"), level(LevelTrace)).
+				emit(
+					&pb.Entry{
+						Kind:  pb.Kind_Log,
+						Scope: a.name,
+					},
+				)
 		}
 
 		// trace
@@ -194,11 +195,13 @@ func (c Client) Debug(msg string, tags ...Tag) {
 		return
 	}
 
+	name, _ := caller(c.callerSkip)
+
 	c.With(tags...).
-		With(String("msg", msg)).
+		With(message(msg), level(LevelDebug)).
 		emit(&pb.Entry{
 			Kind:  pb.Kind_Log,
-			Scope: "debug",
+			Scope: name,
 		})
 }
 
@@ -208,11 +211,13 @@ func (c Client) Info(msg string, tags ...Tag) {
 		return
 	}
 
+	name, _ := caller(c.callerSkip)
+
 	c.With(tags...).
-		With(String("msg", msg)).
+		With(message(msg), level(LevelInfo)).
 		emit(&pb.Entry{
 			Kind:  pb.Kind_Log,
-			Scope: "info",
+			Scope: name,
 		})
 }
 
@@ -222,11 +227,13 @@ func (c Client) Warn(msg string, tags ...Tag) {
 		return
 	}
 
+	name, _ := caller(c.callerSkip)
+
 	c.With(tags...).
-		With(String("msg", msg)).
+		With(message(msg), level(LevelWarn)).
 		emit(&pb.Entry{
 			Kind:  pb.Kind_Log,
-			Scope: "warn",
+			Scope: name,
 		})
 }
 
@@ -236,11 +243,13 @@ func (c Client) Error(msg string, tags ...Tag) {
 		return
 	}
 
+	name, _ := caller(c.callerSkip)
+
 	c.With(tags...).
-		With(String("msg", msg)).
+		With(message(msg), level(LevelError)).
 		emit(&pb.Entry{
 			Kind:  pb.Kind_Log,
-			Scope: "error",
+			Scope: name,
 		})
 }
 
@@ -263,7 +272,7 @@ func (c Client) emit(entries ...*pb.Entry) {
 }
 
 // caller attempts to get method caller information. This information is used for tracing information across an
-// applications source code.
+// applications source code. Need to look into the performance of this call. Parts of it may be able to be cached.
 func caller(skip int) (name string, line int) {
 	pctr, _, line, ok := runtime.Caller(skip)
 	if !ok {
diff --git a/tags.ext.go b/tags.ext.go
index 67db728..86f0ebc 100644
--- a/tags.ext.go
+++ b/tags.ext.go
@@ -25,3 +25,9 @@ func Err(err error) Tag { return Tag{"err", err} }
 
 // Errp returns a Tag whose value is read after submission.
 func Errp(err *error) Tag { return Tag{"err", err} }
+
+// level returns a tag that contains the string representation of a level.
+func level(level Level) Tag { return Tag{"level", (&level).String()} }
+
+// message returns a tag containing message string to index.
+func message(msg string) Tag { return Tag{"msg", msg} }