@intentius/chant-lexicon-docker 0.102.0 → 0.104.1

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "e7a19357c7fdbc452830f8f1b348c87e98b2cb424e84b6aa584020b35b1f2650",
+    "manifest.json": "c39d048027ec61fa80629f8b22bd19cca47959e905133a147842d98d0a4e1046",
     "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": "14a64046d656bdf511370cac18a4325fbef0dea043179957339b9e08993fe703"
+  "composite": "f63ae956999279fd8dd17fbc85e3d090980676d936204471f882dab87662eda4"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "docker",
-  "version": "0.102.0",
+  "version": "0.104.1",
   "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,EAAoB,UAAU,EAAoB,MAAM,6BAA6B,CAAC;AA+RlG,eAAO,MAAM,gBAAgB,EAAE,UAqE9B,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;AA6SlG,eAAO,MAAM,gBAAgB,EAAE,UAqE9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-docker",
-  "version": "0.102.0",
+  "version": "0.104.1",
   "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.102.0",
+    "@intentius/chant": "^0.104.1",
     "typescript": "^5.9.3"
   }
 }

package/src/composites/docker-otel-collector.ts

@@ -75,7 +75,7 @@ export const DockerOtelCollector = Composite((props: DockerOtelCollectorProps) =
     image,
     command: [`--config=${COLLECTOR_CONFIG_PATH}`],
     configs: [{ source: config, target: COLLECTOR_CONFIG_PATH }],
-    ...(publishPorts && ports.length > 0 ? { ports: ports.map((p) => `${p.port}:${p.port}`) } : {}),
+    ...(publishPorts && ports.length > 0 ? { ports: ports.map((p) => `${p.port}:${p.port}${p.protocol ? "/udp" : ""}`) } : {}),
     restart,
   }, defs?.service));
 

package/src/serializer.test.ts

@@ -365,4 +365,15 @@ describe("telemetry attribution", () => {
     expect(out).not.toContain("OTEL_SERVICE_NAME=api");
     expect(out).toContain("- OTEL_RESOURCE_ATTRIBUTES=chant.workspace=acme,chant.member=delivery");
   });
+
+  test("the resource attributes end with the release reference a deploy fills, once (#3061)", () => {
+    expect(run({ image: "nginx:1" }, attrs)).toContain(
+      "OTEL_RESOURCE_ATTRIBUTES: chant.workspace=acme,chant.member=delivery,chant.decl=api,deployment.environment.name=prod${CHANT_RELEASE_ATTRIBUTES:-}",
+    );
+    const own = run({ image: "x", environment: { OTEL_RESOURCE_ATTRIBUTES: "team=pay${CHANT_RELEASE_ATTRIBUTES:-}" } }, { workspace: "acme" });
+    expect(own.match(/CHANT_RELEASE_ATTRIBUTES/g)).toHaveLength(1);
+    expect(run({ image: "x", environment: ["OTEL_RESOURCE_ATTRIBUTES=team=pay"] }, { workspace: "acme" })).toContain(
+      "- OTEL_RESOURCE_ATTRIBUTES=team=pay,chant.workspace=acme,chant.decl=api${CHANT_RELEASE_ATTRIBUTES:-}",
+    );
+  });
 });

package/src/serializer.ts

@@ -12,7 +12,7 @@
 import type { Declarable } from "@intentius/chant/declarable";
 import { isPropertyDeclarable, isResourceDeclarable } from "@intentius/chant/declarable";
 import type { SerializeContext, Serializer, SerializerResult } from "@intentius/chant/serializer";
-import { mergeResourceAttributes, telemetryEnvironment, type TelemetryAttribution } from "@intentius/chant/telemetry-attribution";
+import { mergeResourceAttributes, RELEASE_ATTRIBUTES_VARIABLE, 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";
@@ -107,11 +107,25 @@ function imageDigest(image: unknown): string | undefined {
   return at === -1 ? undefined : image.slice(at + 1);
 }
 
+/** Compose's reference to the release attributes a deploy exports (#3061, ws-081), empty when unset. */
+const RELEASE_REF = `\${${RELEASE_ATTRIBUTES_VARIABLE}:-}`;
+
+/** A resource-attributes value that ends with the release reference, once. */
+function withReleaseRef(value: string): string {
+  return value.includes(RELEASE_REF) ? value : `${value}${RELEASE_REF}`;
+}
+
 /**
  * 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.
+ *
+ * `OTEL_RESOURCE_ATTRIBUTES` ends with `${CHANT_RELEASE_ATTRIBUTES:-}`, which
+ * Compose fills from the environment of `docker compose up`: a release deploy
+ * exports `service.version` and `vcs.ref.head.revision` there (#3061,
+ * ws-081), and any other `up` leaves it empty, so this output does not change
+ * with a release.
  */
 function stampTelemetry(service: Record<string, unknown>, name: string, telemetry: TelemetryAttribution): void {
   const version = imageDigest(service.image);
@@ -122,9 +136,9 @@ function stampTelemetry(service: Record<string, unknown>, name: string, telemetr
     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}`);
+    if (at === -1) entries.push(`OTEL_RESOURCE_ATTRIBUTES=${withReleaseRef(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)}`;
+      entries[at] = `OTEL_RESOURCE_ATTRIBUTES=${withReleaseRef(mergeResourceAttributes(entries[at]!.slice(entries[at]!.indexOf("=") + 1), vars.OTEL_RESOURCE_ATTRIBUTES))}`;
     }
     service.environment = entries;
     return;
@@ -132,8 +146,8 @@ function stampTelemetry(service: Record<string, unknown>, name: string, telemetr
   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);
+  if (own === undefined) map.OTEL_RESOURCE_ATTRIBUTES = withReleaseRef(vars.OTEL_RESOURCE_ATTRIBUTES);
+  else if (typeof own === "string") map.OTEL_RESOURCE_ATTRIBUTES = withReleaseRef(mergeResourceAttributes(own, vars.OTEL_RESOURCE_ATTRIBUTES));
   service.environment = map;
 }