Merge pull request #1003 from pokt-foundation/develop

[staging] feat: add method to log

.github/workflows/dockerhub.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'develop'
+      - 'feat/arm-support'
     tags:
       - 'v*'
   pull_request:
@@ -46,6 +47,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/production-eu-central-1.yml

@@ -4,7 +4,7 @@ name: Terraform Production Deployment eu-central-1
 
 on:
   push:
-    branches: [master, eth-altruist]
+    branches: [master]
 
 jobs:
   deploy:
@@ -122,4 +122,4 @@ jobs:
           task-definition: ${{ steps.task-def-eu-central-1-datadog-agent.outputs.task-definition }}
           service: gateway-prod
           cluster: gateway-prod
-          wait-for-service-stability: true
+          wait-for-service-stability: true

.github/workflows/tag_and_release.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - develop
+      - develop-k8s
       - master
 
 jobs:

pocket-gateway/tasks/production/eu-central-1/production-eu-central-1.yml

@@ -6,7 +6,7 @@ name: Terraform Production Deployment eu-central-1
 
 on:
   push:
-    branches: [master, eth-altruist]
+    branches: [master]
 
 jobs:
   deploy:

scripts/error.init.sql

@@ -0,0 +1,14 @@
+CREATE TABLE error (
+  timestamp TIMESTAMPTZ NOT NULL,
+  applicationpublickey TEXT NOT NULL,
+  blockchain TEXT NOT NULL,
+  nodepublickey TEXT,
+  elapsedtime DOUBLE PRECISION NOT NULL,
+  bytes NUMERIC NOT NULL,
+  method TEXT,
+  message TEXT,
+  code TEXT
+);
+CREATE INDEX error_node_public_key_timestamp_idx ON error(nodepublickey, timestamp DESC);
+CREATE INDEX error_timestamp_application_public_key_idx ON error(timestamp DESC, applicationpublickey);
+CREATE INDEX error_timestamp_idx ON error(timestamp DESC);

src/services/logger.ts

@@ -72,23 +72,14 @@ const consoleFormat = printf(
 
 const startTime = new Date().toISOString()
 
-const logFormat = format.combine(
-  format.colorize(),
-  format.simple(),
-  format.timestamp({
-    format: 'YYYY-MM-DD HH:mm:ss.SSS',
-  }),
-  consoleFormat
-)
-
 const logName = (process.env.REGION_NAME || '') + '/ecs/gateway'
 
 const options = {
   console: {
     level: 'debug',
     handleExceptions: true,
     colorize: true,
-    format: logFormat,
+    format: format.json(),
     silent,
   },
   aws: {

src/services/metrics-recorder.ts

@@ -123,6 +123,7 @@ export class MetricsRecorder {
           relayType: 'APP',
           typeID: applicationID,
           gigastakeAppID,
+          method,
           serviceNode,
           serviceURL,
           serviceDomain,
@@ -142,6 +143,7 @@ export class MetricsRecorder {
           relayType: 'APP',
           typeID: applicationID,
           gigastakeAppID,
+          method,
           serviceNode,
           serviceURL,
           serviceDomain,
@@ -162,6 +164,7 @@ export class MetricsRecorder {
           relayType: 'APP',
           typeID: applicationID,
           gigastakeAppID,
+          method,
           serviceNode,
           serviceURL,
           serviceDomain,

stacks/local.yml

@@ -18,7 +18,7 @@ services:
     depends_on:
       - db
       - cache
-      - metricsdb
+      - errorsdb
     networks:
       - pocket
 
@@ -57,9 +57,9 @@ services:
       - pocket
 
   # DB to store errors
-  metricsdb:
-    container_name: metricsdb
-    image: timescale/timescaledb:2.0.2-pg12
+  errorsdb:
+    image: postgres:15.1
+    container_name: errorsdb
     environment:
       - POSTGRES_USER=pguser
       - POSTGRES_PASSWORD=pgpassword
@@ -69,7 +69,7 @@ services:
     networks:
       - pocket
     volumes:
-      - ./local.init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ../scripts/error.init.sql:/docker-entrypoint-initdb.d/init.sql
 
   influxdb:
     image: quay.io/influxdb/influxdb:v2.0.3