diff --git a/.golangci.yml b/.golangci.yml
index 11949076e..cef170f7c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,6 +7,21 @@ linters:
enable:
- misspell
- goimports
+ - golint
+ - gofmt
+
+issues:
+ exclude-rules:
+ # helpers in tests often (rightfully) pass a *testing.T as their first argument
+ - path: _test\.go
+ text: "context.Context should be the first parameter of a function"
+ linters:
+ - golint
+ # Yes, they are, but it's okay in a test
+ - path: _test\.go
+ text: "exported func.*returns unexported type.*which can be annoying to use"
+ linters:
+ - golint
linters-settings:
misspell:
diff --git a/api/metric/api_test.go b/api/metric/api_test.go
index f735f0b3a..afda76d20 100644
--- a/api/metric/api_test.go
+++ b/api/metric/api_test.go
@@ -661,6 +661,7 @@ func TestObserver(t *testing.T) {
}
func checkBatches(t *testing.T, ctx context.Context, labels LabelSet, meter *mockMeter, descriptor *Descriptor) {
+ t.Helper()
if len(meter.measurementBatches) != 3 {
t.Errorf("Expected 3 recorded measurement batches, got %d", len(meter.measurementBatches))
}
diff --git a/api/trace/always_sampler.go b/api/trace/always_sampler.go
index f23c2adfb..920280192 100644
--- a/api/trace/always_sampler.go
+++ b/api/trace/always_sampler.go
@@ -47,6 +47,6 @@ func (as alwaysSampleSampler) Description() string {
var _ Sampler = alwaysSampleSampler{}
-func AlwaysSampleSampler() alwaysSampleSampler {
+func AlwaysSampleSampler() Sampler {
return alwaysSampleSampler{}
}
diff --git a/api/trace/never_sampler.go b/api/trace/never_sampler.go
index 3cdce92e9..3fac9e3f2 100644
--- a/api/trace/never_sampler.go
+++ b/api/trace/never_sampler.go
@@ -47,6 +47,6 @@ func (ns neverSampleSampler) Description() string {
var _ Sampler = neverSampleSampler{}
-func NeverSampleSampler() neverSampleSampler {
+func NeverSampleSampler() Sampler {
return neverSampleSampler{}
}
diff --git a/experimental/bridge/opentracing/mix_test.go b/experimental/bridge/opentracing/mix_test.go
index 715e7b229..9307a5880 100644
--- a/experimental/bridge/opentracing/mix_test.go
+++ b/experimental/bridge/opentracing/mix_test.go
@@ -250,15 +250,15 @@ type coin3Value struct{}
func newContextIntactTest() *contextIntactTest {
return &contextIntactTest{
contextKeyValues: []internal.MockContextKeyValue{
- internal.MockContextKeyValue{
+ {
Key: coin1Key{},
Value: coin1Value{},
},
- internal.MockContextKeyValue{
+ {
Key: coin2Key{},
Value: coin2Value{},
},
- internal.MockContextKeyValue{
+ {
Key: coin3Key{},
Value: coin3Value{},
},
diff --git a/experimental/streaming/exporter/exporter.go b/experimental/streaming/exporter/exporter.go
index 6ef0b4b4a..1f3f70543 100644
--- a/experimental/streaming/exporter/exporter.go
+++ b/experimental/streaming/exporter/exporter.go
@@ -51,6 +51,7 @@ type Observer interface {
}
//go:generate stringer -type=EventType
+// nolint:golint
const (
INVALID EventType = iota
START_SPAN
diff --git a/experimental/streaming/sdk/span_test.go b/experimental/streaming/sdk/span_test.go
index 06db87965..aa3fdcb2e 100644
--- a/experimental/streaming/sdk/span_test.go
+++ b/experimental/streaming/sdk/span_test.go
@@ -153,8 +153,8 @@ func measurementCompare(m1, m2 metric.Measurement) bool {
func diffEvents(t *testing.T, got, want []exporter.Event, extraIgnoredFields ...string) bool {
ignoredPaths := map[string]struct{}{
- "Sequence": struct{}{},
- "Context": struct{}{},
+ "Sequence": {},
+ "Context": {},
}
for _, field := range extraIgnoredFields {
ignoredPaths[field] = struct{}{}
diff --git a/experimental/streaming/sdk/trace.go b/experimental/streaming/sdk/trace.go
index 5da5834b5..42c1247ec 100644
--- a/experimental/streaming/sdk/trace.go
+++ b/experimental/streaming/sdk/trace.go
@@ -24,8 +24,8 @@ import (
"go.opentelemetry.io/experimental/streaming/exporter"
)
+// TODO These should move somewhere in the api, right?
var (
- // TODO These should move somewhere in the api, right?
ErrorKey = key.New("error")
SpanIDKey = key.New("span_id")
TraceIDKey = key.New("trace_id")
diff --git a/exporter/trace/jaeger/jaeger_test.go b/exporter/trace/jaeger/jaeger_test.go
index fc194f59f..82c3abc77 100644
--- a/exporter/trace/jaeger/jaeger_test.go
+++ b/exporter/trace/jaeger/jaeger_test.go
@@ -61,7 +61,7 @@ func Test_spanDataToThrift(t *testing.T) {
StartTime: now,
EndTime: now,
Links: []apitrace.Link{
- apitrace.Link{
+ {
SpanContext: core.SpanContext{
TraceID: linkTraceID,
SpanID: linkSpanID,
@@ -96,7 +96,7 @@ func Test_spanDataToThrift(t *testing.T) {
{Key: "status.message", VType: gen.TagType_STRING, VStr: &statusMessage},
},
References: []*gen.SpanRef{
- &gen.SpanRef{
+ {
RefType: gen.SpanRefType_CHILD_OF,
TraceIdLow: int64(linkTraceID.Low),
TraceIdHigh: int64(linkTraceID.High),
diff --git a/exporter/trace/jaeger/uploader.go b/exporter/trace/jaeger/uploader.go
index 0f6f26d2a..79917162e 100644
--- a/exporter/trace/jaeger/uploader.go
+++ b/exporter/trace/jaeger/uploader.go
@@ -25,7 +25,7 @@ type EndpointOption func() (batchUploader, error)
func WithAgentEndpoint(agentEndpoint string) func() (batchUploader, error) {
return func() (batchUploader, error) {
if agentEndpoint == "" {
- return nil, errors.New("agentEndpoint must not be empty.")
+ return nil, errors.New("agentEndpoint must not be empty")
}
client, err := newAgentClientUDP(agentEndpoint, udpPacketMaxLength)
@@ -42,7 +42,7 @@ func WithAgentEndpoint(agentEndpoint string) func() (batchUploader, error) {
func WithCollectorEndpoint(collectorEndpoint string, options ...CollectorEndpointOption) func() (batchUploader, error) {
return func() (batchUploader, error) {
if collectorEndpoint == "" {
- return nil, errors.New("collectorEndpoint must not be empty.")
+ return nil, errors.New("collectorEndpoint must not be empty")
}
o := &CollectorEndpointOptions{}
diff --git a/internal/trace/mock_tracer.go b/internal/trace/mock_tracer.go
index 4e0ebe9b6..12b13549e 100644
--- a/internal/trace/mock_tracer.go
+++ b/internal/trace/mock_tracer.go
@@ -30,9 +30,9 @@ type MockTracer struct {
// Sampled specifies if the new span should be sampled or not.
Sampled bool
- // StartSpanId is used to initialize spanId. It is incremented by one
+ // StartSpanID is used to initialize spanId. It is incremented by one
// every time a new span is created.
- StartSpanId *uint64
+ StartSpanID *uint64
}
var _ apitrace.Tracer = (*MockTracer)(nil)
@@ -81,7 +81,7 @@ func (mt *MockTracer) Start(ctx context.Context, name string, o ...apitrace.Span
} else {
sc = opts.Reference.SpanContext
}
- sc.SpanID = atomic.AddUint64(mt.StartSpanId, 1)
+ sc.SpanID = atomic.AddUint64(mt.StartSpanID, 1)
span = &MockSpan{
sc: sc,
tracer: mt,
diff --git a/plugin/httptrace/httptrace.go b/plugin/httptrace/httptrace.go
index 12771650c..409fa568e 100644
--- a/plugin/httptrace/httptrace.go
+++ b/plugin/httptrace/httptrace.go
@@ -31,7 +31,7 @@ var (
HostKey = key.New("http.host")
URLKey = key.New("http.url")
- propagator = propagation.HttpTraceContextPropagator()
+ propagator = propagation.HTTPTraceContextPropagator{}
)
// Returns the Attributes, Context Entries, and SpanContext that were encoded by Inject.
diff --git a/plugin/othttp/server.go b/plugin/othttp/server.go
index 7591cf7a9..6e5d30735 100644
--- a/plugin/othttp/server.go
+++ b/plugin/othttp/server.go
@@ -117,7 +117,7 @@ func NewHandler(handler http.Handler, operation string, opts ...HandlerOption) h
h := HTTPHandler{handler: handler}
defaultOpts := []HandlerOption{
WithTracer(trace.GlobalTracer()),
- WithPropagator(prop.HttpTraceContextPropagator()),
+ WithPropagator(prop.HTTPTraceContextPropagator{}),
}
for _, opt := range append(defaultOpts, opts...) {
diff --git a/plugin/othttp/server_test.go b/plugin/othttp/server_test.go
index 7aa1540b1..5f70b4c55 100644
--- a/plugin/othttp/server_test.go
+++ b/plugin/othttp/server_test.go
@@ -29,7 +29,7 @@ func TestBasics(t *testing.T) {
rr := httptest.NewRecorder()
var id uint64
- tracer := mocktrace.MockTracer{StartSpanId: &id}
+ tracer := mocktrace.MockTracer{StartSpanID: &id}
h := NewHandler(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/propagation/binary_propagator.go b/propagation/binary_propagator.go
index 9124f13e3..2b4229eeb 100644
--- a/propagation/binary_propagator.go
+++ b/propagation/binary_propagator.go
@@ -27,7 +27,7 @@ var _ apipropagation.BinaryFormatPropagator = binaryPropagator{}
// BinaryPropagator creates a new propagator. The propagator implements
// ToBytes and FromBytes method to transform SpanContext to/from byte array.
-func BinaryPropagator() binaryPropagator {
+func BinaryPropagator() apipropagation.BinaryFormatPropagator {
return binaryPropagator{}
}
diff --git a/propagation/http_b3_propagator.go b/propagation/http_b3_propagator.go
index 135c83b6e..e378bed70 100644
--- a/propagation/http_b3_propagator.go
+++ b/propagation/http_b3_propagator.go
@@ -36,16 +36,7 @@ const (
B3ParentSpanIDHeader = "X-B3-ParentSpanId"
)
-type httpB3Propagator struct {
- singleHeader bool
-}
-
-var _ apipropagation.TextFormatPropagator = httpB3Propagator{}
-
-var hexStr32ByteRegex = regexp.MustCompile("^[a-f0-9]{32}$")
-var hexStr16ByteRegex = regexp.MustCompile("^[a-f0-9]{16}$")
-
-// HttpB3Propagator creates a new text format propagator that facilitates core.SpanContext
+// HTTPB3Propagator that facilitates core.SpanContext
// propagation using B3 Headers.
// This propagator supports both version of B3 headers,
// 1. Single Header :
@@ -57,18 +48,21 @@ var hexStr16ByteRegex = regexp.MustCompile("^[a-f0-9]{16}$")
// X-B3-Sampled: {SamplingState}
// X-B3-Flags: {DebugFlag}
//
-// If singleHeader is set to true then X-B3 header is used to inject and extract. Otherwise,
+// If SingleHeader is set to true then X-B3 header is used to inject and extract. Otherwise,
// separate headers are used to inject and extract.
-func HttpB3Propagator(singleHeader bool) httpB3Propagator {
- // [TODO](rghetia): should it automatically look for both versions? which one to pick if
- // both are present? What if one is valid and other one is not.
- return httpB3Propagator{singleHeader}
+type HTTPB3Propagator struct {
+ SingleHeader bool
}
-func (b3 httpB3Propagator) Inject(ctx context.Context, supplier apipropagation.Supplier) {
+var _ apipropagation.TextFormatPropagator = HTTPB3Propagator{}
+
+var hexStr32ByteRegex = regexp.MustCompile("^[a-f0-9]{32}$")
+var hexStr16ByteRegex = regexp.MustCompile("^[a-f0-9]{16}$")
+
+func (b3 HTTPB3Propagator) Inject(ctx context.Context, supplier apipropagation.Supplier) {
sc := trace.CurrentSpan(ctx).SpanContext()
if sc.IsValid() {
- if b3.singleHeader {
+ if b3.SingleHeader {
sampled := sc.TraceFlags & core.TraceFlagsSampled
supplier.Set(B3SingleHeader,
fmt.Sprintf("%.16x%.16x-%.16x-%.1d", sc.TraceID.High, sc.TraceID.Low, sc.SpanID, sampled))
@@ -90,21 +84,21 @@ func (b3 httpB3Propagator) Inject(ctx context.Context, supplier apipropagation.S
}
// Extract retrieves B3 Headers from the supplier
-func (b3 httpB3Propagator) Extract(ctx context.Context, supplier apipropagation.Supplier) core.SpanContext {
- if b3.singleHeader {
+func (b3 HTTPB3Propagator) Extract(ctx context.Context, supplier apipropagation.Supplier) core.SpanContext {
+ if b3.SingleHeader {
return b3.extractSingleHeader(supplier)
}
return b3.extract(supplier)
}
-func (b3 httpB3Propagator) GetAllKeys() []string {
- if b3.singleHeader {
+func (b3 HTTPB3Propagator) GetAllKeys() []string {
+ if b3.SingleHeader {
return []string{B3SingleHeader}
}
return []string{B3TraceIDHeader, B3SpanIDHeader, B3SampledHeader}
}
-func (b3 httpB3Propagator) extract(supplier apipropagation.Supplier) core.SpanContext {
+func (b3 HTTPB3Propagator) extract(supplier apipropagation.Supplier) core.SpanContext {
tid, ok := b3.extractTraceID(supplier.Get(B3TraceIDHeader))
if !ok {
return core.EmptySpanContext()
@@ -139,7 +133,7 @@ func (b3 httpB3Propagator) extract(supplier apipropagation.Supplier) core.SpanCo
return sc
}
-func (b3 httpB3Propagator) extractSingleHeader(supplier apipropagation.Supplier) core.SpanContext {
+func (b3 HTTPB3Propagator) extractSingleHeader(supplier apipropagation.Supplier) core.SpanContext {
h := supplier.Get(B3SingleHeader)
if h == "" || h == "0" {
core.EmptySpanContext()
@@ -153,30 +147,30 @@ func (b3 httpB3Propagator) extractSingleHeader(supplier apipropagation.Supplier)
if l < 2 {
return core.EmptySpanContext()
- } else {
- var ok bool
- sc.TraceID, ok = b3.extractTraceID(parts[0])
+ }
+
+ var ok bool
+ sc.TraceID, ok = b3.extractTraceID(parts[0])
+ if !ok {
+ return core.EmptySpanContext()
+ }
+
+ sc.SpanID, ok = b3.extractSpanID(parts[1])
+ if !ok {
+ return core.EmptySpanContext()
+ }
+
+ if l > 2 {
+ sc.TraceFlags, ok = b3.extractSampledState(parts[2])
if !ok {
return core.EmptySpanContext()
}
-
- sc.SpanID, ok = b3.extractSpanID(parts[1])
+ }
+ if l == 4 {
+ _, ok = b3.extractSpanID(parts[3])
if !ok {
return core.EmptySpanContext()
}
-
- if l > 2 {
- sc.TraceFlags, ok = b3.extractSampledState(parts[2])
- if !ok {
- return core.EmptySpanContext()
- }
- }
- if l == 4 {
- _, ok = b3.extractSpanID(parts[3])
- if !ok {
- return core.EmptySpanContext()
- }
- }
}
if !sc.IsValid() {
@@ -187,12 +181,12 @@ func (b3 httpB3Propagator) extractSingleHeader(supplier apipropagation.Supplier)
}
// extractTraceID parses the value of the X-B3-TraceId b3Header.
-func (b3 httpB3Propagator) extractTraceID(tid string) (traceID core.TraceID, ok bool) {
+func (b3 HTTPB3Propagator) extractTraceID(tid string) (traceID core.TraceID, ok bool) {
if hexStr32ByteRegex.MatchString(tid) {
traceID.High, _ = strconv.ParseUint(tid[0:(16)], 16, 64)
traceID.Low, _ = strconv.ParseUint(tid[(16):32], 16, 64)
ok = true
- } else if b3.singleHeader && hexStr16ByteRegex.MatchString(tid) {
+ } else if b3.SingleHeader && hexStr16ByteRegex.MatchString(tid) {
traceID.Low, _ = strconv.ParseUint(tid[:16], 16, 64)
ok = true
}
@@ -200,7 +194,7 @@ func (b3 httpB3Propagator) extractTraceID(tid string) (traceID core.TraceID, ok
}
// extractSpanID parses the value of the X-B3-SpanId or X-B3-ParentSpanId headers.
-func (b3 httpB3Propagator) extractSpanID(sid string) (spanID uint64, ok bool) {
+func (b3 HTTPB3Propagator) extractSpanID(sid string) (spanID uint64, ok bool) {
if hexStr16ByteRegex.MatchString(sid) {
spanID, _ = strconv.ParseUint(sid, 16, 64)
ok = true
@@ -209,18 +203,18 @@ func (b3 httpB3Propagator) extractSpanID(sid string) (spanID uint64, ok bool) {
}
// extractSampledState parses the value of the X-B3-Sampled b3Header.
-func (b3 httpB3Propagator) extractSampledState(sampled string) (flag byte, ok bool) {
+func (b3 HTTPB3Propagator) extractSampledState(sampled string) (flag byte, ok bool) {
switch sampled {
case "", "0":
return 0, true
case "1":
return core.TraceFlagsSampled, true
case "true":
- if !b3.singleHeader {
+ if !b3.SingleHeader {
return core.TraceFlagsSampled, true
}
case "d":
- if b3.singleHeader {
+ if b3.SingleHeader {
return core.TraceFlagsSampled, true
}
}
@@ -228,7 +222,7 @@ func (b3 httpB3Propagator) extractSampledState(sampled string) (flag byte, ok bo
}
// extracDebugFlag parses the value of the X-B3-Sampled b3Header.
-func (b3 httpB3Propagator) extracDebugFlag(debug string) (flag byte, ok bool) {
+func (b3 HTTPB3Propagator) extracDebugFlag(debug string) (flag byte, ok bool) {
switch debug {
case "", "0":
return 0, true
diff --git a/propagation/http_b3_propagator_benchmark_test.go b/propagation/http_b3_propagator_benchmark_test.go
index f6fa20353..beed63df3 100644
--- a/propagation/http_b3_propagator_benchmark_test.go
+++ b/propagation/http_b3_propagator_benchmark_test.go
@@ -54,7 +54,7 @@ func BenchmarkExtractB3(b *testing.B) {
trace.SetGlobalTracer(&mocktrace.MockTracer{})
for _, tg := range testGroup {
- propagator := propagation.HttpB3Propagator(tg.singleHeader)
+ propagator := propagation.HTTPB3Propagator{tg.singleHeader}
for _, tt := range tg.tests {
traceBenchmark(tg.name+"/"+tt.name, b, func(b *testing.B) {
ctx := context.Background()
@@ -93,13 +93,13 @@ func BenchmarkInjectB3(b *testing.B) {
mockTracer := &mocktrace.MockTracer{
Sampled: false,
- StartSpanId: &id,
+ StartSpanID: &id,
}
trace.SetGlobalTracer(mockTracer)
for _, tg := range testGroup {
id = 0
- propagator := propagation.HttpB3Propagator(tg.singleHeader)
+ propagator := propagation.HTTPB3Propagator{tg.singleHeader}
for _, tt := range tg.tests {
traceBenchmark(tg.name+"/"+tt.name, b, func(b *testing.B) {
req, _ := http.NewRequest("GET", "http://example.com", nil)
diff --git a/propagation/http_b3_propagator_test.go b/propagation/http_b3_propagator_test.go
index a255c023e..68baa8fc5 100644
--- a/propagation/http_b3_propagator_test.go
+++ b/propagation/http_b3_propagator_test.go
@@ -56,7 +56,7 @@ func TestExtractB3(t *testing.T) {
trace.SetGlobalTracer(&mocktrace.MockTracer{})
for _, tg := range testGroup {
- propagator := propagation.HttpB3Propagator(tg.singleHeader)
+ propagator := propagation.HTTPB3Propagator{tg.singleHeader}
for _, tt := range tg.tests {
t.Run(tt.name, func(t *testing.T) {
req, _ := http.NewRequest("GET", "http://example.com", nil)
@@ -95,13 +95,13 @@ func TestInjectB3(t *testing.T) {
mockTracer := &mocktrace.MockTracer{
Sampled: false,
- StartSpanId: &id,
+ StartSpanID: &id,
}
trace.SetGlobalTracer(mockTracer)
for _, tg := range testGroup {
id = 0
- propagator := propagation.HttpB3Propagator(tg.singleHeader)
+ propagator := propagation.HTTPB3Propagator{tg.singleHeader}
for _, tt := range tg.tests {
t.Run(tt.name, func(t *testing.T) {
req, _ := http.NewRequest("GET", "http://example.com", nil)
@@ -132,8 +132,8 @@ func TestInjectB3(t *testing.T) {
}
}
-func TestHttpB3Propagator_GetAllKeys(t *testing.T) {
- propagator := propagation.HttpB3Propagator(false)
+func TestHTTPB3Propagator_GetAllKeys(t *testing.T) {
+ propagator := propagation.HTTPB3Propagator{false}
want := []string{
propagation.B3TraceIDHeader,
propagation.B3SpanIDHeader,
@@ -146,7 +146,7 @@ func TestHttpB3Propagator_GetAllKeys(t *testing.T) {
}
func TestHttpB3PropagatorWithSingleHeader_GetAllKeys(t *testing.T) {
- propagator := propagation.HttpB3Propagator(true)
+ propagator := propagation.HTTPB3Propagator{true}
want := []string{
propagation.B3SingleHeader,
}
diff --git a/propagation/http_trace_context_propagator.go b/propagation/http_trace_context_propagator.go
index 88b8b0c2b..f1ebfce4f 100644
--- a/propagation/http_trace_context_propagator.go
+++ b/propagation/http_trace_context_propagator.go
@@ -34,12 +34,13 @@ const (
TraceparentHeader = "Traceparent"
)
-type httpTraceContextPropagator struct{}
+// HTTPTraceContextPropagator propagates SpanContext in W3C TraceContext format.
+type HTTPTraceContextPropagator struct{}
-var _ apipropagation.TextFormatPropagator = httpTraceContextPropagator{}
+var _ apipropagation.TextFormatPropagator = HTTPTraceContextPropagator{}
var traceCtxRegExp = regexp.MustCompile("^[0-9a-f]{2}-[a-f0-9]{32}-[a-f0-9]{16}-[a-f0-9]{2}-?")
-func (hp httpTraceContextPropagator) Inject(ctx context.Context, supplier apipropagation.Supplier) {
+func (hp HTTPTraceContextPropagator) Inject(ctx context.Context, supplier apipropagation.Supplier) {
sc := trace.CurrentSpan(ctx).SpanContext()
if sc.IsValid() {
h := fmt.Sprintf("%.2x-%.16x%.16x-%.16x-%.2x",
@@ -52,7 +53,7 @@ func (hp httpTraceContextPropagator) Inject(ctx context.Context, supplier apipro
}
}
-func (hp httpTraceContextPropagator) Extract(ctx context.Context, supplier apipropagation.Supplier) core.SpanContext {
+func (hp HTTPTraceContextPropagator) Extract(ctx context.Context, supplier apipropagation.Supplier) core.SpanContext {
h := supplier.Get(TraceparentHeader)
if h == "" {
return core.EmptySpanContext()
@@ -127,12 +128,6 @@ func (hp httpTraceContextPropagator) Extract(ctx context.Context, supplier apipr
return sc
}
-func (hp httpTraceContextPropagator) GetAllKeys() []string {
+func (hp HTTPTraceContextPropagator) GetAllKeys() []string {
return []string{TraceparentHeader}
}
-
-// HttpTraceContextPropagator creates a new text format propagator that propagates SpanContext
-// in W3C TraceContext format.
-func HttpTraceContextPropagator() apipropagation.TextFormatPropagator {
- return httpTraceContextPropagator{}
-}
diff --git a/propagation/http_trace_context_propagator_benchmark_test.go b/propagation/http_trace_context_propagator_benchmark_test.go
index f1e291244..660b4d160 100644
--- a/propagation/http_trace_context_propagator_benchmark_test.go
+++ b/propagation/http_trace_context_propagator_benchmark_test.go
@@ -11,7 +11,7 @@ import (
)
func BenchmarkInject(b *testing.B) {
- t := httpTraceContextPropagator{}
+ var t HTTPTraceContextPropagator
injectSubBenchmarks(b, func(ctx context.Context, b *testing.B) {
req, _ := http.NewRequest("GET", "http://example.com", nil)
@@ -31,7 +31,7 @@ func injectSubBenchmarks(b *testing.B, fn func(context.Context, *testing.B)) {
)
mockTracer := &mocktrace.MockTracer{
Sampled: false,
- StartSpanId: &id,
+ StartSpanID: &id,
}
b.ReportAllocs()
sc := core.SpanContext{
@@ -53,7 +53,7 @@ func injectSubBenchmarks(b *testing.B, fn func(context.Context, *testing.B)) {
func BenchmarkExtract(b *testing.B) {
extractSubBenchmarks(b, func(b *testing.B, req *http.Request) {
- propagator := HttpTraceContextPropagator()
+ var propagator HTTPTraceContextPropagator
ctx := context.Background()
b.ResetTimer()
for i := 0; i < b.N; i++ {
diff --git a/propagation/http_trace_context_propagator_test.go b/propagation/http_trace_context_propagator_test.go
index c6e232588..4d7aa5757 100644
--- a/propagation/http_trace_context_propagator_test.go
+++ b/propagation/http_trace_context_propagator_test.go
@@ -35,7 +35,7 @@ var (
func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
trace.SetGlobalTracer(&mocktrace.MockTracer{})
- propagator := propagation.HttpTraceContextPropagator()
+ var propagator propagation.HTTPTraceContextPropagator
tests := []struct {
name string
header string
@@ -129,7 +129,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
func TestExtractInvalidTraceContextFromHTTPReq(t *testing.T) {
trace.SetGlobalTracer(&mocktrace.MockTracer{})
- propagator := propagation.HttpTraceContextPropagator()
+ var propagator propagation.HTTPTraceContextPropagator
wantSc := core.EmptySpanContext()
tests := []struct {
name string
@@ -219,9 +219,9 @@ func TestInjectTraceContextToHTTPReq(t *testing.T) {
var id uint64
mockTracer := &mocktrace.MockTracer{
Sampled: false,
- StartSpanId: &id,
+ StartSpanID: &id,
}
- propagator := propagation.HttpTraceContextPropagator()
+ var propagator propagation.HTTPTraceContextPropagator
tests := []struct {
name string
sc core.SpanContext
@@ -277,7 +277,7 @@ func TestInjectTraceContextToHTTPReq(t *testing.T) {
}
func TestHttpTraceContextPropagator_GetAllKeys(t *testing.T) {
- propagator := propagation.HttpTraceContextPropagator()
+ var propagator propagation.HTTPTraceContextPropagator
want := []string{"Traceparent"}
got := propagator.GetAllKeys()
if diff := cmp.Diff(got, want); diff != "" {
diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go
index 2cafcb529..0203aa0de 100644
--- a/sdk/trace/batch_span_processor.go
+++ b/sdk/trace/batch_span_processor.go
@@ -24,9 +24,9 @@ import (
)
const (
- defaultMaxQueueSize = 2048
- defaultScheduledDelayMillis = time.Duration(5000 * time.Millisecond)
- defaultMaxExportBatchSize = 512
+ defaultMaxQueueSize = 2048
+ defaultScheduledDelay = time.Duration(5000 * time.Millisecond)
+ defaultMaxExportBatchSize = 512
)
var (
@@ -86,7 +86,7 @@ func NewBatchSpanProcessor(e export.SpanBatcher, opts ...BatchSpanProcessorOptio
}
o := BatchSpanProcessorOptions{
- ScheduledDelayMillis: defaultScheduledDelayMillis,
+ ScheduledDelayMillis: defaultScheduledDelay,
MaxQueueSize: defaultMaxQueueSize,
MaxExportBatchSize: defaultMaxExportBatchSize,
}