Merge pull request #916 from near/main

Prod Release 24/07/2024
near · Jul 24, 2024 · 8034220 · 8034220
2 parents af40c14 + 9133af4
commit 8034220
Show file tree

Hide file tree

Showing 50 changed files with 9,307 additions and 1,146 deletions.
diff --git a/README.md b/README.md
@@ -66,6 +66,24 @@ With everything configured correctly, we can now start all components of QueryAp
 docker compose up
 ```
 
+### Developing frontend
+1. Change `frontend/replacement.dev.json` to
+```json
+{
+    "REPL_ACCOUNT_ID": "dev-queryapi.dataplatform.near",
+    "REPL_GRAPHQL_ENDPOINT": "https://near-queryapi.dev.api.pagoda.co",
+    "REPL_EXTERNAL_APP_URL": "http://localhost:3000",
+    "REPL_REGISTRY_CONTRACT_ID": "dev-queryapi.dataplatform.near",
+    "REPL_QUERY_API_USAGE_URL": "https://storage.googleapis.com/databricks-near-query-runner/output/query-api-usage/indexers_dev.json"
+}
+```
+2. `cd frontend`
+3. `npm install`
+4. `npm run dev`
+5. `npm run serve:widgets:dev`
+6. Set flags https://dev.near.org/flags to `http://127.0.0.1:3030`
+7. Navigate to `https://dev.near.org/dev-queryapi.dataplatform.near/widget/QueryApi.dev-App`
+
 ### Local Configuration
 - Coordinator watches the dev registry contract by default (`dev-queryapi.dataplatform.near`). To use a different contract, you can update the `REGISTRY_CONTRACT_ID` environment variable.
 

diff --git a/block-streamer/src/block_stream.rs b/block-streamer/src/block_stream.rs
@@ -409,9 +409,14 @@ async fn process_bitmap_indexer_blocks(
 
     let mut last_published_block_height: u64 = start_block_height;
 
+    let indexer_name = indexer.get_full_name();
+
     while let Some(block_height_result) = matching_block_heights.next().await {
         match block_height_result {
             Ok(block_height) => {
+                metrics::RECEIVER_BLOCKS_FAILURE
+                    .with_label_values(&[&indexer_name])
+                    .set(0);
                 redis
                     .publish_block(indexer, redis_stream.clone(), block_height, MAX_STREAM_SIZE)
                     .await?;
@@ -422,6 +427,9 @@ async fn process_bitmap_indexer_blocks(
                 last_published_block_height = block_height;
             }
             Err(err) => {
+                metrics::RECEIVER_BLOCKS_FAILURE
+                    .with_label_values(&[&indexer_name])
+                    .inc();
                 tracing::error!(
                     "Backfill using bitmap indexer failed unexpectedly: {:?}",
                     err

diff --git a/block-streamer/src/graphql/client.rs b/block-streamer/src/graphql/client.rs
@@ -57,6 +57,12 @@ impl GraphQLClientImpl {
             .json(&body)
             .send()
             .await?;
+        if reqwest_response.status() != 200 {
+            tracing::error!(
+                "GraphQL query failed with status code: {}",
+                reqwest_response.status()
+            );
+        }
 
         reqwest_response.json().await
     }

diff --git a/block-streamer/src/metrics.rs b/block-streamer/src/metrics.rs
@@ -63,6 +63,12 @@ lazy_static! {
         &["indexer"]
     )
     .unwrap();
+    pub static ref RECEIVER_BLOCKS_FAILURE: IntGaugeVec = register_int_gauge_vec!(
+        "queryapi_block_streamer_receiver_blocks_failure",
+        "Gauge which only has a nonzero value if an error occurs during receiver block backfill",
+        &["indexer"]
+    )
+    .unwrap();
 }
 
 pub struct LogCounter;

diff --git a/core-indexers/.eslintrc.js b/core-indexers/.eslintrc.js
@@ -0,0 +1,35 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  env: {
+    es2021: true,
+    node: true
+  },
+  overrides: [
+    {
+      files: ['.eslintrc.js', 'jest.config.js'],
+      parser: 'espree',
+      extends: ['standard'],
+      rules: {
+        semi: ['error', 'always'],
+        quotes: ['error', 'single'],
+        'array-callback-return': ['error', { allowImplicit: false }]
+      }
+    },
+    {
+      files: ['**/*.ts'],
+      parserOptions: {
+        project: './tsconfig.json',
+        tsconfigRootDir: __dirname
+      },
+      extends: [
+        'standard-with-typescript'
+      ],
+      rules: {
+        '@typescript-eslint/semi': ['error', 'always'],
+        '@typescript-eslint/comma-dangle': ['error', 'only-multiline'],
+        '@typescript-eslint/strict-boolean-expressions': 'off',
+        'array-callback-return': ['error', { allowImplicit: false }]
+      }
+    }
+  ]
+};
diff --git a/core-indexers/jest.config.js b/core-indexers/jest.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/*.test.ts'],
+  testTimeout: 10000
+};