mirror
/
kratos
mirror of https://github.com/ory/kratos
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: revert "fix: otlp sampling rate default (#9055)" 

GitOrigin-RevId: 9de37a48b68c7ee29caefb01c83f1a78999dc15b
This commit is contained in:
Ferdynand Naczynski 2025-08-06 14:03:39 +02:00 committed by ory-bot
parent 97848c7cd7
commit 8379db8fc8
7 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
oryx/configx/provider.go
View File

@ -412,17 +412,6 @@ func (p *Provider) Float64F(key string, fallback float64) (val float64) {
return p.Float64(key)
}
func (p *Provider) Float64PtrF(key string, fallback float64) (val *float64) {
p.l.RLock()
defer p.l.RUnlock()
if !p.Koanf.Exists(key) {
return &fallback
}
out := p.Float64(key)
return &out
}
func (p *Provider) DurationF(key string, fallback time.Duration) (val time.Duration) {
p.l.RLock()
defer p.l.RUnlock()
@ -482,21 +471,21 @@ func (p *Provider) TracingConfig(serviceName string) *otelx.Config {
Jaeger: otelx.JaegerConfig{
Sampling: otelx.JaegerSampling{
ServerURL: p.String("tracing.providers.jaeger.sampling.server_url"),
TraceIdRatio: p.Float64PtrF("tracing.providers.jaeger.sampling.trace_id_ratio", 1.0),
TraceIdRatio: p.Float64F("tracing.providers.jaeger.sampling.trace_id_ratio", 1),
},
LocalAgentAddress: p.String("tracing.providers.jaeger.local_agent_address"),
},
Zipkin: otelx.ZipkinConfig{
ServerURL: p.String("tracing.providers.zipkin.server_url"),
Sampling: otelx.ZipkinSampling{
SamplingRatio: p.Float64PtrF("tracing.providers.zipkin.sampling.sampling_ratio",0.0),
SamplingRatio: p.Float64("tracing.providers.zipkin.sampling.sampling_ratio"),
},
},
OTLP: otelx.OTLPConfig{
ServerURL: p.String("tracing.providers.otlp.server_url"),
Insecure: p.Bool("tracing.providers.otlp.insecure"),
Sampling: otelx.OTLPSampling{
SamplingRatio: p.Float64PtrF("tracing.providers.otlp.sampling.sampling_ratio", 1.0),
SamplingRatio: p.Float64F("tracing.providers.otlp.sampling.sampling_ratio", 1),
},
AuthorizationHeader: p.String("tracing.providers.otlp.authorization_header"),
},

1
oryx/go.mod
View File

@ -209,7 +209,6 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/yaml v1.4.0 // indirect
)

2
oryx/go.sum
View File

@ -724,7 +724,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

11
oryx/otelx/config.go
View File

@ -27,16 +27,16 @@ type OTLPConfig struct {
}
type JaegerSampling struct {
ServerURL string `json:"server_url"`
TraceIdRatio *float64 `json:"trace_id_ratio"`
ServerURL string `json:"server_url"`
TraceIdRatio float64 `json:"trace_id_ratio"`
}
type ZipkinSampling struct {
SamplingRatio *float64 `json:"sampling_ratio"`
SamplingRatio float64 `json:"sampling_ratio"`
}
type OTLPSampling struct {
SamplingRatio *float64 `json:"sampling_ratio"`
SamplingRatio float64 `json:"sampling_ratio"`
}
type ProvidersConfig struct {
@ -61,7 +61,6 @@ const ConfigSchemaID = "ory://tracing-config"
// The interface is specified instead of `jsonschema.Compiler` to allow the use of any jsonschema library fork or version.
func AddConfigSchema(c interface {
AddResource(url string, r io.Reader) error
},
) error {
}) error {
return c.AddResource(ConfigSchemaID, bytes.NewBufferString(ConfigSchema))
}

9
oryx/otelx/jaeger.go
View File

@ -51,13 +51,10 @@ func SetupJaeger(t *Tracer, tracerName string, c *Config) (trace.Tracer, error)
}
samplingServerURL := c.Providers.Jaeger.Sampling.ServerURL
traceIdRatio := c.Providers.Jaeger.Sampling.TraceIdRatio
sampler := sdktrace.TraceIDRatioBased(traceIdRatio)
var sampler sdktrace.Sampler
if c.Providers.Jaeger.Sampling.TraceIdRatio != nil {
sampler = sdktrace.TraceIDRatioBased(*c.Providers.Jaeger.Sampling.TraceIdRatio)
} else {
sampler = sdktrace.TraceIDRatioBased(1)
}
if samplingServerURL != "" {
sampler = jaegerremote.New(
"jaegerremote",

9
oryx/otelx/otlp.go
View File

@ -41,10 +41,7 @@ func SetupOTLP(t *Tracer, tracerName string, c *Config) (trace.Tracer, error) {
if err != nil {
return nil, err
}
var sampler sdktrace.Sampler
if c.Providers.OTLP.Sampling.SamplingRatio != nil {
sampler = sdktrace.ParentBased(sdktrace.TraceIDRatioBased(*c.Providers.OTLP.Sampling.SamplingRatio))
}
tpOpts := []sdktrace.TracerProviderOption{
sdktrace.WithBatcher(exp),
sdktrace.WithResource(resource.NewWithAttributes(
@ -52,7 +49,9 @@ func SetupOTLP(t *Tracer, tracerName string, c *Config) (trace.Tracer, error) {
semconv.ServiceName(c.ServiceName),
semconv.DeploymentEnvironmentName(c.DeploymentEnvironment),
)),
sdktrace.WithSampler(sampler),
sdktrace.WithSampler(sdktrace.ParentBased(sdktrace.TraceIDRatioBased(
c.Providers.OTLP.Sampling.SamplingRatio,
))),
}
tp := sdktrace.NewTracerProvider(tpOpts...)

8
oryx/otelx/zipkin.go
View File

@ -18,10 +18,6 @@ func SetupZipkin(t *Tracer, tracerName string, c *Config) (trace.Tracer, error)
return nil, err
}
var sampler sdktrace.Sampler
if c.Providers.Zipkin.Sampling.SamplingRatio != nil {
sampler = sdktrace.ParentBased(sdktrace.TraceIDRatioBased(*c.Providers.Zipkin.Sampling.SamplingRatio))
}
tpOpts := []sdktrace.TracerProviderOption{
sdktrace.WithBatcher(exp),
sdktrace.WithResource(resource.NewWithAttributes(
@ -29,7 +25,9 @@ func SetupZipkin(t *Tracer, tracerName string, c *Config) (trace.Tracer, error)
semconv.ServiceName(c.ServiceName),
semconv.DeploymentEnvironmentName(c.DeploymentEnvironment),
)),
sdktrace.WithSampler(sampler),
sdktrace.WithSampler(sdktrace.ParentBased(sdktrace.TraceIDRatioBased(
c.Providers.Zipkin.Sampling.SamplingRatio,
))),
}
tp := sdktrace.NewTracerProvider(tpOpts...)