@flareapp/core 2.2.1 → 2.4.0

package/README.md

@@ -12,9 +12,12 @@ the official SDKs use.
 
 - `Flare` — the core class. Takes three optional injection points: `ScopeProvider`,
   `ContextCollector`, `FileReader`.
+- `Logger` — structured logging (`flare.logger`). Eight syslog levels, opt-in via
+  `enableLogs`; owns the log buffer, batching policy, and OTel envelope. A
+  `FlushScheduler` seam is injected per platform.
 - `Scope`, `GlobalScopeProvider`, `ScopeProvider` — per-call mutable state.
 - `FileReader`, `NullFileReader` — source-snippet reading abstraction.
-- `Api` — the HTTP client used to send reports.
+- `Api` — the HTTP client used to send reports and logs.
 - Types: `Config`, `Report`, `Attributes`, `Glow`, `StackFrame`, etc.
 - Util: `redactUrlQuery`, `resolveDenylist`, `convertToError`, `DEFAULT_URL_DENYLIST`.
 

package/dist/index.cjs

@@ -30,7 +30,7 @@ let error_stack_parser = require("error-stack-parser");
 error_stack_parser = __toESM(error_stack_parser);
 
 //#region src/env/index.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.2.1" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.4.0" : "?";
 const KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 const SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -191,7 +191,311 @@ var Api = class {
 			if (debug) console.error(error);
 		});
 	}
+	logs(envelope, url, key, debug = false, keepalive = false) {
+		return fetch(url, {
+			method: "POST",
+			keepalive,
+			headers: {
+				"Accept": "application/json",
+				"Content-Type": "application/json",
+				"x-api-token": key ?? ""
+			},
+			body: flatJsonStringify(envelope)
+		}).then((response) => {
+			if (debug && response.status !== 201) console.error(`Received response with status ${response.status} from Flare logs`);
+		}, (error) => {
+			if (debug) console.error(error);
+		});
+	}
+};
+
+//#endregion
+//#region src/logging/otel.ts
+function valueToOpenTelemetry(value, inPath = /* @__PURE__ */ new WeakSet()) {
+	if (typeof value === "string") return { stringValue: value };
+	if (typeof value === "boolean") return { boolValue: value };
+	if (typeof value === "number") {
+		if (!Number.isFinite(value)) return null;
+		return Number.isInteger(value) ? { intValue: value } : { doubleValue: value };
+	}
+	if (value === null || value === void 0) return null;
+	if (Array.isArray(value)) {
+		if (inPath.has(value)) return { stringValue: "[Circular]" };
+		inPath.add(value);
+		const values = [];
+		for (const item of value) {
+			const mapped = valueToOpenTelemetry(item, inPath);
+			if (mapped !== null) values.push(mapped);
+		}
+		inPath.delete(value);
+		return { arrayValue: { values } };
+	}
+	if (typeof value === "object") {
+		if (inPath.has(value)) return { stringValue: "[Circular]" };
+		inPath.add(value);
+		const values = [];
+		for (const [key, item] of Object.entries(value)) {
+			const mapped = valueToOpenTelemetry(item, inPath);
+			if (mapped !== null) values.push({
+				key,
+				value: mapped
+			});
+		}
+		inPath.delete(value);
+		return { kvlistValue: { values } };
+	}
+	return null;
+}
+function attributesToOpenTelemetry(attributes) {
+	const out = [];
+	for (const [key, value] of Object.entries(attributes)) {
+		const mapped = valueToOpenTelemetry(value);
+		if (mapped !== null) out.push({
+			key,
+			value: mapped
+		});
+	}
+	return out;
+}
+
+//#endregion
+//#region src/logging/envelope.ts
+function buildLogsEnvelope(records, resourceAttributes, scopeName, scopeVersion) {
+	return { resourceLogs: [{
+		resource: {
+			attributes: attributesToOpenTelemetry(resourceAttributes),
+			droppedAttributesCount: 0
+		},
+		scopeLogs: [{
+			scope: {
+				name: scopeName,
+				version: scopeVersion,
+				attributes: [],
+				droppedAttributesCount: 0
+			},
+			logRecords: records.map((record) => ({
+				timeUnixNano: record.timeUnixNano,
+				observedTimeUnixNano: record.timeUnixNano,
+				severityNumber: record.severityNumber,
+				severityText: record.severityText,
+				body: { stringValue: record.message },
+				attributes: record.recordAttributes,
+				flags: 0,
+				droppedAttributesCount: 0
+			}))
+		}]
+	}] };
+}
+
+//#endregion
+//#region src/logging/severity.ts
+const SEVERITY_NUMBERS = {
+	debug: 5,
+	info: 9,
+	notice: 10,
+	warning: 13,
+	error: 17,
+	critical: 18,
+	alert: 19,
+	emergency: 21
 };
