rian 0.1.1 → 0.2.2

package/exporter.otel.http/index.d.ts

@@ -0,0 +1,3 @@
+import type { Exporter } from 'rian';
+
+export const exporter: (request: (payload: any) => any) => Exporter;

package/exporter.otel.http/index.js

@@ -0,0 +1 @@
+const { name:e, version:t } = require('rian/package.json');var r=e=>{let t=typeof e,n={};return"string"===t?n.stringValue=e:"number"===t?Number.isInteger(e)?n.intValue=e:n.doubleValue=e:"boolean"===t?n.boolValue=e:Array.isArray(e)?n.arrayValue={values:e.map((e=>r(e)))}:e&&(n.kvlistValue={values:a(e)}),n},a=e=>{let t=[];for(let a of Object.keys(e))t.push({key:a,value:r(e[a])});return t},n=e=>{switch(e){default:case"INTERNAL":return 1;case"SERVER":return 2;case"CLIENT":return 3;case"PRODUCER":return 4;case"CONSUMER":return 5}},s=r=>(s,i)=>{let u=[];for(let e of s){let t,{kind:r,error:s,...i}=e.context;s&&(t={code:2},"message"in s&&(t.message=s.message)),u.push({traceId:e.id.trace_id,spanId:e.id.parent_id,parentSpanId:e.parent?.parent_id,name:e.name,kind:n(r||"INTERNAL"),startTimeUnixNano:1e6*e.start,endTimeUnixNano:e.end?1e6*e.end:void 0,droppedAttributesCount:0,droppedEventsCount:0,droppedLinksCount:0,attributes:a(i),status:t||{code:0},events:e.events.map((e=>({name:e.name,attributes:a(e.attributes),droppedAttributesCount:0,timeUnixNano:1e6*e.timestamp})))})}return r({resourceSpans:[{resource:{attributes:a(i),droppedAttributesCount:0},instrumentationLibrarySpans:[{instrumentationLibrary:{name:e,version:t},spans:u}]}]})};exports.exporter=s;

package/exporter.otel.http/index.mjs

@@ -0,0 +1 @@
+import{name as e,version as t}from"rian/package.json";var r=e=>{let t=typeof e,n={};return"string"===t?n.stringValue=e:"number"===t?Number.isInteger(e)?n.intValue=e:n.doubleValue=e:"boolean"===t?n.boolValue=e:Array.isArray(e)?n.arrayValue={values:e.map((e=>r(e)))}:e&&(n.kvlistValue={values:a(e)}),n},a=e=>{let t=[];for(let a of Object.keys(e))t.push({key:a,value:r(e[a])});return t},n=e=>{switch(e){default:case"INTERNAL":return 1;case"SERVER":return 2;case"CLIENT":return 3;case"PRODUCER":return 4;case"CONSUMER":return 5}},s=r=>(s,i)=>{let u=[];for(let e of s){let t,{kind:r,error:s,...i}=e.context;s&&(t={code:2},"message"in s&&(t.message=s.message)),u.push({traceId:e.id.trace_id,spanId:e.id.parent_id,parentSpanId:e.parent?.parent_id,name:e.name,kind:n(r||"INTERNAL"),startTimeUnixNano:1e6*e.start,endTimeUnixNano:e.end?1e6*e.end:void 0,droppedAttributesCount:0,droppedEventsCount:0,droppedLinksCount:0,attributes:a(i),status:t||{code:0},events:e.events.map((e=>({name:e.name,attributes:a(e.attributes),droppedAttributesCount:0,timeUnixNano:1e6*e.timestamp})))})}return r({resourceSpans:[{resource:{attributes:a(i),droppedAttributesCount:0},instrumentationLibrarySpans:[{instrumentationLibrary:{name:e,version:t},spans:u}]}]})};export{s as exporter};

package/exporter.zipkin/index.d.ts

@@ -0,0 +1,3 @@
+import type { Exporter } from 'rian';
+
+export const exporter: (request: (payload: any) => any) => Exporter;

package/exporter.zipkin/index.js

