@rivetkit/engine 1.0.0 → 2.2.1-pr.4600.b74ff3b

package/docker/template/grafana-dashboards/traces.json

@@ -163,7 +163,9 @@
 									"type": "datetime"
 								}
 							],
-							"groupBy": ["ServiceName"],
+							"groupBy": [
+								"ServiceName"
+							],
 							"limit": 10000,
 							"mode": "trend",
 							"orderBy": [],
@@ -381,7 +383,9 @@
 				"footer": {
 					"countRows": false,
 					"fields": "",
-					"reducer": ["sum"],
+					"reducer": [
+						"sum"
+					],
 					"show": false
 				},
 				"showHeader": true,
@@ -712,7 +716,9 @@
 									"type": "datetime"
 								}
 							],
-							"groupBy": ["ServiceName"],
+							"groupBy": [
+								"ServiceName"
+							],
 							"limit": 10000,
 							"mode": "trend",
 							"orderBy": [],
@@ -722,7 +728,7 @@
 					},
 					"pluginVersion": "4.0.6",
 					"queryType": "timeseries",
-					"rawSql": "SELECT\r\n  $__timeInterval(Timestamp) as time,\r\n  count(*) as ` `,\r\n  ServiceName\r\nFROM otel.otel_traces\r\nWHERE\r\n  $__conditionalAll(TraceId IN (${trace_id:singlequote}),  $trace_id)\r\n  AND ( Timestamp >= $__fromTime AND Timestamp <= $__toTime )\r\n  AND ServiceName IN (${service_name:singlequote})\r\n  AND SpanName IN (${span_name:singlequote})\r\n  AND (($ray_id, NULL).1 = 'All' ? true : SpanAttributes['ray_id'] IN (${ray_id:singlequote}))\r\n  AND (($workflow_id, NULL).1 = 'All' ? true : SpanAttributes['workflow_id'] IN (${workflow_id:singlequote}))\r\n AND StatusCode IN ('Error', 'STATUS_CODE_ERROR')\r\n  AND ServiceName != 'loadgenerator' GROUP BY ServiceName, time\r\nORDER BY time ASC\r\nLIMIT 100000",
+					"rawSql": "SELECT\r\n  $__timeInterval(Timestamp) as time,\r\n  count(*) as ` `,\r\n  ServiceName\r\nFROM otel.otel_traces\r\nWHERE\r\n  TraceId IN array($trace_id),  $trace_id)\r\n  AND ( Timestamp >= $__fromTime AND Timestamp <= $__toTime )\r\n  AND ServiceName IN (${service_name:singlequote})\r\n  AND SpanName IN (${span_name:singlequote})\r\n  AND (($ray_id, NULL).1 = 'All' ? true : SpanAttributes['ray_id'] IN (${ray_id:singlequote}))\r\n  AND (($workflow_id, NULL).1 = 'All' ? true : SpanAttributes['workflow_id'] IN (${workflow_id:singlequote}))\r\n AND StatusCode IN ('Error', 'STATUS_CODE_ERROR')\r\n  AND ServiceName != 'loadgenerator' GROUP BY ServiceName, time\r\nORDER BY time ASC\r\nLIMIT 100000",
 					"refId": "A"
 				}
 			],
