feat: infrastructure and boilerplate deps upgrade (MAPCO-9937)

.dockerignore

@@ -16,3 +16,5 @@ commitlint.config.json
 dist
 build
 reports
+local.json
+

.gitignore

@@ -1,15 +1,16 @@
 # Logs
 logs
 *.log
+
+# Diff files
+*.diff
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
 # Development tools
 .idea
-local.json
-local.yaml
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

.swcrc

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://swc.rs/schema.json",
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "decorators": true
+    },
+    "transform": {
+      "decoratorMetadata": true
+    }
+  }
+}

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "cSpell.words": ["shapefile"]
+  "cSpell.words": ["shapefile"],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 ENV NODE_ENV=production
 ENV SERVER_PORT=8080
+ENV CONFIG_OFFLINE_MODE=true
 
 WORKDIR /usr/src/app
 
@@ -30,4 +31,4 @@ COPY --chown=node:node ./config ./config
 USER node
 EXPOSE 8080
 
-CMD ["dumb-init", "node", "--require", "./common/tracing.js", "./index.js"]
+CMD ["dumb-init", "node", "--import", "./instrumentation.mjs", "./index.js"]

config/custom-environment-variables.json

@@ -11,16 +11,22 @@
       "prettyPrint": {
         "__name": "LOG_PRETTY_PRINT_ENABLED",
         "__format": "boolean"
+      },
+      "opentelemetryOptions": {
+        "enabled": {
+          "__name": "OPENTELEMETRY_LOGGING_ENABLED",
+          "__format": "boolean"
+        },
+        "url": "OPENTELEMETRY_LOGGING_URL",
+        "resourceAttributes": {
+          "__name": "OPENTELEMETRY_RESOURCE_ATTRIBUTES",
+          "__format": "json"
+        }
       }
     },
     "tracing": {
-      "enabled": "TELEMETRY_TRACING_ENABLED",
+      "isEnabled": "TELEMETRY_TRACING_ENABLED",
       "url": "TELEMETRY_TRACING_URL"
-    },
-    "metrics": {
-      "enabled": "TELEMETRY_METRICS_ENABLED",
-      "url": "TELEMETRY_METRICS_URL",
-      "interval": "TELEMETRY_METRICS_INTERVAL"
     }
   },
   "server": {

config/default.json

@@ -8,20 +8,18 @@
   "telemetry": {
     "logger": {
       "level": "info",
-      "prettyPrint": false
+      "prettyPrint": false,
+      "opentelemetryOptions": {
+        "enabled": false
+      }
     },
+    "shared": {},
     "tracing": {
-      "enabled": "true",
-      "url": "http://localhost:4318/v1/traces"
-    },
-    "metrics": {
-      "enabled": false,
-      "url": "http://localhost:4318/v1/metrics",
-      "interval": 5
+      "isEnabled": false
     }
   },
   "server": {
-    "port": "8080",
+    "port": 8080,
     "request": {
       "payload": {
         "limit": "1mb"

eslint.config.mjs

@@ -0,0 +1,5 @@
+import tsBaseConfig from '@map-colonies/eslint-config/ts-base';
+import jestConfig from '@map-colonies/eslint-config/jest';
+import { config } from '@map-colonies/eslint-config/helpers';
+
+export default config(jestConfig, tsBaseConfig);

helm/templates/_helpers.tpl

@@ -102,3 +102,4 @@ Returns the cloud provider image pull secret name from global if exists or from
     {{- .Values.cloudProvider.imagePullSecretName -}}
 {{- end -}}
 {{- end -}}
+

helm/templates/_tplValues.tpl

@@ -69,6 +69,6 @@ Custom definitions
 {{- include "common.tplvalues.merge" ( dict "values" ( list .Values.tracing .Values.global.tracing ) "context" . ) }}
 {{- end -}}
 
-{{- define "common.metrics.merged" -}}
-{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics .Values.global.metrics ) "context" . ) }}
+{{- define "common.openTelemetryOptions.merged" -}}
+{{- include "common.tplvalues.merge" ( dict "values" ( list .Values.env.openTelemetryOptions .Values.global.openTelemetryOptions ) "context" . ) }}
 {{- end -}}

helm/templates/configmap.yaml

@@ -1,7 +1,7 @@
 {{- $chartName := include "ingestion-trigger.name" . -}}
-{{- $tracing := (include "common.tracing.merged" .) | fromYaml }}
-{{- $metrics := (include "common.metrics.merged" .) | fromYaml }}
 {{- $configmapName := include "configmap.fullname" . }}
+{{- $tracing := (include "common.tracing.merged" .) | fromYaml }}
+{{- $openTelemetryOptions := (include "common.openTelemetryOptions.merged" .) | fromYaml }}
 {{- $serviceUrls := (include "common.serviceUrls.merged" .) | fromYaml }}
 {{- $jobDefinitions := (include "common.jobDefinitions.merged" .) | fromYaml }}
 {{- $storage := (include "common.storage.merged" .) | fromYaml }}
@@ -47,10 +47,20 @@ data:
   {{ if $tracing.enabled }}
   TELEMETRY_TRACING_URL: {{ $tracing.url }}
   {{ end }}
-  {{ if $metrics.enabled }}
-  TELEMETRY_METRICS_ENABLED: {{ $metrics.enabled | quote }}
-  TELEMETRY_METRICS_URL: {{ $metrics.url }}
+  {{- with $openTelemetryOptions }}
+  OPENTELEMETRY_LOGGING_ENABLED: {{ .enabled | quote }}
+  {{ if .enabled }}
+  OPENTELEMETRY_LOGGING_URL: {{ .url | quote }}
+  {{ if .resourceAttributes }}
+  OPENTELEMETRY_RESOURCE_ATTRIBUTES: {{ .resourceAttributes | toJson | quote }}
+  {{ end }}
   {{ end }}
+  {{- end }}
+  {{- with .Values.configManagement }}
+  CONFIG_SERVER_URL: {{ .serverUrl | quote }}
+  CONFIG_NAME: {{ .name | quote }}
+  CONFIG_VERSION: {{ .version | quote }}
+  OFFLINE_MODE: {{ .offlineMode | quote }}
+  {{- end }}
   npm_config_cache: /tmp/
 {{- end }}
-# TODO: check if values should be clean up

helm/templates/deployment.yaml

@@ -1,7 +1,6 @@
 {{- $releaseName := .Release.Name -}}
 {{- $chartName := include "ingestion-trigger.name" . -}}
 {{- $deploymentName := include "deployment.fullname" . }}
-{{- $metrics := (include "common.metrics.merged" .) | fromYaml }}
 {{- $configmapName := include "configmap.fullname" . }}
 {{- $cloudProviderFlavor := include "ingestion-trigger.cloudProviderFlavor" . -}}
 {{- $cloudProviderDockerRegistryUrl := include "ingestion-trigger.cloudProviderDockerRegistryUrl" . -}}
@@ -66,6 +65,10 @@ spec:
               subPath: {{ quote .Values.global.ca.key }}
             {{- end }}
           env:
+            - name: K8S_POD_UID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.uid
             - name: SERVER_PORT
               value: {{ .Values.env.targetPort | quote }}
             {{- if .Values.global.ca.secretName }}

helm/values.yaml

@@ -1,10 +1,13 @@
 global:
   cloudProvider: {}
   tracing: {}
-  metrics: {}
   environment: ''
   domain: "RASTER"
   serviceUrls: {}
+  openTelemetryOptions:
+    enabled: false
+    url: ''
+    resourceAttributes: {}
   jobDefinitions: {}
   storage:
     fs:
@@ -74,12 +77,11 @@ tracing:
   enabled: false
   url: ''
 
-metrics:
-  enabled: false
-  url: ''
-  prometheus:
-    scrape: true
-    port: 8080
+configManagement:
+  offlineMode: false
+  name: 'ingestion-trigger'
+  version: 'latest'
+  serverUrl: 'http://localhost:8080/api'
 
 image:
   repository: ingestion-trigger
@@ -128,8 +130,15 @@ env:
   protocol: TCP
   logLevel: info
   logPrettyPrintEnabled: false
+  openTelemetryOptions:
+    enabled: false
+    url: ''
+    resourceAttributes: {}
   responseCompressionEnabled: true
   requestPayloadLimit: 1mb
+  tracing:
+    enabled: false
+    url: ''
   storageExplorer:
     layerSourceDir: '/layerSources'
     displayNameDir: "\\layerSources"