promote main

.ceramicDev.config.json

@@ -1,5 +1,5 @@
 {
-  "anchor": { },
+  "anchor": {},
   "http-api": {
     "cors-allowed-origins": [
       ".*"
@@ -16,8 +16,8 @@
     "log-level": 2
   },
   "metrics": {
-    "metrics-exporter-enabled": false,
-    "metrics-port": 9090
+    "prometheus-exporter-enabled": true,
+    "prometheus-exporter-port": 9464
   },
   "network": {
     "name": "inmemory"
@@ -33,3 +33,4 @@
     "models": []
   }
 }
+

.github/workflows/build-and-test.yaml

@@ -22,6 +22,7 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   CONTAINER_IMAGE: desci-server
   DOCKER_BUILDKIT: 1
+  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
 jobs:
   build-and-test:
@@ -55,6 +56,15 @@ jobs:
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-research-object.json
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-dpid.json
 
+      - name: Set up Sentry CLI
+        run: |
+          npm install -g @sentry/cli
+          sentry-cli --version
+          sentry-cli login --auth-token $SENTRY_AUTH_TOKEN
+          # append to .env
+          echo -e "\nSENTRY_AUTH_TOKEN=$SENTRY_AUTH" >> desci-server/.env
+          cd desci-server && yarn build
+
       - name: Run tests
         run: |
           cd desci-server && export DOCKER_BUILDKIT=1 && yarn --ignore-engines && yarn test

.github/workflows/build-server.yaml

@@ -23,6 +23,7 @@ env:
   AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   CONTAINER_IMAGE: desci-server
   DOCKER_BUILDKIT: 1
 
@@ -57,6 +58,14 @@ jobs:
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-research-object.json
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-dpid.json
 
+      - name: Set up Sentry CLI
+        run: |
+          npm install -g @sentry/cli
+          sentry-cli --version
+          sentry-cli login --auth-token $SENTRY_AUTH_TOKEN
+          # append to .env
+          echo -e "\nSENTRY_AUTH_TOKEN=$SENTRY_AUTH" >> desci-server/.env
+
       - name: Run tests
         run: |
           cd desci-server && export DOCKER_BUILDKIT=1 && yarn --ignore-engines && yarn test
@@ -113,6 +122,14 @@ jobs:
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-research-object.json
           echo "{\"proxies\":[{\"address\":\"\"}]}" > desci-server/src/desci-contracts-config/unknown-dpid.json
 
+      - name: Set up Sentry CLI
+        run: |
+          npm install -g @sentry/cli
+          sentry-cli --version
+          sentry-cli login --auth-token $SENTRY_AUTH_TOKEN
+          # append to .env
+          echo -e "\nSENTRY_AUTH_TOKEN=$SENTRY_AUTH" >> desci-server/.env
+
       - name: Build and tag the image (DEV)
         if: github.ref == 'refs/heads/develop'
         run: |

ceramic-k8s/ceramic_deployment_dev.yaml

@@ -11,10 +11,7 @@ spec:
     matchLabels:
       App: JsCeramicDev
   strategy:
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
-    type: RollingUpdate
+    type: Recreate
   template:
     metadata:
       annotations:
@@ -41,14 +38,18 @@ spec:
         App: JsCeramicDev
     spec:
       containers:
-        - image: ceramicnetwork/js-ceramic:6.4.0
+          # Enables a fix allowing us to heal dropped anchors on genesis commits:
+          # https://github.com/ceramicnetwork/js-ceramic/pull/3280
+        - image: ceramicnetwork/js-ceramic:6.6.0-rc.0
           name: js-ceramic-dev
           command: ["/bin/bash", "-c"]
           args:
             - echo "SOURCING ENV"; source /vault/secrets/config; ./packages/cli/bin/ceramic.js daemon --config daemon.config.json;
           ports:
             - containerPort: 7007
               name: http-api
+            - containerPort: 9464
+              name: metrics
           resources:
             limits:
               cpu: 2
@@ -70,9 +71,38 @@ spec:
               port: http-api
             failureThreshold: 60
             periodSeconds: 1
-
       serviceAccountName: "vault-auth"
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: js-ceramic-dev-service-internal
+  labels:
+    App: JsCeramicDev
+spec:
+  type: ClusterIP
+  selector:
+    App: JsCeramicDev
+  ports:
+    - name: metrics
+      port: 9464
+      targetPort: metrics
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: public-js-ceramic-dev-service
+  labels:
+    App: JsCeramicDev
+spec:
+  type: LoadBalancer
+  selector:
+    App: JsCeramicDev
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: http-api
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -91,19 +121,3 @@ spec:
                 name: public-js-ceramic-dev-service
                 port:
                   number: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: public-js-ceramic-dev-service
-  labels:
-    App: JsCeramicDev
-spec:
-  type: LoadBalancer
-  selector:
-    App: JsCeramicDev
-  ports:
-    - protocol: TCP
-      name: http
-      port: 80
-      targetPort: 7007

ceramic-k8s/ceramic_deployment_prod.yaml

@@ -62,7 +62,7 @@ spec:
         App: JsCeramicProd
     spec:
       containers:
-        - image: ceramicnetwork/js-ceramic:6.4.0
+        - image: ceramicnetwork/js-ceramic:6.5.0
           name: js-ceramic-prod
           command: ["/bin/bash", "-c"]
           volumeMounts:
@@ -73,6 +73,8 @@ spec:
           ports:
             - containerPort: 7007
               name: http-api
+            - containerPort: 9464
+              name: metrics
           resources:
             limits:
               cpu: 2
@@ -107,9 +109,39 @@ spec:
         - name: ceramic-prod-persistent-storage
           persistentVolumeClaim:
             claimName: ceramic-prod-persistent-storage-pvc
-
       serviceAccountName: "vault-auth"
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: js-ceramic-prod-service-internal
+  labels:
+    App: JsCeramicProd
+spec:
+  type: ClusterIP
+  selector:
+    App: JsCeramicProd
+  ports:
+    - name: metrics
+      port: 9464
+      targetPort: metrics
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: public-js-ceramic-prod-service
+  labels:
+    App: JsCeramicProd
+spec:
+  type: LoadBalancer
+  selector:
+    App: JsCeramicProd
+  ports:
+    - protocol: TCP
+      name: http
+      port: 80
+      targetPort: http-api
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -128,19 +160,3 @@ spec:
                 name: public-js-ceramic-prod-service
                 port:
                   number: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: public-js-ceramic-prod-service
-  labels:
-    App: JsCeramicProd
-spec:
-  type: LoadBalancer
-  selector:
-    App: JsCeramicProd
-  ports:
-    - protocol: TCP
-      name: http
-      port: 80
-      targetPort: 7007

desci-repo/src/controllers/nodes/documents.ts

@@ -59,18 +59,13 @@ export const createNodeDocument = async function (req: Request, res: Response) {
 export const getLatestNodeManifest = async function (req: Request, res: Response) {
   logger.info({ params: req.params }, 'START [getLatestNodeManifest]');
   try {
-    console.log('[getLatestNodeManifest]', req.params);
+    logger.info({ params: req.params }, '[getLatestNodeManifest]');
     if (!req.params.uuid) {
       res.status(400).send({ ok: false, message: 'Invalid data' });
       return;
     }
 
     const { uuid } = req.params;
-
-    // const queryResult = await pool.query('SELECT * FROM nodes WHERE uuid = $1', [uuid]);
-    // console.log('user:', queryResult.rows[0]);
-
-    logger.info('[getLatestNodeManifest]', { uuid });
     const node = await findNodeByUuid(uuid);
     logger.trace('[getLatestNodeManifest::node]', { node });
 

desci-server/.gitignore

@@ -16,3 +16,6 @@ server.log
 repo-tmp
 
 queries.sql
+
+# Sentry Config File
+.sentryclirc

desci-server/package.json

@@ -25,7 +25,7 @@
     "script:seed-social-data": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/seed-social-data.ts",
     "script:DESTRUCTIVE-clear-social-data": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/DESTRUCTIVE-clear-social-data.ts",
     "script:seed-community-member": "debug=* node --no-warnings --enable-source-maps --loader ts-node/esm ./src/scripts/seed-community-members.ts",
-    "build": "rimraf dist && tsc && yarn copy-files",
+    "build": "rimraf dist && tsc && yarn copy-files; if [ \"$SENTRY_AUTH_TOKEN\" ]; then yarn sentry:sourcemaps; else echo 'SENTRY_AUTH_TOKEN not set, sourcemaps will not upload'; fi",
     "copy-files": "copyfiles -u 1 src/**/*.cjs dist/",
     "generate": "npx prisma generate",
     "migrate:local": "DATABASE_URL=postgresql://walter:white@localhost:5433/boilerplate npx prisma migrate dev",
@@ -50,7 +50,8 @@
     "docker:prod": "../dockerProd.sh",
     "podman:dev": "podman-compose --file docker-compose.yml --file docker-compose.dev.yml up --build",
     "email-dev": "email dev --dir ./src/templates/emails --port 3777",
-    "check-deps": "npx npm-check"
+    "check-deps": "npx npm-check",
+    "sentry:sourcemaps": "sentry-cli sourcemaps inject --org desci-labs --project nodes-backend ./dist && sentry-cli sourcemaps upload --org desci-labs --project nodes-backend ./dist && echo 'Sentry sourcemaps uploaded'"
   },
   "dependencies": {
     "@automerge/automerge-repo": "^1.0.19",
@@ -68,7 +69,9 @@
     "@prisma/client": "4.10.1",
     "@react-email/components": "0.0.15",
     "@sendgrid/mail": "^7.7.0",
-    "@sentry/node": "^7.12.0",
+    "@sentry/cli": "^2.35.0",
+    "@sentry/node": "^8.29.0",
+    "@sentry/profiling-node": "^8.32.0",
     "@sentry/tracing": "^7.12.0",
     "@types/lodash-es": "^4.17.12",
     "@types/mkdirp": "^1.0.2",

desci-server/prisma/schema.prisma

@@ -1,5 +1,6 @@
 generator client {
-  provider = "prisma-client-js"
+  provider        = "prisma-client-js"
+  previewFeatures = ["tracing"]
 }
 
 datasource db {