Skip to content

Commit

Permalink
ddtrace/tracer: more renaming of ProvenanceXXX to provenanceXXX.
Browse files Browse the repository at this point in the history
  • Loading branch information
yuanyuanzhao3 committed Apr 4, 2024
1 parent 9afc89f commit 841bdbc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ddtrace/tracer/rule_sampler_test.go
Expand Up @@ -203,7 +203,7 @@ func TestSamplingRuleProvenanceMarshal(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
// Same rule with provenance "customer"
for prov, provName := range ProvenanceName {
for prov, provName := range provenanceName {
test.rule.Provenance = prov
data, err := json.Marshal(test.rule)
assert.NoError(t, err)
Expand Down
17 changes: 9 additions & 8 deletions ddtrace/tracer/rules_sampler.go
Expand Up @@ -63,20 +63,21 @@ const (
)

var (
ProvenanceName = map[provenance]string{
// Note provenanceName and provenanceValue should
provenanceName = map[provenance]string{
Local: "local",
Customer: "customer",
Dynamic: "dynamic",
}
ProvenanceValue = map[string]provenance{
provenanceValue = map[string]provenance{
"local": Local,
"customer": Customer,
"dynamic": Dynamic,
}
)

func (p provenance) String() string {
return ProvenanceName[p]
return provenanceName[p]
}

func (p provenance) MarshalJSON() ([]byte, error) {
Expand All @@ -89,14 +90,14 @@ func (p *provenance) UnmarshalJSON(data []byte) error {
if err = json.Unmarshal(data, &prov); err != nil {
return err
}
if *p, err = ParseProvenance(prov); err != nil {
if *p, err = parseProvenance(prov); err != nil {
return err
}
return nil
}

func ParseProvenance(p string) (provenance, error) {
v, ok := ProvenanceValue[strings.TrimSpace(strings.ToLower(p))]
func parseProvenance(p string) (provenance, error) {
v, ok := provenanceValue[strings.TrimSpace(strings.ToLower(p))]
if !ok {
return Customer, fmt.Errorf("Invalid Provenance: \"%v\"", p)
}
Expand Down Expand Up @@ -787,7 +788,7 @@ func (j jsonRule) String() string {
s = append(s, fmt.Sprintf("Type: %v", *j.Type))
}
if j.Provenance != Local {
s = append(s, fmt.Sprintf("Provenance: %v", ProvenanceName[j.Provenance]))
s = append(s, fmt.Sprintf("Provenance: %v", provenanceName[j.Provenance]))
}
return fmt.Sprintf("{%s}", strings.Join(s, " "))
}
Expand Down Expand Up @@ -892,7 +893,7 @@ func (sr SamplingRule) MarshalJSON() ([]byte, error) {
s.Type = &t
}
if sr.Provenance != Local {
s.Provenance = ProvenanceName[sr.Provenance]
s.Provenance = provenanceName[sr.Provenance]
}
return json.Marshal(&s)
}
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/tracer/telemetry_test.go
Expand Up @@ -69,7 +69,7 @@ func TestTelemetryEnabled(t *testing.T) {
rule := TagsResourceRule(map[string]string{"tag-a": "tv-a??"},
"resource-*", "op-name", "test-serv", 0.1)

for prov, provName := range ProvenanceName {
for prov, provName := range provenanceName {
if prov == Local {
continue
}
Expand Down

0 comments on commit 841bdbc

Please sign in to comment.