Skip to content

Commit fc9d7d4

Browse files
authored
Merge pull request src-d#166 from erizocosmico/feature/remove-tracer-impl
server: remove specific tracer implementation
2 parents a39c64a + 5e6be47 commit fc9d7d4

File tree

6 files changed

+71
-312
lines changed

6 files changed

+71
-312
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ matrix:
1515
sudo: required
1616

1717
install:
18-
- go get -v github.com/golang/dep/...
19-
- dep ensure
2018
- make dependencies
2119

2220
script:

Gopkg.lock

Lines changed: 0 additions & 198 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 43 deletions
This file was deleted.

engine_test.go

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import (
1111
"gopkg.in/src-d/go-mysql-server.v0/sql"
1212
"gopkg.in/src-d/go-mysql-server.v0/sql/parse"
1313

14+
opentracing "github.com/opentracing/opentracing-go"
15+
"github.com/opentracing/opentracing-go/log"
1416
"github.com/stretchr/testify/require"
15-
jaeger "github.com/uber/jaeger-client-go"
1617
)
1718

1819
const driverName = "engine_tests"
@@ -414,11 +415,7 @@ func TestTracing(t *testing.T) {
414415
require := require.New(t)
415416
e := newEngine(t)
416417

417-
reporter := jaeger.NewInMemoryReporter()
418-
tracer, closer := jaeger.NewTracer("go-mysql-server", jaeger.NewConstSampler(true), reporter)
419-
defer func() {
420-
require.NoError(closer.Close())
421-
}()
418+
tracer := new(memTracer)
422419

423420
ctx := sql.NewContext(context.TODO(), sql.WithTracer(tracer))
424421

@@ -433,30 +430,67 @@ func TestTracing(t *testing.T) {
433430
require.Len(rows, 1)
434431
require.NoError(err)
435432

436-
spans := reporter.GetSpans()
433+
spans := tracer.spans
437434

438435
var expectedSpans = []string{
439-
"expression.Equals",
440-
"expression.Equals",
441-
"expression.Equals",
442-
"plan.Filter",
443436
"plan.Limit",
444437
"plan.Distinct",
445438
"plan.Project",
446439
"plan.Sort",
440+
"plan.Filter",
441+
"expression.Equals",
442+
"expression.Equals",
443+
"expression.Equals",
447444
}
448445

449446
var spanOperations []string
450447
for _, s := range spans {
451-
name := s.(*jaeger.Span).OperationName()
452448
// only check the ones inside the execution tree
453-
if strings.HasPrefix(name, "plan.") ||
454-
strings.HasPrefix(name, "expression.") ||
455-
strings.HasPrefix(name, "function.") ||
456-
strings.HasPrefix(name, "aggregation.") {
457-
spanOperations = append(spanOperations, name)
449+
if strings.HasPrefix(s, "plan.") ||
450+
strings.HasPrefix(s, "expression.") ||
451+
strings.HasPrefix(s, "function.") ||
452+
strings.HasPrefix(s, "aggregation.") {
453+
spanOperations = append(spanOperations, s)
458454
}
459455
}
460456

461457
require.Equal(expectedSpans, spanOperations)
462458
}
459+
460+
type memTracer struct {
461+
spans []string
462+
}
463+
464+
type memSpan struct {
465+
opName string
466+
}
467+
468+
func (t *memTracer) StartSpan(operationName string, opts ...opentracing.StartSpanOption) opentracing.Span {
469+
t.spans = append(t.spans, operationName)
470+
return &memSpan{operationName}
471+
}
472+
473+
func (t *memTracer) Inject(sm opentracing.SpanContext, format interface{}, carrier interface{}) error {
474+
panic("not implemented")
475+
}
476+
477+
func (t *memTracer) Extract(format interface{}, carrier interface{}) (opentracing.SpanContext, error) {
478+
panic("not implemented")
479+
}
480+
481+
func (m memSpan) Context() opentracing.SpanContext { return m }
482+
func (m memSpan) SetBaggageItem(key, val string) opentracing.Span { return m }
483+
func (m memSpan) BaggageItem(key string) string { return "" }
484+
func (m memSpan) SetTag(key string, value interface{}) opentracing.Span { return m }
485+
func (m memSpan) LogFields(fields ...log.Field) {}
486+
func (m memSpan) LogKV(keyVals ...interface{}) {}
487+
func (m memSpan) Finish() {}
488+
func (m memSpan) FinishWithOptions(opts opentracing.FinishOptions) {}
489+
func (m memSpan) SetOperationName(operationName string) opentracing.Span {
490+
return &memSpan{operationName}
491+
}
492+
func (m memSpan) Tracer() opentracing.Tracer { return &memTracer{} }
493+
func (m memSpan) LogEvent(event string) {}
494+
func (m memSpan) LogEventWithPayload(event string, payload interface{}) {}
495+
func (m memSpan) Log(data opentracing.LogData) {}
496+
func (m memSpan) ForeachBaggageItem(handler func(k, v string) bool) {}

server/config.go

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)