@neat.is/core 0.4.3 → 0.4.4

package/dist/index.cjs

@@ -437,6 +437,64 @@ async function buildOtelReceiver(opts) {
     for (const s of spans) queue.push(s);
     drainPromise = drainPromise.then(() => drain());
   };
+  const projectQueue = [];
+  let projectDraining = false;
+  let projectDrainPromise = Promise.resolve();
+  const drainProject = async () => {
+    if (projectDraining) return;
+    projectDraining = true;
+    try {
+      while (projectQueue.length > 0) {
+        const { project, span } = projectQueue.shift();
+        try {
+          if (opts.onProjectSpan) {
+            await opts.onProjectSpan(project, span);
+          } else {
+            await opts.onSpan(span);
+          }
+        } catch (err) {
+          console.warn(`[neat] otel handler error: ${err.message}`);
+        }
+      }
+    } finally {
+      projectDraining = false;
+    }
+  };
+  const enqueueProject = (project, spans) => {
+    if (spans.length === 0) return;
+    for (const s of spans) projectQueue.push({ project, span: s });
+    projectDrainPromise = projectDrainPromise.then(() => drainProject());
+  };
+  const legacyEndpointWarned = /* @__PURE__ */ new Set();
+  function warnLegacyEndpoint(serviceName) {
+    if (legacyEndpointWarned.has(serviceName)) return;
+    legacyEndpointWarned.add(serviceName);
+    console.warn(
+      `[neatd] received span on the global endpoint; migrate OTEL_EXPORTER_OTLP_TRACES_ENDPOINT to /projects/<name>/v1/traces (service.name="${serviceName}").`
+    );
+  }
+  async function readOtlpBody(req) {
+    const ct = (req.headers["content-type"] ?? "").toString().split(";")[0].trim().toLowerCase();
+    if (ct === "application/x-protobuf") {
+      try {
+        const body = await decodeProtobufBody(req.body);
+        return { ok: true, body, flavor: "protobuf" };
+      } catch (err) {
+        return { ok: false, code: 400, error: `protobuf decode failed: ${err.message}` };
+      }
+    }
+    if (!ct || ct === "application/json") {
+      return { ok: true, body: req.body ?? {}, flavor: "json" };
+    }
+    return { ok: false, code: 415, error: `unsupported content-type: ${ct}` };
+  }
+  function sendOtlpSuccess(reply, flavor) {
+    if (flavor === "protobuf") {
+      const buf = encodeProtobufResponseBody();
+      return reply.code(200).header("content-type", "application/x-protobuf").send(buf);
+    }
+    return reply.code(200).header("content-type", "application/json").send({ partialSuccess: {} });
+  }
   app.addContentTypeParser(
     "application/x-protobuf",
     { parseAs: "buffer", bodyLimit: opts.bodyLimit ?? 16 * 1024 * 1024 },
@@ -446,26 +504,44 @@ async function buildOtelReceiver(opts) {
   );
   app.get("/health", async () => ({ ok: true }));
   app.post("/v1/traces", async (req, reply) => {
-    const ct = (req.headers["content-type"] ?? "").toString().split(";")[0].trim().toLowerCase();
-    let body;
-    let responseFlavor;
-    if (ct === "application/x-protobuf") {
-      responseFlavor = "protobuf";
+    const result = await readOtlpBody(req);
+    if (!result.ok) {
+      return reply.code(result.code).send({ error: result.error });
+    }
+    const spans = parseOtlpRequest(result.body);
+    for (const s of spans) warnLegacyEndpoint(s.service);
+    if (opts.onErrorSpanSync) {
       try {
-        body = await decodeProtobufBody(req.body);
+        for (const span of spans) {
+          if (span.statusCode === 2) await opts.onErrorSpanSync(span);
+        }
       } catch (err) {
-        return reply.code(400).send({
-          error: `protobuf decode failed: ${err.message}`
+        return reply.code(500).send({
+          error: `error-event write failed: ${err.message}`
         });
       }
-    } else if (!ct || ct === "application/json") {
-      responseFlavor = "json";
-      body = req.body ?? {};
-    } else {
-      return reply.code(415).send({ error: `unsupported content-type: ${ct}` });
     }
-    const spans = parseOtlpRequest(body);
-    if (opts.onErrorSpanSync) {
+    enqueue(spans);
+    return sendOtlpSuccess(reply, result.flavor);
+  });
+  app.post("/projects/:project/v1/traces", async (req, reply) => {
+    const project = req.params.project;
+    const result = await readOtlpBody(req);
+    if (!result.ok) {
+      return reply.code(result.code).send({ error: result.error });
+    }
+    const spans = parseOtlpRequest(result.body);
+    if (opts.onProjectErrorSpanSync) {
+      try {
+        for (const span of spans) {
+          if (span.statusCode === 2) await opts.onProjectErrorSpanSync(project, span);
+        }
+      } catch (err) {
+        return reply.code(500).send({
+          error: `error-event write failed: ${err.message}`
+        });
+      }
+    } else if (opts.onErrorSpanSync) {
       try {
         for (const span of spans) {
           if (span.statusCode === 2) await opts.onErrorSpanSync(span);
@@ -476,17 +552,13 @@ async function buildOtelReceiver(opts) {
         });
       }
     }
-    enqueue(spans);
-    if (responseFlavor === "protobuf") {
-      const buf = encodeProtobufResponseBody();
-      return reply.code(200).header("content-type", "application/x-protobuf").send(buf);
-    }
-    return reply.code(200).header("content-type", "application/json").send({ partialSuccess: {} });
+    enqueueProject(project, spans);
+    return sendOtlpSuccess(reply, result.flavor);
   });
   const decorated = app;
   decorated.flushPending = async () => {
-    while (queue.length > 0 || draining) {
-      await drainPromise;
+    while (queue.length > 0 || draining || projectQueue.length > 0 || projectDraining) {
+      await Promise.all([drainPromise, projectDrainPromise]);
     }
   };
   return decorated;
@@ -5884,6 +5956,25 @@ async function startDaemon(opts = {}) {
       }
       return slot.status === "active" ? slot : null;
     }
+    async function resolveSlotByName(project, serviceName, traceId) {
+      const liveEntries = await listProjects().catch(() => []);
+      let slot = slots.get(project);
+      if (!slot) {
+        await recordUnroutedSpan(serviceName, traceId);
+        return null;
+      }
+      if (slot.status === "broken") {
+        const entry = liveEntries.find((e) => e.name === slot.entry.name);
+        if (entry) {
+          slot = await tryRecoverSlot(entry);
+        }
+        if (slot.status !== "active") {
+          warnDroppedSpan(slot.entry.name, slot.errorReason ?? "unknown");
+          return null;
+        }
+      }
+      return slot.status === "active" ? slot : null;
+    }
     try {
       otlpApp = await buildOtelReceiver({
         authToken: auth.otelToken,
@@ -5906,6 +5997,28 @@ async function startDaemon(opts = {}) {
           const slot = await resolveTargetSlot(span.service, span.traceId);
           if (!slot) return;
           await makeErrorSpanWriter(slot.paths.errorsPath)(span);
+        },
+        // Project-scoped route (issue #367) — the URL already named the
+        // project. Resolution is a direct slot lookup; service.name resolves
+        // the ServiceNode inside the slot's graph instead of which project
+        // owns the span.
+        onProjectSpan: async (project, span) => {
+          const slot = await resolveSlotByName(project, span.service, span.traceId);
+          if (!slot) return;
+          await handleSpan(
+            {
+              graph: slot.graph,
+              errorsPath: slot.paths.errorsPath,
+              project: slot.entry.name,
+              writeErrorEventInline: false
+            },
+            span
+          );
+        },
+        onProjectErrorSpanSync: async (project, span) => {
+          const slot = await resolveSlotByName(project, span.service, span.traceId);
+          if (!slot) return;
+          await makeErrorSpanWriter(slot.paths.errorsPath)(span);
         }
       });
       otlpAddress = await otlpApp.listen({ port: otlpPort, host });