feat(marketing-pages): wire instrumentation — site-settings + pages spans + use-case/controller withSpan

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-07 00:26:45 +02:00
parent 64ffb009e1
commit 404cb07e79
10 changed files with 411 additions and 83 deletions
--- a/packages/marketing-pages/src/di/bind-dev-seed.test.ts
+++ b/packages/marketing-pages/src/di/bind-dev-seed.test.ts
@@ -1,5 +1,6 @@
 import "reflect-metadata";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { NoopTracer, NoopLogger } from "@repo/core-shared/instrumentation";
 import { bindDevSeedMarketingPages } from "@/di/bind-dev-seed";
 import { marketingPagesContainer } from "@/di/container";
 import { MARKETING_PAGES_SYMBOLS } from "@/di/symbols";
@@ -8,6 +9,8 @@ import { MockSiteSettingsRepository } from "@/infrastructure/repositories/site-s
 import type { IPagesRepository } from "@/application/repositories/pages.repository.interface";
 import type { ISiteSettingsRepository } from "@/application/repositories/site-settings.repository.interface";

+const noop = { tracer: new NoopTracer(), logger: new NoopLogger() };
+
 describe("bindDevSeedMarketingPages", () => {
  // Each test starts from default mock bindings and tears down afterwards so
  // the global marketingPagesContainer state stays clean for siblings.
@@ -56,7 +59,7 @@ describe("bindDevSeedMarketingPages", () => {
  });

  it("populates the pages repository with the dev pages", async () => {
-    await bindDevSeedMarketingPages();
+    await bindDevSeedMarketingPages(noop.tracer, noop.logger);

    const repo = marketingPagesContainer.get<IPagesRepository>(
      MARKETING_PAGES_SYMBOLS.IPagesRepository,
@@ -67,7 +70,7 @@ describe("bindDevSeedMarketingPages", () => {
  });

  it("seeds site settings with a non-default site name", async () => {
-    await bindDevSeedMarketingPages();
+    await bindDevSeedMarketingPages(noop.tracer, noop.logger);

    const settingsRepo = marketingPagesContainer.get<ISiteSettingsRepository>(
      MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
@@ -79,13 +82,13 @@ describe("bindDevSeedMarketingPages", () => {
  });

  it("is idempotent — calling twice rebuilds fresh populated repos", async () => {
-    await bindDevSeedMarketingPages();
+    await bindDevSeedMarketingPages(noop.tracer, noop.logger);
    const before = marketingPagesContainer.get<IPagesRepository>(
      MARKETING_PAGES_SYMBOLS.IPagesRepository,
    );
    const beforeCount = (await before.getPages()).length;

-    await bindDevSeedMarketingPages();
+    await bindDevSeedMarketingPages(noop.tracer, noop.logger);
    const after = marketingPagesContainer.get<IPagesRepository>(
      MARKETING_PAGES_SYMBOLS.IPagesRepository,
    );
--- a/packages/marketing-pages/src/di/bind-dev-seed.ts
+++ b/packages/marketing-pages/src/di/bind-dev-seed.ts
@@ -1,7 +1,18 @@
+import {
+  withSpan,
+  INSTRUMENTATION_SYMBOLS,
+  type ITracer,
+  type ILogger,
+} from "@repo/core-shared/instrumentation";
 import { marketingPagesContainer } from "./container.js";
 import { MARKETING_PAGES_SYMBOLS } from "./symbols.js";
 import { MockPagesRepository } from "../infrastructure/repositories/pages.repository.mock.js";
+import { MockSiteSettingsRepository } from "../infrastructure/repositories/site-settings.repository.mock.js";
 import { buildDevPages, buildDevSiteSettings } from "../__seeds__/dev.js";
+import { getSiteSettingsUseCase } from "../application/use-cases/get-site-settings.use-case.js";
+import { getPageBySlugUseCase } from "../application/use-cases/get-page-by-slug.use-case.js";
+import { getSiteSettingsController } from "../interface-adapters/controllers/get-site-settings.controller.js";
+import { getPageBySlugController } from "../interface-adapters/controllers/get-page-by-slug.controller.js";
 import type { IPagesRepository } from "../application/repositories/pages.repository.interface.js";
 import type { ISiteSettingsRepository } from "../application/repositories/site-settings.repository.interface.js";

@@ -15,32 +26,82 @@ import type { ISiteSettingsRepository } from "../application/repositories/site-s
 * Idempotent: safe to call multiple times; each call rebuilds fresh populated
 * repos and rebinds both symbols.
 */
-export async function bindDevSeedMarketingPages(): Promise<void> {
+export async function bindDevSeedMarketingPages(tracer: ITracer, logger: ILogger): Promise<void> {
+  // Bind shared instrumentation into feature container
+  if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) {
+    marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER);
+  }
+  if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.LOGGER)) {
+    marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.LOGGER);
+  }
+  marketingPagesContainer.bind<ITracer>(INSTRUMENTATION_SYMBOLS.TRACER).toConstantValue(tracer);
+  marketingPagesContainer.bind<ILogger>(INSTRUMENTATION_SYMBOLS.LOGGER).toConstantValue(logger);
+
  // Pages repository — MockPagesRepository accepts an initial array.
  if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IPagesRepository)) {
    marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IPagesRepository);
  }
-
+  const pagesRepo = new MockPagesRepository(buildDevPages(), tracer, logger);
  marketingPagesContainer
    .bind<IPagesRepository>(MARKETING_PAGES_SYMBOLS.IPagesRepository)
-    .toConstantValue(new MockPagesRepository(buildDevPages()));
+    .toConstantValue(pagesRepo);

-  // Site settings repository — MockSiteSettingsRepository has no mutable
-  // storage so we bind a constant-value implementation directly.
-  if (
-    marketingPagesContainer.isBound(
-      MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
-    )
-  ) {
-    marketingPagesContainer.unbind(
-      MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
-    );
+  // Site settings repository
+  if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository)) {
+    marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository);
  }
-
  const settings = buildDevSiteSettings();
+  // Inline constant so dev seed returns exactly the seeded value (not the mock's default)
+  const siteSettingsRepo: ISiteSettingsRepository = {
+    getSiteSettings: async () => settings,
+  };
  marketingPagesContainer
    .bind<ISiteSettingsRepository>(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository)
-    .toConstantValue({
-      getSiteSettings: async () => settings,
-    });
+    .toConstantValue(siteSettingsRepo);
+
+  // Wrap use cases + controllers identically to bind-production
+  const wrappedGetSiteSettings = withSpan(
+    tracer,
+    { name: "marketing-pages.getSiteSettings", op: "use-case" },
+    getSiteSettingsUseCase(siteSettingsRepo),
+  );
+  const wrappedGetPageBySlug = withSpan(
+    tracer,
+    { name: "marketing-pages.getPageBySlug", op: "use-case" },
+    getPageBySlugUseCase(pagesRepo),
+  );
+
+  for (const sym of [
+    MARKETING_PAGES_SYMBOLS.IGetSiteSettingsUseCase,
+    MARKETING_PAGES_SYMBOLS.IGetPageBySlugUseCase,
+    MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController,
+    MARKETING_PAGES_SYMBOLS.IGetPageBySlugController,
+  ]) {
+    if (marketingPagesContainer.isBound(sym)) marketingPagesContainer.unbind(sym);
+  }
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetSiteSettingsUseCase)
+    .toConstantValue(wrappedGetSiteSettings);
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetPageBySlugUseCase)
+    .toConstantValue(wrappedGetPageBySlug);
+
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController)
+    .toConstantValue(
+      withSpan(
+        tracer,
+        { name: "marketing-pages.getSiteSettings", op: "controller" },
+        getSiteSettingsController(wrappedGetSiteSettings),
+      ),
+    );
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetPageBySlugController)
+    .toConstantValue(
+      withSpan(
+        tracer,
+        { name: "marketing-pages.getPageBySlug", op: "controller" },
+        getPageBySlugController(wrappedGetPageBySlug),
+      ),
+    );
 }
