feat: add newer instrument_hooks markers to native_core

Author: GuillaumeLagrange

packages/core/rollup.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from "rollup";
 import { declarationsPlugin, jsPlugins } from "../../rollup.options";
 
-import pkg from "./package.json" assert { type: "json" };
+import pkg from "./package.json" with { type: "json" };
 const entrypoint = "src/index.ts";
 
 export default defineConfig([

packages/core/src/index.ts

@@ -81,3 +81,9 @@ export * from "./utils";
 export * from "./walltime";
 export type { InstrumentMode };
 export const InstrumentHooks = native_core.InstrumentHooks;
+export {
+  MARKER_TYPE_SAMPLE_START,
+  MARKER_TYPE_SAMPLE_END,
+  MARKER_TYPE_BENCHMARK_START,
+  MARKER_TYPE_BENCHMARK_END,
+} from "./native_core/instruments/hooks";

packages/core/src/native_core/index.ts

@@ -59,6 +59,13 @@ try {
       writeEnvironment: (_pid: number) => {
         return 0;
       },
+      currentTimestamp: () => {
+        return 0n;
+      },
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      addMarker: (_pid: number, _markerType: number, _timestamp: bigint) => {
+        return 0;
+      },
       __codspeed_root_frame__: <T>(callback: () => T): T => {
         return callback();
       },

packages/core/src/native_core/instruments/hooks.ts

@@ -48,9 +48,29 @@ export interface InstrumentHooks {
    */
   writeEnvironment(pid: number): number;
 
+  /**
+   * Returns a high-resolution timestamp (nanoseconds) suitable for marker
+   * emission. Mirrors `instrument_hooks_current_timestamp` in the C API.
+   */
+  currentTimestamp(): bigint;
+
+  /**
+   * Emit a marker for the given pid at the given timestamp.
+   * @param pid Process ID
+   * @param markerType One of MARKER_TYPE_*
+   * @param timestamp Timestamp (typically obtained from `currentTimestamp()`)
+   * @returns 0 on success, non-zero on error
+   */
+  addMarker(pid: number, markerType: number, timestamp: bigint): number;
+
   /**
    * Execute a callback function with __codspeed_root_frame__ in its stack trace
    * @param callback Function to execute
    */
   __codspeed_root_frame__<T>(callback: () => T): T;
 }
+
+export const MARKER_TYPE_SAMPLE_START = 0;
+export const MARKER_TYPE_SAMPLE_END = 1;
+export const MARKER_TYPE_BENCHMARK_START = 2;
+export const MARKER_TYPE_BENCHMARK_END = 3;

packages/core/src/native_core/instruments/hooks_wrapper.cc

@@ -129,6 +129,48 @@ Napi::Number WriteEnvironment(const Napi::CallbackInfo &info) {
   return Napi::Number::New(env, result);
 }
 
+Napi::BigInt CurrentTimestamp(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+  uint64_t ts = instrument_hooks_current_timestamp();
+  return Napi::BigInt::New(env, ts);
+}
+
+Napi::Number AddMarker(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 3) {
+    Napi::TypeError::New(env,
+                         "Expected 3 arguments: pid, markerType, timestamp")
+        .ThrowAsJavaScriptException();
+    return Napi::Number::New(env, 1);
+  }
+
+  if (!info[0].IsNumber() || !info[1].IsNumber() ||
+      !(info[2].IsBigInt() || info[2].IsNumber())) {
+    Napi::TypeError::New(
+        env,
+        "Expected number (pid), number (markerType), bigint|number (timestamp)")
+        .ThrowAsJavaScriptException();
+    return Napi::Number::New(env, 1);
+  }
+
+  int32_t pid = info[0].As<Napi::Number>().Int32Value();
+  uint8_t marker_type =
+      static_cast<uint8_t>(info[1].As<Napi::Number>().Uint32Value());
+  uint64_t timestamp;
+  if (info[2].IsBigInt()) {
+    bool lossless = false;
+    timestamp = info[2].As<Napi::BigInt>().Uint64Value(&lossless);
+  } else {
+    timestamp =
+        static_cast<uint64_t>(info[2].As<Napi::Number>().DoubleValue());
+  }
+
+  uint8_t result =
+      instrument_hooks_add_marker(hooks, pid, marker_type, timestamp);
+  return Napi::Number::New(env, result);
+}
+
 Napi::Value __attribute__ ((noinline)) __codspeed_root_frame__(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
 
@@ -169,6 +211,10 @@ Napi::Object Initialize(Napi::Env env, Napi::Object exports) {
                          Napi::Function::New(env, SetEnvironment));
   instrumentHooksObj.Set(Napi::String::New(env, "writeEnvironment"),
                          Napi::Function::New(env, WriteEnvironment));
+  instrumentHooksObj.Set(Napi::String::New(env, "currentTimestamp"),
+                         Napi::Function::New(env, CurrentTimestamp));
+  instrumentHooksObj.Set(Napi::String::New(env, "addMarker"),
+                         Napi::Function::New(env, AddMarker));
   instrumentHooksObj.Set(Napi::String::New(env, "__codspeed_root_frame__"),
                          Napi::Function::New(env, __codspeed_root_frame__));
 

packages/core/src/native_core/instruments/hooks_wrapper.h

@@ -19,6 +19,8 @@ Napi::Number SetExecutedBenchmark(const Napi::CallbackInfo &info);
 Napi::Number SetIntegration(const Napi::CallbackInfo &info);
 Napi::Number SetEnvironment(const Napi::CallbackInfo &info);
 Napi::Number WriteEnvironment(const Napi::CallbackInfo &info);
+Napi::BigInt CurrentTimestamp(const Napi::CallbackInfo &info);
+Napi::Number AddMarker(const Napi::CallbackInfo &info);
 Napi::Object Initialize(Napi::Env env, Napi::Object exports);
 
 } // namespace hooks_wrapper