@@ -840,8 +846,12 @@
 			},
 			{
 				"current": {
-					"text": ["All"],
-					"value": ["$__all"]
+					"text": [
+						"All"
+					],
+					"value": [
+						"$__all"
+					]
 				},
 				"datasource": {
 					"type": "grafana-clickhouse-datasource",
@@ -879,8 +889,12 @@
 			},
 			{
 				"current": {
-					"text": ["All"],
-					"value": ["$__all"]
+					"text": [
+						"All"
+					],
+					"value": [
+						"$__all"
+					]
 				},
 				"datasource": {
 					"type": "grafana-clickhouse-datasource",
@@ -901,8 +915,12 @@
 			{
 				"allValue": "'All'",
 				"current": {
-					"text": ["All"],
-					"value": ["$__all"]
+					"text": [
+						"All"
+					],
+					"value": [
+						"$__all"
+					]
 				},
 				"datasource": {
 					"type": "grafana-clickhouse-datasource",
@@ -923,8 +941,12 @@
 			{
 				"allValue": "'All'",
 				"current": {
-					"text": ["All"],
-					"value": ["$__all"]
+					"text": [
+						"All"
+					],
+					"value": [
+						"$__all"
+					]
 				},
 				"datasource": {
 					"type": "grafana-clickhouse-datasource",
@@ -954,4 +976,4 @@
 	"uid": "8klBUGfVk",
 	"version": 2,
 	"weekStart": ""
-}
+}

package/docker/template/node_modules/.bin/js-yaml

@@ -10,12 +10,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules/js-yaml/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.0/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/js-yaml@4.1.1/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
+  exec "$basedir/node"  "$basedir/../../../../../node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/bin/js-yaml.js" "$@"
 else
-  exec node  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
+  exec node  "$basedir/../../../../../node_modules/.pnpm/js-yaml@4.1.1/node_modules/js-yaml/bin/js-yaml.js" "$@"
 fi

package/docker/template/node_modules/.bin/tsc

@@ -10,12 +10,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../typescript/bin/tsc" "$@"
+  exec "$basedir/node"  "$basedir/../../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsc" "$@"
 else
-  exec node  "$basedir/../typescript/bin/tsc" "$@"
+  exec node  "$basedir/../../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsc" "$@"
 fi

package/docker/template/node_modules/.bin/tsserver

@@ -10,12 +10,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.2/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../typescript/bin/tsserver" "$@"
+  exec "$basedir/node"  "$basedir/../../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsserver" "$@"
 else
-  exec node  "$basedir/../typescript/bin/tsserver" "$@"
+  exec node  "$basedir/../../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsserver" "$@"
 fi

package/docker/template/node_modules/.bin/tsx

@@ -10,12 +10,12 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules/tsx/dist/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules/tsx/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules/tsx/dist/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules/tsx/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.20.5/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/tsx@4.21.0/node_modules:/home/runner/work/rivet/rivet/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../tsx/dist/cli.mjs" "$@"
+  exec "$basedir/node"  "$basedir/../../../../../node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/cli.mjs" "$@"
 else
-  exec node  "$basedir/../tsx/dist/cli.mjs" "$@"
+  exec node  "$basedir/../../../../../node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/cli.mjs" "$@"
 fi

package/docker/template/src/docker-compose.ts

@@ -65,6 +65,32 @@ export function generateDockerCompose(context: TemplateContext) {
 	};
 	volumes["clickhouse-data"] = null;
 
+	// Prometheus
+	services["prometheus"] = {
+		restart: "unless-stopped",
+		image: "prom/prometheus:latest",
+		volumes: [
+			"prometheus-data:/prometheus",
+			`./${context.getCoreServicePath("prometheus")}/prometheus.yml:/etc/prometheus/prometheus.yml`,
+		],
+		command: [
+			"--config.file=/etc/prometheus/prometheus.yml",
+			"--storage.tsdb.path=/prometheus",
+			"--web.console.libraries=/usr/share/prometheus/console_libraries",
+			"--web.console.templates=/usr/share/prometheus/consoles",
+			"--web.enable-remote-write-receiver",
+		],
+		ports: ["9090:9090"],
+		networks: [...allDcToCoreNetworkNames, CORE_NETWORK_NAME],
+		healthcheck: {
+			test: ["CMD", "wget", "--spider", "-q", "http://127.0.0.1:9090/-/healthy"],
+			interval: "5s",
+			timeout: "3s",
+			retries: 3,
+		},
+	};
+	volumes["prometheus-data"] = null;
+
 	// Grafana
 	services["grafana"] = {
 		image: "grafana/grafana:11.5.2",
@@ -79,6 +105,7 @@ export function generateDockerCompose(context: TemplateContext) {
 		networks: [CORE_NETWORK_NAME],
 		depends_on: {
 			clickhouse: { condition: "service_healthy" },
+			prometheus: { condition: "service_healthy" },
 		},
 	};
 	volumes["grafana-data"] = null;
@@ -100,12 +127,8 @@ export function generateDockerCompose(context: TemplateContext) {
 			"vector-client",
 			datacenter.name,
 		);
-		const otelCollectorServerServiceName = context.getServiceName(
-			"otel-collector-server",
-			datacenter.name,
-		);
-		const otelCollectorClientServiceName = context.getServiceName(
-			"otel-collector-client",
+		const otelCollectorServiceName = context.getServiceName(
+			"otel-collector",
 			datacenter.name,
 		);
 		const postgresServiceName = context.getServiceName(
@@ -180,7 +203,8 @@ export function generateDockerCompose(context: TemplateContext) {
 			},
 			platform: "linux/amd64",
 			restart: "unless-stopped",
-			command: "sleep infinity",
+			entrypoint: "sleep",
+			command: "infinity",
 			stop_grace_period: "0s",
 			depends_on: {
 				//[natsServiceName]: { condition: "service_healthy" },
@@ -226,34 +250,20 @@ export function generateDockerCompose(context: TemplateContext) {
 		};
 		volumes[`vector-client-data-${datacenter.name}`] = null;
 
-		services[otelCollectorServerServiceName] = {
+		services[otelCollectorServiceName] = {
 			image: "otel/opentelemetry-collector-contrib:latest",
 			restart: "unless-stopped",
 			command: "--config=/etc/otel/config.yaml",
 			volumes: [
-				`./${context.getDatacenterServicePath("otel-collector-server", datacenter.name)}/config.yaml:/etc/otel/config.yaml:ro`,
+				`./${context.getDatacenterServicePath("otel-collector", datacenter.name)}/config.yaml:/etc/otel/config.yaml:ro`,
 			],
 			environment: ["CLICKHOUSE_PASSWORD=default"],
 			depends_on: {
 				clickhouse: { condition: "service_healthy" },
+				prometheus: { condition: "service_healthy" },
 			},
 			networks: [dcNetworkName, dcToCoreNetworkName],
-			ports: ["4317:4317"],
-		};
-
-		services[otelCollectorClientServiceName] = {
-			image: "otel/opentelemetry-collector-contrib:latest",
-			restart: "unless-stopped",
-			command: "--config=/etc/otel/config.yaml",
-			volumes: [
-				`./${context.getDatacenterServicePath("otel-collector-client", datacenter.name)}/config.yaml:/etc/otel/config.yaml:ro`,
-			],
-			depends_on: {
-				[otelCollectorServerServiceName]: {
-					condition: "service_started",
-				},
-			},
-			networks: [dcNetworkName],
+			ports: isPrimary ? ["4317:4317"] : undefined,
 		};
 
 		for (let i = 0; i < datacenter.engines; i++) {
@@ -278,7 +288,7 @@ export function generateDockerCompose(context: TemplateContext) {
 					"RUST_LOG_ANSI_COLOR=1",
 					"RIVET_OTEL_ENABLED=1",
 					"RIVET_OTEL_SAMPLER_RATIO=1",
-					`RIVET_OTEL_GRPC_ENDPOINT=http://${context.getServiceHost("otel-collector-client", datacenter.name)}:4317`,
+					`RIVET_OTEL_GRPC_ENDPOINT=http://${context.getServiceHost("otel-collector", datacenter.name)}:4317`,
 					// "RUST_LOG=debug,hyper=info",
 				],
 				stop_grace_period: "0s",
@@ -287,7 +297,7 @@ export function generateDockerCompose(context: TemplateContext) {
 					[vectorClientServiceName]: {
 						condition: "service_started",
 					},
-					[otelCollectorClientServiceName]: {
+					[otelCollectorServiceName]: {
 						condition: "service_started",
 					},
 					[postgresServiceName]: { condition: "service_healthy" },
@@ -326,13 +336,16 @@ export function generateDockerCompose(context: TemplateContext) {
 			services[serviceName] = {
 				build: {
 					context: "../../..",
-					dockerfile: "engine/sdks/typescript/test-runner/Dockerfile",
+					dockerfile: "engine/sdks/rust/test-envoy/Dockerfile",
 				},
 				platform: "linux/amd64",
 				restart: "unless-stopped",
 				environment: [
 					`RIVET_ENDPOINT=http://${context.getServiceHost("rivet-engine", datacenter.name, 0)}:6420`,
-					`RIVET_RUNNER_TOTAL_SLOTS=1000000`,
+					`INTERNAL_SERVER_PORT=5050`,
+					`RIVET_POOL_NAME=test-envoy`,
+					`AUTOSTART_ENVOY=1`,
+					`AUTOCONFIGURE_SERVERLESS=0`
 				],
 				stop_grace_period: "4s",
 				ports: isPrimary && i === 0 ? [`5050:5050`] : undefined,

package/docker/template/src/main.ts

@@ -9,8 +9,8 @@ import { generateGitAttributes } from "./git";
 import { generateReadme } from "./readme";
 import { generateCoreClickhouse } from "./services/core/clickhouse";
 import { generateCoreGrafana } from "./services/core/grafana";
-import { generateDatacenterOtelCollectorClient } from "./services/edge/otel-collector-client";
-import { generateDatacenterOtelCollectorServer } from "./services/edge/otel-collector-server";
+import { generateCorePrometheus } from "./services/core/prometheus";
+import { generateDatacenterOtelCollector } from "./services/edge/otel-collector";
 import { generateDatacenterPostgres } from "./services/edge/postgres";
 import { generateDatacenterRivetEngine } from "./services/edge/rivet-engine";
 import { generateRunner } from "./services/edge/runner";
@@ -35,6 +35,7 @@ function generateTemplate(templateName: string, config: TemplateConfig) {
 	// Generate core services
 	generateCoreClickhouse(context);
 	generateCoreGrafana(context);
+	generateCorePrometheus(context);
 
 	// Generate datacenter-specific configurations
 	for (const datacenter of config.datacenters) {
@@ -42,8 +43,7 @@ function generateTemplate(templateName: string, config: TemplateConfig) {
 		generateDatacenterRivetEngine(context, datacenter);
 		generateDatacenterVectorServer(context, datacenter.name);
 		generateDatacenterVectorClient(context, datacenter.name);
-		generateDatacenterOtelCollectorServer(context, datacenter.name);
-		generateDatacenterOtelCollectorClient(context, datacenter.name);
+		generateDatacenterOtelCollector(context, datacenter);
 	}
 
 	generateRunner(context);

package/docker/template/src/services/core/grafana.ts

@@ -6,6 +6,8 @@ import type { TemplateContext } from "../../context";
 export function generateCoreGrafana(context: TemplateContext) {
 	const clickhouseHost =
 		context.config.networkMode === "host" ? "127.0.0.1" : "clickhouse";
+	const prometheusHost =
+		context.config.networkMode === "host" ? "127.0.0.1" : "prometheus";
 	// Grafana configuration
 	const grafanaIni = `[server]
 http_port = 3000
@@ -23,10 +25,21 @@ org_role = Admin
 default_home_dashboard_path = /var/lib/grafana/dashboards/api.json
 `;
 
-	// Datasource configuration for ClickHouse
+	// Datasource configuration for ClickHouse and Prometheus
 	const datasourcesConfig = {
 		apiVersion: 1,
 		datasources: [
+			{
+				name: "Prometheus",
+				uid: "prometheus",
+				type: "prometheus",
+				access: "proxy",
+				url: `http://${prometheusHost}:9090`,
+				isDefault: true,
+				jsonData: {
+					timeInterval: "15s",
+				},
+			},
 			{
 				name: "ClickHouse",
 				uid: "clickhouse",

package/docker/template/src/services/core/prometheus.ts

@@ -0,0 +1,20 @@
+import * as yaml from "js-yaml";
+import type { TemplateContext } from "../../context";
+
+export function generateCorePrometheus(context: TemplateContext) {
+	// Prometheus configuration with remote write enabled
+	// Metrics are scraped by OTEL collector and sent via remote write
+	const prometheusConfig = {
+		global: {
+			scrape_interval: "15s",
+			evaluation_interval: "15s",
+		},
+		scrape_configs: [],
+	};
+
+	context.writeCoreServiceFile(
+		"prometheus",
+		"prometheus.yml",
+		yaml.dump(prometheusConfig),
+	);
+}

package/docker/template/src/services/edge/{otel-collector-server.ts → otel-collector.ts}

@@ -1,12 +1,38 @@
 import * as yaml from "js-yaml";
 import type { TemplateContext } from "../../context";
+import type { Datacenter } from "../../config";
 
-export function generateDatacenterOtelCollectorServer(
+export function generateDatacenterOtelCollector(
 	context: TemplateContext,
-	dcName: string,
+	datacenter: Datacenter,
 ) {
 	const clickhouseHost =
 		context.config.networkMode === "host" ? "127.0.0.1" : "clickhouse";
+	const prometheusHost =
+		context.config.networkMode === "host" ? "127.0.0.1" : "prometheus";
+
+	// Build scrape configs for all engines in this datacenter
+	const scrapeConfigs: any[] = [];
+	for (let i = 0; i < datacenter.engines; i++) {
+		const engineHost = context.getServiceHost(
+			"rivet-engine",
+			datacenter.name,
+			i,
+		);
+		scrapeConfigs.push({
+			job_name: `rivet-engine-${datacenter.name}-${i}`,
+			scrape_interval: "15s",
+			static_configs: [
+				{
+					targets:
+						context.config.networkMode === "host"
+							? ["host.docker.internal:6430"]
+							: [`${engineHost}:6430`],
+				},
+			],
+		});
+	}
+
 	const otelConfig = {
 		receivers: {
 			otlp: {
@@ -14,6 +40,14 @@ export function generateDatacenterOtelCollectorServer(
 					grpc: {
 						endpoint: "0.0.0.0:4317",
 					},
+					http: {
+						endpoint: "0.0.0.0:4318",
+					},
+				},
+			},
+			prometheus: {
+				config: {
+					scrape_configs: scrapeConfigs,
 				},
 			},
 		},
@@ -27,7 +61,7 @@ export function generateDatacenterOtelCollectorServer(
 					},
 					{
 						key: "rivet.datacenter",
-						value: dcName,
+						value: datacenter.name,
 						action: "upsert",
 					},
 				],
@@ -50,23 +84,6 @@ export function generateDatacenterOtelCollectorServer(
 				logs_table_name: "otel_logs",
 				traces_table_name: "otel_traces",
 				timeout: "5s",
-				metrics_tables: {
-					gauge: {
-						name: "otel_metrics_gauge",
-					},
-					sum: {
-						name: "otel_metrics_sum",
-					},
-					summary: {
-						name: "otel_metrics_summary",
-					},
-					histogram: {
-						name: "otel_metrics_histogram",
-					},
-					exponential_histogram: {
-						name: "otel_metrics_exp_histogram",
-					},
-				},
 				retry_on_failure: {
 					enabled: true,
 					initial_interval: "5s",
@@ -74,8 +91,22 @@ export function generateDatacenterOtelCollectorServer(
 					max_elapsed_time: "300s",
 				},
 			},
+			prometheusremotewrite: {
+				endpoint: `http://${prometheusHost}:9090/api/v1/write`,
+				tls: {
+					insecure: true,
+				},
+				resource_to_telemetry_conversion: {
+					enabled: true,
+				},
+			},
 		},
 		service: {
+			// telemetry: {
+			// 	logs: {
+			// 		level: "debug",
+			// 	},
+			// },
 			pipelines: {
 				logs: {
 					receivers: ["otlp"],
@@ -88,9 +119,9 @@ export function generateDatacenterOtelCollectorServer(
 					exporters: ["clickhouse"],
 				},
 				metrics: {
-					receivers: ["otlp"],
+					receivers: ["prometheus"],
 					processors: ["resource", "batch"],
-					exporters: ["clickhouse"],
+					exporters: ["prometheusremotewrite"],
 				},
 			},
 		},
@@ -99,8 +130,8 @@ export function generateDatacenterOtelCollectorServer(
 	const yamlContent = yaml.dump(otelConfig);
 
 	context.writeDatacenterServiceFile(
-		"otel-collector-server",
-		dcName,
+		"otel-collector",
+		datacenter.name,
 		"config.yaml",
 		yamlContent,
 	);

package/docker/template/src/services/edge/rivet-engine.ts

@@ -10,17 +10,17 @@ export function generateDatacenterRivetEngine(
 ) {
 	const clickhouseHost =
 		context.config.networkMode === "host" ? "127.0.0.1" : "clickhouse";
-	const datacenters = [];
+	const datacenters: Record<string, any> = {};
 
 	for (const dc of context.config.datacenters) {
 		const serviceHost = context.getServiceHost("rivet-engine", dc.name, 0);
-		datacenters.push({
-			name: dc.name,
+		datacenters[dc.name] = {
 			datacenter_label: dc.id,
 			is_leader: dc.id === 1,
 			peer_url: `http://${serviceHost}:${API_PEER_PORT}`,
 			public_url: `http://${serviceHost}:${GUARD_PORT}`,
-		});
+			valid_hosts: [`${serviceHost}`, `127.0.0.1`, `localhost`],
+		};
 	}
 
 	// Generate a separate config file for each engine node
@@ -60,20 +60,8 @@ export function generateDatacenterRivetEngine(
 				native_url: `http://${clickhouseHost}:9301`, // TODO:
 				username: "system",
 				password: "default",
-				// TODO: Move this to init migrations
-				provision_users: {
-					vector: {
-						username: "vector",
-						password: "vector",
-						role: "write",
-					},
-				},
 				secure: false,
 			},
-			vector_http: {
-				host: context.getServiceHost("vector-client", datacenter.name),
-				port: 5022,
-			},
 		};
 
 		context.writeDatacenterServiceFile(

package/docker/template/src/services/edge/runner.ts

@@ -1,7 +1,6 @@
 import type { TemplateContext } from "../../context";
 
 export function generateRunner(context: TemplateContext) {
-	// The runner files are shared and located at sdks/typescript/test-runner/
-	// We just need to reference them in the docker-compose
-	// No specific files need to be generated here for now
+	// The test runner service now uses the Rust test-envoy binary.
+	// The docker-compose template points at the Rust Dockerfile directly.
 }

package/docker/universal/Dockerfile

@@ -10,6 +10,7 @@ ARG TARGETARCH
 ARG BUILD_FRONTEND=false
 ARG CARGO_BUILD_MODE=debug
 ARG VITE_APP_API_URL=__SAME__
+ARG OVERRIDE_GIT_SHA
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && \
@@ -21,7 +22,6 @@ RUN apt-get update -y && \
     libpq-dev \
     libssl-dev \
     pkg-config \
-    protobuf-compiler \
     ca-certificates \
     gpg \
     openssl \
@@ -49,6 +49,7 @@ COPY . .
 
 # Build frontend
 RUN if [ "$BUILD_FRONTEND" = "true" ]; then \
+        export NODE_OPTIONS="--max-old-space-size=8192" && \
         pnpm install && \
         if [ -n "$VITE_APP_API_URL" ]; then \
             VITE_APP_API_URL="${VITE_APP_API_URL}" npx turbo build:engine -F @rivetkit/engine-frontend; \
@@ -72,6 +73,7 @@ RUN \
     fi && \
     # cargo install --locked tokio-console && \
     mkdir /app/dist/ && \
+    echo "Copying binary" && \
     cp target/$CARGO_BUILD_MODE/rivet-engine /app/dist/
 
 # MARK: Engine (full, base)
@@ -100,7 +102,7 @@ RUN apt-get update -y && \
 # MARK: Engine (Full)
 FROM engine-full-base AS engine-full
 
-LABEL org.opencontainers.image.source=https://github.com/rivet-gg/rivet
+LABEL org.opencontainers.image.source=https://github.com/rivet-dev/rivet
 
 COPY --from=builder /app/dist/rivet-engine /usr/bin/rivet-engine
 
@@ -110,7 +112,7 @@ CMD ["start"]
 # MARK: Engine (Slim)
 FROM debian:13.1-slim AS engine-slim
 
-LABEL org.opencontainers.image.source=https://github.com/rivet-gg/rivet
+LABEL org.opencontainers.image.source=https://github.com/rivet-dev/rivet
 
 # Docker automatically provides TARGETARCH
 ARG TARGETARCH

package/package.json

@@ -1,10 +1,7 @@
 {
   "name": "@rivetkit/engine",
-  "version": "1.0.0",
+  "version": "2.2.1-pr.4600.b74ff3b",
   "keywords": [],
   "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@vbare/compiler": "^0.0.3"
-  }
+  "license": "ISC"
 }