@geekmidas/cli 10.0.0-alpha.83 → 10.0.0-alpha.85

package/dist/{engine-DxWswfXe.mjs → engine-BXCtEhSH.mjs}

@@ -4,9 +4,9 @@ import { a as discriminatedUnion, c as looseObject, f as string, n as array, s a
 import { c as runWorker, d as output, r as discover } from "./discover-BPelzeGW.mjs";
 import { i as activeSandbox } from "./sandbox-Dm247NGx.mjs";
 import { t as appKey } from "./derive-B4vDpzgP.mjs";
-import { _ as stripPublicPrefix, c as getAppBuildOrder, g as getPublicEnvPrefix } from "./workspace-DD9mtPy8.mjs";
-import { An as projectName, Cn as applicationName, Dn as isOwnedBy, En as imageRef, Ht as WORKER_PORT, I as reportDevServices, Jt as eventsBackendFor, Lt as resourceName, M as devServicesUsed, N as externalServices, Nt as workerEnvKeys, O as ExternalServicesNotConfigured, On as markerOf, P as manifestServiceDeclarations, Pn as toEmbeddableSecrets, T as validateImageRef, Tn as imageName, Xt as storageBackendFor, Yt as providerOf, _ as DeployJournal, a as createEmptyState, c as isDnsVerified, d as setApplicationId, f as setBackupState, g as setPostgresBackupId, gt as otelEnv, h as setGeneratedSecret, ht as resolveHost, i as assertNoStaleSecrets, j as assertExternalServices, jn as initStageSecrets, jt as dockerfileOf, k as STORAGE_KEY_PAIR, kn as ownershipMarker, l as recordRelease, m as setDnsVerification, mt as isMainFrontendApp, n as reportDatabaseRuns, o as getBackupState, p as setDnsRecord, q as constructGlobs, qt as cacheBackendFor, r as reportPlannedSeeds, s as getGeneratedSecret, t as DeploySeedsFailed, tt as withGeneratedSecrets, u as recordRollback, v as DockerBuildFailed, w as workerDockerfileOf, x as dockerCommand, xt as applyPostgres, y as DockerPushFailed, z as workerUnits } from "./seeds-BoKQ74Od.mjs";
-import { f as StateStoreBusy, m as StateVersionConflict, o as DokployApi, s as DokployApiError, t as sniffAllApps, v as eventError, x as keyFingerprint, y as encryptSecrets } from "./sniffer-6oYI-MpT.mjs";
+import { F as resolveStageTelemetry, P as otlpTelemetryEnv, _ as stripPublicPrefix, c as getAppBuildOrder, g as getPublicEnvPrefix } from "./workspace-Drz4jsvy.mjs";
+import { At as WORKER_PORT, Cn as imageName, Dn as ownershipMarker, En as markerOf, Ft as cacheBackendFor, Hn as resolveHost, I as reportDevServices, It as eventsBackendFor, Jt as scopeTelemetryEnv, Kt as appTelemetry, Lt as providerOf, M as devServicesUsed, Mn as toEmbeddableSecrets, N as externalServices, O as ExternalServicesNotConfigured, On as projectName, P as manifestServiceDeclarations, Rt as storageBackendFor, St as dockerfileOf, T as validateImageRef, Tn as isOwnedBy, Vn as isMainFrontendApp, Wt as resourceName, Xt as telemetryOf, Zt as usesTelemetry, _ as DeployJournal, a as createEmptyState, c as isDnsVerified, d as setApplicationId, f as setBackupState, ft as applyPostgres, g as setPostgresBackupId, h as setGeneratedSecret, i as assertNoStaleSecrets, j as assertExternalServices, k as STORAGE_KEY_PAIR, kn as initStageSecrets, l as recordRelease, m as setDnsVerification, n as reportDatabaseRuns, o as getBackupState, p as setDnsRecord, q as constructGlobs, r as reportPlannedSeeds, s as getGeneratedSecret, t as DeploySeedsFailed, tt as withGeneratedSecrets, u as recordRollback, v as DockerBuildFailed, w as workerDockerfileOf, wn as imageRef, wt as workerEnvKeys, x as dockerCommand, xn as applicationName, y as DockerPushFailed, z as workerUnits } from "./seeds-9C5CkDon.mjs";
+import { f as StateStoreBusy, m as StateVersionConflict, o as DokployApi, s as DokployApiError, t as sniffAllApps, v as eventError, x as keyFingerprint, y as encryptSecrets } from "./sniffer-DgBkaLAu.mjs";
 import { _ as migrationFiles, f as plannedSeeds } from "./databases-CzszQV0N.mjs";
 import { n as assertStageCredentials } from "./credentialSchemas-BJqRJNK4.mjs";
 import { join, relative } from "node:path";
@@ -94,10 +94,13 @@ async function writeCredentialsFile(credentials) {
 * @param buildArgs - Build arguments to pass to docker build
 * @param credentials - Encrypted credentials, passed as a build secret
 */
-async function buildImage(imageRef, buildArgs, credentials, { cwd, dockerfile, signal, stdio }) {
+async function buildImage(imageRef, buildArgs, credentials, { cwd, dockerfile, signal, stdio, stage }) {
 	logger$3.log(`\n🔨 Building Docker image: ${imageRef}`);
 	logger$3.log("   Generating Dockerfile...");
-	const { buildRoot } = await dockerCommand({ cwd });
+	const { buildRoot } = await dockerCommand({
+		cwd,
+		...stage ? { stage } : {}
+	});
 	const dockerfilePath = relative(buildRoot, dockerfile);
 	const secret = credentials ? await writeCredentialsFile(credentials) : void 0;
 	try {
@@ -180,7 +183,8 @@ async function deployDocker(options) {
 		cwd,
 		dockerfile: join(cwd, options.dockerfile ?? dockerfileOf(config.appName ?? imageName, options.appPath ?? ".")),
 		...options.signal ? { signal: options.signal } : {},
-		...options.stdio ? { stdio: options.stdio } : {}
+		...options.stdio ? { stdio: options.stdio } : {},
+		stage
 	};
 	await buildImage(imageRef, buildArgs, credentials, docker);
 	let digest;
@@ -2591,6 +2595,16 @@ async function releaseDokploy(run) {
 	const { stageSecrets, sniffedApps, encryptedSecrets } = run.preflight;
 	const { api, journal, state, environmentId, registry, registryId, declaredEnv, changes, applied } = run.provisioned;
 	const project = { projectId: run.provisioned.projectId };
+	const telemetry = resolveStageTelemetry({
+		...workspace.deploy?.telemetry ? { telemetry: workspace.deploy.telemetry } : {},
+		stage,
+		local: false,
+		target: "dokploy",
+		runtime: "server",
+		selfHosted: false,
+		used: usesTelemetry(run.manifest)
+	});
+	const telemetryValues = telemetry?.provider === "otlp" ? otlpTelemetryEnv(telemetry) : void 0;
 	try {
 		await migrate(run);
 	} finally {
@@ -2732,11 +2746,14 @@ async function releaseDokploy(run) {
 					...sniffedVars
 				])], envContext);
 				if (!valid) throw new MissingEnvVars(appName, missing, stage);
-				const withDeclared = {
+				const withDeclared = scopeTelemetryEnv({
 					...resolved,
-					...declaredEnv,
-					...otelEnv(stageSecrets?.custom ?? {}, appName)
-				};
+					...declaredEnv
+				}, {
+					uses: appTelemetry(run.manifest, appName) !== void 0,
+					serviceName: appName,
+					...telemetryValues ? { telemetry: telemetryValues } : {}
+				});
 				const envVars = Object.entries(withDeclared).map(([key, value]) => `${key}=${value}`);
 				if (Object.keys(withDeclared).length > 0) logger.log(`      Resolved ${Object.keys(withDeclared).length} env vars: ${Object.keys(withDeclared).sort().join(", ")}`);
 				await release(appName, application.applicationId, {
@@ -2802,8 +2819,11 @@ async function releaseDokploy(run) {
 				});
 				built(worker.name, image, imageRef$2);
 				const env = {
-					...Object.fromEntries(Object.entries(declaredEnv).filter(([key]) => keys.includes(key))),
-					...otelEnv(stageSecrets?.custom ?? {}, worker.name),
+					...scopeTelemetryEnv(Object.fromEntries(Object.entries(declaredEnv).filter(([key]) => keys.includes(key))), {
+						uses: telemetryOf(run.manifest, worker.id) !== void 0,
+						serviceName: worker.name,
+						...telemetryValues ? { telemetry: telemetryValues } : {}
+					}),
 					...credentials ? { GKM_MASTER_KEY: secrets.masterKey } : {},
 					NODE_ENV: "production",
 					PORT: String(WORKER_PORT),
@@ -3433,4 +3453,4 @@ const MOBILE_SKIP_REASON = "deploys via its framework toolchain";
 //#endregion
 export { RegistryNotConfigured as _, dokployResult as a, releaseDokploy as c, validateDokploy as d, verifyDokploy as f, RegistryAmbiguous as g, HealthCheckTimedOut as h, dokployApi as i, restoreImage as l, DeployMigrationsFailed as m, FrontendDeployFailed as n, planDokploy as o, verifySettings as p, MissingEnvVars as r, provisionDokploy as s, BackendDeployFailed as t, rollbackDokploy as u, RegistryNotFound as v, ProjectNotOwned as y };
 
-//# sourceMappingURL=engine-DxWswfXe.mjs.map
+//# sourceMappingURL=engine-BXCtEhSH.mjs.map