Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tracing: add traceid_128bit support for jaeger #4942

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Tracing: add traceid_128bit support for jaeger #4942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efa0315
Tracing: add Gen128Bit support for jaeger
hanjm Dec 11, 2021
314a1b7
docs: add changelog
hanjm Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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