Replace custom Loki HTTP push with native OpenTelemetry OTLP exporter

app/.vscode/settings.json

@@ -49,6 +49,7 @@
     "Odoo",
     "openai",
     "OPENAI",
+    "otlp",
     "polaris",
     "postgres",
     "postgresql",

app/package.json

@@ -19,9 +19,15 @@
     "@headlessui/react": "2.2.9",
     "@next-auth/prisma-adapter": "1.0.7",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.208.0",
-    "@opentelemetry/instrumentation": "0.208.0",
-    "@opentelemetry/sdk-logs": "0.208.0",
+    "@opentelemetry/api-logs": "0.210.0",
+    "@opentelemetry/auto-instrumentations-node": "0.68.0",
+    "@opentelemetry/exporter-logs-otlp-http": "0.210.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.210.0",
+    "@opentelemetry/instrumentation": "0.210.0",
+    "@opentelemetry/resources": "2.4.0",
+    "@opentelemetry/sdk-logs": "0.210.0",
+    "@opentelemetry/sdk-node": "0.210.0",
+    "@opentelemetry/semantic-conventions": "1.39.0",
     "@paralleldrive/cuid2": "2.3.1",
     "@prisma/client": "6.6.0",
     "@prisma/instrumentation": "6.6.0",
@@ -44,7 +50,6 @@
     "@uidotdev/usehooks": "2.4.1",
     "@unleash/nextjs": "1.6.2",
     "@vercel/analytics": "1.6.1",
-    "@vercel/otel": "1.14.0",
     "@vercel/speed-insights": "1.3.1",
     "@xyflow/react": "12.10.0",
     "algoliasearch": "4.25.3",

app/src/env.ts

