Skip to content

Commit e2487aa

Browse files
committed
fix(pipeline): set OTLP instrumentation scope (#173)
* fix(pipeline): set OTLP instrumentation scope * fix(pipeline): consume ported libdatadog scope patch Update the temporary libdatadog dependency to the PR head ported onto main. Current libdatadog also changed the stats concentrator API, so adapt the WASM stats wrapper to pass the new cardinality limit argument and encode unobfuscated buckets from FlushResult. * fix(pipeline): return collapsed stats count from flushStats * test(pipeline): widen stats overflow regression
1 parent 51b250c commit e2487aa

6 files changed

Lines changed: 299 additions & 140 deletions

File tree

Cargo.lock

Lines changed: 77 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/capabilities/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ http = "1"
1515
bytes = "1.4"
1616
futures-core = "0.3"
1717
anyhow = "1"
18-
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0" }
18+
# TODO: Replace this temporary libdatadog PR rev with the official release/tag
19+
# that contains DataDog/libdatadog#2235, then regenerate Cargo.lock.
20+
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af" }
1921

2022
[dev-dependencies]
2123
wasm-bindgen-test = "0.3"

crates/pipeline/Cargo.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ js-sys = "0.3"
1414
serde = { version = "1.0", features = ["derive"] }
1515
serde_json = "1"
1616
libdatadog-nodejs-capabilities = { path = "../capabilities" }
17-
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0" }
18-
libdd-common = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false }
19-
libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false }
20-
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false, features = ["change-buffer"] }
21-
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false }
22-
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false }
23-
libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog.git", tag = "v37.0.0", default-features = false }
17+
# TODO: Replace these temporary libdatadog PR revs with the official release/tag
18+
# that contains DataDog/libdatadog#2235, then regenerate Cargo.lock.
19+
libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af" }
20+
libdd-common = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
21+
libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
22+
libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false, features = ["change-buffer"] }
23+
libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
24+
libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
25+
libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
2426
rmp-serde = "1"
2527
bytes = "1"
2628
http = "1"

0 commit comments

Comments
 (0)