Fix application telemetry instance_id (closes #28)

snowplow-devops · Mar 9, 2023 · 9b9b1f2 · 9b9b1f2
1 parent 3c473a4
commit 9b9b1f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/main.tf b/main.tf
@@ -362,12 +362,14 @@ locals {
 
     assets_update_period = var.assets_update_period
 
-    disable           = !tobool(var.telemetry_enabled)
-    telemetry_url     = join("", module.telemetry.*.collector_uri)
-    user_provided_id  = var.user_provided_id
-    auto_generated_id = join("", module.telemetry.*.auto_generated_id)
-    module_name       = local.module_name
-    module_version    = local.module_version
+    telemetry_disable          = !var.telemetry_enabled
+    telemetry_collector_uri    = join("", module.telemetry.*.collector_uri)
+    telemetry_collector_port   = 443
+    telemetry_secure           = true
+    telemetry_user_provided_id = var.user_provided_id
+    telemetry_auto_gen_id      = join("", module.telemetry.*.auto_generated_id)
+    telemetry_module_name      = local.module_name
+    telemetry_module_version   = local.module_version
   })
 
   user_data = templatefile("${path.module}/templates/user-data.sh.tmpl", {

diff --git a/templates/config.hocon.tmpl b/templates/config.hocon.tmpl
@@ -44,16 +44,16 @@
   }
 
   "telemetry": {
-    "disable": ${disable}
+    "disable": ${telemetry_disable}
     "interval": 15 minutes
-    "method": POST
-    "collectorUri": "${telemetry_url}"
-    "collectorPort": 443
-    "secure": true
-    "userProvidedId": "${user_provided_id}"
-    "autoGeneratedId": "${auto_generated_id}"
-    "moduleName": "${module_name}"
-    "moduleVersion": "${module_version}"
+    "method": "POST"
+    "collectorUri": "${telemetry_collector_uri}"
+    "collectorPort": ${telemetry_collector_port}
+    "secure": ${telemetry_secure}
+    "userProvidedId": "${telemetry_user_provided_id}"
+    "autoGeneratedId": "${telemetry_auto_gen_id}"
+    "moduleName": "${telemetry_module_name}"
+    "moduleVersion": "${telemetry_module_version}"
   }
 
   "featureFlags" : {

diff --git a/templates/user-data.sh.tmpl b/templates/user-data.sh.tmpl
@@ -20,7 +20,8 @@ sudo docker run \
   --log-opt max-file=5 \
 %{ endif ~}
   -v $${CONFIG_DIR}:/snowplow/config \
-  -e 'JAVA_OPTS=${java_opts}' \
+  -e 'JAVA_OPTS=-Dconfig.override_with_env_vars=true ${java_opts}' \
+  -e "CONFIG_FORCE_telemetry_instanceId=$(get_instance_id)" \
   snowplow/snowplow-enrich-kinesis:${version} \
   --config /snowplow/config/enrich.hocon \
   --iglu-config ${resolver} \