@@ -33,9 +33,6 @@ export const env = createEnv({
     R2_BUCKET_NAME: z.string(),
     UNLEASH_SERVER_API_URL: z.url(),
     UNLEASH_SERVER_API_TOKEN: z.string(),
-    LOKI_HOST: z.url().optional(),
-    LOKI_AUTH_USER: z.string().optional(),
-    LOKI_AUTH_PASSWORD: z.string().optional(),
     BASE_URL: z.preprocess(
       // Uses VERCEL_URL if BASE_URL is not set, e.g. on Vercel's preview deployments
       (str) => {
@@ -125,9 +122,6 @@ export const env = createEnv({
     NEXT_PUBLIC_R2_PUBLIC_URL: process.env.NEXT_PUBLIC_R2_PUBLIC_URL,
     UNLEASH_SERVER_API_URL: process.env.UNLEASH_SERVER_API_URL,
     UNLEASH_SERVER_API_TOKEN: process.env.UNLEASH_SERVER_API_TOKEN,
-    LOKI_HOST: process.env.LOKI_HOST,
-    LOKI_AUTH_USER: process.env.LOKI_AUTH_USER,
-    LOKI_AUTH_PASSWORD: process.env.LOKI_AUTH_PASSWORD,
     HOST: process.env.HOST,
     COMMIT_SHA: process.env.COMMIT_SHA,
     NEXT_PUBLIC_CARE_BEAR_SHOOTER_BUILD_URL:

app/src/instrumentation.node.ts

@@ -0,0 +1,45 @@
+import { logs } from "@opentelemetry/api-logs";
+import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+import { resourceFromAttributes } from "@opentelemetry/resources";
+import {
+  BatchLogRecordProcessor,
+  LoggerProvider,
+} from "@opentelemetry/sdk-logs";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
+import { PrismaInstrumentation } from "@prisma/instrumentation";
+import { env } from "./env";
+
+const resource = resourceFromAttributes({
+  [ATTR_SERVICE_NAME]: "sam",
+});
+
+const traceExporter = new OTLPTraceExporter({
+  url: `${env.OTEL_EXPORTER_OTLP_ENDPOINT}/v1/traces`,
+});
+
+const sdk = new NodeSDK({
+  resource,
+  traceExporter,
+  instrumentations: [
+    getNodeAutoInstrumentations(),
+    new PrismaInstrumentation(),
+  ],
+});
+
+sdk.start();
+
+const loggerProvider = new LoggerProvider({
+  resource,
+  processors: [
+    new BatchLogRecordProcessor(
+      new OTLPLogExporter({
+        url: `${env.OTEL_EXPORTER_OTLP_ENDPOINT}/v1/logs`,
+      }),
+    ),
+  ],
+});
+
+logs.setGlobalLoggerProvider(loggerProvider);

app/src/instrumentation.ts

@@ -1,13 +1,14 @@
-import { PrismaInstrumentation } from "@prisma/instrumentation";
-import { registerOTel } from "@vercel/otel";
 import { env } from "./env";
 
-export const register = () => {
-  if (env.ENABLE_INSTRUMENTATION !== "true") return;
-  if (!env.OTEL_EXPORTER_OTLP_PROTOCOL || !env.OTEL_EXPORTER_OTLP_ENDPOINT)
+export const register = async () => {
+  if (
+    env.ENABLE_INSTRUMENTATION !== "true" ||
+    !env.OTEL_EXPORTER_OTLP_PROTOCOL ||
+    !env.OTEL_EXPORTER_OTLP_ENDPOINT
+  )
     return;
-  registerOTel({
-    serviceName: "sam",
-    instrumentations: [new PrismaInstrumentation()],
-  });
+
+  if (process.env.NEXT_RUNTIME === "nodejs") {
+    await import("./instrumentation.node");
+  }
 };

app/src/modules/logging/index.ts

@@ -1,9 +1,9 @@
 import { env } from "@/env";
 import { logToConsole } from "./console";
-import { logToLoki } from "./loki";
+import { logToOTel } from "./otel";
 import { type LogEntry } from "./types";
 
-const info = async (message: string, args: Record<string, unknown> = {}) => {
+const info = (message: string, args: Record<string, unknown> = {}) => {
   const logEntry: LogEntry = {
     ...args,
     timestamp: new Date().toISOString(),
@@ -14,10 +14,11 @@ const info = async (message: string, args: Record<string, unknown> = {}) => {
     ...(env.COMMIT_SHA && { commitSha: env.COMMIT_SHA }),
   };
 
-  await Promise.all([logToConsole(logEntry), logToLoki(logEntry)]);
+  void logToConsole(logEntry);
+  void logToOTel(logEntry);
 };
 
-const warn = async (message: string, args: Record<string, unknown> = {}) => {
+const warn = (message: string, args: Record<string, unknown> = {}) => {
   const logEntry: LogEntry = {
     ...args,
     timestamp: new Date().toISOString(),
@@ -28,10 +29,11 @@ const warn = async (message: string, args: Record<string, unknown> = {}) => {
     ...(env.COMMIT_SHA && { commitSha: env.COMMIT_SHA }),
   };
 
-  await Promise.all([logToConsole(logEntry), logToLoki(logEntry)]);
+  void logToConsole(logEntry);
+  void logToOTel(logEntry);
 };
 
-const error = async (message: string, args: Record<string, unknown> = {}) => {
+const error = (message: string, args: Record<string, unknown> = {}) => {
   const logEntry: LogEntry = {
     ...args,
     timestamp: new Date().toISOString(),
@@ -42,7 +44,8 @@ const error = async (message: string, args: Record<string, unknown> = {}) => {
     ...(env.COMMIT_SHA && { commitSha: env.COMMIT_SHA }),
   };
 
-  await Promise.all([logToConsole(logEntry), logToLoki(logEntry)]);
+  void logToConsole(logEntry);
+  void logToOTel(logEntry);
 };
 
 export const log = {

app/src/modules/logging/otel.ts

@@ -0,0 +1,46 @@
+import { env } from "@/env";
+import { logs, SeverityNumber } from "@opentelemetry/api-logs";
+import { type LogEntry, type LogOutput } from "./types";
+
+const getSeverityNumber = (level: LogEntry["level"]): SeverityNumber => {
+  switch (level) {
+    case "info":
+      return SeverityNumber.INFO;
+    case "warn":
+      return SeverityNumber.WARN;
+    case "error":
+      return SeverityNumber.ERROR;
+  }
+};
+
+export const logToOTel: LogOutput = (logEntry) => {
+  if (
+    env.ENABLE_INSTRUMENTATION !== "true" ||
+    !env.OTEL_EXPORTER_OTLP_PROTOCOL ||
+    !env.OTEL_EXPORTER_OTLP_ENDPOINT
+  )
+    return;
+
+  try {
+    const loggerProvider = logs.getLoggerProvider();
+    const logger = loggerProvider.getLogger("sam");
+
+    const { timestamp, level, message, host, commitSha, stack, ...attributes } =
+      logEntry;
+
+    logger.emit({
+      severityNumber: getSeverityNumber(level),
+      severityText: level,
+      body: message,
+      timestamp: new Date(timestamp).getTime(),
+      attributes: {
+        host,
+        ...(commitSha && { commitSha }),
+        ...(stack && { stack }),
+        ...attributes,
+      },
+    });
+  } catch (error) {
+    console.error("Failed to emit log to OTel:", error);
+  }
+};