Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bindings/otel-thread-ctx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ void CtxWrap::DrainLive(void* arg) {
if (!p->handle_.IsEmpty()) {
SetAlignedPointerInInternalField(p->handle_.Get(isolate), 0, nullptr);
}
std::atomic_signal_fence(std::memory_order_acq_rel);
Destroy(p);
p = next;
}
Expand Down
2 changes: 1 addition & 1 deletion ts/src/otel-thread-ctx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const SCHEMA_VERSION = 'nodejs_v1_dev';
// (no V8 pointer compression, no sandbox); the reader is Linux-only per
// the OTEP anyway, so the fallbacks just keep processContextAttributes
// consistent in shape.
let JS_OBJECT_RECORD_OFFSET = 24;
let JS_OBJECT_RECORD_OFFSET = 0x18;
let TAGGED_SIZE = 8;
let JS_MAP_TABLE_OFFSET = 0x18;
let ORDERED_HASH_MAP_HEADER_SIZE = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion ts/test/test-otel-thread-ctx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ function captureBytes(opts: {
const pca = getProcessContextAttributes(keys);
strictAssert.equal(pca['threadlocal.schema_version'], 'nodejs_v1_dev');
strictAssert.deepEqual(pca['threadlocal.attribute_key_map'], keys);
strictAssert.equal(pca['threadlocal.js_object_record_offset'], 24);
strictAssert.equal(pca['threadlocal.js_object_record_offset'], 0x18);
strictAssert.equal(pca['threadlocal.tagged_size'], 8);
strictAssert.equal(pca['threadlocal.js_map_table_offset'], 0x18);
strictAssert.equal(
Expand Down
Loading