Update jaeger-client-go dependency to v2.25.0
This commit is contained in:
parent
1502d20def
commit
584f4bc596
8 changed files with 47 additions and 13 deletions
|
@ -185,6 +185,29 @@ tracing:
|
||||||
--tracing.jaeger.traceContextHeaderName=uber-trace-id
|
--tracing.jaeger.traceContextHeaderName=uber-trace-id
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### disableAttemptReconnecting
|
||||||
|
|
||||||
|
_Optional, Default=true_
|
||||||
|
|
||||||
|
Disable the UDP connection helper that periodically re-resolves the agent's hostname and reconnects if there was a change.
|
||||||
|
Enabling the re-resolving of UDP address make the client more robust in Kubernetes deployments.
|
||||||
|
|
||||||
|
```toml tab="File (TOML)"
|
||||||
|
[tracing]
|
||||||
|
[tracing.jaeger]
|
||||||
|
disableAttemptReconnecting = false
|
||||||
|
```
|
||||||
|
|
||||||
|
```yaml tab="File (YAML)"
|
||||||
|
tracing:
|
||||||
|
jaeger:
|
||||||
|
disableAttemptReconnecting: false
|
||||||
|
```
|
||||||
|
|
||||||
|
```bash tab="CLI"
|
||||||
|
--tracing.jaeger.disableAttemptReconnecting=false
|
||||||
|
```
|
||||||
|
|
||||||
### `collector`
|
### `collector`
|
||||||
#### `endpoint`
|
#### `endpoint`
|
||||||
|
|
||||||
|
|
|
@ -858,6 +858,9 @@ Password for basic http authentication when sending spans to jaeger-collector.
|
||||||
`--tracing.jaeger.collector.user`:
|
`--tracing.jaeger.collector.user`:
|
||||||
User for basic http authentication when sending spans to jaeger-collector.
|
User for basic http authentication when sending spans to jaeger-collector.
|
||||||
|
|
||||||
|
`--tracing.jaeger.disableattemptreconnecting`:
|
||||||
|
Disable the periodic re-resolution of the agent's hostname and reconnection if there was a change. (Default: ```true```)
|
||||||
|
|
||||||
`--tracing.jaeger.gen128bit`:
|
`--tracing.jaeger.gen128bit`:
|
||||||
Generate 128 bit span IDs. (Default: ```false```)
|
Generate 128 bit span IDs. (Default: ```false```)
|
||||||
|
|
||||||
|
|
|
@ -858,6 +858,9 @@ Password for basic http authentication when sending spans to jaeger-collector.
|
||||||
`TRAEFIK_TRACING_JAEGER_COLLECTOR_USER`:
|
`TRAEFIK_TRACING_JAEGER_COLLECTOR_USER`:
|
||||||
User for basic http authentication when sending spans to jaeger-collector.
|
User for basic http authentication when sending spans to jaeger-collector.
|
||||||
|
|
||||||
|
`TRAEFIK_TRACING_JAEGER_DISABLEATTEMPTRECONNECTING`:
|
||||||
|
Disable the periodic re-resolution of the agent's hostname and reconnection if there was a change. (Default: ```true```)
|
||||||
|
|
||||||
`TRAEFIK_TRACING_JAEGER_GEN128BIT`:
|
`TRAEFIK_TRACING_JAEGER_GEN128BIT`:
|
||||||
Generate 128 bit span IDs. (Default: ```false```)
|
Generate 128 bit span IDs. (Default: ```false```)
|
||||||
|
|
||||||
|
|
|
@ -290,6 +290,7 @@
|
||||||
gen128Bit = true
|
gen128Bit = true
|
||||||
propagation = "foobar"
|
propagation = "foobar"
|
||||||
traceContextHeaderName = "foobar"
|
traceContextHeaderName = "foobar"
|
||||||
|
disableAttemptReconnecting = true
|
||||||
[tracing.jaeger.collector]
|
[tracing.jaeger.collector]
|
||||||
endpoint = "foobar"
|
endpoint = "foobar"
|
||||||
user = "foobar"
|
user = "foobar"
|
||||||
|
|
|
@ -308,6 +308,7 @@ tracing:
|
||||||
gen128Bit: true
|
gen128Bit: true
|
||||||
propagation: foobar
|
propagation: foobar
|
||||||
traceContextHeaderName: foobar
|
traceContextHeaderName: foobar
|
||||||
|
disableAttemptReconnecting: true
|
||||||
collector:
|
collector:
|
||||||
endpoint: foobar
|
endpoint: foobar
|
||||||
user: foobar
|
user: foobar
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -75,7 +75,7 @@ require (
|
||||||
github.com/stvp/go-udp-testing v0.0.0-20191102171040-06b61409b154
|
github.com/stvp/go-udp-testing v0.0.0-20191102171040-06b61409b154
|
||||||
github.com/tinylib/msgp v1.0.2 // indirect
|
github.com/tinylib/msgp v1.0.2 // indirect
|
||||||
github.com/traefik/paerser v0.1.0
|
github.com/traefik/paerser v0.1.0
|
||||||
github.com/uber/jaeger-client-go v2.22.1+incompatible
|
github.com/uber/jaeger-client-go v2.25.0+incompatible
|
||||||
github.com/uber/jaeger-lib v2.2.0+incompatible
|
github.com/uber/jaeger-lib v2.2.0+incompatible
|
||||||
github.com/unrolled/render v1.0.2
|
github.com/unrolled/render v1.0.2
|
||||||
github.com/unrolled/secure v1.0.7
|
github.com/unrolled/secure v1.0.7
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -704,8 +704,8 @@ github.com/transip/gotransip/v6 v6.0.2/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4
|
||||||
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
|
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
|
||||||
github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
|
github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
|
||||||
github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
|
github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
|
||||||
github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM=
|
github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U=
|
||||||
github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
|
github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
|
||||||
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
|
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
|
||||||
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
|
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
|
||||||
github.com/unrolled/render v1.0.2 h1:dGS3EmChQP3yOi1YeFNO/Dx+MbWZhdvhQJTXochM5bs=
|
github.com/unrolled/render v1.0.2 h1:dGS3EmChQP3yOi1YeFNO/Dx+MbWZhdvhQJTXochM5bs=
|
||||||
|
|
|
@ -25,6 +25,7 @@ type Config struct {
|
||||||
Propagation string `description:"Which propagation format to use (jaeger/b3)." json:"propagation,omitempty" toml:"propagation,omitempty" yaml:"propagation,omitempty" export:"true"`
|
Propagation string `description:"Which propagation format to use (jaeger/b3)." json:"propagation,omitempty" toml:"propagation,omitempty" yaml:"propagation,omitempty" export:"true"`
|
||||||
TraceContextHeaderName string `description:"Set the header to use for the trace-id." json:"traceContextHeaderName,omitempty" toml:"traceContextHeaderName,omitempty" yaml:"traceContextHeaderName,omitempty" export:"true"`
|
TraceContextHeaderName string `description:"Set the header to use for the trace-id." json:"traceContextHeaderName,omitempty" toml:"traceContextHeaderName,omitempty" yaml:"traceContextHeaderName,omitempty" export:"true"`
|
||||||
Collector *Collector `description:"Define the collector information" json:"collector,omitempty" toml:"collector,omitempty" yaml:"collector,omitempty" export:"true"`
|
Collector *Collector `description:"Define the collector information" json:"collector,omitempty" toml:"collector,omitempty" yaml:"collector,omitempty" export:"true"`
|
||||||
|
DisableAttemptReconnecting bool `description:"Disable the periodic re-resolution of the agent's hostname and reconnection if there was a change." json:"disableAttemptReconnecting,omitempty" toml:"disableAttemptReconnecting,omitempty" yaml:"disableAttemptReconnecting,omitempty" export:"true"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetDefaults sets the default values.
|
// SetDefaults sets the default values.
|
||||||
|
@ -36,6 +37,7 @@ func (c *Config) SetDefaults() {
|
||||||
c.Propagation = "jaeger"
|
c.Propagation = "jaeger"
|
||||||
c.Gen128Bit = false
|
c.Gen128Bit = false
|
||||||
c.TraceContextHeaderName = jaegercli.TraceContextHeaderName
|
c.TraceContextHeaderName = jaegercli.TraceContextHeaderName
|
||||||
|
c.DisableAttemptReconnecting = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Collector provides configuration settings for jaeger collector.
|
// Collector provides configuration settings for jaeger collector.
|
||||||
|
@ -57,6 +59,7 @@ func (c *Config) Setup(componentName string) (opentracing.Tracer, io.Closer, err
|
||||||
reporter := &jaegercfg.ReporterConfig{
|
reporter := &jaegercfg.ReporterConfig{
|
||||||
LogSpans: true,
|
LogSpans: true,
|
||||||
LocalAgentHostPort: c.LocalAgentHostPort,
|
LocalAgentHostPort: c.LocalAgentHostPort,
|
||||||
|
DisableAttemptReconnecting: c.DisableAttemptReconnecting,
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Collector != nil {
|
if c.Collector != nil {
|
||||||
|
|
Loading…
Reference in a new issue