From 6989d98214fdf694947f77623c0d1a2e084fc0cd Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 17 Feb 2026 16:06:14 +0100
Subject: [PATCH] feat: add execution_id to all telemetry payloads

- Generate EXECUTION_ID from RANDOM_UUID in variables()
- Export EXECUTION_ID to container environment
- Add execution_id field to all 8 API payloads in api.func
- Add execution_id to post_progress_to_api in install.func and alpine-install.func
- Fallback to RANDOM_UUID when EXECUTION_ID not set (backward compat)
---
 misc/alpine-install.func | 2 +-
 misc/api.func            | 8 ++++++++
 misc/build.func          | 2 ++
 misc/install.func        | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/misc/alpine-install.func b/misc/alpine-install.func
index 49b83dbae..f09fac8a5 100644
--- a/misc/alpine-install.func
+++ b/misc/alpine-install.func
@@ -30,7 +30,7 @@ post_progress_to_api() {
 
   curl -fsS -m 5 -X POST "https://telemetry.community-scripts.org/telemetry" \
     -H "Content-Type: application/json" \
-    -d "{\"random_id\":\"${RANDOM_UUID}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"configuring\"}" &>/dev/null || true
+    -d "{\"random_id\":\"${RANDOM_UUID}\",\"execution_id\":\"${EXECUTION_ID:-${RANDOM_UUID}}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"configuring\"}" &>/dev/null || true
 }
 
 # This function enables IPv6 if it's not disabled and sets verbose mode
diff --git a/misc/api.func b/misc/api.func
index 457f5cc75..6d485e270 100644
--- a/misc/api.func
+++ b/misc/api.func
@@ -552,6 +552,7 @@ post_to_api() {
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "lxc",
     "nsapp": "${NSAPP:-unknown}",
     "status": "installing",
@@ -656,6 +657,7 @@ post_to_api_vm() {
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "vm",
     "nsapp": "${NSAPP:-unknown}",
     "status": "installing",
@@ -788,6 +790,7 @@ post_update_to_api() {
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "${TELEMETRY_TYPE:-lxc}",
     "nsapp": "${NSAPP:-unknown}",
     "status": "${pb_status}",
@@ -830,6 +833,7 @@ EOF
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "${TELEMETRY_TYPE:-lxc}",
     "nsapp": "${NSAPP:-unknown}",
     "status": "${pb_status}",
@@ -872,6 +876,7 @@ EOF
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "${TELEMETRY_TYPE:-lxc}",
     "nsapp": "${NSAPP:-unknown}",
     "status": "${pb_status}",
@@ -1088,6 +1093,7 @@ post_tool_to_api() {
     cat <<EOF
 {
     "random_id": "${uuid}",
+    "execution_id": "${EXECUTION_ID:-${uuid}}",
     "type": "tool",
     "nsapp": "${tool_name}",
     "status": "${status}",
@@ -1155,6 +1161,7 @@ post_addon_to_api() {
     cat <<EOF
 {
     "random_id": "${uuid}",
+    "execution_id": "${EXECUTION_ID:-${uuid}}",
     "type": "addon",
     "nsapp": "${addon_name}",
     "status": "${status}",
@@ -1246,6 +1253,7 @@ post_update_to_api_extended() {
     cat <<EOF
 {
     "random_id": "${RANDOM_UUID}",
+    "execution_id": "${EXECUTION_ID:-${RANDOM_UUID}}",
     "type": "${TELEMETRY_TYPE:-lxc}",
     "nsapp": "${NSAPP:-unknown}",
     "status": "${pb_status}",
diff --git a/misc/build.func b/misc/build.func
index 6b372b9a9..c2e63f149 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -45,6 +45,7 @@ variables() {
   DIAGNOSTICS="yes"                                      # sets the DIAGNOSTICS variable to "yes", used for the API call.
   METHOD="default"                                       # sets the METHOD variable to "default", used for the API call.
   RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"      # generates a random UUID and sets it to the RANDOM_UUID variable.
+  EXECUTION_ID="${RANDOM_UUID}"                          # Unique execution ID for telemetry record identification (unique-indexed in PocketBase)
   SESSION_ID="${RANDOM_UUID:0:8}"                        # Short session ID (first 8 chars of UUID) for log files
   BUILD_LOG="/tmp/create-lxc-${SESSION_ID}.log"          # Host-side container creation log
   combined_log="/tmp/install-${SESSION_ID}-combined.log" # Combined log (build + install) for failed installations
@@ -3561,6 +3562,7 @@ build_container() {
   # Core exports for install.func
   export DIAGNOSTICS="$DIAGNOSTICS"
   export RANDOM_UUID="$RANDOM_UUID"
+  export EXECUTION_ID="$EXECUTION_ID"
   export SESSION_ID="$SESSION_ID"
   export CACHER="$APT_CACHER"
   export CACHER_IP="$APT_CACHER_IP"
diff --git a/misc/install.func b/misc/install.func
index ed7205c7d..3b2062625 100644
--- a/misc/install.func
+++ b/misc/install.func
@@ -56,7 +56,7 @@ post_progress_to_api() {
 
   curl -fsS -m 5 -X POST "https://telemetry.community-scripts.org/telemetry" \
     -H "Content-Type: application/json" \
-    -d "{\"random_id\":\"${RANDOM_UUID}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"configuring\"}" &>/dev/null || true
+    -d "{\"random_id\":\"${RANDOM_UUID}\",\"execution_id\":\"${EXECUTION_ID:-${RANDOM_UUID}}\",\"type\":\"lxc\",\"nsapp\":\"${app:-unknown}\",\"status\":\"configuring\"}" &>/dev/null || true
 }
 
 # ==============================================================================