Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Coredns
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
Coredns
Commits
501e5031
Commit
501e5031
authored
Jun 23, 2022
by
Ondřej Benkovský
Committed by
GitHub
Jun 23, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
plugin/trace: make zipkin and datadog reporters log errors using CoreDNS logger (#5452)
parent
c9eedcb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
3 deletions
+28
-3
plugin/trace/logger.go
plugin/trace/logger.go
+20
-0
plugin/trace/trace.go
plugin/trace/trace.go
+8
-3
No files found.
plugin/trace/logger.go
0 → 100644
View file @
501e5031
package
trace
import
(
clog
"github.com/coredns/coredns/plugin/pkg/log"
)
// loggerAdapter is a simple adapter around plugin logger made to implement io.Writer and ddtrace.Logger interface
// in order to log errors from span reporters as warnings
type
loggerAdapter
struct
{
clog
.
P
}
func
(
l
*
loggerAdapter
)
Write
(
p
[]
byte
)
(
n
int
,
err
error
)
{
l
.
P
.
Warning
(
string
(
p
))
return
len
(
p
),
nil
}
func
(
l
*
loggerAdapter
)
Log
(
msg
string
)
{
l
.
P
.
Warning
(
msg
)
}
plugin/trace/trace.go
View file @
501e5031
...
...
@@ -4,6 +4,7 @@ package trace
import
(
"context"
"fmt"
stdlog
"log"
"net/http"
"sync"
"sync/atomic"
...
...
@@ -12,7 +13,7 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/metadata"
"github.com/coredns/coredns/plugin/pkg/dnstest"
"github.com/coredns/coredns/plugin/pkg/log"
clog
"github.com/coredns/coredns/plugin/pkg/log"
"github.com/coredns/coredns/plugin/pkg/rcode"
_
"github.com/coredns/coredns/plugin/pkg/trace"
// Plugin the trace package.
"github.com/coredns/coredns/request"
...
...
@@ -35,6 +36,8 @@ const (
metaTraceIdKey
=
"trace/traceid"
)
var
log
=
clog
.
NewWithPlugin
(
"trace"
)
type
traceTags
struct
{
Name
string
Type
string
...
...
@@ -90,10 +93,11 @@ func (t *trace) OnStartup() error {
case
"datadog"
:
tracer
:=
opentracer
.
New
(
tracer
.
WithAgentAddr
(
t
.
Endpoint
),
tracer
.
WithDebugMode
(
log
.
D
.
Value
()),
tracer
.
WithDebugMode
(
c
log
.
D
.
Value
()),
tracer
.
WithGlobalTag
(
ext
.
SpanTypeDNS
,
true
),
tracer
.
WithServiceName
(
t
.
serviceName
),
tracer
.
WithAnalyticsRate
(
t
.
datadogAnalyticsRate
),
tracer
.
WithLogger
(
&
loggerAdapter
{
log
}),
)
t
.
tracer
=
tracer
t
.
tagSet
=
tagByProvider
[
"datadog"
]
...
...
@@ -105,7 +109,8 @@ func (t *trace) OnStartup() error {
}
func
(
t
*
trace
)
setupZipkin
()
error
{
reporter
:=
zipkinhttp
.
NewReporter
(
t
.
Endpoint
)
logOpt
:=
zipkinhttp
.
Logger
(
stdlog
.
New
(
&
loggerAdapter
{
log
},
""
,
0
))
reporter
:=
zipkinhttp
.
NewReporter
(
t
.
Endpoint
,
logOpt
)
recorder
,
err
:=
zipkin
.
NewEndpoint
(
t
.
serviceName
,
t
.
serviceEndpoint
)
if
err
!=
nil
{
log
.
Warningf
(
"build Zipkin endpoint found err: %v"
,
err
)
...
...
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