Merge pull request #2399 from AztecProtocol/stage

Pw/logging and optimisations (#2398)
mohsobh · Feb 17, 2023 · 5160615 · 5160615
2 parents d0de04e + 6b9b68f
commit 5160615
Show file tree

Hide file tree

Showing 24 changed files with 740 additions and 186 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -685,6 +685,9 @@ jobs:
       - run:
           name: 'Build sidecar'
           command: build metrics-sidecar
+      - run:
+          name: 'Build fluent-bit'
+          command: build fluent-bit
       - run:
           name: 'Build prometheus'
           command: build prometheus
@@ -814,6 +817,9 @@ jobs:
       - run:
           name: 'sidecar'
           command: deploy_ecr metrics-sidecar
+      - run:
+          name: 'fluent-bit'
+          command: deploy_ecr fluent-bit
       - run:
           name: 'prometheus'
           command: deploy_global prometheus

diff --git a/yarn-project/barretenberg.js/src/blockchain/blockchain_status.ts b/yarn-project/barretenberg.js/src/blockchain/blockchain_status.ts
@@ -37,7 +37,7 @@ export type BlockchainAssetJson = Jsonify<BlockchainAsset>;
 
 export const blockchainAssetToJson = ({ address, ...asset }: BlockchainAsset): BlockchainAssetJson => ({
   ...asset,
-  address: address.toString(),
+  address: address.toLowerCaseAddress(),
 });
 
 export const blockchainAssetFromJson = ({ address, ...asset }: BlockchainAssetJson): BlockchainAsset => ({
@@ -55,7 +55,7 @@ export type BlockchainBridgeJson = Jsonify<BlockchainBridge>;
 
 export const blockchainBridgeToJson = ({ address, ...bridge }: BlockchainBridge): BlockchainBridgeJson => ({
   ...bridge,
-  address: address.toString(),
+  address: address.toLowerCaseAddress(),
 });
 
 export const blockchainBridgeFromJson = ({ address, ...bridge }: BlockchainBridgeJson): BlockchainBridge => ({
@@ -88,10 +88,10 @@ export type BlockchainStatusJson = Jsonify<BlockchainStatus>;
 export function blockchainStatusToJson(status: BlockchainStatus): BlockchainStatusJson {
   return {
     ...status,
-    rollupContractAddress: status.rollupContractAddress.toString(),
-    permitHelperContractAddress: status.permitHelperContractAddress.toString(),
-    verifierContractAddress: status.verifierContractAddress.toString(),
-    bridgeDataProvider: status.bridgeDataProvider.toString(),
+    rollupContractAddress: status.rollupContractAddress.toLowerCaseAddress(),
+    permitHelperContractAddress: status.permitHelperContractAddress.toLowerCaseAddress(),
+    verifierContractAddress: status.verifierContractAddress.toLowerCaseAddress(),
+    bridgeDataProvider: status.bridgeDataProvider.toLowerCaseAddress(),
     dataRoot: status.dataRoot.toString('hex'),
     nullRoot: status.nullRoot.toString('hex'),
     rootRoot: status.rootRoot.toString('hex'),

diff --git a/yarn-project/barretenberg.js/src/rollup_provider/rollup_provider_status.ts b/yarn-project/barretenberg.js/src/rollup_provider/rollup_provider_status.ts
@@ -71,8 +71,8 @@ export const runtimeConfigToJson = ({
   maxFeePerGas: maxFeePerGas.toString(),
   maxPriorityFeePerGas: maxPriorityFeePerGas.toString(),
   privacySets: privacySetsToJson(privacySets),
-  rollupBeneficiary: rollupBeneficiary ? rollupBeneficiary.toString() : undefined,
-  blacklist: blacklist ? blacklist.map(x => x.toString()) : undefined,
+  rollupBeneficiary: rollupBeneficiary ? rollupBeneficiary.toLowerCaseAddress() : undefined,
+  blacklist: blacklist ? blacklist.map(x => x.toLowerCaseAddress()) : undefined,
 });
 
 export const runtimeConfigFromJson = ({

diff --git a/yarn-project/block-server/src/app.ts b/yarn-project/block-server/src/app.ts
@@ -77,6 +77,9 @@ export function appFactory(server: Server, prefix: string) {
   });
 
   const app = new Koa();
+  app.on('error', error => {
+    console.log(`KOA app-level error. ${JSON.stringify({ error })}`);
+  });
   app.proxy = true;
   app.use(compress({ br: false } as any));
   app.use(cors());

diff --git a/yarn-project/block-server/terraform/dev/main.tf b/yarn-project/block-server/terraform/dev/main.tf
@@ -72,6 +72,7 @@ resource "aws_ecs_task_definition" "block-server" {
   cpu                      = "2048"
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
 
   container_definitions = <<DEFINITIONS
 [
@@ -104,11 +105,14 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-      "logDriver": "awslogs",
+      "logDriver":"awsfirelens",
       "options": {
-        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/block-server",
-        "awslogs-region": "eu-west-2",
-        "awslogs-stream-prefix": "ecs"
+        "Name": "cloudwatch",
+        "region": "eu-west-2",
+        "log_key": "log",
+        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
+        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "auto_create_group": "false"
       }
     }
   },
@@ -136,6 +140,46 @@ resource "aws_ecs_task_definition" "block-server" {
         "awslogs-stream-prefix": "ecs"
       }
     }
+  },
+  {
+    "essential": true,
+    "image": "278380418400.dkr.ecr.eu-west-2.amazonaws.com/fluent-bit:latest",
+    "name": "log_router",
+    "firelensConfiguration": {
+        "type": "fluentbit",
+        "options": {
+            "enable-ecs-log-metadata": "true",
+            "config-file-type":"file",
+            "config-file-value":"/etc/fluent-bit/fluent-bit.conf"
+        }
+    },
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    },
+    "environment": [
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
+      {
+        "name": "SERVICE",
+        "value": "block-server"
+      },
+      {
+        "name": "LOKI_HOST",
+        "value": "loki.local"
+      },
+      {
+        "name": "LOKI_PORT",
+        "value": "3100"
+      }
+    ],
+    "memoryReservation": 64
   }
 ]
 DEFINITIONS

diff --git a/yarn-project/block-server/terraform/prod/main.tf b/yarn-project/block-server/terraform/prod/main.tf
@@ -72,6 +72,7 @@ resource "aws_ecs_task_definition" "block-server" {
   cpu                      = "2048"
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
 
   container_definitions = <<DEFINITIONS
 [
@@ -104,15 +105,15 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-        "logDriver": "awsfirelens",
-        "options": {
-            "Name": "grafana-loki",
-            "Url": "http://loki.local:3100/loki/api/v1/push",
-            "Labels": "{environment=\"${var.DEPLOY_TAG}\", service=\"block-server\"}",
-            "RemoveKeys": "container_id,ecs_task_arn",
-            "LabelKeys": "container_name,ecs_task_definition,source,ecs_cluster",
-            "LineFormat": "key_value"
-        }
+      "logDriver":"awsfirelens",
+      "options": {
+        "Name": "cloudwatch",
+        "region": "eu-west-2",
+        "log_key": "log",
+        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
+        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "auto_create_group": "false"
+      }
     }
   },
   {
@@ -142,14 +143,42 @@ resource "aws_ecs_task_definition" "block-server" {
   },
   {
     "essential": true,
-    "image": "grafana/fluent-bit-plugin-loki:2.7.0-amd64",
+    "image": "278380418400.dkr.ecr.eu-west-2.amazonaws.com/fluent-bit:latest",
     "name": "log_router",
     "firelensConfiguration": {
         "type": "fluentbit",
         "options": {
-            "enable-ecs-log-metadata": "true"
+            "enable-ecs-log-metadata": "true",
+            "config-file-type":"file",
+            "config-file-value":"/etc/fluent-bit/fluent-bit.conf"
         }
     },
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    },
+    "environment": [
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
+      {
+        "name": "SERVICE",
+        "value": "block-server"
+      },
+      {
+        "name": "LOKI_HOST",
+        "value": "loki.local"
+      },
+      {
+        "name": "LOKI_PORT",
+        "value": "3100"
+      }
+    ],
     "memoryReservation": 64
   }
 ]

diff --git a/yarn-project/block-server/terraform/stage/main.tf b/yarn-project/block-server/terraform/stage/main.tf
@@ -74,6 +74,7 @@ resource "aws_ecs_task_definition" "block-server" {
   cpu                      = "2048"
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
 
   container_definitions = <<DEFINITIONS
 [
@@ -106,15 +107,15 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-        "logDriver": "awsfirelens",
-        "options": {
-            "Name": "grafana-loki",
-            "Url": "http://loki.local:3100/loki/api/v1/push",
-            "Labels": "{environment=\"${var.DEPLOY_TAG}\", service=\"block-server\"}",
-            "RemoveKeys": "container_id,ecs_task_arn",
-            "LabelKeys": "container_name,ecs_task_definition,source,ecs_cluster",
-            "LineFormat": "key_value"
-        }
+      "logDriver":"awsfirelens",
+      "options": {
+        "Name": "cloudwatch",
+        "region": "eu-west-2",
+        "log_key": "log",
+        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
+        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "auto_create_group": "false"
+      }
     }
   },
   {
@@ -144,14 +145,42 @@ resource "aws_ecs_task_definition" "block-server" {
   },
   {
     "essential": true,
-    "image": "grafana/fluent-bit-plugin-loki:2.7.0-amd64",
+    "image": "278380418400.dkr.ecr.eu-west-2.amazonaws.com/fluent-bit:latest",
     "name": "log_router",
     "firelensConfiguration": {
         "type": "fluentbit",
         "options": {
-            "enable-ecs-log-metadata": "true"
+            "enable-ecs-log-metadata": "true",
+            "config-file-type":"file",
+            "config-file-value":"/etc/fluent-bit/fluent-bit.conf"
         }
     },
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    },
+    "environment": [
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
+      {
+        "name": "SERVICE",
+        "value": "block-server"
+      },
+      {
+        "name": "LOKI_HOST",
+        "value": "loki.local"
+      },
+      {
+        "name": "LOKI_PORT",
+        "value": "3100"
+      }
+    ],
     "memoryReservation": 64
   }
 ]

diff --git a/yarn-project/block-server/terraform/testnet/main.tf b/yarn-project/block-server/terraform/testnet/main.tf
@@ -72,6 +72,7 @@ resource "aws_ecs_task_definition" "block-server" {
   cpu                      = "2048"
   memory                   = "4096"
   execution_role_arn       = data.terraform_remote_state.setup_iac.outputs.ecs_task_execution_role_arn
+  task_role_arn            = data.terraform_remote_state.aztec2_iac.outputs.cloudwatch_logging_ecs_role_arn
 
   container_definitions = <<DEFINITIONS
 [
@@ -104,15 +105,15 @@ resource "aws_ecs_task_definition" "block-server" {
       }
     ],
     "logConfiguration": {
-        "logDriver": "awsfirelens",
-        "options": {
-            "Name": "grafana-loki",
-            "Url": "http://loki.local:3100/loki/api/v1/push",
-            "Labels": "{environment=\"${var.DEPLOY_TAG}\", service=\"block-server\"}",
-            "RemoveKeys": "container_id,ecs_task_arn",
-            "LabelKeys": "container_name,ecs_task_definition,source,ecs_cluster",
-            "LineFormat": "key_value"
-        }
+      "logDriver":"awsfirelens",
+      "options": {
+        "Name": "cloudwatch",
+        "region": "eu-west-2",
+        "log_key": "log",
+        "log_stream_name": "/ecs/$(container_name)/$(ecs_task_id)",
+        "log_group_name": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "auto_create_group": "false"
+      }
     }
   },
   {
@@ -142,14 +143,42 @@ resource "aws_ecs_task_definition" "block-server" {
   },
   {
     "essential": true,
-    "image": "grafana/fluent-bit-plugin-loki:2.7.0-amd64",
+    "image": "278380418400.dkr.ecr.eu-west-2.amazonaws.com/fluent-bit:latest",
     "name": "log_router",
     "firelensConfiguration": {
         "type": "fluentbit",
         "options": {
-            "enable-ecs-log-metadata": "true"
+            "enable-ecs-log-metadata": "true",
+            "config-file-type":"file",
+            "config-file-value":"/etc/fluent-bit/fluent-bit.conf"
         }
     },
+    "logConfiguration": {
+      "logDriver": "awslogs",
+      "options": {
+        "awslogs-group": "/fargate/service/${var.DEPLOY_TAG}/block-server",
+        "awslogs-region": "eu-west-2",
+        "awslogs-stream-prefix": "ecs"
+      }
+    },
+    "environment": [
+      {
+        "name": "DEPLOY_TAG",
+        "value": "${var.DEPLOY_TAG}"
+      },
+      {
+        "name": "SERVICE",
+        "value": "block-server"
+      },
+      {
+        "name": "LOKI_HOST",
+        "value": "loki.local"
+      },
+      {
+        "name": "LOKI_PORT",
+        "value": "3100"
+      }
+    ],
     "memoryReservation": 64
   }
 ]

diff --git a/yarn-project/falafel/src/app.ts b/yarn-project/falafel/src/app.ts
@@ -401,6 +401,9 @@ export function appFactory(server: Server, prefix: string, metrics: Metrics, ser
   });
 
   const app = new Koa();
+  app.on('error', error => {
+    console.log(`KOA app-level error. ${JSON.stringify({ error })}`);
+  });
   app.proxy = true;
   app.use(compress({ br: false } as any));
   app.use(cors());