@blueking/open-telemetry 0.0.20 → 0.0.21

package/dist/index.js

@@ -12,7 +12,7 @@ import { BatchSpanProcessor as x, SamplingDecision as S, SimpleSpanProcessor as
 import { WebTracerProvider as w } from "@opentelemetry/sdk-trace-web";
 import { SeverityNumber as T } from "@opentelemetry/api-logs";
 //#region package.json
-var ee = "0.0.20", E = (e) => typeof crypto < "u" && typeof crypto.randomUUID == "function" ? crypto.randomUUID() : `${e}-${Date.now()}-${Math.random().toString(16).slice(2)}`, D = (e) => {
+var ee = "0.0.21", E = (e) => typeof crypto < "u" && typeof crypto.randomUUID == "function" ? crypto.randomUUID() : `${e}-${Date.now()}-${Math.random().toString(16).slice(2)}`, D = (e) => {
 	let t = 5381;
 	for (let n = 0; n < e.length; n++) t = t * 33 ^ e.charCodeAt(n);
 	return (t >>> 0).toString(36);
@@ -1402,7 +1402,10 @@ var Ye = ["http.url", "url.full"], Xe = "bk.rum.request.discard", Ze = (e) => {
 					responseStatus: t.responseStatus,
 					transferSize: t.transferSize,
 					url: r
-				})), {}, { "url.full": r }, Cn(t)), { startTime: a }).end(o), n.notifyActivity({
+				})), {}, { "url.full": r }, Cn(t)), {
+					kind: s.CLIENT,
+					startTime: a
+				}).end(o), n.notifyActivity({
 					endTime: o,
 					startTime: a,
 					type: "resource",
@@ -2150,10 +2153,13 @@ var Ye = ["http.url", "url.full"], Xe = "bk.rum.request.discard", Ze = (e) => {
 	}
 	return `bk_ot_session__${D(`${t}\0${n || "default"}`)}`;
 }, Ir = (e, t) => {
-	t.reason && e.emitLog({
+	if (!t.reason) return;
+	let n = t.reason === "init" ? "session.start" : "session.rotate";
+	e.emitLog({
 		severityNumber: T.INFO,
 		severityText: "INFO",
-		body: t.reason === "init" ? "session.start" : "session.rotate",
+		body: n,
+		eventName: n,
 		attributes: j(j({}, e.config.hooks.getPageAttributes()), {}, {
 			[O.sessionHasReplay]: !1,
 			[O.sessionId]: t.record.id,
@@ -2502,47 +2508,48 @@ var Ye = ["http.url", "url.full"], Xe = "bk.rum.request.discard", Ze = (e) => {
 	}, r = { "network.protocol.name": "websocket" };
 	try {
 		let t = new URL(e, typeof location > "u" ? "http://localhost" : location.href);
-		n["server.address"] = t.host, n["url.scheme"] = t.protocol.replace(":", ""), r["server.address"] = t.host, r["url.scheme"] = n["url.scheme"];
+		n["server.address"] = t.hostname, r["server.address"] = t.hostname, t.port && (n["server.port"] = Number(t.port), r["server.port"] = Number(t.port)), n["url.scheme"] = t.protocol.replace(":", ""), r["url.scheme"] = n["url.scheme"];
 	} catch (e) {}
 	return {
 		metricAttributes: r,
 		spanAttributes: n
 	};
 }, oi = (e, t) => {
-	let { bytesCounter: n, connectDurationHistogram: r, context: i, errorCounter: a, errorThrottle: o, isDisposed: s, messageCounter: l, url: u } = t, { metricAttributes: d, spanAttributes: f } = ai(u, i.config.hooks.redactUrl), p = i.config.hooks.getMetricAttributes(), m = () => i.applyRedact(j(j(j({}, p), B(i.getRuntimeAttributes())), d)), h = i.startSpan("websocket.connect", j(j({}, f), z({
+	let { bytesCounter: n, connectDurationHistogram: r, context: i, errorCounter: a, errorThrottle: o, isDisposed: l, messageCounter: u, url: d } = t, { metricAttributes: f, spanAttributes: p } = ai(d, i.config.hooks.redactUrl), m = i.config.hooks.getMetricAttributes(), h = () => i.applyRedact(j(j(j({}, m), B(i.getRuntimeAttributes())), f)), g = i.startSpan("websocket.connect", j(j({}, p), z({
 		errorType: "none",
 		spanSubtype: "websocket",
 		spanType: R.custom
-	}))), g = performance.now(), _ = !1, v = (e) => {
-		if (_) return;
-		_ = !0;
-		let t = performance.now() - g;
-		e === "error" && h.setStatus({
+	})), { kind: s.CLIENT }), _ = performance.now(), v = !1, y = (e) => {
+		if (v) return;
+		v = !0;
+		let t = performance.now() - _;
+		e === "error" && g.setStatus({
 			code: c.ERROR,
 			message: "websocket connect failed"
-		}), h.setAttributes(z({
+		}), g.setAttributes(z({
 			errorType: e === "error" ? "network" : "none",
 			result: e === "error" ? L.error : L.success,
 			spanSubtype: "websocket",
 			spanType: R.custom
-		})), h.end(), e === "opened" && !s() && I(i, "metrics") && r.record(t, m());
+		})), g.end(), e === "opened" && !l() && I(i, "metrics") && r.record(t, h());
 	};
 	e.addEventListener("open", () => {
-		s() || v("opened");
+		l() || y("opened");
 	}), e.addEventListener("message", (e) => {
-		if (s() || !I(i, "metrics")) return;
-		let t = j(j({}, m()), {}, { "websocket.direction": "in" });
-		l.add(1, t), n.add(ii(e.data), t);
+		if (l() || !I(i, "metrics")) return;
+		let t = j(j({}, h()), {}, { "websocket.direction": "in" });
+		u.add(1, t), n.add(ii(e.data), t);
 	}), e.addEventListener("error", () => {
-		if (s()) return;
-		let e = _ ? "runtime" : "connect";
-		if (I(i, "metrics") && a.add(1, j(j({}, m()), {}, { "websocket.error.phase": e })), v("error"), !I(i, "logs")) return;
-		let t = o.allow(`ws:error:${u}`);
+		if (l()) return;
+		let e = v ? "runtime" : "connect";
+		if (I(i, "metrics") && a.add(1, j(j({}, h()), {}, { "websocket.error.phase": e })), y("error"), !I(i, "logs")) return;
+		let t = o.allow(`ws:error:${d}`);
 		t.allowed && i.emitLog({
 			severityNumber: T.ERROR,
 			severityText: "ERROR",
 			body: "websocket.error",
-			attributes: j(j(j({}, f), z({
+			eventName: "websocket.error",
+			attributes: j(j(j({}, p), z({
 				errorType: "network",
 				result: L.error,
 				spanSubtype: "websocket",
@@ -2553,11 +2560,12 @@ var Ye = ["http.url", "url.full"], Xe = "bk.rum.request.discard", Ze = (e) => {
 			})
 		});
 	}), e.addEventListener("close", (e) => {
-		s() || (_ || v("error"), I(i, "logs") && i.emitLog({
+		l() || (v || y("error"), I(i, "logs") && i.emitLog({
 			severityNumber: T.INFO,
 			severityText: "INFO",
 			body: "websocket.close",
-			attributes: j(j(j({}, f), z({
+			eventName: "websocket.close",
+			attributes: j(j(j({}, p), z({
 				errorType: e.wasClean ? "none" : "network",
 				result: e.wasClean ? L.success : L.warning,
 				spanSubtype: "websocket",
@@ -2569,13 +2577,13 @@ var Ye = ["http.url", "url.full"], Xe = "bk.rum.request.discard", Ze = (e) => {
 			})
 		}));
 	});
-	let y = e.send.bind(e);
+	let b = e.send.bind(e);
 	e.send = (e) => {
-		if (!s() && I(i, "metrics")) {
-			let t = j(j({}, m()), {}, { "websocket.direction": "out" });
-			l.add(1, t), n.add(ii(e), t);
+		if (!l() && I(i, "metrics")) {
+			let t = j(j({}, h()), {}, { "websocket.direction": "out" });
+			u.add(1, t), n.add(ii(e), t);
 		}
-		return y(e);
+		return b(e);
 	};
 }, si = () => {
 	let e, t, n = !1;