+function severityNumber(level) {
+	return SEVERITY_NUMBERS[level];
+}
+function severityText(level) {
+	return level.toUpperCase();
+}
+function isAtOrAboveMinimum(level, minimum) {
+	return severityNumber(level) >= severityNumber(minimum);
+}
+
+//#endregion
+//#region src/logging/Logger.ts
+var Logger = class {
+	buffer = [];
+	resourceAttributes = {};
+	timer;
+	timerActive = false;
+	constructor(deps) {
+		this.deps = deps;
+		const flush = (opts) => this.flush(opts);
+		this.deps.scheduler.register(flush);
+	}
+	debug(message, context = {}, attributes = {}) {
+		this.record("debug", message, context, attributes);
+	}
+	info(message, context = {}, attributes = {}) {
+		this.record("info", message, context, attributes);
+	}
+	notice(message, context = {}, attributes = {}) {
+		this.record("notice", message, context, attributes);
+	}
+	warning(message, context = {}, attributes = {}) {
+		this.record("warning", message, context, attributes);
+	}
+	error(message, context = {}, attributes = {}) {
+		this.record("error", message, context, attributes);
+	}
+	critical(message, context = {}, attributes = {}) {
+		this.record("critical", message, context, attributes);
+	}
+	alert(message, context = {}, attributes = {}) {
+		this.record("alert", message, context, attributes);
+	}
+	emergency(message, context = {}, attributes = {}) {
+		this.record("emergency", message, context, attributes);
+	}
+	bufferLength() {
+		return this.buffer.length;
+	}
+	record(level, message, context, attributes) {
+		const config = this.deps.getConfig();
+		if (!config.enableLogs) return;
+		if (config.minimumLogLevel && !isAtOrAboveMinimum(level, config.minimumLogLevel)) return;
+		const userAttributes = {
+			"log.context": context,
+			...attributes
+		};
+		const { record, resource } = this.deps.buildLogAttributes(userAttributes);
+		const buffered = {
+			timeUnixNano: String(Date.now()) + "000000",
+			severityNumber: severityNumber(level),
+			severityText: severityText(level),
+			message,
+			recordAttributes: attributesToOpenTelemetry(record),
+			resourceAttributes: resource
+		};
+		if (this.estimateBytes(buffered) > config.logFlushMaxBytes) {
+			if (config.debug) console.error("Flare: dropping oversized log record");
+			return;
+		}
+		this.buffer.push(buffered);
+		this.resourceAttributes = resource;
+		this.evaluateTriggers(config);
+		this.trim(config);
+	}
+	evaluateTriggers(config) {
+		if (this.buffer.length >= config.maxLogBufferSize) {
+			this.flush();
+			return;
+		}
+		if (this.bufferBytes() >= config.logFlushMaxBytes) {
+			this.flush();
+			return;
+		}
+		this.armTimer(config);
+	}
+	armTimer(config) {
+		if (this.timerActive) return;
+		this.timerActive = true;
+		this.timer = setTimeout(() => this.flush(), config.logFlushIntervalMs);
+		this.timer.unref?.();
+	}
+	trim(config) {
+		if (this.buffer.length > config.maxLogBufferSize) this.buffer = this.buffer.slice(this.buffer.length - config.maxLogBufferSize);
+		while (this.buffer.length > 1 && this.bufferBytes() > config.logFlushMaxBytes) this.buffer.shift();
+	}
+	flush(opts) {
+		const config = this.deps.getConfig();
+		if (!config.enableLogs) return;
+		if (this.buffer.length === 0) return;
+		if (!assertKey(config.key, config.debug)) {
+			this.clearTimer();
+			return;
+		}
+		this.clearTimer();
+		let records;
+		if (opts?.keepalive) {
+			records = this.packForKeepalive(config);
+			this.buffer = this.buffer.filter((log) => !records.includes(log));
+			if (this.buffer.length > 0) this.armTimer(config);
+		} else {
+			records = this.buffer;
+			this.buffer = [];
+		}
+		if (records.length === 0) return;
+		this.deps.track(this.deps.api.logs(this.buildEnvelope(records), config.logsIngestUrl, config.key, config.debug, !!opts?.keepalive));
+	}
+	clear() {
+		this.buffer = [];
+		this.clearTimer();
+	}
+	packForKeepalive(config) {
+		let selected = [];
+		for (let i = this.buffer.length - 1; i >= 0; i--) {
+			const trial = [this.buffer[i], ...selected];
+			if (new TextEncoder().encode(flatJsonStringify(this.buildEnvelope(trial))).length <= config.keepaliveMaxBytes) selected = trial;
+			else if (config.debug) console.error("Flare: dropping log record from keepalive envelope (over budget)");
+		}
+		return selected;
+	}
+	buildEnvelope(records) {
+		const sdk = this.deps.getSdkInfo();
+		return buildLogsEnvelope(records, this.resourceForFlush(), sdk.name, sdk.version);
+	}
+	resourceForFlush() {
+		const config = this.deps.getConfig();
+		const sdk = this.deps.getSdkInfo();
+		const framework = this.deps.getFramework();
+		const identity = {
+			"telemetry.sdk.language": "javascript",
+			"telemetry.sdk.name": sdk.name,
+			"telemetry.sdk.version": sdk.version,
+			"flare.language.name": "javascript"
+		};
+		if (config.serviceName) identity["service.name"] = config.serviceName;
+		if (config.version) identity["service.version"] = config.version;
+		if (config.stage) identity["service.stage"] = config.stage;
+		if (framework?.name) identity["flare.framework.name"] = framework.name;
+		if (framework?.version) identity["flare.framework.version"] = framework.version;
+		return {
+			...this.resourceAttributes,
+			...identity
+		};
+	}
+	clearTimer() {
+		if (this.timer) {
+			clearTimeout(this.timer);
+			this.timer = void 0;
+		}
+		this.timerActive = false;
+	}
+	estimateBytes(log) {
+		return flatJsonStringify(log).length;
+	}
+	bufferBytes() {
+		return this.buffer.reduce((sum, log) => sum + this.estimateBytes(log), 0);
+	}
+};
+
+//#endregion
+//#region src/logging/FlushScheduler.ts
+var NoopFlushScheduler = class {
+	register() {}
+};
+
+//#endregion
+//#region src/logging/partition.ts
+const RESOURCE_PREFIXES = [
+	"service.",
+	"telemetry.",
+	"host.",
+	"os.",
+	"process.",
+	"flare.framework.",
+	"flare.language."
+];
+const RECORD_LEVEL_EXCEPTIONS = new Set(["process.uptime"]);
+function partitionAttributes(attributes) {
+	const resource = {};
+	const record = {};
+	for (const [key, value] of Object.entries(attributes)) if (!RECORD_LEVEL_EXCEPTIONS.has(key) && RESOURCE_PREFIXES.some((prefix) => key.startsWith(prefix))) resource[key] = value;
+	else record[key] = value;
+	return {
+		resource,
+		record
+	};
+}
 
 //#endregion
 //#region src/Scope.ts
