Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
invinoveritas
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository 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
gbe
invinoveritas
Commits
d9fb75a9
Commit
d9fb75a9
authored
3 years ago
by
gbe
Browse files
Options
Downloads
Patches
Plain Diff
Log remote host names if available
parent
a8fa7b81
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
log/log.go
+10
-2
10 additions, 2 deletions
log/log.go
log/log_test.go
+89
-0
89 additions, 0 deletions
log/log_test.go
with
99 additions
and
2 deletions
log/log.go
+
10
−
2
View file @
d9fb75a9
...
...
@@ -2,6 +2,7 @@ package log
import
(
"context"
"net"
"net/http"
"time"
...
...
@@ -21,10 +22,18 @@ func Request(next http.Handler, logger log.Logger) http.Handler {
remote
=
r
.
RemoteAddr
}
// Try to figure out a name for the remote. If there are multiple, we select the first.
names
,
err
:=
net
.
LookupAddr
(
remote
)
if
err
!=
nil
{
// Can't resolve name, but that's ok. There might not be a PTR record for the remote.
names
=
[]
string
{
"n/a"
}
}
l
:=
log
.
With
(
logger
,
"method"
,
r
.
Method
,
"url"
,
r
.
URL
,
"remote"
,
remote
,
"host"
,
names
[
0
],
"request_id"
,
betterguid
.
New
())
start
:=
time
.
Now
()
...
...
@@ -32,8 +41,7 @@ func Request(next http.Handler, logger log.Logger) http.Handler {
d
:=
time
.
Since
(
start
)
level
.
Info
(
l
)
.
Log
(
"duration"
,
d
,
"msg"
,
"request handled"
)
Log
(
"duration"
,
d
,
"msg"
,
"request handled"
)
}()
key
:=
contextKey
(
"logger"
)
...
...
This diff is collapsed.
Click to expand it.
log/log_test.go
0 → 100644
+
89
−
0
View file @
d9fb75a9
package
log
import
(
"fmt"
"net/http"
"net/http/httptest"
"testing"
)
type
testLogger
struct
{
m
map
[
string
]
string
}
func
(
tl
*
testLogger
)
Log
(
vals
...
interface
{})
error
{
tl
.
m
=
make
(
map
[
string
]
string
)
if
len
(
vals
)
%
2
!=
0
{
// Append dummy MISSING! value
vals
=
append
(
vals
,
"MISSING!"
)
}
for
i
:=
0
;
i
<
len
(
vals
);
i
+=
2
{
key
:=
fmt
.
Sprintf
(
"%v"
,
vals
[
i
])
val
:=
fmt
.
Sprintf
(
"%v"
,
vals
[
i
+
1
])
tl
.
m
[
key
]
=
val
}
return
nil
}
func
TestLogRequest
(
t
*
testing
.
T
)
{
next
:=
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
t
.
Log
(
"next called!"
)
})
testCases
:=
[]
struct
{
forwardedFor
string
remoteAddr
string
expectRemote
string
expectHost
string
}{
{
forwardedFor
:
"8.8.4.4"
,
remoteAddr
:
"foobar"
,
expectRemote
:
"8.8.4.4"
,
expectHost
:
"dns.google."
,
},
{
forwardedFor
:
"2001:4860:4860::8888"
,
remoteAddr
:
"foobar"
,
expectRemote
:
"2001:4860:4860::8888"
,
expectHost
:
"dns.google."
,
},
{
expectHost
:
"n/a"
},
{
remoteAddr
:
"1.2.3.4"
,
expectRemote
:
"1.2.3.4"
,
expectHost
:
"n/a"
},
{
remoteAddr
:
"2001:db8::1"
,
expectRemote
:
"2001:db8::1"
,
expectHost
:
"n/a"
},
}
for
_
,
tc
:=
range
testCases
{
t
.
Run
(
tc
.
forwardedFor
+
"-"
+
tc
.
remoteAddr
,
func
(
t
*
testing
.
T
)
{
var
log
testLogger
hdlr
:=
Request
(
next
,
&
log
)
t
.
Log
(
tc
)
w
:=
httptest
.
NewRecorder
()
r
:=
httptest
.
NewRequest
(
"GET"
,
"/"
,
nil
)
r
.
RemoteAddr
=
tc
.
remoteAddr
if
tc
.
forwardedFor
!=
""
{
r
.
Header
.
Set
(
"X-Forwarded-For"
,
tc
.
forwardedFor
)
}
hdlr
.
ServeHTTP
(
w
,
r
)
t
.
Log
(
"logged fields:"
,
log
.
m
)
if
log
.
m
[
"host"
]
!=
tc
.
expectHost
{
t
.
Errorf
(
"unexpected host name in log. want %q, have %q"
,
tc
.
expectHost
,
log
.
m
[
"host"
])
}
if
log
.
m
[
"remote"
]
!=
tc
.
expectRemote
{
t
.
Errorf
(
"unexpected remote address in log. want %q, have %q"
,
tc
.
expectRemote
,
log
.
m
[
"remote"
])
}
})
}
}
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