Skip to content

Commit

Permalink
Tracing: add traceid_128bit support for jaeger (#4942)
Browse files Browse the repository at this point in the history
  • Loading branch information
hanjm authored Dec 14, 2021
1 parent c7a44e2 commit d837809
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
- [#4897](https://github.com/thanos-io/thanos/pull/4897) Querier: Add validation for querier address flags.
- [#4903](https://github.com/thanos-io/thanos/pull/4903) Compactor: Added tracing support for compaction.
- [#4909](https://github.com/thanos-io/thanos/pull/4909) Compactor: Add flag --max-time / --min-time to filter blocks that are ready to be compacted.
- [#4942](https://github.com/thanos-io/thanos/pull/4942) Tracing: add `traceid_128bit` support for jaeger.

### Fixed

Expand Down
1 change: 1 addition & 0 deletions docs/tracing.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ config:
password: ""
agent_host: ""
agent_port: 0
traceid_128bit: false
```

### Stackdriver
Expand Down
5 changes: 5 additions & 0 deletions pkg/tracing/jaeger/config_yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type Config struct {
Password string `yaml:"password"`
AgentHost string `yaml:"agent_host"`
AgentPort int `yaml:"agent_port"`
Gen128Bit bool `yaml:"traceid_128bit"`
}

// ParseConfigFromYaml uses config YAML to set the tracer's Configuration.
Expand All @@ -57,6 +58,10 @@ func ParseConfigFromYaml(cfg []byte) (*config.Configuration, error) {
c.RPCMetrics = conf.RPCMetrics
}

if conf.Gen128Bit {
c.Gen128Bit = conf.Gen128Bit
}

if conf.Disabled {
c.Disabled = conf.Disabled
}
Expand Down

0 comments on commit d837809

Please sign in to comment.