ddtrace/tracer: hide TracerConf function

DataDog · Mar 25, 2024 · 8c59737 · 8c59737
1 parent 42807ee
commit 8c59737
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/ddtrace/mocktracer/mocktracer.go b/ddtrace/mocktracer/mocktracer.go
@@ -186,7 +186,7 @@ func (t *mocktracer) Inject(context *tracer.SpanContext, carrier interface{}) er
 	}).Inject(context, carrier)
 }
 
-func (t *mocktracer) TracerConf() tracer.TracerConf {
+func (t *mocktracer) tracerConf() tracer.TracerConf {
 	return tracer.TracerConf{}
 }
 

diff --git a/ddtrace/tracer/globaltracer_test.go b/ddtrace/tracer/globaltracer_test.go
@@ -26,7 +26,7 @@ func (r *raceTestTracer) Stop() {
 	r.stopped = true
 }
 
-func (*raceTestTracer) TracerConf() TracerConf {
+func (*raceTestTracer) tracerConf() TracerConf {
 	return TracerConf{}
 }
 

diff --git a/ddtrace/tracer/noop.go b/ddtrace/tracer/noop.go
@@ -31,7 +31,7 @@ func (NoopTracer) Stop() {}
 
 // TODO(kjn v2): These should be removed. They are here temporarily to facilitate
 // the shift to the v2 API.
-func (NoopTracer) TracerConf() TracerConf {
+func (NoopTracer) tracerConf() TracerConf {
 	return TracerConf{}
 }
 

diff --git a/ddtrace/tracer/span.go b/ddtrace/tracer/span.go
@@ -641,7 +641,7 @@ func (s *Span) finish(finishTime int64) {
 
 	keep := true
 	if t := GetGlobalTracer(); t != nil {
-		tc := t.TracerConf()
+		tc := t.(*tracer).tracerConf()
 		if !tc.Disabled {
 			// we have an active tracer
 			if tc.CanComputeStats && shouldComputeStats(s) {
@@ -794,7 +794,7 @@ func (s *Span) Format(f fmt.State, c rune) {
 			fmt.Fprintf(f, "dd.service=%s ", svc)
 		}
 		if tr := GetGlobalTracer(); tr != nil {
-			tc := tr.TracerConf()
+			tc := tr.(*tracer).tracerConf()
 			if tc.EnvTag != "" {
 				fmt.Fprintf(f, "dd.env=%s ", tc.EnvTag)
 			} else if env := os.Getenv("DD_ENV"); env != "" {

diff --git a/ddtrace/tracer/spancontext.go b/ddtrace/tracer/spancontext.go
@@ -481,7 +481,7 @@ func (t *trace) finishedOne(s *Span) {
 	if tr == nil {
 		return
 	}
-	tc := tr.TracerConf()
+	tc := tr.(*tracer).tracerConf()
 	setPeerService(s, tr)
 
 	// attach the _dd.base_service tag only when the globally configured service name is different from the
@@ -560,7 +560,7 @@ func (t *trace) finishChunk(tr Tracer, ch *Chunk) {
 // setPeerService sets the peer.service, _dd.peer.service.source, and _dd.peer.service.remapped_from
 // tags as applicable for the given span.
 func setPeerService(s *Span, t Tracer) {
-	tc := t.TracerConf()
+	tc := t.(*tracer).tracerConf()
 	if _, ok := s.meta[ext.PeerService]; ok { // peer.service already set on the span
 		s.setMeta(keyPeerServiceSource, ext.PeerService)
 	} else { // no peer.service currently set

diff --git a/ddtrace/tracer/tracer.go b/ddtrace/tracer/tracer.go
@@ -65,10 +65,6 @@ type Tracer interface {
 	// Stop stops the tracer. Calls to Stop should be idempotent.
 	Stop()
 
-	// TODO(kjn v2): These can be removed / consolidated. These are
-	// here temporarily as we figure out a sensible API.
-	TracerConf() TracerConf
-
 	SubmitStats(*Span)
 	SubmitAbandonedSpan(*Span, bool)
 	SubmitChunk(any) // This is a horrible signature. This will eventually become SubmitChunk(Chunk)
@@ -774,7 +770,7 @@ func (t *tracer) Extract(carrier interface{}) (*SpanContext, error) {
 	return t.config.propagator.Extract(carrier)
 }
 
-func (t *tracer) TracerConf() TracerConf {
+func (t *tracer) tracerConf() TracerConf {
 	return TracerConf{
 		CanComputeStats:      t.config.canComputeStats(),
 		CanDropP0s:           t.config.canDropP0s(),

diff --git a/ddtrace/tracer/transport.go b/ddtrace/tracer/transport.go
@@ -149,7 +149,7 @@ func (t *httpTransport) send(p *payload) (body io.ReadCloser, err error) {
 	req.Header.Set("Content-Length", strconv.Itoa(p.size()))
 	req.Header.Set(headerComputedTopLevel, "yes")
 	if t := GetGlobalTracer(); t != nil {
-		if t.TracerConf().CanComputeStats {
+		if t.(*tracer).tracerConf().CanComputeStats {
 			req.Header.Set("Datadog-Client-Computed-Stats", "yes")
 		}
 		droppedTraces := int(tracerstats.Count(tracerstats.AgentDroppedP0Traces))