test(dev): cover spanCount noise-filtering; clarify hex-id helper name

Follow-ups from #2043 review (Gitika, Harrison):
- Add a TraceStore.list spanCount test with transport-noise spans
  (1 agent + 4 http-send -> "1"), guarding the post-filter count.
- Rename hexFromB64OrString -> hexFromBase64OrHex; both reviewers misread B64.

Author: tejaskash

src/core/dev/otel/store.test.ts

@@ -70,6 +70,16 @@ describe("TraceStore", () => {
     expect(traces[0]!.spanCount).toBe("2");
   });
 
+  test("spanCount reflects the rendered waterfall, not filtered transport noise", async () => {
+    const trace = payload(TRACE_A);
+    const spans = trace.resourceSpans![0]!.scopeSpans![0]!.spans!;
+    // 1 meaningful agent span + 4 "http send" spans the inspector filters out.
+    for (let i = 0; i < 4; i++) spans.push({ ...spans[0]!, name: "GET / http send" });
+    await store.append(trace);
+
+    expect((await store.list())[0]!.spanCount).toBe("1");
+  });
+
   test("payloads without a trace id are dropped", async () => {
     await store.append({ resourceSpans: [] });
     expect(await store.list()).toEqual([]);

src/core/dev/otel/transforms.test.ts

@@ -4,7 +4,7 @@ import {
   extractAnyValue,
   extractTraceMeta,
   flattenAttributes,
-  hexFromB64OrString,
+  hexFromBase64OrHex,
   nanoToMs,
   partitionByTraceId,
 } from "./transforms";
@@ -199,10 +199,10 @@ describe("helpers", () => {
     expect(nanoToMs(undefined)).toBe(0);
   });
 
-  test("hexFromB64OrString accepts hex, base64, and empty", () => {
-    expect(hexFromB64OrString(TRACE_ID_HEX.toUpperCase())).toBe(TRACE_ID_HEX);
-    expect(hexFromB64OrString(TRACE_ID_B64)).toBe(TRACE_ID_HEX);
-    expect(hexFromB64OrString(undefined)).toBe("");
+  test("hexFromBase64OrHex accepts hex, base64, and empty", () => {
+    expect(hexFromBase64OrHex(TRACE_ID_HEX.toUpperCase())).toBe(TRACE_ID_HEX);
+    expect(hexFromBase64OrHex(TRACE_ID_B64)).toBe(TRACE_ID_HEX);
+    expect(hexFromBase64OrHex(undefined)).toBe("");
   });
 
   test("flattenAttributes handles typed values, arrays, and kvlist, empty for none", () => {

src/core/dev/otel/transforms.ts

@@ -28,7 +28,7 @@ export function extractTraceMeta(
     if (service) services.add(service);
     for (const scopeSpan of resourceSpan.scopeSpans ?? []) {
       for (const span of scopeSpan.spans ?? []) {
-        meta.traceId ??= hexFromB64OrString(span.traceId) || undefined;
+        meta.traceId ??= hexFromBase64OrHex(span.traceId) || undefined;
         widenTimeBounds(meta, nanoToMs(span.startTimeUnixNano));
         widenTimeBounds(meta, nanoToMs(span.endTimeUnixNano));
         meta.sessionId ??=
@@ -43,7 +43,7 @@ export function extractTraceMeta(
     if (service) services.add(service);
     for (const scopeLog of resourceLog.scopeLogs ?? []) {
       for (const record of scopeLog.logRecords ?? []) {
-        meta.traceId ??= hexFromB64OrString(record.traceId) || undefined;
+        meta.traceId ??= hexFromBase64OrHex(record.traceId) || undefined;
         widenTimeBounds(
           meta,
           nanoToMs(record.timeUnixNano) || nanoToMs(record.observedTimeUnixNano),
@@ -79,7 +79,7 @@ export function partitionByTraceId(payload: OtlpPayload): Map<string, OtlpPayloa
 
   for (const resourceSpan of payload.resourceSpans ?? []) {
     for (const scopeSpan of resourceSpan.scopeSpans ?? []) {
-      const byTrace = groupBy(scopeSpan.spans ?? [], (span) => hexFromB64OrString(span.traceId));
+      const byTrace = groupBy(scopeSpan.spans ?? [], (span) => hexFromBase64OrHex(span.traceId));
       for (const [traceId, spans] of byTrace) {
         (partition(traceId).resourceSpans ??= []).push({
           resource: resourceSpan.resource,
@@ -92,7 +92,7 @@ export function partitionByTraceId(payload: OtlpPayload): Map<string, OtlpPayloa
   for (const resourceLog of payload.resourceLogs ?? []) {
     for (const scopeLog of resourceLog.scopeLogs ?? []) {
       const byTrace = groupBy(scopeLog.logRecords ?? [], (record) =>
-        hexFromB64OrString(record.traceId),
+        hexFromBase64OrHex(record.traceId),
       );
       for (const [traceId, logRecords] of byTrace) {
         (partition(traceId).resourceLogs ??= []).push({
@@ -137,9 +137,9 @@ export function buildTraceDetail(
           spans: scopeSpan.spans
             ?.map((span) => ({
               ...span,
-              traceId: hexFromB64OrString(span.traceId),
-              spanId: hexFromB64OrString(span.spanId),
-              parentSpanId: hexFromB64OrString(span.parentSpanId),
+              traceId: hexFromBase64OrHex(span.traceId),
+              spanId: hexFromBase64OrHex(span.spanId),
+              parentSpanId: hexFromBase64OrHex(span.parentSpanId),
               attributes: flattenAttributes(span.attributes),
             }))
             .filter((span) => isMeaningfulSpan(span)),
@@ -157,8 +157,8 @@ export function buildTraceDetail(
         scope: scopeLog.scope,
         logRecords: scopeLog.logRecords?.map((record) => ({
           ...record,
-          traceId: hexFromB64OrString(record.traceId),
-          spanId: hexFromB64OrString(record.spanId),
+          traceId: hexFromBase64OrHex(record.traceId),
+          spanId: hexFromBase64OrHex(record.spanId),
           body: record.body === undefined ? undefined : extractAnyValue(record.body),
           attributes: flattenAttributes(record.attributes),
         })),
@@ -224,7 +224,7 @@ export function nanoToMs(nano: string | undefined): number {
  * Normalize a trace/span id that may be base64 (protobuf JSON conversion) or
  * already hex (JSON ingest) into lowercase hex.
  */
-export function hexFromB64OrString(value: string | undefined): string {
+export function hexFromBase64OrHex(value: string | undefined): string {
   if (!value) return "";
   if (/^[0-9a-f]+$/i.test(value) && (value.length === 32 || value.length === 16))
     return value.toLowerCase();