@@ -0,0 +1 @@
+const { flattie:e } = require('flattie');var t=t=>(a,n)=>{let r=[];for(let t of a){let{kind:a,error:i,...s}=t.context;i&&(s.error=!("message"in i)||{name:i.name,message:i.message,stack:i.stack}),r.push({id:t.id.parent_id,traceId:t.id.trace_id,parentId:t.parent?t.parent.parent_id:void 0,name:t.name,kind:"INTERNAL"===a?void 0:a,timestamp:1e3*t.start,duration:t.end?1e3*(t.end-t.start):void 0,localEndpoint:n.localEndpoint||{serviceName:s["service.name"]},tags:e({...n,...s},".",!0),annotations:t.events.map((e=>({value:`${e.name} :: ${JSON.stringify(e.attributes)}`,timestamp:1e3*e.timestamp})))})}return t(r)};exports.exporter=t;

package/exporter.zipkin/index.mjs

@@ -0,0 +1 @@
+import{flattie as e}from"flattie";var t=t=>(a,n)=>{let r=[];for(let t of a){let{kind:a,error:i,...s}=t.context;i&&(s.error=!("message"in i)||{name:i.name,message:i.message,stack:i.stack}),r.push({id:t.id.parent_id,traceId:t.id.trace_id,parentId:t.parent?t.parent.parent_id:void 0,name:t.name,kind:"INTERNAL"===a?void 0:a,timestamp:1e3*t.start,duration:t.end?1e3*(t.end-t.start):void 0,localEndpoint:n.localEndpoint||{serviceName:s["service.name"]},tags:e({...n,...s},".",!0),annotations:t.events.map((e=>({value:`${e.name} :: ${JSON.stringify(e.attributes)}`,timestamp:1e3*e.timestamp})))})}return t(r)};export{t as exporter};

package/index.d.ts

@@ -1,5 +1,3 @@
-import { Traceparent } from 'tctx';
-
 /**
  * Spans are units within a distributed trace. Spans encapsulate mainly 3 pieces of information, a
  * {@link Span.name|name}, and a {@link Span.start|start} and {@link Span.end|end} time.
@@ -20,110 +18,124 @@ import { Traceparent } from 'tctx';
  * Spans are aimed to interoperate with
  * {@link https://github.com/opentracing/specification/blob/master/specification.md|OpenTracing's Spans}, albeit not entirely api compatible — they do share principles.
  */
