rian 0.1.0 → 0.1.1

package/exporter.otel.http.js

@@ -79,6 +79,7 @@ const exporter = (request) => (spans, context) => {
             droppedEventsCount: 0,
             droppedLinksCount: 0,
             attributes: convert_object_to_kv(span_ctx),
+            // @ts-expect-error TS2454
             status: status || { code: SpanStatusCode_UNSET },
             events: span.events.map((i) => ({
                 name: i.name,

package/exporter.otel.http.mjs

@@ -77,6 +77,7 @@ const exporter = (request) => (spans, context) => {
             droppedEventsCount: 0,
             droppedLinksCount: 0,
             attributes: convert_object_to_kv(span_ctx),
+            // @ts-expect-error TS2454
             status: status || { code: SpanStatusCode_UNSET },
             events: span.events.map((i) => ({
                 name: i.name,

package/index.js

@@ -2,7 +2,7 @@
 
 const package_json = require('rian/package.json');
 const tctx = require('tctx');
-const rian = require('rian');
+const utils = require('rian/utils');
 
 function _interopNamespace(e) {
 	if (e && e.__esModule) return e;
@@ -24,53 +24,6 @@ function _interopNamespace(e) {
 
 const tctx__namespace = /*#__PURE__*/_interopNamespace(tctx);
 
-const set_error = (scope, error) => {
-    scope.set_context({
-        error,
-    });
-};
-const measureFn = (scope, fn, ...args) => {
-    try {
-        var r = fn(...args, scope), is_promise = r instanceof Promise;
-        if (is_promise && rian.PROMISES.has(scope))
-            rian.ADD_PROMISE(scope, r
-                .catch((e) => void set_error(scope, e))
-                .finally(() => scope.end()));
-        return r;
-    }
-    catch (e) {
-        set_error(scope, e);
-        throw e;
-    }
-    finally {
-        if (is_promise !== true)
-            scope.end();
-    }
-};
-/**
- * With a passed function — will start a span, and run the function, when the function finishes
- * the span finishes.
- *
- * The measure method will return whatever the function is, so if it's a promise, it returns a
- * promise and so on. Any error is caught and re thrown, and automatically tracked in the
- * context under the `error` property.
- *
- * All promises are tracked, and awaited on a `tracer.end`.
- *
- * @example
- *
- * ```text
- * const data = await measure(scope, get_data, 'user_id_123');
- *        ^                           ^        ^
- *        |                           |        |
- *        |                           |        the first argument to get_data
- *        |                           function to be called
- *        return value from get_data
- * ```
- */
-const measure = (scope, fn, // TODO: fn doesnt see scope correctly
-...args) => measureFn(scope, fn, ...args);
-
 // ==> impl
 /**
  * @internal
@@ -125,9 +78,10 @@ const create = (name, options) => {
         };
         if (should_sample)
             spans.add(span_obj);
-        const $ = (cb) => measure($, cb);
+        const $ = (cb) => utils.measureFn($, cb);
         $.traceparent = id;
         $.fork = (name) => span(name, id);
+        // @ts-expect-error TS7030 its always undefined ts :eye-roll:
         $.set_context = (ctx) => {
             if (typeof ctx === 'function')
                 return void (span_obj.context = ctx(span_obj.context));
@@ -141,9 +95,8 @@ const create = (name, options) => {
             });
         };
         $.end = () => {
-            if (span_obj.end)
-                return void 0;
-            span_obj.end = Date.now();
+            if (span_obj.end == null)
+                span_obj.end = Date.now();
         };
         return $;
     };

package/index.mjs

@@ -1,53 +1,6 @@
 import { name, version } from 'rian/package.json';
 import * as tctx from 'tctx';
-import { PROMISES as PROMISES$1, ADD_PROMISE as ADD_PROMISE$1 } from 'rian';
-
-const set_error = (scope, error) => {
-    scope.set_context({
-        error,
-    });
-};
-const measureFn = (scope, fn, ...args) => {
-    try {
-        var r = fn(...args, scope), is_promise = r instanceof Promise;
-        if (is_promise && PROMISES$1.has(scope))
-            ADD_PROMISE$1(scope, r
-                .catch((e) => void set_error(scope, e))
-                .finally(() => scope.end()));
-        return r;
-    }
-    catch (e) {
-        set_error(scope, e);
-        throw e;
-    }
-    finally {
-        if (is_promise !== true)
-            scope.end();
-    }
-};
-/**
- * With a passed function — will start a span, and run the function, when the function finishes
- * the span finishes.
- *
- * The measure method will return whatever the function is, so if it's a promise, it returns a
- * promise and so on. Any error is caught and re thrown, and automatically tracked in the
- * context under the `error` property.
- *
- * All promises are tracked, and awaited on a `tracer.end`.
- *
- * @example
- *
- * ```text
- * const data = await measure(scope, get_data, 'user_id_123');
- *        ^                           ^        ^
- *        |                           |        |
- *        |                           |        the first argument to get_data
- *        |                           function to be called
- *        return value from get_data
- * ```
- */
-const measure = (scope, fn, // TODO: fn doesnt see scope correctly
-...args) => measureFn(scope, fn, ...args);
+import { measureFn } from 'rian/utils';
 
 // ==> impl
 /**
@@ -103,9 +56,10 @@ const create = (name, options) => {
         };
         if (should_sample)
             spans.add(span_obj);
-        const $ = (cb) => measure($, cb);
+        const $ = (cb) => measureFn($, cb);
         $.traceparent = id;
         $.fork = (name) => span(name, id);
+        // @ts-expect-error TS7030 its always undefined ts :eye-roll:
         $.set_context = (ctx) => {
             if (typeof ctx === 'function')
                 return void (span_obj.context = ctx(span_obj.context));
@@ -119,9 +73,8 @@ const create = (name, options) => {
             });
         };
         $.end = () => {
-            if (span_obj.end)
-                return void 0;
-            span_obj.end = Date.now();
+            if (span_obj.end == null)
+                span_obj.end = Date.now();
         };
         return $;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rian",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "Effective tracing for the edge and origins",
 	"keywords": [
 		"opentelemetry",

package/utils.d.ts

@@ -15,15 +15,18 @@ declare type RealMeasureFnParams<T extends unknown[]> = T extends [] ? [] : T ex
  * @example
  *
  * ```text
- * const data = await measure(scope, get_data, 'user_id_123');
- *        ^                           ^        ^
- *        |                           |        |
- *        |                           |        the first argument to get_data
- *        |                           function to be called
- *        return value from get_data
+ * const data = await measure(scope, 'name', get_data, 'user_id_123');
+ *        ^                    ^      ^       ^          ^
+ *        |                    |      |       |          |
+ *        |                    |      |       |          the first argument to get_data
+ *        |                    |      |       function to be called
+ *        |                    |      the name of the sub scope
+ *        |                    |
+ *        |                    the parent scope
+ *         return value from get_data
  * ```
  */
-declare const measure: <Fn extends MeasureFn>(scope: Scope, fn: Fn, ...args: RealMeasureFnParams<Parameters<Fn>>) => ReturnType<Fn>;
+declare const measure: <Fn extends MeasureFn>(scope: Scope, name: string, fn: Fn, ...args: RealMeasureFnParams<Parameters<Fn>>) => ReturnType<Fn>;
 /**
  * Wraps any function with a measured scoped function. Useful for when defer function execution
  * till a later time.
@@ -31,13 +34,13 @@ declare const measure: <Fn extends MeasureFn>(scope: Scope, fn: Fn, ...args: Rea
  * @example
  *
  * ```js
- * const wrapped = wrap(scope, my_function);
+ * const wrapped = wrap(scope, "run something", my_function);
  *
  * // ... lots of things, where the access to `scope` is lost.
  *
  * wrapped();
  * ```
  */
-declare const wrap: <Fn extends MeasureFn>(scope: Scope, fn: Fn) => Fn;
+declare const wrap: <Fn extends MeasureFn>(scope: Scope, name: string, fn: Fn) => Fn;
 
 export { MeasureFn, measure, wrap };

package/utils.js

@@ -7,6 +7,9 @@ const set_error = (scope, error) => {
         error,
     });
 };
+/**
+ * @internal
+ */
 const measureFn = (scope, fn, ...args) => {
     try {
         var r = fn(...args, scope), is_promise = r instanceof Promise;
@@ -17,10 +20,12 @@ const measureFn = (scope, fn, ...args) => {
         return r;
     }
     catch (e) {
-        set_error(scope, e);
+        if (e instanceof Error)
+            set_error(scope, e);
         throw e;
     }
     finally {
+        // @ts-expect-error TS2454
         if (is_promise !== true)
             scope.end();
     }
@@ -38,16 +43,19 @@ const measureFn = (scope, fn, ...args) => {
  * @example
  *
  * ```text
- * const data = await measure(scope, get_data, 'user_id_123');
- *        ^                           ^        ^
- *        |                           |        |
- *        |                           |        the first argument to get_data
- *        |                           function to be called
- *        return value from get_data
+ * const data = await measure(scope, 'name', get_data, 'user_id_123');
+ *        ^                    ^      ^       ^          ^
+ *        |                    |      |       |          |
+ *        |                    |      |       |          the first argument to get_data
+ *        |                    |      |       function to be called
+ *        |                    |      the name of the sub scope
+ *        |                    |
+ *        |                    the parent scope
+ *         return value from get_data
  * ```
  */
-const measure = (scope, fn, // TODO: fn doesnt see scope correctly
-...args) => measureFn(scope, fn, ...args);
+const measure = (scope, name, fn, // TODO: fn doesnt see scope correctly
+...args) => measureFn(scope.fork(name), fn, ...args);
 /**
  * Wraps any function with a measured scoped function. Useful for when defer function execution
  * till a later time.
@@ -55,16 +63,17 @@ const measure = (scope, fn, // TODO: fn doesnt see scope correctly
  * @example
  *
  * ```js
- * const wrapped = wrap(scope, my_function);
+ * const wrapped = wrap(scope, "run something", my_function);
  *
  * // ... lots of things, where the access to `scope` is lost.
  *
  * wrapped();
  * ```
  */
-const wrap = (scope, fn) => function () {
-    return measureFn(scope, fn, ...arguments);
+const wrap = (scope, name, fn) => function () {
+    return measureFn(scope.fork(name), fn, ...arguments);
 };
 
 exports.measure = measure;
+exports.measureFn = measureFn;
 exports.wrap = wrap;

package/utils.mjs

@@ -5,6 +5,9 @@ const set_error = (scope, error) => {
         error,
     });
 };
+/**
+ * @internal
+ */
 const measureFn = (scope, fn, ...args) => {
     try {
         var r = fn(...args, scope), is_promise = r instanceof Promise;
@@ -15,10 +18,12 @@ const measureFn = (scope, fn, ...args) => {
         return r;
     }
     catch (e) {
-        set_error(scope, e);
+        if (e instanceof Error)
+            set_error(scope, e);
         throw e;
     }
     finally {
+        // @ts-expect-error TS2454
         if (is_promise !== true)
             scope.end();
     }
@@ -36,16 +41,19 @@ const measureFn = (scope, fn, ...args) => {
  * @example
  *
  * ```text
- * const data = await measure(scope, get_data, 'user_id_123');
- *        ^                           ^        ^
- *        |                           |        |
- *        |                           |        the first argument to get_data
- *        |                           function to be called
- *        return value from get_data
+ * const data = await measure(scope, 'name', get_data, 'user_id_123');
+ *        ^                    ^      ^       ^          ^
+ *        |                    |      |       |          |
+ *        |                    |      |       |          the first argument to get_data
+ *        |                    |      |       function to be called
+ *        |                    |      the name of the sub scope
+ *        |                    |
+ *        |                    the parent scope
+ *         return value from get_data
  * ```
  */
-const measure = (scope, fn, // TODO: fn doesnt see scope correctly
-...args) => measureFn(scope, fn, ...args);
+const measure = (scope, name, fn, // TODO: fn doesnt see scope correctly
+...args) => measureFn(scope.fork(name), fn, ...args);
 /**
  * Wraps any function with a measured scoped function. Useful for when defer function execution
  * till a later time.
@@ -53,15 +61,15 @@ const measure = (scope, fn, // TODO: fn doesnt see scope correctly
  * @example
  *
  * ```js
- * const wrapped = wrap(scope, my_function);
+ * const wrapped = wrap(scope, "run something", my_function);
  *
  * // ... lots of things, where the access to `scope` is lost.
  *
  * wrapped();
  * ```
  */
-const wrap = (scope, fn) => function () {
-    return measureFn(scope, fn, ...arguments);
+const wrap = (scope, name, fn) => function () {
+    return measureFn(scope.fork(name), fn, ...arguments);
 };
 
-export { measure, wrap };
+export { measure, measureFn, wrap };