Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
db637a36
Unverified
Commit
db637a36
authored
Nov 10, 2020
by
Carl Bergquist
Committed by
GitHub
Nov 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tracing: log traceID in request logger (#28952)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
parent
afb06ec2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
5 deletions
+35
-5
pkg/middleware/logger.go
+35
-5
No files found.
pkg/middleware/logger.go
View file @
db637a36
...
...
@@ -16,12 +16,15 @@
package
middleware
import
(
"context"
"net/http"
"time"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
opentracing
"github.com/opentracing/opentracing-go"
"github.com/prometheus/client_golang/prometheus"
"github.com/uber/jaeger-client-go"
"gopkg.in/macaron.v1"
)
...
...
@@ -49,13 +52,40 @@ func Logger() macaron.Handler {
if
ctx
,
ok
:=
c
.
Data
[
"ctx"
];
ok
{
ctxTyped
:=
ctx
.
(
*
models
.
ReqContext
)
if
status
==
500
{
ctxTyped
.
Logger
.
Error
(
"Request Completed"
,
"method"
,
req
.
Method
,
"path"
,
req
.
URL
.
Path
,
"status"
,
status
,
"remote_addr"
,
c
.
RemoteAddr
(),
"time_ms"
,
int64
(
timeTaken
),
"size"
,
rw
.
Size
(),
"referer"
,
req
.
Referer
())
logParams
:=
[]
interface
{}{
"method"
,
req
.
Method
,
"path"
,
req
.
URL
.
Path
,
"status"
,
status
,
"remote_addr"
,
c
.
RemoteAddr
(),
"time_ms"
,
int64
(
timeTaken
),
"size"
,
rw
.
Size
(),
"referer"
,
req
.
Referer
(),
}
traceID
,
exist
:=
extractTraceID
(
ctxTyped
.
Req
.
Request
.
Context
())
if
exist
{
logParams
=
append
(
logParams
,
"traceID"
,
traceID
)
}
if
status
>=
500
{
ctxTyped
.
Logger
.
Error
(
"Request Completed"
,
logParams
...
)
}
else
{
ctxTyped
.
Logger
.
Info
(
"Request Completed"
,
"method"
,
req
.
Method
,
"path"
,
req
.
URL
.
Path
,
"status"
,
status
,
"remote_addr"
,
c
.
RemoteAddr
(),
"time_ms"
,
int64
(
timeTaken
),
"size"
,
rw
.
Size
(),
"referer"
,
req
.
Referer
())
ctxTyped
.
Logger
.
Info
(
"Request Completed"
,
logParams
...
)
}
}
}
}
func
extractTraceID
(
ctx
context
.
Context
)
(
string
,
bool
)
{
sp
:=
opentracing
.
SpanFromContext
(
ctx
)
if
sp
==
nil
{
return
""
,
false
}
sctx
,
ok
:=
sp
.
Context
()
.
(
jaeger
.
SpanContext
)
if
!
ok
{
return
""
,
false
}
return
sctx
.
TraceID
()
.
String
(),
true
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment