Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
0071ecea
Commit
0071ecea
authored
1 year ago
by
Semyon Krestyaninov
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/PRXS-951-1964-FixZapCustomFields' into feature/PRXS-951-1961-ZapIntergration
parents
03fda18d
ee8d2412
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
log/zap/field.go
+9
-9
9 additions, 9 deletions
log/zap/field.go
log/zap/field_test.go
+10
-10
10 additions, 10 deletions
log/zap/field_test.go
with
19 additions
and
19 deletions
log/zap/field.go
+
9
−
9
View file @
0071ecea
...
...
@@ -30,32 +30,32 @@ func Event(event string) zap.Field {
return
zap
.
String
(
"event"
,
event
)
}
// Object
ID
возвращает поле и устанавливает передаваемый аргумент в качестве идентификатора объекта в формате ObjectId.
// Object возвращает поле и устанавливает передаваемый аргумент в качестве идентификатора объекта в формате ObjectId.
// Поддерживает типы в формате ObjectId: id.Descriptor, string, map[string]any, системные объекты.
func
Object
ID
(
v
any
)
zap
.
Field
{
func
Object
(
v
any
)
zap
.
Field
{
oid
,
err
:=
id
.
NewObjectId
(
v
)
if
err
!=
nil
{
return
zap
.
Skip
()
}
return
zap
.
Reflect
(
"object
_id
"
,
oid
)
return
zap
.
Reflect
(
"object"
,
oid
)
}
// Caller
ID
возвращает поле и устанавливает передаваемый аргумент в качестве "вызывающего" в формате ObjectId.
// Caller возвращает поле и устанавливает передаваемый аргумент в качестве "вызывающего" в формате ObjectId.
// Поддерживает типы в формате ObjectId: id.Descriptor, string, map[string]any, системные объекты.
func
Caller
ID
(
v
any
)
zap
.
Field
{
func
Caller
(
v
any
)
zap
.
Field
{
oid
,
err
:=
id
.
NewObjectId
(
v
)
if
err
!=
nil
{
return
zap
.
Skip
()
}
return
zap
.
Reflect
(
"caller
_id
"
,
oid
)
return
zap
.
Reflect
(
"caller"
,
oid
)
}
// Caller
ID
FromContext извлекает auth.Principal из контекста и устанавливает его в качестве "вызывающего" в формате Object
ID
.
func
Caller
ID
FromContext
(
ctx
context
.
Context
)
zap
.
Field
{
// CallerFromContext извлекает auth.Principal из контекста и устанавливает его в качестве "вызывающего" в формате Object.
func
CallerFromContext
(
ctx
context
.
Context
)
zap
.
Field
{
if
ctx
==
nil
{
return
zap
.
Skip
()
}
return
Caller
ID
(
auth
.
GetPrincipal
(
ctx
))
return
Caller
(
auth
.
GetPrincipal
(
ctx
))
}
func
Attr
(
attr
any
)
zap
.
Field
{
...
...
This diff is collapsed.
Click to expand it.
log/zap/field_test.go
+
10
−
10
View file @
0071ecea
...
...
@@ -79,10 +79,10 @@ func TestObjectID(t *testing.T) {
field
zap
.
Field
want
zap
.
Field
}{
{
name
:
"system object"
,
field
:
Object
ID
(
item
),
want
:
zap
.
Reflect
(
"object
_id
"
,
oid
)},
{
name
:
"object id"
,
field
:
Object
ID
(
itemId
),
want
:
zap
.
Reflect
(
"object
_id
"
,
oid
)},
{
name
:
"string"
,
field
:
Object
ID
(
oid
.
String
()),
want
:
zap
.
Reflect
(
"object
_id
"
,
oid
)},
{
name
:
"invalid"
,
field
:
Object
ID
(
nil
),
want
:
zap
.
Skip
()},
{
name
:
"system object"
,
field
:
Object
(
item
),
want
:
zap
.
Reflect
(
"object"
,
oid
)},
{
name
:
"object id"
,
field
:
Object
(
itemId
),
want
:
zap
.
Reflect
(
"object"
,
oid
)},
{
name
:
"string"
,
field
:
Object
(
oid
.
String
()),
want
:
zap
.
Reflect
(
"object"
,
oid
)},
{
name
:
"invalid"
,
field
:
Object
(
nil
),
want
:
zap
.
Skip
()},
}
for
_
,
tc
:=
range
tests
{
...
...
@@ -109,10 +109,10 @@ func TestCallerID(t *testing.T) {
field
zap
.
Field
want
zap
.
Field
}{
{
name
:
"system object"
,
field
:
Caller
ID
(
user
),
want
:
zap
.
Reflect
(
"caller
_id
"
,
oid
)},
{
name
:
"object id"
,
field
:
Caller
ID
(
userId
),
want
:
zap
.
Reflect
(
"caller
_id
"
,
oid
)},
{
name
:
"string"
,
field
:
Caller
ID
(
oid
.
String
()),
want
:
zap
.
Reflect
(
"caller
_id
"
,
oid
)},
{
name
:
"invalid"
,
field
:
Caller
ID
(
nil
),
want
:
zap
.
Skip
()},
{
name
:
"system object"
,
field
:
Caller
(
user
),
want
:
zap
.
Reflect
(
"caller"
,
oid
)},
{
name
:
"object id"
,
field
:
Caller
(
userId
),
want
:
zap
.
Reflect
(
"caller"
,
oid
)},
{
name
:
"string"
,
field
:
Caller
(
oid
.
String
()),
want
:
zap
.
Reflect
(
"caller"
,
oid
)},
{
name
:
"invalid"
,
field
:
Caller
(
nil
),
want
:
zap
.
Skip
()},
}
for
_
,
tc
:=
range
tests
{
...
...
@@ -135,8 +135,8 @@ func TestCallerIDFromContext(t *testing.T) {
field
zap
.
Field
want
zap
.
Field
}{
{
name
:
"ok"
,
field
:
Caller
ID
FromContext
(
ctx
),
want
:
zap
.
Reflect
(
"caller
_id
"
,
oid
)},
{
name
:
"invalid"
,
field
:
Caller
ID
FromContext
(
nil
),
want
:
zap
.
Skip
()},
{
name
:
"ok"
,
field
:
CallerFromContext
(
ctx
),
want
:
zap
.
Reflect
(
"caller"
,
oid
)},
{
name
:
"invalid"
,
field
:
CallerFromContext
(
nil
),
want
:
zap
.
Skip
()},
}
for
_
,
tc
:=
range
tests
{
...
...
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