--- a/packages/marketing-pages/src/di/bind-production.ts
+++ b/packages/marketing-pages/src/di/bind-production.ts
@@ -1,29 +1,99 @@
 import type { SanitizedConfig } from "payload";
+import {
+  withSpan,
+  INSTRUMENTATION_SYMBOLS,
+  type ITracer,
+  type ILogger,
+} from "@repo/core-shared/instrumentation";
 import { marketingPagesContainer } from "./container";
 import { MARKETING_PAGES_SYMBOLS } from "./symbols";
 import { PagesRepository } from "../infrastructure/repositories/pages.repository";
 import { SiteSettingsRepository } from "../infrastructure/repositories/site-settings.repository";
+import { getSiteSettingsUseCase } from "../application/use-cases/get-site-settings.use-case";
+import { getPageBySlugUseCase } from "../application/use-cases/get-page-by-slug.use-case";
+import { getSiteSettingsController } from "../interface-adapters/controllers/get-site-settings.controller";
+import { getPageBySlugController } from "../interface-adapters/controllers/get-page-by-slug.controller";

-export function bindProductionMarketingPages(config: SanitizedConfig): void {
-  if (
-    marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IPagesRepository)
-  ) {
+export function bindProductionMarketingPages(
+  config: SanitizedConfig,
+  tracer: ITracer,
+  logger: ILogger,
+): void {
+  // Bind shared instrumentation into feature container
+  if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.TRACER)) {
+    marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.TRACER);
+  }
+  if (marketingPagesContainer.isBound(INSTRUMENTATION_SYMBOLS.LOGGER)) {
+    marketingPagesContainer.unbind(INSTRUMENTATION_SYMBOLS.LOGGER);
+  }
+  marketingPagesContainer.bind<ITracer>(INSTRUMENTATION_SYMBOLS.TRACER).toConstantValue(tracer);
+  marketingPagesContainer.bind<ILogger>(INSTRUMENTATION_SYMBOLS.LOGGER).toConstantValue(logger);
+
+  // Real repositories
+  if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.IPagesRepository)) {
    marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.IPagesRepository);
  }
+  const pagesRepo = new PagesRepository(config, tracer, logger);
  marketingPagesContainer
    .bind(MARKETING_PAGES_SYMBOLS.IPagesRepository)
-    .toConstantValue(new PagesRepository(config));
+    .toConstantValue(pagesRepo);

-  if (
-    marketingPagesContainer.isBound(
-      MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
-    )
-  ) {
-    marketingPagesContainer.unbind(
-      MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository,
-    );
+  if (marketingPagesContainer.isBound(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository)) {
+    marketingPagesContainer.unbind(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository);
  }
+  const siteSettingsRepo = new SiteSettingsRepository(config, tracer, logger);
  marketingPagesContainer
    .bind(MARKETING_PAGES_SYMBOLS.ISiteSettingsRepository)
-    .toConstantValue(new SiteSettingsRepository(config));
+    .toConstantValue(siteSettingsRepo);
+
+  // Use cases — wrapped with span at bind time
+  const wrappedGetSiteSettings = withSpan(
+    tracer,
+    { name: "marketing-pages.getSiteSettings", op: "use-case" },
+    getSiteSettingsUseCase(siteSettingsRepo),
+  );
+  const wrappedGetPageBySlug = withSpan(
+    tracer,
+    { name: "marketing-pages.getPageBySlug", op: "use-case" },
+    getPageBySlugUseCase(pagesRepo),
+  );
+
+  for (const sym of [
+    MARKETING_PAGES_SYMBOLS.IGetSiteSettingsUseCase,
+    MARKETING_PAGES_SYMBOLS.IGetPageBySlugUseCase,
+  ]) {
+    if (marketingPagesContainer.isBound(sym)) marketingPagesContainer.unbind(sym);
+  }
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetSiteSettingsUseCase)
+    .toConstantValue(wrappedGetSiteSettings);
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetPageBySlugUseCase)
+    .toConstantValue(wrappedGetPageBySlug);
+
+  // Controllers — wrapped with span at bind time
+  for (const sym of [
+    MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController,
+    MARKETING_PAGES_SYMBOLS.IGetPageBySlugController,
+  ]) {
+    if (marketingPagesContainer.isBound(sym)) marketingPagesContainer.unbind(sym);
+  }
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController)
+    .toConstantValue(
+      withSpan(
+        tracer,
+        { name: "marketing-pages.getSiteSettings", op: "controller" },
+        getSiteSettingsController(wrappedGetSiteSettings),
+      ),
+    );
+  marketingPagesContainer
+    .bind(MARKETING_PAGES_SYMBOLS.IGetPageBySlugController)
+    .toConstantValue(
+      withSpan(
+        tracer,
+        { name: "marketing-pages.getPageBySlug", op: "controller" },
+        getPageBySlugController(wrappedGetPageBySlug),
+      ),
+    );
 }