set the instance identifier in the deployment, use in the code

ceramicnetwork · Apr 24, 2024 · 55ff56d · 55ff56d
1 parent f1b7fec
commit 55ff56d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,6 +43,10 @@ RUN npm install
 
 WORKDIR /
 
+COPY entrypoint.sh .
+RUN chmod +x ./entrypoint.sh
+
 COPY runner.sh .
 
+ENTRYPOINT ["./entrypoint.sh"]
 CMD [ "./runner.sh" ]
diff --git a/config/env/dev.json b/config/env/dev.json
@@ -56,7 +56,7 @@
     "traceRatio": "@@METRICS_TRACE_RATIO",
     "exportIntervalMillis": "@@METRICS_EXPORT_INTERVAL_MS",
     "exportTimeoutMillis": "@@METRICS_EXPORT_TIMEOUT_MS",
-    "instanceIdentifier": "@@ECS_CONTAINER_METADATA_URI",
+    "instanceIdentifier": "@@INSTANCE_IDENTIFIER",
     "prometheusPort": "@@METRICS_PORT"
   },
   "db": {

diff --git a/config/env/prod.json b/config/env/prod.json
@@ -56,7 +56,7 @@
     "traceRatio": "@@METRICS_TRACE_RATIO",
     "exportIntervalMillis": "@@METRICS_EXPORT_INTERVAL_MS",
     "exportTimeoutMillis": "@@METRICS_EXPORT_TIMEOUT_MS",
-    "instanceIdentifier": "@@ECS_CONTAINER_METADATA_URI",
+    "instanceIdentifier": "@@INSTANCE_IDENTIFIER",
     "prometheusPort": "@@METRICS_PORT"
   },
   "db": {

diff --git a/config/env/test.json b/config/env/test.json
@@ -37,7 +37,7 @@
     "traceRatio": "@@METRICS_TRACE_RATIO",
     "exportIntervalMillis": "@@METRICS_EXPORT_INTERVAL_MS",
     "exportTimeoutMillis": "@@METRICS_EXPORT_TIMEOUT_MS",
-    "instanceIdentifier": "@@ECS_CONTAINER_METADATA_URI",
+    "instanceIdentifier": "@@INSTANCE_IDENTIFIER",
     "prometheusPort": "@@METRICS_PORT"
   },
   "db": {

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+instance_uri=$ECS_CONTAINER_METADATA_URI
+
+# Parse the last portion of the URI
+instance_id=${instance_uri##*/}
+
+# Remove everything after the hyphen to get the task ID
+instance_id=${instance_id%%-*}
+
+# if present, will be the task ID, otherwise empty string
+export INSTANCE_IDENTIFIER=$instance_id
+
+exec "$@"
diff --git a/src/app.ts b/src/app.ts
@@ -130,16 +130,7 @@ export class CeramicAnchorApp {
       Metrics.count('HELLO', 1)
       logger.imp('Metrics exporter started')
       if (this.config.metrics.instanceIdentifier) {
-         // In the API server, the instanceIdentifer is set from ECS_CONTAINER_METADATA_URI
-         // example value: http://169.254.170.2/v3/234fae8d117d4b76a7af0600b94fc195-2439726129
-
-         // in this case, return only the task id following the last /
-         const match = this.config.metrics.instanceIdentifier.match(/\/([^/]*)$/);
-         if (match && match[1]) {
-            Metrics.setInstanceIdentifier(match[1])
-         } else {
-            Metrics.setInstanceIdentifier(this.config.metrics.instanceIdentifier)
-         }
+         Metrics.setInstanceIdentifier(this.config.metrics.instanceIdentifier)
       }
     } catch (e: any) {
       logger.imp('ERROR: Metrics exporter failed to start. Continuing anyway.')