@@ -406,6 +710,7 @@ var NullFileReader = class {
 const DEFAULT_SDK_NAME = "@flareapp/core";
 var Flare = class {
 	inflight = /* @__PURE__ */ new Set();
+	_logger;
 	_config = {
 		key: null,
 		version: "",
@@ -419,7 +724,13 @@ var Flare = class {
 		replaceDefaultUrlDenylist: false,
 		sampleRate: 1,
 		beforeEvaluate: (error) => error,
-		beforeSubmit: (report) => report
+		beforeSubmit: (report) => report,
+		enableLogs: false,
+		logsIngestUrl: "https://ingress.flareapp.io/v1/logs",
+		maxLogBufferSize: 100,
+		logFlushIntervalMs: 5e3,
+		logFlushMaxBytes: 8e5,
+		keepaliveMaxBytes: 6e4
 	};
 	sdkInfo = {
 		name: DEFAULT_SDK_NAME,
@@ -438,11 +749,20 @@ var Flare = class {
 	*                         single global scope; Node uses an AsyncLocalStorage-
 	*                         backed provider so each request gets its own.
 	*/
-	constructor(api = new Api(), contextCollector = () => ({}), fileReader = new NullFileReader(), scopeProvider = new GlobalScopeProvider()) {
+	constructor(api = new Api(), contextCollector = () => ({}), fileReader = new NullFileReader(), scopeProvider = new GlobalScopeProvider(), scheduler = new NoopFlushScheduler()) {
 		this.api = api;
 		this.contextCollector = contextCollector;
 		this.fileReader = fileReader;
 		this.scopeProvider = scopeProvider;
+		this._logger = new Logger({
+			api: this.api,
+			getConfig: () => this._config,
+			getSdkInfo: () => this.sdkInfo,
+			getFramework: () => this.framework,
+			buildLogAttributes: (userAttributes) => this.buildLogAttributes(userAttributes),
+			track: (p) => this.track(p),
+			scheduler
+		});
 	}
 	/**
 	* Register an in-flight report so `flush()` can wait for it. Called by
@@ -581,6 +901,7 @@ var Flare = class {
 	*     again if you need to wait for those too.
 	*/
 	flush(timeoutMs = 2e3) {
+		this._logger.flush();
 		const pending = [...this.inflight];
 		if (pending.length === 0) return Promise.resolve();
 		return new Promise((resolve) => {
@@ -597,18 +918,25 @@ var Flare = class {
 	get glows() {
 		return this.scopeProvider.active().glows;
 	}
+	get logger() {
+		return this._logger;
+	}
 	light(key = KEY, debug) {
 		this._config.key = key;
 		if (debug !== void 0) this._config.debug = debug;
+		this._logger.flush();
 		return this;
 	}
 	configure(config) {
+		const wasLogsEnabled = this._config.enableLogs;
 		this._config = {
 			...this._config,
 			...config
 		};
 		if (config.sampleRate !== void 0) this._config.sampleRate = Math.max(0, Math.min(1, config.sampleRate));
 		this._config.urlDenylist = resolveDenylist(config.urlDenylist, config.replaceDefaultUrlDenylist ?? this._config.replaceDefaultUrlDenylist);
+		if (wasLogsEnabled && this._config.enableLogs === false) this._logger.clear();
+		if (config.key !== void 0) this._logger.flush();
 		return this;
 	}
 	test() {
@@ -729,8 +1057,7 @@ var Flare = class {
 			seenAtUnixNano
 		});
 	}
-	buildReport(input) {
-		const activeScope = this.scopeProvider.active();
+	buildBaseAttributes() {
 		const baseAttributes = {
 			"telemetry.sdk.language": "javascript",
 			"telemetry.sdk.name": this.sdkInfo.name,
@@ -741,6 +1068,11 @@ var Flare = class {
 		if (this._config.version) baseAttributes["service.version"] = this._config.version;
 		if (this.framework?.name) baseAttributes["flare.framework.name"] = this.framework.name;
 		if (this.framework?.version) baseAttributes["flare.framework.version"] = this.framework.version;
+		return baseAttributes;
+	}
+	assembleAttributes(collectorAttributes, extraAttributes, includeBase) {
+		const activeScope = this.scopeProvider.active();
+		const baseAttributes = includeBase ? this.buildBaseAttributes() : {};
 		const entryPoint = activeScope.entryPoint;
 		const entryPointOverrides = {};
 		if (entryPoint?.identifier !== void 0) entryPointOverrides["flare.entry_point.handler.identifier"] = entryPoint.identifier;
@@ -748,13 +1080,13 @@ var Flare = class {
 		if (entryPoint?.name !== void 0) entryPointOverrides["flare.entry_point.handler.name"] = entryPoint.name;
 		const attributes = {
 			...baseAttributes,
-			...this.contextCollector(this._config),
+			...collectorAttributes,
 			...entryPointOverrides,
 			...activeScope.pendingAttributes,
-			...input.extraAttributes
+			...extraAttributes
 		};
 		const pendingCustom = activeScope.pendingAttributes["context.custom"];
-		const extraCustom = input.extraAttributes["context.custom"];
+		const extraCustom = extraAttributes["context.custom"];
 		if (pendingCustom && extraCustom && typeof pendingCustom === "object" && typeof extraCustom === "object" && !Array.isArray(pendingCustom) && !Array.isArray(extraCustom)) attributes["context.custom"] = {
 			...pendingCustom,
 			...extraCustom
@@ -763,6 +1095,18 @@ var Flare = class {
 			...attributes["context.custom"] ?? {},
 			framework: this.framework.name.toLowerCase()
 		};
+		return attributes;
+	}
+	buildLogAttributes(userAttributes) {
+		const { resource, record: collectorRecord } = partitionAttributes(this.contextCollector(this._config));
+		return {
+			resource,
+			record: this.assembleAttributes(collectorRecord, userAttributes, false)
+		};
+	}
+	buildReport(input) {
+		const activeScope = this.scopeProvider.active();
+		const attributes = this.assembleAttributes(this.contextCollector(this._config), input.extraAttributes, true);
 		const report = {
 			exceptionClass: input.exceptionClass,
 			message: input.message,
@@ -790,6 +1134,8 @@ exports.Api = Api;
 exports.DEFAULT_URL_DENYLIST = DEFAULT_URL_DENYLIST;
 exports.Flare = Flare;
 exports.GlobalScopeProvider = GlobalScopeProvider;
+exports.Logger = Logger;
+exports.NoopFlushScheduler = NoopFlushScheduler;
 exports.NullFileReader = NullFileReader;
 exports.Scope = Scope;
 exports.assert = assert;

package/dist/index.d.cts

@@ -16,6 +16,14 @@ type Config = {
   urlDenylist: RegExp;
   replaceDefaultUrlDenylist: boolean;
   sampleRate: number;
+  enableLogs: boolean;
+  logsIngestUrl: string;
+  minimumLogLevel?: MessageLevel;
+  serviceName?: string;
+  maxLogBufferSize: number;
+  logFlushIntervalMs: number;
+  logFlushMaxBytes: number;
+  keepaliveMaxBytes: number;
   beforeEvaluate: (error: Error) => Error | false | null | Promise<Error | false | null>;
   beforeSubmit: (report: Report) => Report | false | null | Promise<Report | false | null>;
 };
@@ -75,6 +83,64 @@ type Framework = {
   name: string;
   version?: string;
 };
+type AnyValue = {
+  stringValue: string;
+} | {
+  boolValue: boolean;
+} | {
+  intValue: number;
+} | {
+  doubleValue: number;
+} | {
+  arrayValue: {
+    values: AnyValue[];
+  };
+} | {
+  kvlistValue: {
+    values: KeyValue[];
+  };
+};
+type KeyValue = {
+  key: string;
+  value: AnyValue;
+};
+type OtelResource = {
+  attributes: KeyValue[];
+  droppedAttributesCount: number;
+};
+type OtelScope = {
+  name: string;
+  version: string;
+  attributes: KeyValue[];
+  droppedAttributesCount: number;
+};
+type OtelLogRecord = {
+  timeUnixNano: string;
+  observedTimeUnixNano: string;
+  severityNumber: number;
+  severityText: string;
+  body: AnyValue;
+  attributes: KeyValue[];
+  flags: number;
+  droppedAttributesCount: number;
+};
+type LogsEnvelope = {
+  resourceLogs: Array<{
+    resource: OtelResource;
+    scopeLogs: Array<{
+      scope: OtelScope;
+      logRecords: OtelLogRecord[];
+    }>;
+  }>;
+};
+type BufferedLog = {
+  timeUnixNano: string;
+  severityNumber: number;
+  severityText: string;
+  message: string;
+  recordAttributes: KeyValue[];
+  resourceAttributes: Attributes;
+};
 //#endregion
 //#region src/util/assert.d.ts
 declare function assert(value: unknown, message: string, debug: boolean): boolean;
@@ -105,6 +171,68 @@ declare function redactUrlQuery(fullPath: string, denylist?: RegExp): string;
 //#region src/api/Api.d.ts
 declare class Api {
   report(report: Report, url: string, key: string | null, reportBrowserExtensionErrors: boolean, debug?: boolean): Promise<void>;
+  logs(envelope: LogsEnvelope, url: string, key: string | null, debug?: boolean, keepalive?: boolean): Promise<void>;
+}
+//#endregion
+//#region src/logging/FlushScheduler.d.ts
+type FlushFn = (opts?: {
+  keepalive?: boolean;
+}) => void;
+/**
+ * The seam through which a platform package wires the "drain on lifecycle end"
+ * trigger (browser unload, Node process exit). Core ships a no-op default; the
+ * count/weight/timer batching policy lives in `Logger` regardless.
+ */
+interface FlushScheduler {
+  register(flush: FlushFn): void;
+}
+declare class NoopFlushScheduler implements FlushScheduler {
+  register(): void;
+}
+//#endregion
+//#region src/logging/Logger.d.ts
+type LoggerDeps = {
+  api: Api;
+  getConfig: () => Config;
+  getSdkInfo: () => SdkInfo;
+  getFramework: () => Framework | null;
+  buildLogAttributes: (userAttributes: Attributes) => {
+    record: Attributes;
+    resource: Attributes;
+  };
+  track: <T>(p: Promise<T>) => Promise<T>;
+  scheduler: FlushScheduler;
+};
+declare class Logger {
+  private deps;
+  private buffer;
+  private resourceAttributes;
+  private timer;
+  private timerActive;
+  constructor(deps: LoggerDeps);
+  debug(message: string, context?: Attributes, attributes?: Attributes): void;
+  info(message: string, context?: Attributes, attributes?: Attributes): void;
+  notice(message: string, context?: Attributes, attributes?: Attributes): void;
+  warning(message: string, context?: Attributes, attributes?: Attributes): void;
+  error(message: string, context?: Attributes, attributes?: Attributes): void;
+  critical(message: string, context?: Attributes, attributes?: Attributes): void;
+  alert(message: string, context?: Attributes, attributes?: Attributes): void;
+  emergency(message: string, context?: Attributes, attributes?: Attributes): void;
+  bufferLength(): number;
+  private record;
+  private evaluateTriggers;
+  private armTimer;
+  private trim;
+  flush(opts?: {
+    keepalive?: boolean;
+  }): void;
+  clear(): void;
+  private packForKeepalive;
+  private buildEnvelope;
+  private resourceForFlush;
+  private clearTimer;
+  private estimateBytes;
+  private bufferBytes;
 }
 //#endregion
 //#region src/Scope.d.ts
@@ -206,6 +334,7 @@ declare class Flare {
   private fileReader;
   private scopeProvider;
   private inflight;
+  private _logger;
   private _config;
   private sdkInfo;
   private framework;
@@ -221,7 +350,7 @@ declare class Flare {
    *                         single global scope; Node uses an AsyncLocalStorage-
    *                         backed provider so each request gets its own.
    */
-  constructor(api?: Api, contextCollector?: ContextCollector, fileReader?: FileReader, scopeProvider?: ScopeProvider);
+  constructor(api?: Api, contextCollector?: ContextCollector, fileReader?: FileReader, scopeProvider?: ScopeProvider, scheduler?: FlushScheduler);
   /**
    * Register an in-flight report so `flush()` can wait for it. Called by
    * every public report entry point (`report`, `reportSilently`,
@@ -356,6 +485,7 @@ declare class Flare {
   flush(timeoutMs?: number): Promise<void>;
   get config(): Readonly<Config>;
   get glows(): readonly Glow[];
+  get logger(): Logger;
   light(key?: string, debug?: boolean): this;
   configure(config: Partial<Config>): this;
   test(): Promise<void>;
@@ -375,6 +505,9 @@ declare class Flare {
   reportMessage(message: string, level?: MessageLevel, attributes?: Attributes): Promise<void>;
   private reportMessageInternal;
   createReportFromError(error: Error, attributes?: Attributes, seenAtUnixNano?: number): Promise<Report | false>;
+  private buildBaseAttributes;
+  private assembleAttributes;
+  private buildLogAttributes;
   private buildReport;
   sendReport(report: Report): Promise<void>;
 }
@@ -408,4 +541,4 @@ declare class NullFileReader implements FileReader {
 //#region src/stacktrace/createStackTrace.d.ts
 declare function createStackTrace(error: Error, debug: boolean, fileReader: FileReader): Promise<Array<StackFrame>>;
 //#endregion
-export { Api, type AttributeValue, type Attributes, type Config, type ContextCollector, DEFAULT_URL_DENYLIST, type EntryPointHandler, type FileReader, Flare, type Framework, GlobalScopeProvider, type Glow, type MessageLevel, NullFileReader, type OverriddenGrouping, type Report, Scope, type ScopeProvider, type SdkInfo, type SpanEvent, type StackFrame, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };
+export { type AnyValue, Api, type AttributeValue, type Attributes, type BufferedLog, type Config, type ContextCollector, DEFAULT_URL_DENYLIST, type EntryPointHandler, type FileReader, Flare, type FlushFn, type FlushScheduler, type Framework, GlobalScopeProvider, type Glow, type KeyValue, Logger, type LoggerDeps, type LogsEnvelope, type MessageLevel, NoopFlushScheduler, NullFileReader, type OtelLogRecord, type OverriddenGrouping, type Report, Scope, type ScopeProvider, type SdkInfo, type SpanEvent, type StackFrame, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };

package/dist/index.d.mts

@@ -16,6 +16,14 @@ type Config = {
   urlDenylist: RegExp;
   replaceDefaultUrlDenylist: boolean;
   sampleRate: number;
+  enableLogs: boolean;
+  logsIngestUrl: string;
+  minimumLogLevel?: MessageLevel;
+  serviceName?: string;
+  maxLogBufferSize: number;
+  logFlushIntervalMs: number;
+  logFlushMaxBytes: number;
+  keepaliveMaxBytes: number;
   beforeEvaluate: (error: Error) => Error | false | null | Promise<Error | false | null>;
   beforeSubmit: (report: Report) => Report | false | null | Promise<Report | false | null>;
 };
@@ -75,6 +83,64 @@ type Framework = {
   name: string;
   version?: string;
 };
+type AnyValue = {
+  stringValue: string;
+} | {
+  boolValue: boolean;
+} | {
+  intValue: number;
+} | {
+  doubleValue: number;
+} | {
+  arrayValue: {
+    values: AnyValue[];
+  };
+} | {
+  kvlistValue: {
+    values: KeyValue[];
+  };
+};
+type KeyValue = {
+  key: string;
+  value: AnyValue;
+};
+type OtelResource = {
+  attributes: KeyValue[];
+  droppedAttributesCount: number;
+};
+type OtelScope = {
+  name: string;
+  version: string;
+  attributes: KeyValue[];
+  droppedAttributesCount: number;
+};
+type OtelLogRecord = {
+  timeUnixNano: string;
+  observedTimeUnixNano: string;
+  severityNumber: number;
+  severityText: string;
+  body: AnyValue;
+  attributes: KeyValue[];
+  flags: number;
+  droppedAttributesCount: number;
+};
+type LogsEnvelope = {
+  resourceLogs: Array<{
+    resource: OtelResource;
+    scopeLogs: Array<{
+      scope: OtelScope;
+      logRecords: OtelLogRecord[];
+    }>;
+  }>;
+};
+type BufferedLog = {
+  timeUnixNano: string;
+  severityNumber: number;
+  severityText: string;
+  message: string;
+  recordAttributes: KeyValue[];
+  resourceAttributes: Attributes;
+};
 //#endregion
 //#region src/util/assert.d.ts
 declare function assert(value: unknown, message: string, debug: boolean): boolean;
@@ -105,6 +171,68 @@ declare function redactUrlQuery(fullPath: string, denylist?: RegExp): string;
 //#region src/api/Api.d.ts
 declare class Api {
   report(report: Report, url: string, key: string | null, reportBrowserExtensionErrors: boolean, debug?: boolean): Promise<void>;
+  logs(envelope: LogsEnvelope, url: string, key: string | null, debug?: boolean, keepalive?: boolean): Promise<void>;
+}
+//#endregion
+//#region src/logging/FlushScheduler.d.ts
+type FlushFn = (opts?: {
+  keepalive?: boolean;
+}) => void;
+/**
+ * The seam through which a platform package wires the "drain on lifecycle end"
+ * trigger (browser unload, Node process exit). Core ships a no-op default; the
+ * count/weight/timer batching policy lives in `Logger` regardless.
+ */
+interface FlushScheduler {
+  register(flush: FlushFn): void;
+}
+declare class NoopFlushScheduler implements FlushScheduler {
+  register(): void;
+}
+//#endregion
+//#region src/logging/Logger.d.ts
+type LoggerDeps = {
+  api: Api;
+  getConfig: () => Config;
+  getSdkInfo: () => SdkInfo;
+  getFramework: () => Framework | null;
+  buildLogAttributes: (userAttributes: Attributes) => {
+    record: Attributes;
+    resource: Attributes;
+  };
+  track: <T>(p: Promise<T>) => Promise<T>;
+  scheduler: FlushScheduler;
+};
+declare class Logger {
+  private deps;
+  private buffer;
+  private resourceAttributes;
+  private timer;
+  private timerActive;
+  constructor(deps: LoggerDeps);
+  debug(message: string, context?: Attributes, attributes?: Attributes): void;
+  info(message: string, context?: Attributes, attributes?: Attributes): void;
+  notice(message: string, context?: Attributes, attributes?: Attributes): void;
+  warning(message: string, context?: Attributes, attributes?: Attributes): void;
+  error(message: string, context?: Attributes, attributes?: Attributes): void;
+  critical(message: string, context?: Attributes, attributes?: Attributes): void;
+  alert(message: string, context?: Attributes, attributes?: Attributes): void;
+  emergency(message: string, context?: Attributes, attributes?: Attributes): void;
+  bufferLength(): number;
+  private record;
+  private evaluateTriggers;
+  private armTimer;
+  private trim;
+  flush(opts?: {
+    keepalive?: boolean;
+  }): void;
+  clear(): void;
+  private packForKeepalive;
+  private buildEnvelope;
+  private resourceForFlush;
+  private clearTimer;
+  private estimateBytes;
+  private bufferBytes;
 }
 //#endregion
 //#region src/Scope.d.ts
@@ -206,6 +334,7 @@ declare class Flare {
   private fileReader;
   private scopeProvider;
   private inflight;
+  private _logger;
   private _config;
   private sdkInfo;
   private framework;
@@ -221,7 +350,7 @@ declare class Flare {
    *                         single global scope; Node uses an AsyncLocalStorage-
    *                         backed provider so each request gets its own.
    */
-  constructor(api?: Api, contextCollector?: ContextCollector, fileReader?: FileReader, scopeProvider?: ScopeProvider);
+  constructor(api?: Api, contextCollector?: ContextCollector, fileReader?: FileReader, scopeProvider?: ScopeProvider, scheduler?: FlushScheduler);
   /**
    * Register an in-flight report so `flush()` can wait for it. Called by
    * every public report entry point (`report`, `reportSilently`,
@@ -356,6 +485,7 @@ declare class Flare {
   flush(timeoutMs?: number): Promise<void>;
   get config(): Readonly<Config>;
   get glows(): readonly Glow[];
+  get logger(): Logger;
   light(key?: string, debug?: boolean): this;
   configure(config: Partial<Config>): this;
   test(): Promise<void>;
@@ -375,6 +505,9 @@ declare class Flare {
   reportMessage(message: string, level?: MessageLevel, attributes?: Attributes): Promise<void>;
   private reportMessageInternal;
   createReportFromError(error: Error, attributes?: Attributes, seenAtUnixNano?: number): Promise<Report | false>;
+  private buildBaseAttributes;
+  private assembleAttributes;
+  private buildLogAttributes;
   private buildReport;
   sendReport(report: Report): Promise<void>;
 }
@@ -408,4 +541,4 @@ declare class NullFileReader implements FileReader {
 //#region src/stacktrace/createStackTrace.d.ts
 declare function createStackTrace(error: Error, debug: boolean, fileReader: FileReader): Promise<Array<StackFrame>>;
 //#endregion
-export { Api, type AttributeValue, type Attributes, type Config, type ContextCollector, DEFAULT_URL_DENYLIST, type EntryPointHandler, type FileReader, Flare, type Framework, GlobalScopeProvider, type Glow, type MessageLevel, NullFileReader, type OverriddenGrouping, type Report, Scope, type ScopeProvider, type SdkInfo, type SpanEvent, type StackFrame, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };
+export { type AnyValue, Api, type AttributeValue, type Attributes, type BufferedLog, type Config, type ContextCollector, DEFAULT_URL_DENYLIST, type EntryPointHandler, type FileReader, Flare, type FlushFn, type FlushScheduler, type Framework, GlobalScopeProvider, type Glow, type KeyValue, Logger, type LoggerDeps, type LogsEnvelope, type MessageLevel, NoopFlushScheduler, NullFileReader, type OtelLogRecord, type OverriddenGrouping, type Report, Scope, type ScopeProvider, type SdkInfo, type SpanEvent, type StackFrame, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import ErrorStackParser from "error-stack-parser";
 
 //#region src/env/index.ts
-const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.2.1" : "?";
+const CLIENT_VERSION = typeof process !== "undefined" && true ? "2.4.0" : "?";
 const KEY = typeof FLARE_JS_KEY === "undefined" ? "" : FLARE_JS_KEY;
 const SOURCEMAP_VERSION = typeof FLARE_SOURCEMAP_VERSION === "undefined" ? "" : FLARE_SOURCEMAP_VERSION;
 
@@ -162,7 +162,311 @@ var Api = class {
 			if (debug) console.error(error);
 		});
 	}
+	logs(envelope, url, key, debug = false, keepalive = false) {
+		return fetch(url, {
+			method: "POST",
+			keepalive,
+			headers: {
+				"Accept": "application/json",
+				"Content-Type": "application/json",
+				"x-api-token": key ?? ""
+			},
+			body: flatJsonStringify(envelope)
+		}).then((response) => {
+			if (debug && response.status !== 201) console.error(`Received response with status ${response.status} from Flare logs`);
+		}, (error) => {
+			if (debug) console.error(error);
+		});
+	}
+};
+
+//#endregion
+//#region src/logging/otel.ts
+function valueToOpenTelemetry(value, inPath = /* @__PURE__ */ new WeakSet()) {
+	if (typeof value === "string") return { stringValue: value };
+	if (typeof value === "boolean") return { boolValue: value };
+	if (typeof value === "number") {
+		if (!Number.isFinite(value)) return null;
+		return Number.isInteger(value) ? { intValue: value } : { doubleValue: value };
+	}
+	if (value === null || value === void 0) return null;
+	if (Array.isArray(value)) {
+		if (inPath.has(value)) return { stringValue: "[Circular]" };
+		inPath.add(value);
+		const values = [];
+		for (const item of value) {
+			const mapped = valueToOpenTelemetry(item, inPath);
+			if (mapped !== null) values.push(mapped);
+		}
+		inPath.delete(value);
+		return { arrayValue: { values } };
+	}
+	if (typeof value === "object") {
+		if (inPath.has(value)) return { stringValue: "[Circular]" };
+		inPath.add(value);
+		const values = [];
+		for (const [key, item] of Object.entries(value)) {
+			const mapped = valueToOpenTelemetry(item, inPath);
+			if (mapped !== null) values.push({
+				key,
+				value: mapped
+			});
+		}
+		inPath.delete(value);
+		return { kvlistValue: { values } };
+	}
+	return null;
+}
+function attributesToOpenTelemetry(attributes) {
+	const out = [];
+	for (const [key, value] of Object.entries(attributes)) {
+		const mapped = valueToOpenTelemetry(value);
+		if (mapped !== null) out.push({
+			key,
+			value: mapped
+		});
+	}
+	return out;
+}
+
+//#endregion
+//#region src/logging/envelope.ts
+function buildLogsEnvelope(records, resourceAttributes, scopeName, scopeVersion) {
+	return { resourceLogs: [{
+		resource: {
+			attributes: attributesToOpenTelemetry(resourceAttributes),
+			droppedAttributesCount: 0
+		},
+		scopeLogs: [{
+			scope: {
+				name: scopeName,
+				version: scopeVersion,
+				attributes: [],
+				droppedAttributesCount: 0
+			},
+			logRecords: records.map((record) => ({
+				timeUnixNano: record.timeUnixNano,
+				observedTimeUnixNano: record.timeUnixNano,
+				severityNumber: record.severityNumber,
+				severityText: record.severityText,
+				body: { stringValue: record.message },
+				attributes: record.recordAttributes,
+				flags: 0,
+				droppedAttributesCount: 0
+			}))
+		}]
+	}] };
+}
+
+//#endregion
+//#region src/logging/severity.ts
+const SEVERITY_NUMBERS = {
+	debug: 5,
+	info: 9,
+	notice: 10,
+	warning: 13,
+	error: 17,
+	critical: 18,
+	alert: 19,
+	emergency: 21
 };
+function severityNumber(level) {
+	return SEVERITY_NUMBERS[level];
+}
+function severityText(level) {
+	return level.toUpperCase();
+}
+function isAtOrAboveMinimum(level, minimum) {
+	return severityNumber(level) >= severityNumber(minimum);
+}
+
+//#endregion
+//#region src/logging/Logger.ts
+var Logger = class {
+	buffer = [];
+	resourceAttributes = {};
+	timer;
+	timerActive = false;
+	constructor(deps) {
+		this.deps = deps;
+		const flush = (opts) => this.flush(opts);
+		this.deps.scheduler.register(flush);
+	}
+	debug(message, context = {}, attributes = {}) {
+		this.record("debug", message, context, attributes);
+	}
+	info(message, context = {}, attributes = {}) {
+		this.record("info", message, context, attributes);
+	}
+	notice(message, context = {}, attributes = {}) {
+		this.record("notice", message, context, attributes);
+	}
+	warning(message, context = {}, attributes = {}) {
+		this.record("warning", message, context, attributes);
+	}
+	error(message, context = {}, attributes = {}) {
+		this.record("error", message, context, attributes);
+	}
+	critical(message, context = {}, attributes = {}) {
+		this.record("critical", message, context, attributes);
+	}
+	alert(message, context = {}, attributes = {}) {
+		this.record("alert", message, context, attributes);
+	}
+	emergency(message, context = {}, attributes = {}) {
+		this.record("emergency", message, context, attributes);
+	}
+	bufferLength() {
+		return this.buffer.length;
+	}
+	record(level, message, context, attributes) {
+		const config = this.deps.getConfig();
+		if (!config.enableLogs) return;
+		if (config.minimumLogLevel && !isAtOrAboveMinimum(level, config.minimumLogLevel)) return;
+		const userAttributes = {
+			"log.context": context,
+			...attributes
+		};
+		const { record, resource } = this.deps.buildLogAttributes(userAttributes);
+		const buffered = {
+			timeUnixNano: String(Date.now()) + "000000",
+			severityNumber: severityNumber(level),
+			severityText: severityText(level),
+			message,
+			recordAttributes: attributesToOpenTelemetry(record),
+			resourceAttributes: resource
+		};
+		if (this.estimateBytes(buffered) > config.logFlushMaxBytes) {
+			if (config.debug) console.error("Flare: dropping oversized log record");
+			return;
+		}
+		this.buffer.push(buffered);
+		this.resourceAttributes = resource;
+		this.evaluateTriggers(config);
+		this.trim(config);
+	}
+	evaluateTriggers(config) {
+		if (this.buffer.length >= config.maxLogBufferSize) {
+			this.flush();
+			return;
+		}
+		if (this.bufferBytes() >= config.logFlushMaxBytes) {
+			this.flush();
+			return;
+		}
+		this.armTimer(config);
+	}
+	armTimer(config) {
+		if (this.timerActive) return;
+		this.timerActive = true;
+		this.timer = setTimeout(() => this.flush(), config.logFlushIntervalMs);
+		this.timer.unref?.();
+	}
+	trim(config) {
+		if (this.buffer.length > config.maxLogBufferSize) this.buffer = this.buffer.slice(this.buffer.length - config.maxLogBufferSize);
+		while (this.buffer.length > 1 && this.bufferBytes() > config.logFlushMaxBytes) this.buffer.shift();
+	}
+	flush(opts) {
+		const config = this.deps.getConfig();
+		if (!config.enableLogs) return;
+		if (this.buffer.length === 0) return;
+		if (!assertKey(config.key, config.debug)) {
+			this.clearTimer();
+			return;
+		}
+		this.clearTimer();
+		let records;
+		if (opts?.keepalive) {
+			records = this.packForKeepalive(config);
+			this.buffer = this.buffer.filter((log) => !records.includes(log));
+			if (this.buffer.length > 0) this.armTimer(config);
+		} else {
+			records = this.buffer;
+			this.buffer = [];
+		}
+		if (records.length === 0) return;
+		this.deps.track(this.deps.api.logs(this.buildEnvelope(records), config.logsIngestUrl, config.key, config.debug, !!opts?.keepalive));
+	}
+	clear() {
+		this.buffer = [];
+		this.clearTimer();
+	}
+	packForKeepalive(config) {
+		let selected = [];
+		for (let i = this.buffer.length - 1; i >= 0; i--) {
+			const trial = [this.buffer[i], ...selected];
+			if (new TextEncoder().encode(flatJsonStringify(this.buildEnvelope(trial))).length <= config.keepaliveMaxBytes) selected = trial;
+			else if (config.debug) console.error("Flare: dropping log record from keepalive envelope (over budget)");
+		}
+		return selected;
+	}
+	buildEnvelope(records) {
+		const sdk = this.deps.getSdkInfo();
+		return buildLogsEnvelope(records, this.resourceForFlush(), sdk.name, sdk.version);
+	}
+	resourceForFlush() {
+		const config = this.deps.getConfig();
+		const sdk = this.deps.getSdkInfo();
+		const framework = this.deps.getFramework();
+		const identity = {
+			"telemetry.sdk.language": "javascript",
+			"telemetry.sdk.name": sdk.name,
+			"telemetry.sdk.version": sdk.version,
+			"flare.language.name": "javascript"
+		};
+		if (config.serviceName) identity["service.name"] = config.serviceName;
+		if (config.version) identity["service.version"] = config.version;
+		if (config.stage) identity["service.stage"] = config.stage;
+		if (framework?.name) identity["flare.framework.name"] = framework.name;
+		if (framework?.version) identity["flare.framework.version"] = framework.version;
+		return {
+			...this.resourceAttributes,
+			...identity
+		};
+	}
+	clearTimer() {
+		if (this.timer) {
+			clearTimeout(this.timer);
+			this.timer = void 0;
+		}
+		this.timerActive = false;
+	}
+	estimateBytes(log) {
+		return flatJsonStringify(log).length;
+	}
+	bufferBytes() {
+		return this.buffer.reduce((sum, log) => sum + this.estimateBytes(log), 0);
+	}
+};
+
+//#endregion
+//#region src/logging/FlushScheduler.ts
+var NoopFlushScheduler = class {
+	register() {}
+};
+
+//#endregion
+//#region src/logging/partition.ts
+const RESOURCE_PREFIXES = [
+	"service.",
+	"telemetry.",
+	"host.",
+	"os.",
+	"process.",
+	"flare.framework.",
+	"flare.language."
+];
+const RECORD_LEVEL_EXCEPTIONS = new Set(["process.uptime"]);
+function partitionAttributes(attributes) {
+	const resource = {};
+	const record = {};
+	for (const [key, value] of Object.entries(attributes)) if (!RECORD_LEVEL_EXCEPTIONS.has(key) && RESOURCE_PREFIXES.some((prefix) => key.startsWith(prefix))) resource[key] = value;
+	else record[key] = value;
+	return {
+		resource,
+		record
+	};
+}
 
 //#endregion
 //#region src/Scope.ts
@@ -377,6 +681,7 @@ var NullFileReader = class {
 const DEFAULT_SDK_NAME = "@flareapp/core";
 var Flare = class {
 	inflight = /* @__PURE__ */ new Set();
+	_logger;
 	_config = {
 		key: null,
 		version: "",
@@ -390,7 +695,13 @@ var Flare = class {
 		replaceDefaultUrlDenylist: false,
 		sampleRate: 1,
 		beforeEvaluate: (error) => error,
-		beforeSubmit: (report) => report
+		beforeSubmit: (report) => report,
+		enableLogs: false,
+		logsIngestUrl: "https://ingress.flareapp.io/v1/logs",
+		maxLogBufferSize: 100,
+		logFlushIntervalMs: 5e3,
+		logFlushMaxBytes: 8e5,
+		keepaliveMaxBytes: 6e4
 	};
 	sdkInfo = {
 		name: DEFAULT_SDK_NAME,
@@ -409,11 +720,20 @@ var Flare = class {
 	*                         single global scope; Node uses an AsyncLocalStorage-
 	*                         backed provider so each request gets its own.
 	*/
-	constructor(api = new Api(), contextCollector = () => ({}), fileReader = new NullFileReader(), scopeProvider = new GlobalScopeProvider()) {
+	constructor(api = new Api(), contextCollector = () => ({}), fileReader = new NullFileReader(), scopeProvider = new GlobalScopeProvider(), scheduler = new NoopFlushScheduler()) {
 		this.api = api;
 		this.contextCollector = contextCollector;
 		this.fileReader = fileReader;
 		this.scopeProvider = scopeProvider;
+		this._logger = new Logger({
+			api: this.api,
+			getConfig: () => this._config,
+			getSdkInfo: () => this.sdkInfo,
+			getFramework: () => this.framework,
+			buildLogAttributes: (userAttributes) => this.buildLogAttributes(userAttributes),
+			track: (p) => this.track(p),
+			scheduler
+		});
 	}
 	/**
 	* Register an in-flight report so `flush()` can wait for it. Called by
@@ -552,6 +872,7 @@ var Flare = class {
 	*     again if you need to wait for those too.
 	*/
 	flush(timeoutMs = 2e3) {
+		this._logger.flush();
 		const pending = [...this.inflight];
 		if (pending.length === 0) return Promise.resolve();
 		return new Promise((resolve) => {
@@ -568,18 +889,25 @@ var Flare = class {
 	get glows() {
 		return this.scopeProvider.active().glows;
 	}
+	get logger() {
+		return this._logger;
+	}
 	light(key = KEY, debug) {
 		this._config.key = key;
 		if (debug !== void 0) this._config.debug = debug;
+		this._logger.flush();
 		return this;
 	}
 	configure(config) {
+		const wasLogsEnabled = this._config.enableLogs;
 		this._config = {
 			...this._config,
 			...config
 		};
 		if (config.sampleRate !== void 0) this._config.sampleRate = Math.max(0, Math.min(1, config.sampleRate));
 		this._config.urlDenylist = resolveDenylist(config.urlDenylist, config.replaceDefaultUrlDenylist ?? this._config.replaceDefaultUrlDenylist);
+		if (wasLogsEnabled && this._config.enableLogs === false) this._logger.clear();
+		if (config.key !== void 0) this._logger.flush();
 		return this;
 	}
 	test() {
@@ -700,8 +1028,7 @@ var Flare = class {
 			seenAtUnixNano
 		});
 	}
-	buildReport(input) {
-		const activeScope = this.scopeProvider.active();
+	buildBaseAttributes() {
 		const baseAttributes = {
 			"telemetry.sdk.language": "javascript",
 			"telemetry.sdk.name": this.sdkInfo.name,
@@ -712,6 +1039,11 @@ var Flare = class {
 		if (this._config.version) baseAttributes["service.version"] = this._config.version;
 		if (this.framework?.name) baseAttributes["flare.framework.name"] = this.framework.name;
 		if (this.framework?.version) baseAttributes["flare.framework.version"] = this.framework.version;
+		return baseAttributes;
+	}
+	assembleAttributes(collectorAttributes, extraAttributes, includeBase) {
+		const activeScope = this.scopeProvider.active();
+		const baseAttributes = includeBase ? this.buildBaseAttributes() : {};
 		const entryPoint = activeScope.entryPoint;
 		const entryPointOverrides = {};
 		if (entryPoint?.identifier !== void 0) entryPointOverrides["flare.entry_point.handler.identifier"] = entryPoint.identifier;
@@ -719,13 +1051,13 @@ var Flare = class {
 		if (entryPoint?.name !== void 0) entryPointOverrides["flare.entry_point.handler.name"] = entryPoint.name;
 		const attributes = {
 			...baseAttributes,
-			...this.contextCollector(this._config),
+			...collectorAttributes,
 			...entryPointOverrides,
 			...activeScope.pendingAttributes,
-			...input.extraAttributes
+			...extraAttributes
 		};
 		const pendingCustom = activeScope.pendingAttributes["context.custom"];
-		const extraCustom = input.extraAttributes["context.custom"];
+		const extraCustom = extraAttributes["context.custom"];
 		if (pendingCustom && extraCustom && typeof pendingCustom === "object" && typeof extraCustom === "object" && !Array.isArray(pendingCustom) && !Array.isArray(extraCustom)) attributes["context.custom"] = {
 			...pendingCustom,
 			...extraCustom
@@ -734,6 +1066,18 @@ var Flare = class {
 			...attributes["context.custom"] ?? {},
 			framework: this.framework.name.toLowerCase()
 		};
+		return attributes;
+	}
+	buildLogAttributes(userAttributes) {
+		const { resource, record: collectorRecord } = partitionAttributes(this.contextCollector(this._config));
+		return {
+			resource,
+			record: this.assembleAttributes(collectorRecord, userAttributes, false)
+		};
+	}
+	buildReport(input) {
+		const activeScope = this.scopeProvider.active();
+		const attributes = this.assembleAttributes(this.contextCollector(this._config), input.extraAttributes, true);
 		const report = {
 			exceptionClass: input.exceptionClass,
 			message: input.message,
@@ -757,4 +1101,4 @@ var Flare = class {
 };
 
 //#endregion
-export { Api, DEFAULT_URL_DENYLIST, Flare, GlobalScopeProvider, NullFileReader, Scope, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };
+export { Api, DEFAULT_URL_DENYLIST, Flare, GlobalScopeProvider, Logger, NoopFlushScheduler, NullFileReader, Scope, assert, assertKey, convertToError, createStackTrace, extractCode, flatJsonStringify, getCodeSnippet, glowsToEvents, now, readLinesFromFile, redactUrlQuery, resolveDenylist };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/core",
-    "version": "2.2.1",
+    "version": "2.4.0",
     "description": "Environment-agnostic core for the Flare JS SDK",
     "homepage": "https://flareapp.io",
     "bugs": {