-interface Span {
-    /**
-     * A human-readable name for this span. For example the function name, the name of a subtask,
-     * or stage of the larger stack.
-     *
-     * @example
-     * "resolve_user_ids"
-     * "[POST] /api"
-     */
-    name: string;
-    /**
-     * A w3c trace context compatible id for this span. Will .toString() into an injectable header.
-     *
-     * @see https://www.w3.org/TR/trace-context/#traceparent-header
-     * @see https://github.com/maraisr/tctx
-     */
-    id: Traceparent;
-    /**
-     * Is the id of rhe parent if this is not the parent {@link Span}.
-     *
-     * @see {@link Span.id}
-     */
-    parent?: Traceparent;
-    /**
-     * The time represented as a UNIX epoch timestamp in milliseconds when this span was created.
-     * Typically, via
-     * {@link Scope.fork|tracer.fork()}.
-     */
-    start: number;
-    /**
-     * The UNIX epoch timestamp in milliseconds when the span ended, or undefined if ending was not
-     * captured during the current trace. Time should then be assumed as current time.
-     */
-    end?: number;
-    /**
-     * An arbitrary context object useful for storing information during a trace.
-     *
-     * Usually following a convention such as `tag.*`, `http.*` or any of the
-     * {@link https://github.com/opentracing/specification/blob/master/semantic_conventions.md|Semantic Conventions outlined by OpenTracing}.
-     *
-     * ### Note!
-     *
-     * There are a few keys with "powers"
-     *
-     * - `kind` when set will coerce into the exports scheme, aka INTERNAL in zipkin will be
-     * `"INTERNAL"`, or `1` in otel
-     * - `error` when set, will be assumed to be an `Error` instance, and thus its `.message` wil
-     * exist as `error.message` in zipkin, and `status: 2` in otel.
-     */
-    context: Context;
-    /**
-     * Events are user-defined timestamped annotations of "events" that happened during the
-     * lifetime of a span. Consisting of a textual message, and optional attributes.
-     *
-     * As a rule-of-thumb use events to attach verbose information about a span, than an entirely
-     * new span.
-     */
-    events: {
-        name: string;
-        timestamp: number;
-        attributes: Context;
-    }[];
+export interface Span {
+	/**
+	 * A human-readable name for this span. For example the function name, the name of a subtask,
+	 * or stage of the larger stack.
+	 *
+	 * @example
+	 * "resolve_user_ids"
+	 * "[POST] /api"
+	 */
+	name: string;
+
+	/**
+	 * A w3c trace context compatible id for this span. Will .toString() into an injectable header.
+	 *
+	 * @see https://www.w3.org/TR/trace-context/#traceparent-header
+	 * @see https://github.com/maraisr/tctx
+	 */
+	id: Traceparent;
+
+	/**
+	 * Is the id of rhe parent if this is not the parent {@link Span}.
+	 *
+	 * @see {@link Span.id}
+	 */
+	parent: Traceparent | undefined;
+
+	/**
+	 * The time represented as a UNIX epoch timestamp in milliseconds when this span was created.
+	 * Typically, via
+	 * {@link Scope.fork|tracer.fork()}.
+	 */
+	start: number;
+
+	/**
+	 * The UNIX epoch timestamp in milliseconds when the span ended, or undefined if ending was not
+	 * captured during the current trace. Time should then be assumed as current time.
+	 */
+	end?: number;
+
+	/**
+	 * An arbitrary context object useful for storing information during a trace.
+	 *
+	 * Usually following a convention such as `tag.*`, `http.*` or any of the
+	 * {@link https://github.com/opentracing/specification/blob/master/semantic_conventions.md|Semantic Conventions outlined by OpenTracing}.
+	 *
+	 * ### Note!
+	 *
+	 * There are a few keys with "powers"
+	 *
+	 * - `kind` when set will coerce into the exports scheme, aka INTERNAL in zipkin will be
+	 * `"INTERNAL"`, or `1` in otel
+	 * - `error` when set, will be assumed to be an `Error` instance, and thus its `.message` wil
+	 * exist as `error.message` in zipkin, and `status: 2` in otel.
+	 */
+	context: Context;
+
+	/**
+	 * Events are user-defined timestamped annotations of "events" that happened during the
+	 * lifetime of a span. Consisting of a textual message, and optional attributes.
+	 *
+	 * As a rule-of-thumb use events to attach verbose information about a span, than an entirely
+	 * new span.
+	 */
+	events: { name: string; timestamp: number; attributes: Context }[];
 }
-interface Scope {
-    /**
-     * A W3C traceparent. One can .toString() this if you want to cross a network.
-     */
-    traceparent: Traceparent;
-    /**
-     * Forks the span into a new child span.
-     */
-    fork(name: string): CallableScope;
-    /**
-     * Allows the span's context to be set. Passing an object will be `Object.assign`ed into the
-     * current context.
-     *
-     * Passing a function will be available to return a new context.
-     */
-    set_context(contextFn: Context | ((context: Context) => Context)): void;
-    /**
-     * Adds a new event to the span. As a rule-of-thumb use events to attach verbose information
-     * about a span, than an entirely new span.
-     */
-    add_event(name: string, attributes?: Record<string, any>): void;
-    /**
-     * Ends the current span — setting its `end` timestamp. Not calling this, will have its `end`
-     * timestamp nulled out — when the tracer ends.
-     */
-    end(): void;
+
+export interface Scope {
+	/**
+	 * A W3C traceparent. One can .toString() this if you want to cross a network.
+	 */
+	traceparent: Traceparent;
+
+	/**
+	 * Forks the span into a new child span.
+	 */
+	fork(name: string): CallableScope;
+
+	/**
+	 * Allows the span's context to be set. Passing an object will be `Object.assign`ed into the
+	 * current context.
+	 *
+	 * Passing a function will be available to return a new context.
+	 */
+	set_context(contextFn: Context | ((context: Context) => Context)): void;
+
+	/**
+	 * Adds a new event to the span. As a rule-of-thumb use events to attach verbose information
+	 * about a span, than an entirely new span.
+	 */
+	add_event(name: string, attributes?: Record<string, any>): void;
+
+	/**
+	 * Ends the current span — setting its `end` timestamp. Not calling this, will have its `end`
+	 * timestamp nulled out — when the tracer ends.
+	 */
+	end(): void;
 }
-interface Tracer extends Omit<Scope, 'end'> {
-    end(): ReturnType<Exporter>;
+
+export interface Tracer extends Omit<Scope, 'end'> {
+	end(): ReturnType<Exporter>;
 }
+
 /**
  * An exporter is a method called when the parent scope ends, gets given a Set of all spans traced
  * during this execution.
  */
-declare type Exporter = (spans: ReadonlySet<Readonly<Span>>, context: Context) => any;
+export type Exporter = (
+	spans: ReadonlySet<Readonly<Span>>,
+	context: Context,
+) => any;
+
 /**
  * @borrows {@link Span.context}
  */
-interface Context {
-    [property: string]: any;
+export interface Context {
+	[property: string]: any;
 }
+
 /**
  * Should return true when you want to sample the span, this is ran before the span is traced — so
  * decisions is made preemptively.
@@ -133,28 +145,45 @@ interface Context {
  *
  * Sampling does impact the traceparent, for injection — and is encoded there.
  */
-declare type Sampler = (name: string, parentId?: Traceparent, context?: Context) => boolean;
-interface Options {
-    /**
-     * @borrows {@link Exporter}
-     */
-    exporter: Exporter;
-    /**
-     * @borrows {@link Sampler}
-     */
-    sampler?: Sampler | boolean;
-    context?: Context;
-    /**
-     * A root, or extracted w3c traceparent stringed header.
-     *
-     * If the id is malformed, the {@link create} method will throw an exception. If no root is
-     * provided then one will be created obeying the {@link Options.sampler|sampling} rules.
-     */
-    traceparent?: string;
+export type Sampler = (
+	name: string,
+	parentId?: Traceparent,
+	context?: Context,
+) => boolean;
+
+export interface Options {
+	/**
+	 * @borrows {@link Exporter}
+	 */
+	exporter: Exporter;
+
+	/**
+	 * @borrows {@link Sampler}
+	 */
+	sampler?: Sampler | boolean;
+
+	context?: Context;
+
+	/**
+	 * A root, or extracted w3c traceparent stringed header.
+	 *
+	 * If the id is malformed, the {@link create} method will throw an exception. If no root is
+	 * provided then one will be created obeying the {@link Options.sampler|sampling} rules.
+	 */
+	traceparent?: string;
 }
-interface CallableScope extends Scope {
-    (cb: (scope: Omit<Scope, 'end'>) => void): ReturnType<typeof cb>;
+
+export const create: (name: string, options: Options) => Tracer;
+
+// ==> internals
+
+/** @internal */
+export interface CallableScope extends Scope {
+	(cb: (scope: Omit<Scope, 'end'>) => void): ReturnType<typeof cb>;
 }
-declare const create: (name: string, options: Options) => Tracer;
 
-export { Context, Exporter, Options, Sampler, Scope, Span, Tracer, create };
+/** @internal */
+export const PROMISES: WeakMap<Scope, Promise<any>[]>;
+
+/** @internal */
+export const ADD_PROMISE: (scope: Scope, promise: Promise<any>) => void;

package/index.js

@@ -1,121 +1 @@
-'use strict';
-
-const package_json = 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]);
-};
-/**
- * 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);
-};
-const sdk_object = {
-    'telemetry.sdk.name': package_json.name,
-    'telemetry.sdk.version': package_json.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 $;
-    };
-    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,
-        });
-    };
-    return root;
-};
-
-exports.ADD_PROMISE = ADD_PROMISE;
-exports.PROMISES = PROMISES;
-exports.create = create;
+const e = require('tctx');const { measureFn:t } = require('rian/utils');var n=new WeakMap,a=(e,t)=>{n.has(e)?n.get(e).push(t):n.set(e,[t])},r=(t,n)=>!n||e.is_sampled(n),o={"telemetry.sdk.name":"rian","telemetry.sdk.version":"0.2.2"},s=(a,s)=>{let i=new Set,p=s.sampler||r,d="boolean"!=typeof p,c=(n,a)=>{let r=d?p(n,a,s.context):p,o=a?a.child(r):e.make(r),m={id:o,parent:a,start:Date.now(),name:n,events:[],context:{}};r&&i.add(m);let l=e=>t(l,e);return l.traceparent=o,l.fork=e=>c(e,o),l.set_context=e=>{"function"!=typeof e?Object.assign(m.context,e):m.context=e(m.context)},l.add_event=(e,t)=>{m.events.push({name:e,timestamp:Date.now(),attributes:t||{}})},l.end=()=>{null==m.end&&(m.end=Date.now())},l},m=c(a,"string"==typeof s.traceparent?e.parse(s.traceparent):void 0),l=m.end.bind(m);return m.end=async()=>(l(),n.has(m)&&await Promise.all(n.get(m)),s.exporter(i,{...s.context||{},...o})),m};exports.ADD_PROMISE=a;exports.PROMISES=n;exports.create=s;

package/index.mjs

@@ -1,97 +1 @@
-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]);
-};
-/**
- * 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);
-};
-const sdk_object = {
-    'telemetry.sdk.name': name,
-    'telemetry.sdk.version': 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 $;
-    };
-    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,
-        });
-    };
-    return root;
-};
-
-export { ADD_PROMISE, PROMISES, create };
+import*as e from"tctx";import{measureFn as t}from"rian/utils";var n=new WeakMap,a=(e,t)=>{n.has(e)?n.get(e).push(t):n.set(e,[t])},r=(t,n)=>!n||e.is_sampled(n),o={"telemetry.sdk.name":"rian","telemetry.sdk.version":"0.2.2"},s=(a,s)=>{let i=new Set,p=s.sampler||r,d="boolean"!=typeof p,c=(n,a)=>{let r=d?p(n,a,s.context):p,o=a?a.child(r):e.make(r),m={id:o,parent:a,start:Date.now(),name:n,events:[],context:{}};r&&i.add(m);let l=e=>t(l,e);return l.traceparent=o,l.fork=e=>c(e,o),l.set_context=e=>{"function"!=typeof e?Object.assign(m.context,e):m.context=e(m.context)},l.add_event=(e,t)=>{m.events.push({name:e,timestamp:Date.now(),attributes:t||{}})},l.end=()=>{null==m.end&&(m.end=Date.now())},l},m=c(a,"string"==typeof s.traceparent?e.parse(s.traceparent):void 0),l=m.end.bind(m);return m.end=async()=>(l(),n.has(m)&&await Promise.all(n.get(m)),s.exporter(i,{...s.context||{},...o})),m};export{a as ADD_PROMISE,n as PROMISES,s as create};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rian",
-	"version": "0.1.1",
+	"version": "0.2.2",
 	"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 --minify"
+	},
 	"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 @@
+const { ADD_PROMISE:r, PROMISES:t } = require('rian');var n=(n,o,...e)=>{try{var a=o(...e,n),c=a instanceof Promise;return c&&!t.has(n)&&r(n,a.catch((r=>{n.set_context({error:r})})).finally((()=>n.end()))),a}catch(r){throw r instanceof Error&&n.set_context({error:r}),r}finally{!0!==c&&n.end()}},o=(r,t,o,...e)=>n(r.fork(t),o,...e),e=(r,t,o)=>function(){return n(r.fork(t),o,...arguments)};exports.measure=o;exports.measureFn=n;exports.wrap=e;

package/utils/index.mjs

@@ -0,0 +1 @@
+import{ADD_PROMISE as r,PROMISES as t}from"rian";var n=(n,o,...e)=>{try{var a=o(...e,n),c=a instanceof Promise;return c&&!t.has(n)&&r(n,a.catch((r=>{n.set_context({error:r})})).finally((()=>n.end()))),a}catch(r){throw r instanceof Error&&n.set_context({error:r}),r}finally{!0!==c&&n.end()}},o=(r,t,o,...e)=>n(r.fork(t),o,...e),e=(r,t,o)=>function(){return n(r.fork(t),o,...arguments)};export{o as measure,n as measureFn,e as 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;

package/exporter.otel.http.mjs

@@ -1,111 +0,0 @@
-import { name, version } from '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: name,
-                            version: version,
-                        },
-                        spans: otel_spans,
-                    },
-                ],
-            },
-        ],
-    });
-};
-
-export { exporter };

package/exporter.zipkin.d.ts

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

package/exporter.zipkin.js

@@ -1,45 +0,0 @@
-'use strict';
-
-const flattie = require('flattie');
-
-const exporter = (request) => (spans, context) => {
-    const zipkin = [];
-    for (let span of spans) {
-        const { kind, error, ...span_ctx } = span.context;
-        if (error) {
-            if ('message' in error) {
-                span_ctx.error = {
-                    name: error.name,
-                    message: error.message,
-                    stack: error.stack,
-                };
-            }
-            else {
-                span_ctx.error = true;
-            }
-        }
-        zipkin.push({
-            id: span.id.parent_id,
-            traceId: span.id.trace_id,
-            parentId: span.parent ? span.parent.parent_id : undefined,
-            name: span.name,
-            kind: kind === 'INTERNAL' ? undefined : kind,
-            timestamp: span.start * 1000,
-            duration: span.end ? (span.end - span.start) * 1000 : undefined,
-            localEndpoint: context.localEndpoint || {
-                serviceName: span_ctx['service.name'],
-            },
-            tags: flattie.flattie({
-                ...context,
-                ...span_ctx,
-            }, '.', true),
-            annotations: span.events.map((i) => ({
-                value: `${i.name} :: ${JSON.stringify(i.attributes)}`,
-                timestamp: i.timestamp * 1000,
-            })),
-        });
-    }
-    return request(zipkin);
-};
-
-exports.exporter = exporter;

package/exporter.zipkin.mjs

@@ -1,43 +0,0 @@
-import { flattie } from 'flattie';
-
-const exporter = (request) => (spans, context) => {
-    const zipkin = [];
-    for (let span of spans) {
-        const { kind, error, ...span_ctx } = span.context;
-        if (error) {
-            if ('message' in error) {
-                span_ctx.error = {
-                    name: error.name,
-                    message: error.message,
-                    stack: error.stack,
-                };
-            }
-            else {
-                span_ctx.error = true;
-            }
-        }
-        zipkin.push({
-            id: span.id.parent_id,
-            traceId: span.id.trace_id,
-            parentId: span.parent ? span.parent.parent_id : undefined,
-            name: span.name,
-            kind: kind === 'INTERNAL' ? undefined : kind,
-            timestamp: span.start * 1000,
-            duration: span.end ? (span.end - span.start) * 1000 : undefined,
-            localEndpoint: context.localEndpoint || {
-                serviceName: span_ctx['service.name'],
-            },
-            tags: flattie({
-                ...context,
-                ...span_ctx,
-            }, '.', true),
-            annotations: span.events.map((i) => ({
-                value: `${i.name} :: ${JSON.stringify(i.attributes)}`,
-                timestamp: i.timestamp * 1000,
-            })),
-        });
-    }
-    return request(zipkin);
-};
-
-export { exporter };

package/utils.js

@@ -1,79 +0,0 @@
-'use strict';
-
-const rian = require('rian');
-
-const set_error = (scope, error) => {
-    scope.set_context({
-        error,
-    });
-};
-/**
- * @internal
- */
-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) {
-        if (e instanceof Error)
-            set_error(scope, e);
-        throw e;
-    }
-    finally {
-        // @ts-expect-error TS2454
-        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, '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, 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.
- *
- * @example
- *
- * ```js
- * const wrapped = wrap(scope, "run something", my_function);
- *
- * // ... lots of things, where the access to `scope` is lost.
- *
- * wrapped();
- * ```
- */
-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

@@ -1,75 +0,0 @@
-import { PROMISES, ADD_PROMISE } from 'rian';
-
-const set_error = (scope, error) => {
-    scope.set_context({
-        error,
-    });
-};
-/**
- * @internal
- */
-const 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 set_error(scope, e))
-                .finally(() => scope.end()));
-        return r;
-    }
-    catch (e) {
-        if (e instanceof Error)
-            set_error(scope, e);
-        throw e;
-    }
-    finally {
-        // @ts-expect-error TS2454
-        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, '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, 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.
- *
- * @example
- *
- * ```js
- * const wrapped = wrap(scope, "run something", my_function);
- *
- * // ... lots of things, where the access to `scope` is lost.
- *
- * wrapped();
- * ```
- */
-const wrap = (scope, name, fn) => function () {
-    return measureFn(scope.fork(name), fn, ...arguments);
-};
-
-export { measure, measureFn, wrap };