Skip to content

Commit 9540252

Browse files
arthurpitmanarthurpitman
committed
feat: Use slog for logging
1 parent f9d391b commit 9540252

File tree

35 files changed

+271
-978
lines changed

35 files changed

+271
-978
lines changed

‎cmd/monaco/deploy/command.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ func finishReport(ctx context.Context) {
104104
r.Stop()
105105

106106
if summary := r.GetSummary(); len(summary) > 0 {
107-
log.Info(summary)
107+
log.Info("%s", summary)
108108
}
109109
}

‎cmd/monaco/deploy/deploy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func loadProjects(ctx context.Context, fs afero.Fs, manifestPath string, man *ma
136136
if errs != nil {
137137
log.Error("Failed to load projects - %d errors occurred:", len(errs))
138138
for _, err := range errs {
139-
log.WithFields(field.Error(err)).Error(err.Error())
139+
log.WithFields(field.Error(err)).Error("%s", err.Error())
140140
}
141141
return nil, fmt.Errorf("failed to load projects - %d errors occurred", len(errs))
142142
}

‎cmd/monaco/deploy/internal/logging/logging.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package logging
1818

1919
import (
2020
"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/log"
21-
"github.com/dynatrace/dynatrace-configuration-as-code/v2/internal/loggers"
2221
"github.com/dynatrace/dynatrace-configuration-as-code/v2/pkg/manifest"
2322
"github.com/dynatrace/dynatrace-configuration-as-code/v2/pkg/project"
2423
)
@@ -28,9 +27,7 @@ func LogProjectsInfo(projects []project.Project) {
2827
for _, p := range projects {
2928
log.Info(" - %s", p)
3029
}
31-
if log.Level() == loggers.LevelDebug {
32-
logConfigInfo(projects)
33-
}
30+
logConfigInfo(projects)
3431
}
3532

3633
func logConfigInfo(projects []project.Project) {

‎cmd/monaco/generate/deletefile/deletefile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func createConfigAPIEntry(c config.Config, apis api.APIs, project project.Projec
286286

287287
nameOfRefCfg, err := refCfgNamParamVal.ResolveValue(parameter.ResolveContext{})
288288
if err != nil {
289-
log.Warn("Unable to create delete entry for %s: %v", err)
289+
log.Warn("Unable to create delete entry for %s: %v", c.Coordinate, err)
290290
return persistence.DeleteEntry{}, err
291291
}
292292

‎cmd/monaco/integrationtest/v2/config_restore_e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ func validation_uploadDownloadedConfigs(t *testing.T, fs afero.Fs, downloadFolde
377377
// Shows you the downloaded files list in the command line
378378
_ = afero.Walk(fs, downloadFolder+"/", func(path string, info os.FileInfo, err error) error {
379379
fpath, err := filepath.Abs(path)
380-
log.Info("file " + fpath)
380+
log.Info("file %s", fpath)
381381
return nil
382382
})
383383

‎cmd/monaco/integrationtest/v2/supportarchive_report_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,12 @@ func TestSupportArchiveIsCreatedAsExpected(t *testing.T) {
113113

114114
zipReader := readZipArchive(t, fs, archive)
115115
logFile, err := zipReader.Open(fixedTime + ".log")
116+
require.NoError(t, err)
116117
defer logFile.Close()
117-
assert.NoError(t, err)
118+
118119
content, err := io.ReadAll(logFile)
119-
assert.NoError(t, err)
120-
assert.Contains(t, string(content), "debug", "expected log file to contain debug log entries")
120+
require.NoError(t, err)
121+
assert.Contains(t, string(content), "DEBUG", "expected log file to contain debug log entries")
121122
})
122123
})
123124
}

‎cmd/monaco/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ func notifyUser(msg string) {
8181
if msg == "" {
8282
return
8383
}
84-
log.Info(msg)
84+
log.Info("%s", msg)
8585
}

‎cmd/monaco/supportarchive/supportarchive.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func Write(fs afero.Fs) error {
7070
return err
7171
}
7272

73-
log.Info("Saving support archive to " + filepath.Join(workingDir, zipFileName))
73+
log.Info("Saving support archive to %s", filepath.Join(workingDir, zipFileName))
7474
return zip.Create(fs, zipFileName, files, false)
7575
}
7676

‎go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0
77
github.com/dynatrace/dynatrace-configuration-as-code-core v0.8.1-0.20250513082749-4a52a35af3c3
88
github.com/go-logr/logr v1.4.2
9-
github.com/go-logr/zapr v1.3.0
109
github.com/google/go-cmp v0.7.0
1110
github.com/google/uuid v1.6.0
1211
github.com/invopop/jsonschema v0.13.0
@@ -18,7 +17,6 @@ require (
1817
github.com/stretchr/testify v1.10.0
1918
github.com/wk8/go-ordered-map/v2 v2.1.8
2019
go.uber.org/mock v0.5.2
21-
go.uber.org/zap v1.27.0
2220
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
2321
golang.org/x/oauth2 v0.30.0
2422
gonum.org/v1/gonum v0.16.0
@@ -33,7 +31,6 @@ require (
3331
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3432
github.com/mailru/easyjson v0.7.7 // indirect
3533
github.com/pmezard/go-difflib v1.0.0 // indirect
36-
go.uber.org/multierr v1.11.0 // indirect
3734
golang.org/x/text v0.23.0 // indirect
3835
golang.org/x/time v0.11.0 // indirect
3936
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ github.com/dynatrace/dynatrace-configuration-as-code-core v0.8.1-0.2025051308274
1313
github.com/dynatrace/dynatrace-configuration-as-code-core v0.8.1-0.20250513082749-4a52a35af3c3/go.mod h1:3cRc4TbyVxH62R7GwIvvOgOoOQ4R2EnZa6wWjOD7jCQ=
1414
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
1515
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
16-
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
17-
github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
1816
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1917
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
2018
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -43,14 +41,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
4341
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
4442
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
4543
github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
46-
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
47-
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
4844
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
4945
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
50-
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
51-
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
52-
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
53-
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
5446
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
5547
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
5648
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=

0 commit comments

Comments
 (0)