diff --git a/CONNECTION_PARAMETERS.md b/CONNECTION_PARAMETERS.md index a2008c0f..571d05ed 100644 --- a/CONNECTION_PARAMETERS.md +++ b/CONNECTION_PARAMETERS.md @@ -217,7 +217,7 @@ kernel config. | DSN parameter | Thrift | Kernel | Default | Notes | |---|:---:|:---:|---|---| -| `enableTelemetry` | ✅ | ✅ | unset (server flag decides wrapper telemetry; kernel telemetry defaults on) | Force Go wrapper telemetry on/off on the Thrift path, overriding the server feature flag. On the kernel path, forwarded to kernel-owned telemetry; unset forwards enabled. | +| `enableTelemetry` | ✅ | ✅ | unset (server flag decides wrapper telemetry; kernel telemetry defaults off) | Force Go wrapper telemetry on/off on the Thrift path, overriding the server feature flag. On the kernel path, forwarded to kernel-owned telemetry; unset forwards disabled. | | `telemetry_batch_size` | ✅ | ✅ | `200` wrapper default; kernel default when unset | Events per batch. Forwarded to the kernel only when explicitly set. | | `telemetry_flush_interval` | ✅ | ✅ | `30s` wrapper default; kernel default when unset | Flush interval. Forwarded to the kernel only when explicitly set. | | `telemetry_retry_count` | ⚠️ | ⚠️ | — | **Deprecated and ignored** (retries are owned by the HTTP client + circuit breaker); logs a one-time warning. | @@ -226,7 +226,7 @@ kernel config. These telemetry knobs are **DSN-only** — there are no `WithX` connector options for them. An app assembled with `NewConnector(...)` options rather than a DSN cannot tune telemetry: wrapper telemetry falls back to the server feature flag (since `enableTelemetry` is -unset), kernel telemetry defaults on, and `telemetry_batch_size` / +unset), kernel telemetry defaults off, and `telemetry_batch_size` / `telemetry_flush_interval` use their backend defaults. The Go wrapper telemetry interceptor is skipped on the kernel path so it does not diff --git a/go.mod b/go.mod index ebd4cb8e..b183c4a6 100644 --- a/go.mod +++ b/go.mod @@ -36,11 +36,11 @@ require ( github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - golang.org/x/crypto v0.52.0 // indirect + golang.org/x/crypto v0.55.0 // indirect golang.org/x/mod v0.40.0 // indirect golang.org/x/sync v0.22.0 // indirect golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 // indirect - golang.org/x/term v0.43.0 // indirect + golang.org/x/term v0.45.0 // indirect golang.org/x/tools v0.49.0 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 4ae79590..05730cd7 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= +golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M= +golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -195,8 +195,8 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= +golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/internal/backend/kernel/config.go b/internal/backend/kernel/config.go index c8ea1871..44517bc7 100644 --- a/internal/backend/kernel/config.go +++ b/internal/backend/kernel/config.go @@ -134,7 +134,7 @@ func requestTimeoutMilliseconds(timeout time.Duration) int64 { // TelemetryConfig is the kernel telemetry subset exposed by the Go driver. It // mirrors the kernel telemetry C ABI: Enabled follows the user-supplied -// enableTelemetry value, defaulting to true when unset. Zero-valued tuning fields +// enableTelemetry value, defaulting to false when unset. Zero-valued tuning fields // keep the kernel defaults until applyTelemetry fills them for the setter. type TelemetryConfig struct { Enabled bool diff --git a/kernel_config.go b/kernel_config.go index 1e7f0489..36350952 100644 --- a/kernel_config.go +++ b/kernel_config.go @@ -192,7 +192,7 @@ func buildKernelConfig(cfg *config.Config, kauth kernel.Auth) kernel.Config { } func kernelTelemetryConfig(cfg *config.Config) *kernel.TelemetryConfig { - enabled := true + enabled := false if val, isSet := cfg.EnableTelemetry.Get(); isSet { enabled = val } diff --git a/kernel_config_test.go b/kernel_config_test.go index a2b71013..40159673 100644 --- a/kernel_config_test.go +++ b/kernel_config_test.go @@ -566,14 +566,14 @@ func TestBuildKernelConfig(t *testing.T) { } }) - t.Run("kernel telemetry config defaults enabled and omits unset batch size", func(t *testing.T) { + t.Run("kernel telemetry config defaults disabled and omits unset batch size", func(t *testing.T) { c := baseKernelConfig() kc := buildKernelConfig(c, kernel.Auth{Mode: kernel.AuthPAT, Token: "dapi-x"}) if kc.Telemetry == nil { t.Fatal("Telemetry not forwarded") } - if !kc.Telemetry.Enabled { - t.Error("Telemetry.Enabled = false, want true when enableTelemetry is unset") + if kc.Telemetry.Enabled { + t.Error("Telemetry.Enabled = true, want false when enableTelemetry is unset") } if kc.Telemetry.BatchSize != 0 { t.Errorf("Telemetry.BatchSize = %d, want 0 when telemetry_batch_size is unset", kc.Telemetry.BatchSize)