Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Commit

Permalink
oops
Browse files Browse the repository at this point in the history
  • Loading branch information
black-adder committed Feb 17, 2017
1 parent 4b98c2d commit 66a3d21
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
4 changes: 2 additions & 2 deletions reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ func (r *nullReporter) Close() {
// ------------------------------

type loggingReporter struct {
logger log.Logger
logger Logger
}

// NewLoggingReporter creates a reporter that logs all reported spans to provided logger.
func NewLoggingReporter(logger log.Logger) Reporter {
func NewLoggingReporter(logger Logger) Reporter {
return &loggingReporter{logger}
}

Expand Down
6 changes: 2 additions & 4 deletions reporter_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ package jaeger

import (
"time"

"github.com/uber/jaeger-client-go/log"
)

// ReporterOption is a function that sets some option on the reporter.
Expand All @@ -39,7 +37,7 @@ type reporterOptions struct {
// bufferFlushInterval is how often the buffer is force-flushed, even if it's not full
bufferFlushInterval time.Duration
// logger is used to log errors of span submissions
logger log.Logger
logger Logger
// metrics is used to record runtime stats
metrics *Metrics
}
Expand Down Expand Up @@ -70,7 +68,7 @@ func (reporterOptions) BufferFlushInterval(bufferFlushInterval time.Duration) Re

// Logger creates a ReporterOption that initializes the logger used to log
// errors of span submissions.
func (reporterOptions) Logger(logger log.Logger) ReporterOption {
func (reporterOptions) Logger(logger Logger) ReporterOption {
return func(r *reporterOptions) {
r.logger = logger
}
Expand Down
6 changes: 2 additions & 4 deletions sampler_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ package jaeger

import (
"time"

"github.com/uber/jaeger-client-go/log"
)

// SamplerOption is a function that sets some option on the sampler
Expand All @@ -36,7 +34,7 @@ type samplerOptions struct {
metrics *Metrics
maxOperations int
sampler Sampler
logger log.Logger
logger Logger
samplingServerURL string
samplingRefreshInterval time.Duration
}
Expand Down Expand Up @@ -66,7 +64,7 @@ func (samplerOptions) InitialSampler(sampler Sampler) SamplerOption {
}

// Logger creates a SamplerOption that sets the logger used by the sampler.
func (samplerOptions) Logger(logger log.Logger) SamplerOption {
func (samplerOptions) Logger(logger Logger) SamplerOption {
return func(o *samplerOptions) {
o.logger = logger
}
Expand Down
4 changes: 1 addition & 3 deletions tracer_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ package jaeger

import (
"time"

"github.com/uber/jaeger-client-go/log"
)

// TracerOption is a function that sets some option on the tracer
Expand All @@ -43,7 +41,7 @@ func (tracerOptions) Metrics(m *Metrics) TracerOption {
}

// Logger creates a TracerOption that gives the tracer a Logger.
func (tracerOptions) Logger(logger log.Logger) TracerOption {
func (tracerOptions) Logger(logger Logger) TracerOption {
return func(tracer *tracer) {
tracer.logger = logger
}
Expand Down
5 changes: 3 additions & 2 deletions transport/zipkin/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (

"github.com/apache/thrift/lib/go/thrift"

"github.com/uber/jaeger-client-go"
"github.com/uber/jaeger-client-go/log"
"github.com/uber/jaeger-client-go/thrift-gen/zipkincore"
"github.com/uber/jaeger-client-go/transport"
Expand All @@ -42,7 +43,7 @@ const defaultHTTPTimeout = time.Second * 5

// HTTPTransport implements Transport by forwarding spans to a http server.
type HTTPTransport struct {
logger log.Logger
logger jaeger.Logger
url string
client *http.Client
batchSize int
Expand All @@ -55,7 +56,7 @@ type HTTPOption func(c *HTTPTransport)
// HTTPLogger sets the logger used to report errors in the collection
// process. By default, a no-op logger is used, i.e. no errors are logged
// anywhere. It's important to set this option in a production service.
func HTTPLogger(logger log.Logger) HTTPOption {
func HTTPLogger(logger jaeger.Logger) HTTPOption {
return func(c *HTTPTransport) { c.logger = logger }
}

Expand Down

0 comments on commit 66a3d21

Please sign in to comment.