Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
go-nexus-telemetry
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Public
go-nexus-telemetry
Commits
53bf6b94
Commit
53bf6b94
authored
1 year ago
by
John Harris
Browse files
Options
Downloads
Plain Diff
Merge branch 'refactor' into main
parents
5d7a7776
4bb09063
No related branches found
Branches containing commit
Tags
v1.5.5
Tags containing commit
1 merge request
!1
Refactor library to idiomatic go
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
options.go
+25
-0
25 additions, 0 deletions
options.go
slog.go
+51
-0
51 additions, 0 deletions
slog.go
slog_test.go
+34
-0
34 additions, 0 deletions
slog_test.go
src/main/main.go
+0
-10
0 additions, 10 deletions
src/main/main.go
with
110 additions
and
10 deletions
options.go
0 → 100644
+
25
−
0
View file @
53bf6b94
package
slog
import
(
"golang.org/x/exp/slog"
"io"
)
type
Options
struct
{
Leveler
slog
.
Leveler
Writer
io
.
Writer
}
type
Option
func
(
*
Options
)
func
WithLeveler
(
leveler
slog
.
Leveler
)
Option
{
return
func
(
o
*
Options
)
{
o
.
Leveler
=
leveler
}
}
func
WithWriter
(
writer
io
.
Writer
)
Option
{
return
func
(
o
*
Options
)
{
o
.
Writer
=
writer
}
}
This diff is collapsed.
Click to expand it.
src/slog/
slog.go
→
slog.go
+
51
−
0
View file @
53bf6b94
...
...
@@ -6,36 +6,46 @@ import (
"strings"
)
func
InitLogger
()
*
slog
.
Logger
{
// Could set logger level via ENV vars in future.
programLevel
:=
new
(
slog
.
LevelVar
)
programLevel
.
Set
(
slog
.
LevelDebug
)
func
New
(
opts
...
Option
)
*
slog
.
Logger
{
options
:=
&
Options
{
Leveler
:
slog
.
LevelDebug
,
Writer
:
os
.
Stdout
,
}
for
_
,
opt
:=
range
opts
{
opt
(
options
)
}
// Attributes modified for datadog schema via HandlerOptions.ReplaceAttr
// Per recommendation at https://pkg.go.dev/golang.org/x/exp/slog#JSONHandler
// See datadog: https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention/#reserved-attributes
loggerR
eplace
:=
func
(
groups
[]
string
,
a
slog
.
Attr
)
slog
.
Attr
{
if
a
.
Key
==
"msg"
{
a
.
Key
=
"message"
r
eplace
Attr
:=
func
(
groups
[]
string
,
a
ttr
slog
.
Attr
)
slog
.
Attr
{
if
a
ttr
.
Key
==
"msg"
{
a
ttr
.
Key
=
"message"
}
if
a
.
Key
==
"time"
{
a
.
Key
=
"date"
if
a
ttr
.
Key
==
"time"
{
a
ttr
.
Key
=
"date"
}
if
a
.
Key
==
"level"
{
a
.
Key
=
"status"
a
.
Value
=
slog
.
StringValue
(
strings
.
ToLower
(
a
.
Value
.
String
()))
if
a
ttr
.
Key
==
"level"
{
a
ttr
.
Key
=
"status"
a
ttr
.
Value
=
slog
.
StringValue
(
strings
.
ToLower
(
a
ttr
.
Value
.
String
()))
}
return
a
return
a
ttr
}
logger
:=
slog
.
New
(
slog
.
NewJSONHandler
(
os
.
Stdout
,
&
slog
.
HandlerOptions
{
Level
:
programLevel
,
AddSource
:
true
,
ReplaceAttr
:
loggerReplace
}))
hostname
,
hostnameErr
:=
os
.
Hostname
()
if
hostnameErr
==
nil
{
logger
=
logger
.
With
(
"host"
,
hostname
)
handlerOptions
:=
&
slog
.
HandlerOptions
{
Level
:
options
.
Leveler
,
AddSource
:
true
,
ReplaceAttr
:
replaceAttr
,
}
logHandler
:=
slog
.
NewJSONHandler
(
options
.
Writer
,
handlerOptions
)
logger
:=
slog
.
New
(
logHandler
)
hostname
,
err
:=
os
.
Hostname
()
if
err
!=
nil
{
logger
.
Error
(
"Failed to get hostname."
,
slog
.
String
(
"error"
,
err
.
Error
()))
}
else
{
logger
.
Error
(
"Failed to get hostname."
,
slog
.
String
(
"error"
,
hostnameErr
.
Error
())
)
logger
=
logger
.
With
(
"host"
,
hostname
)
}
logger
.
Info
(
"Initialised."
)
return
logger
}
This diff is collapsed.
Click to expand it.
slog_test.go
0 → 100644
+
34
−
0
View file @
53bf6b94
package
slog
import
(
"bufio"
"bytes"
"encoding/json"
"golang.org/x/exp/slog"
"testing"
)
func
TestNew
(
t
*
testing
.
T
)
{
var
buf
bytes
.
Buffer
logger
:=
New
(
WithWriter
(
&
buf
))
logger
.
Info
(
"Foo"
,
slog
.
String
(
"bar"
,
"baz"
))
logger
.
Error
(
"Bar"
,
slog
.
String
(
"baz"
,
"qux"
))
scanner
:=
bufio
.
NewScanner
(
&
buf
)
// Scan the first log.
scanner
.
Scan
()
infoLog
:=
scanner
.
Bytes
()
var
infoLogMap
map
[
string
]
any
if
err
:=
json
.
Unmarshal
(
infoLog
,
&
infoLogMap
);
err
!=
nil
{
t
.
Errorf
(
"Failed to unmarshal info log: %s"
,
err
.
Error
())
}
t
.
Log
(
infoLogMap
)
if
infoLogMap
[
"status"
]
!=
"info"
{
t
.
Errorf
(
"Expected info log level, got %s"
,
infoLogMap
[
"level"
])
}
if
infoLogMap
[
"bar"
]
!=
"baz"
{
t
.
Errorf
(
"Expected bar=baz, got %s"
,
infoLogMap
[
"bar"
])
}
}
This diff is collapsed.
Click to expand it.
src/main/main.go
deleted
100644 → 0
+
0
−
10
View file @
5d7a7776
package
main
import
(
"gitlab.nexdev.uk/pub/go-slog/src/slog"
)
func
main
()
{
logger
:=
slog
.
InitLogger
()
logger
.
Info
(
"Logger test."
)
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment