@intentius/chant-lexicon-docker 0.99.0 → 0.101.0

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "dfa5e41a1e31a64ea60eeabfe6444b2ba58a81bf0ea14a37a3e092301ddee648",
+    "manifest.json": "d1dd1b11e3d31c5da985b63fc04b567c81c063af6ac1d4da3d7766c88b740788",
     "meta.json": "2996be8fdb14f3f935e1e1441fed8f69af7b6aeeefb14dac96301cc41eba8046",
     "types/index.d.ts": "7b2e6f784b7dbecbbe7924fa1aec7e2520ac0547069311253a006bc2267a5646",
     "rules/no-latest-tag.ts": "efd060453d8ca3d5b85c3972906c6650b6f63eb5f67cb6cdb0f16a41cad91228",
@@ -15,5 +15,5 @@
     "skills/chant-docker.md": "3ff0708e3c76e245f202948949c768464563af2b60cc9aa2ca52f494ef8357f1",
     "skills/chant-docker-patterns.md": "ad1b0196d8150b2df579a699ff107f604340c799c04f3460ebf65003e287b12a"
   },
-  "composite": "962c32558dea3b244bd1c873b0c309fcb79198625cb691c44dc531b6e6aceeef"
+  "composite": "e4c7105a3d96f148222aa308477aea6191dbb466263f0abd60b750263ded3b3d"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "docker",
-  "version": "0.99.0",
+  "version": "0.101.0",
   "chantVersion": ">=0.1.0",
   "namespace": "Docker",
   "intrinsics": [

package/dist/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,6BAA6B,CAAC;AAqPhF,eAAO,MAAM,gBAAgB,EAAE,UAoE9B,CAAC"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAoB,UAAU,EAAoB,MAAM,6BAA6B,CAAC;AA+RlG,eAAO,MAAM,gBAAgB,EAAE,UAqE9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-docker",
-  "version": "0.99.0",
+  "version": "0.101.0",
   "description": "Docker lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -70,7 +70,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.99.0",
+    "@intentius/chant": "^0.101.0",
     "typescript": "^5.9.3"
   }
 }

package/src/serializer.test.ts

@@ -317,3 +317,52 @@ describe("dockerSerializer.serialize — name gen", () => {
     expect(output).toContain("myWebServer:");
   });
 });
+
+// ── Telemetry attribution (#2558, D22) ─────────────────────────────
+
+describe("telemetry attribution", () => {
+  const run = (props: Record<string, unknown>, telemetry?: { workspace?: string; member?: string; environment?: string }) => {
+    const result = dockerSerializer.serialize(new Map([["api", new MockService(props)]]), [], telemetry ? { telemetry } : undefined);
+    return typeof result === "string" ? result : result.primary;
+  };
+  const attrs = { workspace: "acme", member: "delivery", environment: "prod" };
+
+  test("a build with no telemetry context is the same bytes as one that passes an empty context", () => {
+    const props = { image: "nginx:1" };
+    expect(run(props)).toBe(dockerSerializer.serialize(new Map([["api", new MockService(props)]]), [], {}) as string);
+    expect(run(props)).not.toContain("OTEL_");
+  });
+
+  test("stamps the service name and the resource attributes into the environment", () => {
+    const out = run({ image: "nginx:1" }, attrs);
+    expect(out).toContain("OTEL_SERVICE_NAME: api");
+    expect(out).toContain("OTEL_RESOURCE_ATTRIBUTES: chant.workspace=acme,chant.member=delivery,chant.decl=api,deployment.environment.name=prod");
+  });
+
+  test("leaves out an attribute the build does not know", () => {
+    const out = run({ image: "nginx:1" }, { workspace: "acme" });
+    expect(out).toContain("OTEL_RESOURCE_ATTRIBUTES: chant.workspace=acme,chant.decl=api");
+    expect(out).not.toContain("chant.member");
+    expect(out).not.toContain("deployment.environment.name");
+  });
+
+  test("stamps service.version when the image is pinned by digest", () => {
+    const out = run({ image: "ghcr.io/acme/api@sha256:abc123" }, attrs);
+    expect(out).toContain("service.version=sha256%3Aabc123");
+  });
+
+  test("keeps the keys a map environment already sets and appends the missing attributes", () => {
+    const out = run({ image: "x", environment: { OTEL_SERVICE_NAME: "checkout", OTEL_RESOURCE_ATTRIBUTES: "chant.member=mine,team=pay", PORT: "80" } }, attrs);
+    expect(out).toContain("OTEL_SERVICE_NAME: checkout");
+    expect(out).toContain("OTEL_RESOURCE_ATTRIBUTES: chant.member=mine,team=pay,chant.workspace=acme,chant.decl=api,deployment.environment.name=prod");
+    expect(out).toContain("PORT:");
+  });
+
+  test("adds the variables to a list environment, keeping an entry already there", () => {
+    const out = run({ image: "x", environment: ["PORT=80", "OTEL_SERVICE_NAME=checkout"] }, attrs);
+    expect(out).toContain("- PORT=80");
+    expect(out).toContain("- OTEL_SERVICE_NAME=checkout");
+    expect(out).not.toContain("OTEL_SERVICE_NAME=api");
+    expect(out).toContain("- OTEL_RESOURCE_ATTRIBUTES=chant.workspace=acme,chant.member=delivery");
+  });
+});

package/src/serializer.ts

@@ -11,7 +11,8 @@
 
 import type { Declarable } from "@intentius/chant/declarable";
 import { isPropertyDeclarable, isResourceDeclarable } from "@intentius/chant/declarable";
-import type { Serializer, SerializerResult } from "@intentius/chant/serializer";
+import type { SerializeContext, Serializer, SerializerResult } from "@intentius/chant/serializer";
+import { mergeResourceAttributes, telemetryEnvironment, type TelemetryAttribution } from "@intentius/chant/telemetry-attribution";
 import type { LexiconOutput } from "@intentius/chant/lexicon-output";
 import { walkValue, type SerializerVisitor } from "@intentius/chant/serializer-walker";
 import { INTRINSIC_MARKER } from "@intentius/chant/intrinsic";
@@ -97,6 +98,45 @@ function toYAMLValue(value: unknown, entityNames: Map<Declarable, string>): unkn
   return walkValue(preprocessed, entityNames, dockerVisitor(entityNames));
 }
 
+// ── Telemetry attribution (#2558, D22) ────────────────────────────
+
+/** The digest of an image reference pinned with `@sha256:...`, or undefined. */
+function imageDigest(image: unknown): string | undefined {
+  if (typeof image !== "string") return undefined;
+  const at = image.lastIndexOf("@");
+  return at === -1 ? undefined : image.slice(at + 1);
+}
+
+/**
+ * Stamp one service's attributes as `OTEL_SERVICE_NAME` and
+ * `OTEL_RESOURCE_ATTRIBUTES` in its environment. A value the service already
+ * sets is kept: its own `OTEL_SERVICE_NAME` wins, and its own resource
+ * attributes keep their keys while the missing ones are appended.
+ */
+function stampTelemetry(service: Record<string, unknown>, name: string, telemetry: TelemetryAttribution): void {
+  const version = imageDigest(service.image);
+  const vars = telemetryEnvironment(telemetry, { service: name, decl: name, ...(version ? { version } : {}) });
+  const env = service.environment;
+  if (Array.isArray(env)) {
+    const entries = env.map(String);
+    const has = (key: string) => entries.findIndex((e) => e === key || e.startsWith(`${key}=`));
+    if (has("OTEL_SERVICE_NAME") === -1) entries.push(`OTEL_SERVICE_NAME=${vars.OTEL_SERVICE_NAME}`);
+    const at = has("OTEL_RESOURCE_ATTRIBUTES");
+    if (at === -1) entries.push(`OTEL_RESOURCE_ATTRIBUTES=${vars.OTEL_RESOURCE_ATTRIBUTES}`);
+    else if (entries[at]!.includes("=")) {
+      entries[at] = `OTEL_RESOURCE_ATTRIBUTES=${mergeResourceAttributes(entries[at]!.slice(entries[at]!.indexOf("=") + 1), vars.OTEL_RESOURCE_ATTRIBUTES)}`;
+    }
+    service.environment = entries;
+    return;
+  }
+  const map: Record<string, unknown> = env && typeof env === "object" ? { ...(env as Record<string, unknown>) } : {};
+  if (!("OTEL_SERVICE_NAME" in map)) map.OTEL_SERVICE_NAME = vars.OTEL_SERVICE_NAME;
+  const own = map.OTEL_RESOURCE_ATTRIBUTES;
+  if (own === undefined) map.OTEL_RESOURCE_ATTRIBUTES = vars.OTEL_RESOURCE_ATTRIBUTES;
+  else if (typeof own === "string") map.OTEL_RESOURCE_ATTRIBUTES = mergeResourceAttributes(own, vars.OTEL_RESOURCE_ATTRIBUTES);
+  service.environment = map;
+}
+
 // ── Compose serialization ─────────────────────────────────────────
 
 function serializeCompose(
@@ -107,6 +147,7 @@ function serializeCompose(
   secrets: Map<string, Declarable>,
   defaultLabels: Record<string, string>,
   entityNames: Map<Declarable, string>,
+  telemetry?: TelemetryAttribution,
 ): string {
   const doc: Record<string, unknown> = {};
 
@@ -124,6 +165,7 @@ function serializeCompose(
       for (const [k, v] of Object.entries(props)) {
         if (v !== undefined && v !== null) cleaned[k] = v;
       }
+      if (telemetry) stampTelemetry(cleaned, name, telemetry);
       servicesSection[name] = cleaned;
     }
     doc.services = servicesSection;
@@ -263,6 +305,7 @@ export const dockerSerializer: Serializer = {
   serialize(
     entities: Map<string, Declarable>,
     _outputs?: LexiconOutput[],
+    context?: SerializeContext,
   ): string | SerializerResult {
     const entityNames = new Map<Declarable, string>();
     for (const [name, entity] of entities) {
@@ -310,7 +353,7 @@ export const dockerSerializer: Serializer = {
 
     const composeYaml = serializeCompose(
       services, volumes, networks, configs, secrets,
-      defaultLabels, entityNames,
+      defaultLabels, entityNames, context?.telemetry,
     );
 
     if (dockerfiles.size === 0) {