kavoru 0.6.0 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kavoru",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Scaffold a new Kavoru (Elysia + Bun) backend from the official template",
   "type": "module",
   "bin": {

package/src/features.ts

@@ -108,7 +108,7 @@ const FEATURE_PATHS: Record<FeatureId, string[]> = {
   ],
   resend: ["src/infra/resend"],
   cron: ["src/schedules"],
-  docker: ["Dockerfile", "docker-compose.yaml"],
+  docker: ["Dockerfile", "docker-compose.yaml", "docker/otel.Dockerfile"],
 };
 
 const FEATURE_DEPENDENCIES: Partial<
@@ -276,11 +276,14 @@ async function patchModulesIndex(
   await writeText(projectDir, relativePath, content);
 }
 
-async function patchEntryIndex(projectDir: string, selection: FeatureSelection) {
+export function buildEntryIndex(selection: FeatureSelection): string {
   const imports = [
     selection.sentry
       ? 'import { initSentry, flushSentry } from "./infra/sentry";'
       : null,
+    selection.otel
+      ? 'import {\n  bootstrapOpenTelemetry,\n  shutdownOpenTelemetry,\n} from "./infra/telemetry";'
+      : null,
     selection.kafka
       ? 'import { startKafka, stopKafka } from "./infra/kafka";'
       : null,
@@ -291,8 +294,11 @@ async function patchEntryIndex(projectDir: string, selection: FeatureSelection)
 
   const body: string[] = [];
 
+  if (selection.otel) {
+    body.push("", "bootstrapOpenTelemetry();");
+  }
   if (selection.sentry) {
-    body.push("", "initSentry();");
+    body.push("initSentry();");
   }
 
   body.push("", "const server = new HttpServer();", "");
@@ -326,6 +332,9 @@ async function patchEntryIndex(projectDir: string, selection: FeatureSelection)
   if (selection.sentry) {
     body.push("    await flushSentry();");
   }
+  if (selection.otel) {
+    body.push("    await shutdownOpenTelemetry();");
+  }
 
   body.push(
     "    process.exit(0);",
@@ -337,7 +346,11 @@ async function patchEntryIndex(projectDir: string, selection: FeatureSelection)
     "",
   );
 
-  await writeText(projectDir, "src/index.ts", [...imports, ...body].join("\n"));
+  return [...imports, ...body].join("\n");
+}
+
+async function patchEntryIndex(projectDir: string, selection: FeatureSelection) {
+  await writeText(projectDir, "src/index.ts", buildEntryIndex(selection));
 }
 
 async function patchServerIndex(projectDir: string, selection: FeatureSelection) {
@@ -523,7 +536,7 @@ function buildAppEnvironment(selection: FeatureSelection): string {
     lines.push("      KAFKA_BROKERS: kafka:9092");
   }
   if (selection.otel) {
-    lines.push("      OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318/v1/traces");
+    lines.push("      OTEL_EXPORTER_OTLP_ENDPOINT: http://otel:4318/v1/traces");
     lines.push("      OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME:-kavoru}");
   }
   if (selection.sentry) {
@@ -568,15 +581,14 @@ function generateDockerCompose(selection: FeatureSelection): string {
 `
     : "";
 
-  const jaegerService = selection.otel
+  const otelService = selection.otel
     ? `
-  jaeger:
-    image: jaegertracing/all-in-one:1.62.0
+  otel:
+    build:
+      context: .
+      dockerfile: docker/otel.Dockerfile
     ports:
-      - "16686:16686"
       - "4318:4318"
-    environment:
-      COLLECTOR_OTLP_ENABLED: "true"
     networks:
       - app_network
     restart: unless-stopped
@@ -622,7 +634,7 @@ ${appDependsOn}${appEnvironment}    healthcheck:
       timeout: 300s
       retries: 1
       start_period: 40s
-${kafkaService}${jaegerService}${spotlightService}
+${kafkaService}${otelService}${spotlightService}
 networks:
   app_network:
     driver: bridge