rian 0.1.1 → 0.2.1

package/index.js

@@ -1,121 +1,76 @@
-'use strict';
-
-const package_json = require('rian/package.json');
+// src/index.ts
+const { name:rian_name, version:rian_version } = require('rian/package.json');
 const tctx = require('tctx');
-const utils = require('rian/utils');
-
-function _interopNamespace(e) {
-	if (e && e.__esModule) return e;
-	const n = Object.create(null);
-	if (e) {
-		for (const k in e) {
-			if (k !== 'default') {
-				const d = Object.getOwnPropertyDescriptor(e, k);
-				Object.defineProperty(n, k, d.get ? d : {
-					enumerable: true,
-					get: function () { return e[k]; }
-				});
-			}
-		}
-	}
-	n["default"] = e;
-	return n;
-}
-
-const tctx__namespace = /*#__PURE__*/_interopNamespace(tctx);
-
-// ==> impl
-/**
- * @internal
- */
-const PROMISES = new WeakMap();
-/**
- * @internal
- */
-const ADD_PROMISE = (scope, promise) => {
-    if (PROMISES.has(scope))
-        PROMISES.get(scope).push(promise);
-    else
-        PROMISES.set(scope, [promise]);
+const { measureFn } = require('rian/utils');
+var PROMISES = /* @__PURE__ */ new WeakMap();
+var ADD_PROMISE = (scope, promise) => {
+  if (PROMISES.has(scope))
+    PROMISES.get(scope).push(promise);
+  else
+    PROMISES.set(scope, [promise]);
 };
-/**
- * The default sampler;
- *
- * If no parent
- * ~> sample
- * if parent was off
- * ~> never sample
- * if parent was on
- * ~> always sample
- */
-const defaultSampler = (_name, parentId) => {
-    if (!parentId)
-        return true;
-    return tctx__namespace.is_sampled(parentId);
+var defaultSampler = (_name, parentId) => {
+  if (!parentId)
+    return true;
+  return tctx.is_sampled(parentId);
 };
-const sdk_object = {
-    'telemetry.sdk.name': package_json.name,
-    'telemetry.sdk.version': package_json.version,
+var sdk_object = {
+  "telemetry.sdk.name": rian_name,
+  "telemetry.sdk.version": rian_version
 };
-const create = (name, options) => {
-    const spans = new Set();
-    const sampler = options.sampler || defaultSampler;
-    const sampler_callable = typeof sampler !== 'boolean';
-    const span = (name, parent) => {
-        const should_sample = sampler_callable
-            ? sampler(name, parent, options.context)
-            : sampler;
-        const id = parent
-            ? parent.child(should_sample)
-            : tctx__namespace.make(should_sample);
-        const span_obj = {
-            id,
-            parent,
-            start: Date.now(),
-            name,
-            events: [],
-            context: {},
-        };
-        if (should_sample)
-            spans.add(span_obj);
-        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));
-            Object.assign(span_obj.context, ctx);
-        };
-        $.add_event = (name, attributes) => {
-            span_obj.events.push({
-                name,
-                timestamp: Date.now(),
-                attributes: attributes || {},
-            });
-        };
-        $.end = () => {
-            if (span_obj.end == null)
-                span_obj.end = Date.now();
-        };
-        return $;
+var create = (name, options) => {
+  const spans = /* @__PURE__ */ new Set();
+  const sampler = options.sampler || defaultSampler;
+  const sampler_callable = typeof sampler !== "boolean";
+  const span = (name2, parent) => {
+    const should_sample = sampler_callable ? sampler(name2, parent, options.context) : sampler;
+    const id = parent ? parent.child(should_sample) : tctx.make(should_sample);
+    const span_obj = {
+      id,
+      parent,
+      start: Date.now(),
+      name: name2,
+      events: [],
+      context: {}
     };
-    const root = span(name, typeof options.traceparent === 'string'
-        ? tctx__namespace.parse(options.traceparent)
-        : undefined);
-    const endRoot = root.end.bind(root);
-    root.end = async () => {
-        endRoot();
-        if (PROMISES.has(root))
-            await Promise.all(PROMISES.get(root));
-        return options.exporter(spans, {
-            ...(options.context || {}),
-            ...sdk_object,
-        });
+    if (should_sample)
+      spans.add(span_obj);
+    const $ = (cb) => measureFn($, cb);
+    $.traceparent = id;
+    $.fork = (name3) => span(name3, id);
+    $.set_context = (ctx) => {
+      if (typeof ctx === "function")
+        return void (span_obj.context = ctx(span_obj.context));
+      Object.assign(span_obj.context, ctx);
     };
-    return root;
+    $.add_event = (name3, attributes) => {
+      span_obj.events.push({
+        name: name3,
+        timestamp: Date.now(),
+        attributes: attributes || {}
+      });
+    };
+    $.end = () => {
+      if (span_obj.end == null)
+        span_obj.end = Date.now();
+    };
+    return $;
+  };
+  const root = span(name, typeof options.traceparent === "string" ? tctx.parse(options.traceparent) : void 0);
+  const endRoot = root.end.bind(root);
+  root.end = async () => {
+    endRoot();
+    if (PROMISES.has(root))
+      await Promise.all(PROMISES.get(root));
+    return options.exporter(spans, {
+      ...options.context || {},
+      ...sdk_object
+    });
+  };
+  return root;
 };
 
+
 exports.ADD_PROMISE = ADD_PROMISE;
 exports.PROMISES = PROMISES;
-exports.create = create;
+exports.create = create;

package/index.mjs

@@ -1,97 +1,76 @@
-import { name, version } from 'rian/package.json';
-import * as tctx from 'tctx';
-import { measureFn } from 'rian/utils';
-
-// ==> impl
-/**
- * @internal
- */
-const PROMISES = new WeakMap();
-/**
- * @internal
- */
-const ADD_PROMISE = (scope, promise) => {
-    if (PROMISES.has(scope))
-        PROMISES.get(scope).push(promise);
-    else
-        PROMISES.set(scope, [promise]);
+// src/index.ts
+import { name as rian_name, version as rian_version } from "rian/package.json";
+import * as tctx from "tctx";
+import { measureFn } from "rian/utils";
+var PROMISES = /* @__PURE__ */ new WeakMap();
+var ADD_PROMISE = (scope, promise) => {
+  if (PROMISES.has(scope))
+    PROMISES.get(scope).push(promise);
+  else
+    PROMISES.set(scope, [promise]);
 };
-/**
- * The default sampler;
- *
- * If no parent
- * ~> sample
- * if parent was off
- * ~> never sample
- * if parent was on
- * ~> always sample
- */
-const defaultSampler = (_name, parentId) => {
-    if (!parentId)
-        return true;
-    return tctx.is_sampled(parentId);
+var defaultSampler = (_name, parentId) => {
+  if (!parentId)
+    return true;
+  return tctx.is_sampled(parentId);
 };
-const sdk_object = {
-    'telemetry.sdk.name': name,
-    'telemetry.sdk.version': version,
+var sdk_object = {
+  "telemetry.sdk.name": rian_name,
+  "telemetry.sdk.version": rian_version
 };
-const create = (name, options) => {
-    const spans = new Set();
-    const sampler = options.sampler || defaultSampler;
-    const sampler_callable = typeof sampler !== 'boolean';
-    const span = (name, parent) => {
-        const should_sample = sampler_callable
-            ? sampler(name, parent, options.context)
-            : sampler;
-        const id = parent
-            ? parent.child(should_sample)
-            : tctx.make(should_sample);
-        const span_obj = {
-            id,
-            parent,
-            start: Date.now(),
-            name,
-            events: [],
-            context: {},
-        };
-        if (should_sample)
-            spans.add(span_obj);
-        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));
-            Object.assign(span_obj.context, ctx);
-        };
-        $.add_event = (name, attributes) => {
-            span_obj.events.push({
-                name,
-                timestamp: Date.now(),
-                attributes: attributes || {},
-            });
-        };
-        $.end = () => {
-            if (span_obj.end == null)
-                span_obj.end = Date.now();
-        };
-        return $;
+var create = (name, options) => {
+  const spans = /* @__PURE__ */ new Set();
+  const sampler = options.sampler || defaultSampler;
+  const sampler_callable = typeof sampler !== "boolean";
+  const span = (name2, parent) => {
+    const should_sample = sampler_callable ? sampler(name2, parent, options.context) : sampler;
+    const id = parent ? parent.child(should_sample) : tctx.make(should_sample);
+    const span_obj = {
+      id,
+      parent,
+      start: Date.now(),
+      name: name2,
+      events: [],
+      context: {}
     };
-    const root = span(name, typeof options.traceparent === 'string'
-        ? tctx.parse(options.traceparent)
-        : undefined);
-    const endRoot = root.end.bind(root);
-    root.end = async () => {
-        endRoot();
-        if (PROMISES.has(root))
-            await Promise.all(PROMISES.get(root));
-        return options.exporter(spans, {
-            ...(options.context || {}),
-            ...sdk_object,
-        });
+    if (should_sample)
+      spans.add(span_obj);
+    const $ = (cb) => measureFn($, cb);
+    $.traceparent = id;
+    $.fork = (name3) => span(name3, id);
+    $.set_context = (ctx) => {
+      if (typeof ctx === "function")
+        return void (span_obj.context = ctx(span_obj.context));
+      Object.assign(span_obj.context, ctx);
     };
-    return root;
+    $.add_event = (name3, attributes) => {
+      span_obj.events.push({
+        name: name3,
+        timestamp: Date.now(),
+        attributes: attributes || {}
+      });
+    };
+    $.end = () => {
+      if (span_obj.end == null)
+        span_obj.end = Date.now();
+    };
+    return $;
+  };
+  const root = span(name, typeof options.traceparent === "string" ? tctx.parse(options.traceparent) : void 0);
+  const endRoot = root.end.bind(root);
+  root.end = async () => {
+    endRoot();
+    if (PROMISES.has(root))
+      await Promise.all(PROMISES.get(root));
+    return options.exporter(spans, {
+      ...options.context || {},
+      ...sdk_object
+    });
+  };
+  return root;
+};
+export {
+  ADD_PROMISE,
+  PROMISES,
+  create
 };
-
-export { ADD_PROMISE, PROMISES, create };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rian",
-	"version": "0.1.1",
+	"version": "0.2.1",
 	"description": "Effective tracing for the edge and origins",
 	"keywords": [
 		"opentelemetry",
@@ -26,20 +26,24 @@
 	"type": "module",
 	"exports": {
 		".": {
+			"types": "./index.d.ts",
 			"import": "./index.mjs",
 			"require": "./index.js"
 		},
 		"./exporter.otel.http": {
-			"import": "./exporter.otel.http.mjs",
-			"require": "./exporter.otel.http.js"
+			"types": "./exporter.otel.http/index.d.ts",
+			"import": "./exporter.otel.http/index.mjs",
+			"require": "./exporter.otel.http/index.js"
 		},
 		"./exporter.zipkin": {
-			"import": "./exporter.zipkin.mjs",
-			"require": "./exporter.zipkin.js"
+			"types": "./exporter.zipkin/index.d.ts",
+			"import": "./exporter.zipkin/index.mjs",
+			"require": "./exporter.zipkin/index.js"
 		},
 		"./utils": {
-			"import": "./utils.mjs",
-			"require": "./utils.js"
+			"types": "./utils/index.d.ts",
+			"import": "./utils/index.mjs",
+			"require": "./utils/index.js"
 		},
 		"./package.json": "./package.json"
 	},
@@ -49,10 +53,18 @@
 	"files": [
 		"*.mjs",
 		"*.js",
-		"*.d.ts"
+		"*.d.ts",
+		"exporter.*/*",
+		"utils/*"
 	],
+	"scripts": {
+		"build": "bundt"
+	},
 	"dependencies": {
 		"flattie": "^1.1.0",
 		"tctx": "^0.0.10"
+	},
+	"devDependencies": {
+		"bundt": "2.0.0-next.5"
 	}
 }

package/{utils.d.ts → utils/index.d.ts}

@@ -1,7 +1,9 @@
-import { Scope } from 'rian';
+import type { Scope } from 'rian';
+
+export type MeasureFn =
+	| ((...args: [...args: any[]]) => any)
+	| ((...args: [...args: any[], scope: Scope]) => any);
 
-declare type MeasureFn = ((...args: [...args: any[]]) => any) | ((...args: [...args: any[], scope: Scope]) => any);
-declare type RealMeasureFnParams<T extends unknown[]> = T extends [] ? [] : T extends [...rest: infer U, scope: Scope] ? U : T;
 /**
  * With a passed function — will start a span, and run the function, when the function finishes
  * the span finishes.
@@ -26,7 +28,13 @@ declare type RealMeasureFnParams<T extends unknown[]> = T extends [] ? [] : T ex
  *         return value from get_data
  * ```
  */
-declare const measure: <Fn extends MeasureFn>(scope: Scope, name: string, fn: Fn, ...args: RealMeasureFnParams<Parameters<Fn>>) => ReturnType<Fn>;
+export const measure: <Fn extends MeasureFn>(
+	scope: Scope,
+	name: string,
+	fn: Fn, // TODO: fn doesnt see scope correctly
+	...args: RealMeasureFnParams<Parameters<Fn>>
+) => ReturnType<Fn>;
+
 /**
  * Wraps any function with a measured scoped function. Useful for when defer function execution
  * till a later time.
@@ -41,6 +49,20 @@ declare const measure: <Fn extends MeasureFn>(scope: Scope, name: string, fn: Fn
  * wrapped();
  * ```
  */
-declare const wrap: <Fn extends MeasureFn>(scope: Scope, name: string, fn: Fn) => Fn;
+export const wrap: <Fn extends MeasureFn>(
+	scope: Scope,
+	name: string,
+	fn: Fn, // TODO: fn doesnt see scope correctly
+) => Fn;
+
+// ==> internals
+
+/** @internal */
+export type RealMeasureFnParams<T extends unknown[]> = T extends []
+	? []
+	: T extends [...rest: infer U, scope: Scope]
+	? U
+	: T;
 
-export { MeasureFn, measure, wrap };
+/** @internal */
+export const measureFn: (scope: Scope, fn: any, ...args: any[]) => any;

package/utils/index.js

@@ -0,0 +1,30 @@
+// src/utils.ts
+const { ADD_PROMISE, PROMISES } = require('rian');
+var measureFn = (scope, fn, ...args) => {
+  try {
+    var r = fn(...args, scope), is_promise = r instanceof Promise;
+    if (is_promise && !PROMISES.has(scope))
+      ADD_PROMISE(scope, r.catch((e) => void scope.set_context({
+        error: e
+      })).finally(() => scope.end()));
+    return r;
+  } catch (e) {
+    if (e instanceof Error)
+      scope.set_context({
+        error: e
+      });
+    throw e;
+  } finally {
+    if (is_promise !== true)
+      scope.end();
+  }
+};
+var measure = (scope, name, fn, ...args) => measureFn(scope.fork(name), fn, ...args);
+var wrap = (scope, name, fn) => function() {
+  return measureFn(scope.fork(name), fn, ...arguments);
+};
+
+
+exports.measure = measure;
+exports.measureFn = measureFn;
+exports.wrap = wrap;

package/utils/index.mjs

@@ -0,0 +1,30 @@
+// src/utils.ts
+import { ADD_PROMISE, PROMISES } from "rian";
+var measureFn = (scope, fn, ...args) => {
+  try {
+    var r = fn(...args, scope), is_promise = r instanceof Promise;
+    if (is_promise && !PROMISES.has(scope))
+      ADD_PROMISE(scope, r.catch((e) => void scope.set_context({
+        error: e
+      })).finally(() => scope.end()));
+    return r;
+  } catch (e) {
+    if (e instanceof Error)
+      scope.set_context({
+        error: e
+      });
+    throw e;
+  } finally {
+    if (is_promise !== true)
+      scope.end();
+  }
+};
+var measure = (scope, name, fn, ...args) => measureFn(scope.fork(name), fn, ...args);
+var wrap = (scope, name, fn) => function() {
+  return measureFn(scope.fork(name), fn, ...arguments);
+};
+export {
+  measure,
+  measureFn,
+  wrap
+};

package/exporter.otel.http.d.ts

@@ -1,5 +0,0 @@
-import * as rian from 'rian';
-
-declare const exporter: (request: (payload: any) => any) => rian.Exporter;
-
-export { exporter };

package/exporter.otel.http.js

@@ -1,113 +0,0 @@
-'use strict';
-
-const package_json = require('rian/package.json');
-
-const SpanStatusCode_UNSET = 0;
-const SpanStatusCode_ERROR = 2;
-const convert_value_to_anyvalue = (value) => {
-    let type = typeof value, any_value = {};
-    if (type === 'string')
-        any_value.stringValue = value;
-    else if (type === 'number')
-        if (Number.isInteger(value))
-            any_value.intValue = value;
-        else
-            any_value.doubleValue = value;
-    else if (type === 'boolean')
-        any_value.boolValue = value;
-    else if (Array.isArray(value))
-        any_value.arrayValue = {
-            values: value.map((i) => convert_value_to_anyvalue(i)),
-        };
-    else if (value)
-        any_value.kvlistValue = { values: convert_object_to_kv(value) };
-    return any_value;
-};
-const convert_object_to_kv = (input) => {
-    const value = [];
-    for (let key of Object.keys(input)) {
-        value.push({
-            key,
-            value: convert_value_to_anyvalue(input[key]),
-        });
-    }
-    return value;
-};
-// https://github.com/open-telemetry/opentelemetry-proto/blob/b43e9b18b76abf3ee040164b55b9c355217151f3/opentelemetry/proto/trace/v1/trace.proto#L127-L155
-const map_kind = (kind) => {
-    switch (kind) {
-        default:
-        case 'INTERNAL': {
-            return 1;
-        }
-        case 'SERVER': {
-            return 2;
-        }
-        case 'CLIENT': {
-            return 3;
-        }
-        case 'PRODUCER': {
-            return 4;
-        }
-        case 'CONSUMER': {
-            return 5;
-        }
-    }
-};
-const exporter = (request) => (spans, context) => {
-    const otel_spans = [];
-    for (let span of spans) {
-        const { kind, error, ...span_ctx } = span.context;
-        let status;
-        if (error) {
-            status = {
-                code: SpanStatusCode_ERROR,
-            };
-            if ('message' in error) {
-                status.message = error.message;
-            }
-        }
-        otel_spans.push({
-            traceId: span.id.trace_id,
-            spanId: span.id.parent_id,
-            parentSpanId: span.parent?.parent_id,
-            name: span.name,
-            kind: map_kind(kind || 'INTERNAL'),
-            startTimeUnixNano: span.start * 1000000,
-            endTimeUnixNano: span.end ? span.end * 1000000 : undefined,
-            droppedAttributesCount: 0,
-            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,
-                attributes: convert_object_to_kv(i.attributes),
-                droppedAttributesCount: 0,
-                timeUnixNano: i.timestamp * 1000000,
-            })),
-        });
-    }
-    return request({
-        resourceSpans: [
-            {
-                resource: {
-                    attributes: convert_object_to_kv(context),
-                    droppedAttributesCount: 0,
-                },
-                instrumentationLibrarySpans: [
-                    {
-                        instrumentationLibrary: {
-                            name: package_json.name,
-                            version: package_json.version,
-                        },
-                        spans: otel_spans,
-                    },
-                ],
-            },
-        ],
-    });
-};
-
-exports.exporter = exporter;