fix: logging formats

butschi84 · Dec 9, 2023 · 7d88e3e · 7d88e3e
1 parent fae69ac
commit 7d88e3e
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -242,6 +242,8 @@ kafka:
               key: test-response
 ```
 
+Fitler values will have to be one of `equal`, `not equal`, `contains` or `not contains`
+
 ### Debugging
 Environment Variables take precedence over the configmap and are useful for local testing / debugging.
 

diff --git a/f2soperator/main.go b/f2soperator/main.go
@@ -15,14 +15,12 @@ import (
 	"butschi84/f2s/state/queue"
 	"fmt"
 
-	"golang.org/x/exp/slog"
-
 	"sync"
 )
 
 var (
 	F2SConfiguration configuration.F2SConfiguration
-	logging          *slog.Logger
+	logging          *logger.F2SLogger
 	F2SHub           hub.F2SHub
 )
 

diff --git a/f2soperator/operation/apiserver/main.go b/f2soperator/operation/apiserver/main.go
@@ -8,12 +8,10 @@ import (
 	"net/http"
 	"regexp"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/gorilla/mux"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 var f2shub *hub.F2SHub
 

diff --git a/f2soperator/operation/dispatcher/handlerequest.go b/f2soperator/operation/dispatcher/handlerequest.go
@@ -174,8 +174,8 @@ func handleRequest(req *queue.F2SRequest, result *chan queue.F2SRequestResult) {
 		// measure time elapsed
 		elapsed := time.Since(start).Milliseconds()
 		elapsedPerInflight := int(time.Since(start).Milliseconds()) / len(pod.InflightRequests)
-		logging.Info(fmt.Sprintf("[%s] Function execution time: %s\n", req.UID, fmt.Sprintf("%vms", elapsed)))
-		logging.Info(fmt.Sprintf("[%s] Function execution time per inflight request: %sms\n", req.UID, fmt.Sprintf("%v", elapsedPerInflight)))
+		logging.Info(fmt.Sprintf("[%s] Function execution time: %s", req.UID, fmt.Sprintf("%vms", elapsed)))
+		logging.Info(fmt.Sprintf("[%s] Function execution time per inflight request: %sms", req.UID, fmt.Sprintf("%v", elapsedPerInflight)))
 
 		// prepare output
 		requestResult.Success = true

diff --git a/f2soperator/operation/dispatcher/main.go b/f2soperator/operation/dispatcher/main.go
@@ -5,11 +5,9 @@ import (
 	"butschi84/f2s/services/logger"
 	"fmt"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 var f2shub *hub.F2SHub
 
 func Initialize(h *hub.F2SHub) {

diff --git a/f2soperator/operation/kafka/main.go b/f2soperator/operation/kafka/main.go
@@ -5,11 +5,9 @@ import (
 	"butschi84/f2s/services/logger"
 	"fmt"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 var f2shub *hub.F2SHub
 
 func init() {

diff --git a/f2soperator/operation/kafka/matcher.go b/f2soperator/operation/kafka/matcher.go
@@ -3,9 +3,12 @@ package kafka
 import (
 	"butschi84/f2s/state/configuration"
 	"fmt"
+	"strings"
 )
 
 // function to check if a configured kafka trigger matches the message
+// => input (key, value)
+// compare to f2s config
 func matchMessage(key string, value string, kafkaListenerConfig *configuration.F2SConfigMapKafkaListener) []configuration.F2SConfigMapKafkaListenerAction {
 	logging.Info(fmt.Sprintf("Kafka Message: %s => %s", key, value))
 
@@ -30,6 +33,18 @@ func matchMessage(key string, value string, kafkaListenerConfig *configuration.F
 				if actualValue == trigger.Value {
 					resInvokeActions = append(resInvokeActions, action)
 				}
+			case "not equal":
+				if actualValue != trigger.Value {
+					resInvokeActions = append(resInvokeActions, action)
+				}
+			case "contains":
+				if strings.Contains(actualValue, trigger.Value) {
+					resInvokeActions = append(resInvokeActions, action)
+				}
+			case "not contains":
+				if !strings.Contains(actualValue, trigger.Value) {
+					resInvokeActions = append(resInvokeActions, action)
+				}
 			}
 		}
 	}

diff --git a/f2soperator/operation/metrics/main.go b/f2soperator/operation/metrics/main.go
@@ -5,14 +5,12 @@ import (
 	"butschi84/f2s/services/logger"
 	"net/http"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 // pointer to F2SConfiguration
 var f2shub hub.F2SHub

diff --git a/f2soperator/operation/operator/main.go b/f2soperator/operation/operator/main.go
@@ -12,12 +12,10 @@ import (
 	"strconv"
 	"time"
 
-	"golang.org/x/exp/slog"
-
 	kubernetesservice "butschi84/f2s/services/kubernetes"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 var f2shub *hub.F2SHub
 
 func init() {

diff --git a/f2soperator/services/kubernetes/main.go b/f2soperator/services/kubernetes/main.go
@@ -2,11 +2,9 @@ package kubernetesservice
 
 import (
 	"butschi84/f2s/services/logger"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 func init() {
 	// initialize logging

diff --git a/f2soperator/services/logger/logging.go b/f2soperator/services/logger/logging.go
@@ -2,22 +2,39 @@ package logger
 
 import (
 	"os"
+	"strings"
 
 	"golang.org/x/exp/slog"
 )
 
-type IF2SLogger interface {
-	Debug()
-	Info()
-	Warn()
-	Error()
-}
-
 type F2SLogger struct {
 	ComponentName string
 	Logger        *slog.Logger
 }
 
-func Initialize(ComponentName string) *slog.Logger {
-	return slog.New(slog.NewTextHandler(os.Stdout, nil)).With("component", ComponentName)
+func Initialize(ComponentName string) *F2SLogger {
+	logger := slog.New(slog.NewTextHandler(os.Stdout, nil)).With("component", ComponentName)
+	return &F2SLogger{
+		ComponentName: ComponentName,
+		Logger:        logger,
+	}
+}
+
+// standard logging functions
+func (l F2SLogger) Info(text ...string) {
+	l.Logger.Info(strings.Join(text, " "), "type", "log")
+}
+func (l F2SLogger) Debug(text ...string) {
+	l.Logger.Debug(strings.Join(text, " "), "type", "log")
+}
+func (l F2SLogger) Warn(text ...string) {
+	l.Logger.Warn(strings.Join(text, " "), "type", "log")
+}
+func (l F2SLogger) Error(text ...string) {
+	l.Logger.Error(strings.Join(text, " "), "type", "log")
+}
+
+// log an event
+func (l F2SLogger) Event(text ...string) {
+	l.Logger.Info(strings.Join(text, " "), "type", "event")
 }
diff --git a/f2soperator/state/configuration/api/clientset/v1alpha1/main.go b/f2soperator/state/configuration/api/clientset/v1alpha1/main.go
@@ -2,11 +2,9 @@ package v1alpha1
 
 import (
 	"butschi84/f2s/services/logger"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 func init() {
 	// initialize logging

diff --git a/f2soperator/state/configuration/main.go b/f2soperator/state/configuration/main.go
@@ -7,12 +7,10 @@ import (
 	"log"
 	"os"
 
-	"golang.org/x/exp/slog"
-
 	"gopkg.in/yaml.v2"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 var ActiveConfiguration F2SConfiguration
 

diff --git a/f2soperator/state/dispatcherstate/main.go b/f2soperator/state/dispatcherstate/main.go
@@ -2,11 +2,9 @@ package dispatcherstate
 
 import (
 	"butschi84/f2s/services/logger"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 var functionTargets F2SDispatcherHub
 

diff --git a/f2soperator/state/queue/main.go b/f2soperator/state/queue/main.go
@@ -3,11 +3,9 @@ package queue
 import (
 	"butschi84/f2s/services/logger"
 	"fmt"
-
-	"golang.org/x/exp/slog"
 )
 
-var logging *slog.Logger
+var logging *logger.F2SLogger
 
 func init() {
 	// initialize logging

diff --git a/helm/templates/prometheus/promtail.yaml b/helm/templates/prometheus/promtail.yaml
@@ -69,6 +69,17 @@ data:
         - role: pod
       pipeline_stages:
         - docker: {}
+        - logfmt:
+            mapping:
+              component: 
+              type: 
+              timestamp: 
+              source: file
+        - labels:
+            timestamp:
+            component:
+            source:
+            type: 
       relabel_configs:
         - source_labels:
             - __meta_kubernetes_pod_node_name