v0.18.0

crates/capabilities/Cargo.toml

@@ -17,7 +17,7 @@ futures-core = "0.3"
 anyhow = "1"
 # TODO: Replace this temporary libdatadog PR rev with the official release/tag
 # that contains DataDog/libdatadog#2235, then regenerate Cargo.lock.
-libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af" }
+libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a" }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3"

crates/pipeline/Cargo.toml

@@ -16,13 +16,13 @@ serde_json = "1"
 libdatadog-nodejs-capabilities = { path = "../capabilities" }
 # TODO: Replace these temporary libdatadog PR revs with the official release/tag
 # that contains DataDog/libdatadog#2235, then regenerate Cargo.lock.
-libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af" }
-libdd-common = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
-libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
-libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false, features = ["change-buffer"] }
-libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
-libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
-libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog.git", rev = "8cd68ab922fb7aade0f089ccfc91291d874673af", default-features = false }
+libdd-capabilities = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a" }
+libdd-common = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false }
+libdd-data-pipeline = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false }
+libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false, features = ["change-buffer"] }
+libdd-trace-stats = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false }
+libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false }
+libdd-shared-runtime = { git = "https://github.com/DataDog/libdatadog.git", rev = "6356aee4c69b51f27e7e82e43b1797f60b74905a", default-features = false }
 rmp-serde = "1"
 bytes = "1"
 http = "1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/libdatadog",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Node.js binding for libdatadog",
   "main": "index.js",
   "scripts": {

test/pipeline.js

@@ -239,7 +239,7 @@ class NativeSpansInterface {
       this.cqbCount = 0
     }
 
-    const view = this._cqbView
+    let view = this._cqbView
     // Op header: opcode (u16 LE) + span_id (u64 LE) = 10 bytes. Rust reads the
     // opcode as a u16, then the span_id as a u64.
     view.setUint16(this.cqbIndex, op, true)
@@ -250,6 +250,10 @@ class NativeSpansInterface {
     for (const arg of args) {
       if (typeof arg === 'string') {
         const stringId = this.getStringId(arg)
+        if (this._wasmMemory.buffer !== view.buffer) {
+          this._refreshViews()
+          view = this._cqbView
+        }
         view.setUint32(this.cqbIndex, stringId, true)
         this.cqbIndex += 4
       } else {
@@ -743,6 +747,28 @@ describe('pipeline', { skip }, () => {
       assert.strictEqual(span.getTag('bulk-key'), 'bulk-val')
     })
 
+    it('refreshes change-buffer views when string interning grows memory', () => {
+      const span = nativeSpans.createSpan()
+      const getStringId = nativeSpans.getStringId.bind(nativeSpans)
+      let grew = false
+      nativeSpans.getStringId = (str) => {
+        const id = getStringId(str)
+        if (!grew) {
+          grew = true
+          wasmMemory.grow(1)
+        }
+        return id
+      }
+
+      try {
+        span.setTag('grow-key', 'grow-value')
+
+        assert.strictEqual(span.getTag('grow-key'), 'grow-value')
+      } finally {
+        nativeSpans.getStringId = getStringId
+      }
+    })
+
     it('rejects a malformed (non-terminated) stringTableInsertMany entry', () => {
       const ptr = nativeSpans.state.string_table_input_ptr()
       const len = nativeSpans.state.string_table_input_len()
@@ -944,6 +970,7 @@ describe('pipeline', { skip }, () => {
             method: req.method,
             url: req.url,
             ct: req.headers['content-type'],
+            clientComputedStats: req.headers['datadog-client-computed-stats'],
             len: Buffer.concat(chunks).length,
             body: Buffer.concat(chunks).toString(),
           })
@@ -956,6 +983,7 @@ describe('pipeline', { skip }, () => {
       const ns = new NativeSpansInterface({
         agentUrl: `http://127.0.0.1:${port}`,
         tracerVersion: '7.0.0-pre',
+        clientComputedStats: true,
       })
       ns.state.setOtlpEndpoint(`http://127.0.0.1:${port}/v1/traces`)
       const span = ns.createSpan()
@@ -975,6 +1003,11 @@ describe('pipeline', { skip }, () => {
         const body = JSON.parse(req.body)
         assert.strictEqual(body.resourceSpans[0].scopeSpans[0].scope.name, 'dd-trace-js')
         assert.strictEqual(body.resourceSpans[0].scopeSpans[0].scope.version, '7.0.0-pre')
+        assert.strictEqual(req.clientComputedStats, 'yes')
+        const resourceAttrs = body.resourceSpans[0].resource.attributes
+        assert.ok(resourceAttrs.some((attr) => {
+          return attr.key === '_dd.stats_computed' && attr.value.stringValue === 'true'
+        }), 'OTLP resource should mark client-computed stats')
       } finally {
         server.closeAllConnections?.()
         server.close()