fixes

kyma-project · Jan 19, 2023 · 65cda49 · 65cda49
1 parent 507b1d7
commit 65cda49
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 47 deletions.
diff --git a/components/telemetry-operator/controller/logparser/controller.go b/components/telemetry-operator/controller/logparser/controller.go
@@ -49,18 +49,13 @@ type DaemonSetAnnotator interface {
 	SetAnnotation(ctx context.Context, name types.NamespacedName, key, value string) error
 }
 
-type GlobalConfigHandler interface {
-	CheckGlobalConfig(config overrides.GlobalConfig) error
-	UpdateOverrideConfig(ctx context.Context, overrideConfigMap types.NamespacedName) (overrides.Config, error)
-}
-
 type Reconciler struct {
 	client.Client
 	config       Config
 	prober       DaemonSetProber
 	annotator    DaemonSetAnnotator
 	syncer       syncer
-	globalConfig GlobalConfigHandler
+	globalConfig *overrides.Handler
 }
 
 func NewReconciler(client client.Client, config Config, prober DaemonSetProber, annotator DaemonSetAnnotator, handler *overrides.Handler) *Reconciler {

diff --git a/components/telemetry-operator/controller/logpipeline/suite_test.go b/components/telemetry-operator/controller/logpipeline/suite_test.go
@@ -18,7 +18,7 @@ package logpipeline
 
 import (
 	"context"
-	"github.com/kyma-project/kyma/components/telemetry-operator/internal/configurelogger"
+	"github.com/kyma-project/kyma/components/telemetry-operator/internal/logger"
 	"github.com/kyma-project/kyma/components/telemetry-operator/internal/overrides"
 	"path/filepath"
 	"testing"
@@ -77,7 +77,7 @@ func TestAPIs(t *testing.T) {
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 	dynamicLoglevel := zapLog.NewAtomicLevel()
-	configureLogLevelOnFly := configurelogger.New(dynamicLoglevel)
+	configureLogLevelOnFly := logger.NewLogReconfigurer(dynamicLoglevel)
 
 	ctx, cancel = context.WithCancel(context.TODO())
 

diff --git a/components/telemetry-operator/controller/tracepipeline/suite_test.go b/components/telemetry-operator/controller/tracepipeline/suite_test.go
@@ -15,8 +15,8 @@ package tracepipeline
 
 import (
 	"context"
-	"github.com/kyma-project/kyma/components/telemetry-operator/internal/configurelogger"
 	"github.com/kyma-project/kyma/components/telemetry-operator/internal/kubernetes"
+	"github.com/kyma-project/kyma/components/telemetry-operator/internal/logger"
 	"github.com/kyma-project/kyma/components/telemetry-operator/internal/overrides"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
@@ -74,7 +74,7 @@ func TestAPIs(t *testing.T) {
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 	dynamicLoglevel := zapLog.NewAtomicLevel()
-	configureLogLevelOnFly := configurelogger.New(dynamicLoglevel)
+	configureLogLevelOnFly := logger.NewLogReconfigurer(dynamicLoglevel)
 
 	ctx, cancel = context.WithCancel(context.TODO())
 

diff --git a/components/telemetry-operator/internal/configureLogger/configurelogger.go b/components/telemetry-operator/internal/configureLogger/configurelogger.go
diff --git a/components/telemetry-operator/internal/logger/logger.go b/components/telemetry-operator/internal/logger/logger.go
@@ -3,6 +3,7 @@ package logger
 import (
 	"github.com/kyma-project/kyma/common/logging/logger"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 	"k8s.io/klog/v2"
 )
 
@@ -37,3 +38,29 @@ func New(format, level string, atomic zap.AtomicLevel) (*Logger, error) {
 
 	return &Logger{Logger: log}, nil
 }
+
+type LogLevel struct {
+	Atomic  zap.AtomicLevel
+	Default string
+}
+
+func NewLogReconfigurer(atomic zap.AtomicLevel) *LogLevel {
+	var l LogLevel
+	l.Atomic = atomic
+	l.Default = atomic.String()
+	return &l
+}
+
+func (l *LogLevel) SetDefaultLogLevel() error {
+	return l.ChangeLogLevel(l.Default)
+}
+
+func (l *LogLevel) ChangeLogLevel(logLevel string) error {
+	parsedLevel, err := zapcore.ParseLevel(logLevel)
+	if err != nil {
+		return err
+	}
+
+	l.Atomic.SetLevel(parsedLevel)
+	return nil
+}
diff --git a/components/telemetry-operator/internal/overrides/overrides.go b/components/telemetry-operator/internal/overrides/overrides.go
@@ -3,7 +3,7 @@ package overrides
 import (
 	"context"
 	"fmt"
-	"github.com/kyma-project/kyma/components/telemetry-operator/internal/configurelogger"
+	"github.com/kyma-project/kyma/components/telemetry-operator/internal/logger"
 	"gopkg.in/yaml.v3"
 	"k8s.io/apimachinery/pkg/types"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -47,7 +47,7 @@ type Handler struct {
 	cmProber        ConfigMapProber
 }
 
-func New(loglevelChanger *configurelogger.LogLevel, cmProber ConfigMapProber) *Handler {
+func New(loglevelChanger *logger.LogLevel, cmProber ConfigMapProber) *Handler {
 	var m Handler
 	m.logLevelChanger = loglevelChanger
 	m.cmProber = cmProber

diff --git a/components/telemetry-operator/main.go b/components/telemetry-operator/main.go
@@ -19,7 +19,6 @@ package main
 import (
 	"errors"
 	"flag"
-	"github.com/kyma-project/kyma/components/telemetry-operator/internal/configurelogger"
 	"os"
 	"strings"
 	"time"
@@ -83,7 +82,7 @@ var (
 	syncPeriod             time.Duration
 	telemetryNamespace     string
 	dynamicLoglevel        = zap.NewAtomicLevel()
-	configureLogLevelOnFly *configurelogger.LogLevel
+	configureLogLevelOnFly *logger.LogLevel
 
 	traceCollectorCreateServiceMonitor bool
 	traceCollectorBaseName             string
@@ -203,7 +202,7 @@ func main() {
 		os.Exit(1)
 	}
 	dynamicLoglevel.SetLevel(parsedLevel)
-	configureLogLevelOnFly = configurelogger.New(dynamicLoglevel)
+	configureLogLevelOnFly = logger.NewLogReconfigurer(dynamicLoglevel)
 
 	ctrLogger, err := logger.New(logFormat, logLevel, dynamicLoglevel)