File tree Expand file tree Collapse file tree 6 files changed +13
-15
lines changed Expand file tree Collapse file tree 6 files changed +13
-15
lines changed Original file line number Diff line number Diff line change @@ -156,14 +156,14 @@ func logStartup(t *tracer) {
156156 DataStreamsEnabled : t .config .dataStreamsMonitoringEnabled ,
157157 }
158158 if _ , _ , err := samplingRulesFromEnv (); err != nil {
159- info .SamplingRulesError = fmt . Sprintf ( "%s" , err .Error () )
159+ info .SamplingRulesError = err .Error ()
160160 }
161161 if limit , ok := t .rulesSampling .TraceRateLimit (); ok {
162162 info .SampleRateLimit = fmt .Sprintf ("%v" , limit )
163163 }
164164 if ! t .config .logToStdout {
165165 if err := checkEndpoint (t .config .httpClient , t .config .transport .endpoint ()); err != nil {
166- info .AgentError = fmt . Sprintf ( "%s" , err .Error () )
166+ info .AgentError = err .Error ()
167167 log .Warn ("DIAGNOSTICS Unable to reach agent intake: %s" , err .Error ())
168168 }
169169 }
Original file line number Diff line number Diff line change @@ -1085,7 +1085,7 @@ func WithAgentURL(agentURL string) StartOption {
10851085 log .Warn ("Fail to parse Agent URL: %s" , urlErr .Err )
10861086 return
10871087 }
1088- log .Warn ("Fail to parse Agent URL" )
1088+ log .Warn ("Fail to parse Agent URL: %s" , err . Error () )
10891089 return
10901090 }
10911091 log .Warn ("Fail to parse Agent URL: %s" , err .Error ())
Original file line number Diff line number Diff line change @@ -463,9 +463,10 @@ func (rs *traceRulesSampler) sampleRules(span *Span) bool {
463463 if rule .match (span ) {
464464 matched = true
465465 rate = rule .Rate
466- if rule .Provenance == Customer {
466+ switch rule .Provenance {
467+ case Customer :
467468 sampler = samplernames .RemoteUserRule
468- } else if rule . Provenance == Dynamic {
469+ case Dynamic :
469470 sampler = samplernames .RemoteDynamicRule
470471 }
471472 break
Original file line number Diff line number Diff line change @@ -970,7 +970,6 @@ const (
970970 keySamplingPriority = "_sampling_priority_v1"
971971 keySamplingPriorityRate = "_dd.agent_psr"
972972 keyDecisionMaker = "_dd.p.dm"
973- keyServiceHash = "_dd.dm.service_hash"
974973 keyOrigin = "_dd.origin"
975974 keyReparentID = "_dd.parent_id"
976975 // keyHostname can be used to override the agent's hostname detection when using `WithHostname`.
@@ -1025,7 +1024,6 @@ const (
10251024 keyUserLogin = "usr.login"
10261025 keyUserEmail = "usr.email"
10271026 keyUserName = "usr.name"
1028- keyUserOrg = "usr.org"
10291027 keyUserRole = "usr.role"
10301028 keyUserScope = "usr.scope"
10311029 keyUserSessionID = "usr.session_id"
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ import (
2121
2222 "github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
2323 "github.com/DataDog/dd-trace-go/v2/ddtrace/internal/tracerstats"
24- "github.com/DataDog/dd-trace-go/v2/internal"
2524 globalinternal "github.com/DataDog/dd-trace-go/v2/internal"
2625 "github.com/DataDog/dd-trace-go/v2/internal/appsec"
2726 appsecConfig "github.com/DataDog/dd-trace-go/v2/internal/appsec/config"
@@ -290,7 +289,7 @@ func storeConfig(c *config) {
290289 ServiceEnvironment : c .env ,
291290 ServiceVersion : c .version ,
292291 ProcessTags : processtags .GlobalTags ().String (),
293- ContainerID : internal .ContainerID (),
292+ ContainerID : globalinternal .ContainerID (),
294293 }
295294
296295 data , _ := metadata .MarshalMsg (nil )
Original file line number Diff line number Diff line change @@ -2760,25 +2760,25 @@ func TestExecutionTraceSpanTagged(t *testing.T) {
27602760
27612761func wasteA (d time.Duration ) {
27622762 start := time .Now ()
2763+ i := 0
27632764 for start .Add (d ).Before (time .Now ()) {
2764- //lint:ignore S1039 We are intentionally creating empty prints
2765- _ = fmt .Sprint ("waste" )
2765+ _ = fmt .Sprintf ("waste %d" , i )
27662766 }
27672767}
27682768
27692769func wasteB (d time.Duration ) {
27702770 start := time .Now ()
2771+ i := 0
27712772 for start .Add (d ).Before (time .Now ()) {
2772- //lint:ignore S1039 We are intentionally creating empty prints
2773- _ = fmt .Sprint ("waste" )
2773+ _ = fmt .Sprintf ("waste %d" , i )
27742774 }
27752775}
27762776
27772777func wasteC (d time.Duration ) {
27782778 start := time .Now ()
2779+ i := 0
27792780 for start .Add (d ).Before (time .Now ()) {
2780- //lint:ignore S1039 We are intentionally creating empty prints
2781- _ = fmt .Sprint ("waste" )
2781+ _ = fmt .Sprintf ("waste %d" , i )
27822782 }
27832783}
27842784
You can’t perform that action at this time.
0 commit comments