From ed60ff26089c487daec3ca21f20778b6d055fa15 Mon Sep 17 00:00:00 2001 From: Makisuo Date: Sun, 13 Sep 2026 23:24:06 +0200 Subject: [PATCH] chore(deps): clear the open Dependabot alerts Ingest gateway (apps/ingest): - opentelemetry family 0.31 -> 0.32 (opentelemetry_sdk 0.32.1 bounds W3C Baggage parsing, GHSA-w9wp-h8wv-79jx); tracing-opentelemetry 0.32 -> 0.33. The 0.32 protos carry OTLP 1.9's experimental string-table fields, so KeyValue literals gain key_strindex and any_value_string treats an unresolvable StringValueStrindex as empty. - aws-lc-sys 0.37.1 -> 0.45.0, rustls-webpki 0.103.9 -> 0.103.15, quinn-proto 0.11.13 -> 0.11.17, rand 0.9.2 -> 0.9.5. - The bump also collapses the duplicate reqwest 0.12 out of the lockfile. .deepsec: pnpm override undici@8 -> ^8.9.0 (a transitive dep pinned 8.5.0). Co-Authored-By: Claude Fable 5.1 --- .deepsec/package.json | 7 +- .deepsec/pnpm-lock.yaml | 49 ++++----- apps/ingest/Cargo.lock | 128 ++++++++++-------------- apps/ingest/Cargo.toml | 12 +-- apps/ingest/benches/ai_session_bench.rs | 1 + apps/ingest/benches/ingest_bench.rs | 1 + apps/ingest/src/ai_session.rs | 2 + apps/ingest/src/bin/load_test.rs | 1 + apps/ingest/src/main.rs | 5 + apps/ingest/src/telemetry.rs | 7 +- 10 files changed, 107 insertions(+), 106 deletions(-) diff --git a/.deepsec/package.json b/.deepsec/package.json index 25c86b08e..a9d183e41 100644 --- a/.deepsec/package.json +++ b/.deepsec/package.json @@ -8,5 +8,10 @@ "dependencies": { "deepsec": "^2.0.8" }, - "packageManager": "pnpm@9.15.4" + "packageManager": "pnpm@9.15.4", + "pnpm": { + "overrides": { + "undici@8": "^8.9.0" + } + } } diff --git a/.deepsec/pnpm-lock.yaml b/.deepsec/pnpm-lock.yaml index 087f300a1..05d895918 100644 --- a/.deepsec/pnpm-lock.yaml +++ b/.deepsec/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + undici@8: ^8.9.0 + importers: .: @@ -693,8 +696,8 @@ packages: fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} - fast-uri@3.1.6: - resolution: {integrity: sha512-7Ical1vFEMr0onbVzEDIreM22I4khW+fzyQPwvAFWBp1iwdshSZRsL4jjRvPG9JP1uiqMHRto+YU6R2/CzDz5Q==} + fast-uri@3.1.7: + resolution: {integrity: sha512-dOvZVzjdZdz7phd9v6jCbwxrBW3fK6n8Rc0CtdmM4bumzMnxywBYhuph6J819RRw/ku+rLbelwfMunktuzVVHg==} fetch-blob@3.2.0: resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} @@ -773,8 +776,8 @@ packages: highlight.js@10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} - hono@4.13.5: - resolution: {integrity: sha512-O6+/eCYRkzzzy0rPWwKLiGBR1nFuUPZynnwjxN1MBA62NNqbT0wQEzQyK2gSO5yDIDB336sXQleAhOHrzlYyKw==} + hono@4.13.7: + resolution: {integrity: sha512-c8/gF9ac8Y78/agExVocyLevgR+JlpNB444Py0FSX8pJoPdYUfUzRcXtYEYGwt6l19qIlVZPN5Mfsw9jFShmQQ==} engines: {node: '>=16.9.0'} hosted-git-info@9.0.3: @@ -859,8 +862,8 @@ packages: jose@5.10.0: resolution: {integrity: sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==} - jose@6.2.10: - resolution: {integrity: sha512-iiW7J9qRFlGxvCOIBDBDxFePQSn7ZMAnrYGhrrOo6siO/MIqwfyilLR27pkfDgUk+raLuzADS8A3S/KLBisc0g==} + jose@6.2.12: + resolution: {integrity: sha512-9NiFmJEex0sy2Dk58j2UGBSHgUs2ypF9eZSu4L6vjOX3Dp96Sw1F3uL+H+D1sx02jZZdzUT0HgvCy59CuvXcWw==} json-bigint@1.0.0: resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==} @@ -1201,12 +1204,12 @@ packages: undici-types@8.3.0: resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} - undici@7.29.0: - resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==} + undici@7.29.1: + resolution: {integrity: sha512-RYONW2MeafgYlkVOKYKkA/Ag7BmXqgIWCa8t1m0JcxrQg9pI9lEqRhAOruOBCbAohOa/gkCF+iPi9hrgvTzu6Q==} engines: {node: '>=20.18.1'} - undici@8.5.0: - resolution: {integrity: sha512-xamtWoB1EshgjpmlXd7GGm2VfdDtw1+rD8uhry8pSNW3If6S8E0m2T2+orSKeZXEn/aPJMviCpDBA65WJt8zhg==} + undici@8.10.2: + resolution: {integrity: sha512-/y4/bH9YNU5hi9NIrpOuvGXFcxrj3CMrV+/AYpowAYTpHn8gX/XPFjNy766FPoYY0miQhdW977JFWKGNhBdwyQ==} engines: {node: '>=22.19.0'} unpipe@1.0.0: @@ -1608,7 +1611,7 @@ snapshots: proper-lockfile: 4.1.2 semver: 7.8.0 typebox: 1.1.38 - undici: 8.5.0 + undici: 8.10.2 yaml: 2.9.0 optionalDependencies: '@mariozechner/clipboard': 0.3.9 @@ -1638,9 +1641,9 @@ snapshots: - supports-color - utf-8-validate - '@hono/node-server@2.1.1(hono@4.13.5)': + '@hono/node-server@2.1.1(hono@4.13.7)': dependencies: - hono: 4.13.5 + hono: 4.13.7 '@isaacs/fs-minipass@4.0.1': dependencies: @@ -1704,7 +1707,7 @@ snapshots: '@modelcontextprotocol/sdk@1.30.0(zod@4.5.4)': dependencies: - '@hono/node-server': 2.1.1(hono@4.13.5) + '@hono/node-server': 2.1.1(hono@4.13.7) ajv: 8.20.0 ajv-formats: 3.0.1(ajv@8.20.0) content-type: 1.0.5 @@ -1714,8 +1717,8 @@ snapshots: eventsource-parser: 3.1.1 express: 5.2.1 express-rate-limit: 8.7.0(express@5.2.1) - hono: 4.13.5 - jose: 6.2.10 + hono: 4.13.7 + jose: 6.2.12 json-schema-typed: 8.0.2 pkce-challenge: 5.0.1 raw-body: 3.0.2 @@ -1866,7 +1869,7 @@ snapshots: ms: 2.1.3 picocolors: 1.1.1 tar-stream: 3.1.7 - undici: 7.29.0 + undici: 7.29.1 xdg-app-paths: 5.1.0 zod: 3.24.4 transitivePeerDependencies: @@ -1889,7 +1892,7 @@ snapshots: ajv@8.20.0: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.1.6 + fast-uri: 3.1.7 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -2132,7 +2135,7 @@ snapshots: fast-fifo@1.3.2: {} - fast-uri@3.1.6: {} + fast-uri@3.1.7: {} fetch-blob@3.2.0: dependencies: @@ -2229,7 +2232,7 @@ snapshots: highlight.js@10.7.3: {} - hono@4.13.5: {} + hono@4.13.7: {} hosted-git-info@9.0.3: dependencies: @@ -2321,7 +2324,7 @@ snapshots: jose@5.10.0: {} - jose@6.2.10: {} + jose@6.2.12: {} json-bigint@1.0.0: dependencies: @@ -2666,9 +2669,9 @@ snapshots: undici-types@8.3.0: {} - undici@7.29.0: {} + undici@7.29.1: {} - undici@8.5.0: {} + undici@8.10.2: {} unpipe@1.0.0: {} diff --git a/apps/ingest/Cargo.lock b/apps/ingest/Cargo.lock index 24f1e41e0..8c01ff6ff 100644 --- a/apps/ingest/Cargo.lock +++ b/apps/ingest/Cargo.lock @@ -130,9 +130,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-lc-rs" -version = "1.15.4" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256" +checksum = "b281d307588d634de920874890732659e2e7672f72b5e10e81badc1a8a83621e" dependencies = [ "aws-lc-sys", "zeroize", @@ -140,14 +140,15 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.37.1" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" +checksum = "9bff6c3b54fad79a2e60b8102caf565819711497c1f5f092f49508e2f5c31b27" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", ] [[package]] @@ -957,11 +958,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi 5.3.0", "wasip2", - "wasm-bindgen", ] [[package]] @@ -971,11 +970,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi 6.0.0", "rand_core 0.10.1", "wasip2", "wasip3", + "wasm-bindgen", ] [[package]] @@ -1099,7 +1100,7 @@ dependencies = [ "prettytable-rs", "quanta", "regex", - "reqwest 0.13.2", + "reqwest", "reqwest-middleware", "serde", "serde_json", @@ -1220,7 +1221,6 @@ dependencies = [ "hyper", "hyper-util", "rustls", - "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1589,7 +1589,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "reqwest 0.13.2", + "reqwest", "rustls", "serde", "serde_json", @@ -1768,9 +1768,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "opentelemetry" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682" dependencies = [ "futures-core", "futures-sink", @@ -1782,9 +1782,9 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2" +checksum = "2c0080f0dc1d7c786f467cd85a4e395fcab11ee852004f39a29a18ab7c25d837" dependencies = [ "opentelemetry", "tracing", @@ -1794,22 +1794,22 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" +checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331" dependencies = [ "async-trait", "bytes", "http", "opentelemetry", - "reqwest 0.12.28", + "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f" +checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35" dependencies = [ "http", "opentelemetry", @@ -1817,15 +1817,15 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "prost", - "reqwest 0.12.28", + "reqwest", "thiserror 2.0.18", ] [[package]] name = "opentelemetry-proto" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" +checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638" dependencies = [ "base64", "const-hex", @@ -1833,23 +1833,23 @@ dependencies = [ "opentelemetry_sdk", "prost", "serde", - "serde_json", "tonic", "tonic-prost", ] [[package]] name = "opentelemetry_sdk" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9" dependencies = [ "futures-channel", "futures-executor", "futures-util", "opentelemetry", "percent-encoding", - "rand 0.9.2", + "portable-atomic", + "rand 0.9.5", "thiserror 2.0.18", "tokio", "tokio-stream", @@ -1941,6 +1941,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" + [[package]] name = "plotters" version = "0.3.7" @@ -2074,7 +2080,7 @@ checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532" dependencies = [ "bitflags", "num-traits", - "rand 0.9.2", + "rand 0.9.5", "rand_chacha", "rand_xorshift", "regex-syntax", @@ -2141,15 +2147,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "04759210543be93709136e28212294a659ef5001836ff4eab4d663e4529bba83" dependencies = [ "aws-lc-rs", "bytes", - "getrandom 0.3.4", + "getrandom 0.4.2", "lru-slab", - "rand 0.9.2", + "rand 0.10.1", + "rand_pcg", "ring", "rustc-hash", "rustls", @@ -2198,9 +2205,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha", "rand_core 0.9.5", @@ -2251,6 +2258,15 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" +[[package]] +name = "rand_pcg" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core 0.10.1", +] + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -2338,44 +2354,6 @@ version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "reqwest" version = "0.13.2" @@ -2426,7 +2404,7 @@ dependencies = [ "anyhow", "async-trait", "http", - "reqwest 0.13.2", + "reqwest", "serde", "thiserror 2.0.18", "tower-service", @@ -2519,9 +2497,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.9" +version = "0.103.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" +checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" dependencies = [ "aws-lc-rs", "ring", @@ -3196,9 +3174,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc" +checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26" dependencies = [ "js-sys", "opentelemetry", diff --git a/apps/ingest/Cargo.toml b/apps/ingest/Cargo.toml index 15bf2f168..331b4141e 100644 --- a/apps/ingest/Cargo.toml +++ b/apps/ingest/Cargo.toml @@ -15,9 +15,9 @@ chrono = { version = "0.4.42", default-features = false, features = ["clock"] } flate2 = "1.1.5" hmac = "0.12.1" dotenvy = "0.15.7" -opentelemetry = "0.31" -opentelemetry-appender-tracing = "0.31" -opentelemetry_sdk = { version = "0.31", features = [ +opentelemetry = "0.32" +opentelemetry-appender-tracing = "0.32" +opentelemetry_sdk = { version = "0.32", features = [ "rt-tokio", "trace", "logs", @@ -26,7 +26,7 @@ opentelemetry_sdk = { version = "0.31", features = [ "experimental_metrics_periodicreader_with_async_runtime", "experimental_logs_batch_log_processor_with_async_runtime", ] } -opentelemetry-otlp = { version = "0.31", default-features = false, features = [ +opentelemetry-otlp = { version = "0.32", default-features = false, features = [ "http-proto", "reqwest-client", "reqwest-rustls", @@ -34,7 +34,7 @@ opentelemetry-otlp = { version = "0.31", default-features = false, features = [ "logs", "metrics", ] } -opentelemetry-proto = { version = "0.31.0", features = [ +opentelemetry-proto = { version = "0.32", features = [ "gen-tonic", "trace", "logs", @@ -52,7 +52,7 @@ sha2 = "0.10.9" tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "signal"] } tonic = { version = "0.14", features = ["transport"] } tracing = "0.1.41" -tracing-opentelemetry = "0.32" +tracing-opentelemetry = "0.33" tracing-subscriber = { version = "0.3.20", features = ["fmt", "env-filter"] } tower-http = { version = "0.6", features = ["cors"] } url = "2.5.7" diff --git a/apps/ingest/benches/ai_session_bench.rs b/apps/ingest/benches/ai_session_bench.rs index 6c379419e..7afc61f06 100644 --- a/apps/ingest/benches/ai_session_bench.rs +++ b/apps/ingest/benches/ai_session_bench.rs @@ -12,6 +12,7 @@ use opentelemetry_proto::tonic::{ fn kv(key: &str, value: &str) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), diff --git a/apps/ingest/benches/ingest_bench.rs b/apps/ingest/benches/ingest_bench.rs index eadebc7e2..fbfacd64a 100644 --- a/apps/ingest/benches/ingest_bench.rs +++ b/apps/ingest/benches/ingest_bench.rs @@ -255,6 +255,7 @@ fn build_traces(count: usize) -> ExportTraceServiceRequest { fn string_kv(key: &str, value: &str) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), diff --git a/apps/ingest/src/ai_session.rs b/apps/ingest/src/ai_session.rs index 1c6321a48..288c1139e 100644 --- a/apps/ingest/src/ai_session.rs +++ b/apps/ingest/src/ai_session.rs @@ -182,6 +182,7 @@ fn string_attribute(key: &str, value: &str) -> KeyValue { fn owned_string_attribute(key: &str, value: String) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value)), }), @@ -1458,6 +1459,7 @@ mod tests { fn integer_session_ids_are_stringified() { let span_attrs = vec![KeyValue { key: "session.id".to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::IntValue(4211)), }), diff --git a/apps/ingest/src/bin/load_test.rs b/apps/ingest/src/bin/load_test.rs index 12307c76f..ebd6410a8 100644 --- a/apps/ingest/src/bin/load_test.rs +++ b/apps/ingest/src/bin/load_test.rs @@ -627,6 +627,7 @@ fn build_logs_payload(batch_logs: usize) -> Vec { fn string_kv(key: &str, value: &str) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), diff --git a/apps/ingest/src/main.rs b/apps/ingest/src/main.rs index 8891afc71..c5af2f125 100644 --- a/apps/ingest/src/main.rs +++ b/apps/ingest/src/main.rs @@ -4659,6 +4659,7 @@ fn current_time_unix_nano() -> u64 { fn string_attribute(key: &str, value: &str) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), @@ -4935,6 +4936,7 @@ fn upsert_string_attribute(attributes: &mut Vec, key: &str, value: &st attributes.push(KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), @@ -6568,12 +6570,14 @@ mod tests { let mut attributes = vec![ KeyValue { key: "org_id".to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue("spoofed".to_owned())), }), }, KeyValue { key: "maple_org_id".to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue("spoofed".to_owned())), }), @@ -7247,6 +7251,7 @@ mod tests { resource: Some(Resource { attributes: vec![KeyValue { key: "service.name".to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue("routing-test".to_owned())), }), diff --git a/apps/ingest/src/telemetry.rs b/apps/ingest/src/telemetry.rs index 43b26e8d4..36818e330 100644 --- a/apps/ingest/src/telemetry.rs +++ b/apps/ingest/src/telemetry.rs @@ -3864,7 +3864,9 @@ fn any_value_string(value: &AnyValue) -> String { let attrs = attr_map(&value.values); serde_json::to_string(&attrs).unwrap_or_default() } - None => String::new(), + // String-table references (OTLP 1.9 experimental encoding) cannot be resolved + // without the sender's dictionary, which the gateway does not accept yet. + Some(any_value::Value::StringValueStrindex(_)) | None => String::new(), } } @@ -4231,6 +4233,7 @@ mod tests { fn string_kv(key: &str, value: &str) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue(value.to_owned())), }), @@ -4240,6 +4243,7 @@ mod tests { fn bool_kv(key: &str, value: bool) -> KeyValue { KeyValue { key: key.to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::BoolValue(value)), }), @@ -6994,6 +6998,7 @@ mod tests { .get_or_insert_with(Resource::default); resource.attributes.push(KeyValue { key: "maple_org_id".to_owned(), + key_strindex: 0, value: Some(AnyValue { value: Some(any_value::Value::StringValue("org_scraper".to_owned())), }),