Merge pull request #1 from ai-chat-os/chore/new-relic

Add Newrelic

Dockerfile

@@ -51,6 +51,8 @@ COPY --from=builder /evolution/Docker ./Docker
 COPY --from=builder /evolution/runWithProvider.js ./runWithProvider.js
 COPY --from=builder /evolution/tsup.config.ts ./tsup.config.ts
 
+COPY newrelic.js .
+
 ENV DOCKER_ENV=true
 
 EXPOSE 8080

chatfluxctl

@@ -0,0 +1,87 @@
+#!/bin/bash
+
+if [ "$#" -lt 3 ]; then
+    echo "Usage: $0 <environment> <action> <service_name>"
+    echo "Environment: staging|production"
+    echo "Action: start|stop"
+    echo "Service: service_name|all"
+    exit 1
+fi
+
+ENVIRONMENT=$1
+ACTION=$2
+SERVICE_NAME=$3
+BASE_COMPOSE=""
+ENV_COMPOSE=""
+DOCKER_COMPOSE_CMD="docker compose"
+
+# Check for both yml and yaml extensions for base compose
+if [ -f "docker-compose.yml" ]; then
+    BASE_COMPOSE="docker-compose.yml"
+elif [ -f "docker-compose.yaml" ]; then
+    BASE_COMPOSE="docker-compose.yaml"
+else
+    echo "Error: Base docker-compose file not found (tried .yml and .yaml)"
+    exit 1
+fi
+
+# Check for both yml and yaml extensions for environment compose
+if [ -f "docker-compose.${ENVIRONMENT}.yml" ]; then
+    ENV_COMPOSE="docker-compose.${ENVIRONMENT}.yml"
+elif [ -f "docker-compose.${ENVIRONMENT}.yaml" ]; then
+    ENV_COMPOSE="docker-compose.${ENVIRONMENT}.yaml"
+else
+    echo "Error: Environment docker-compose file not found (tried .yml and .yaml)"
+    exit 1
+fi
+
+# Validate environment
+if [ "$ENVIRONMENT" != "staging" ] && [ "$ENVIRONMENT" != "production" ]; then
+    echo "Error: Environment must be either 'staging' or 'production'"
+    exit 1
+fi
+
+# Validate action
+if [ "$ACTION" != "start" ] && [ "$ACTION" != "stop" ]; then
+    echo "Error: Action must be either 'start' or 'stop'"
+    exit 1
+fi
+
+# Function to check if service exists in compose files
+check_service() {
+    local service=$1
+    if [ "$service" != "all" ]; then
+        if ! $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE config --services | grep -q "^$service$"; then
+            echo "Error: Service '$service' not found in docker-compose files"
+            exit 1
+        fi
+    fi
+}
+
+# Validate service exists
+check_service $SERVICE_NAME
+
+if [ "$ACTION" == "stop" ]; then
+    echo "Stopping service(s): $SERVICE_NAME"
+    if [ "$SERVICE_NAME" == "all" ]; then
+        $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE down
+    else
+        $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE stop $SERVICE_NAME
+        $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE rm -f $SERVICE_NAME
+    fi
+else
+    echo "Starting service(s): $SERVICE_NAME"
+    if [ "$SERVICE_NAME" == "all" ]; then
+        $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE up -d
+    else
+        $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE up -d $SERVICE_NAME
+    fi
+fi
+
+# Check service status
+echo "Service status:"
+if [ "$SERVICE_NAME" == "all" ]; then
+    $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE ps
+else
+    $DOCKER_COMPOSE_CMD -f $BASE_COMPOSE -f $ENV_COMPOSE ps $SERVICE_NAME
+fi

docker-compose.staging.yaml

@@ -0,0 +1,5 @@
+services:
+  api:
+    environment:
+      CHATFLUX_ENV: Staging
+      NEW_RELIC_APP_NAME: "Staging Evolution API"

docker-compose.yaml

@@ -1,10 +1,22 @@
 services:
   api:
     container_name: evolution_api
-    image: atendai/evolution-api:v2.2.1
+    image: ghcr.io/ai-chat-os/evolution-api:v2.2.1
     restart: always
     depends_on:
       - postgres
+    environment:
+      # 1- Add the Env key values pair to /etc/environment file
+      # 2- Run source /etc/environment
+      # 3- Run env |grep -i relic; to validate it being loaded.
+      # 4- If didn't, CTRL+d to logout
+      # 5- Login to the server
+      # 6- Run env |grep -i relic again;
+      NEW_RELIC_LICENSE_KEY: ${NEW_RELIC_LICENSE_KEY}
+      NEW_RELIC_NO_CONFIG_FILE: true
+      NEW_RELIC_DISTRIBUTED_TRACING_ENABLED: true
+      NEW_RELIC_LOG: stdout
+      NODE_ENV: PROD
     ports:
       - 8080:8080
     volumes:

newrelic.js

@@ -0,0 +1,22 @@
+exports.config = {
+    app_name: [`${process.env.CHATFLUX_ENV} Evolution API`],
+  license_key: process.env.NEW_RELIC_LICENSE_KEY,
+  logging: {
+    level: 'trace'
+  },
+  allow_all_headers: true,
+  attributes: {
+    exclude: [
+      'request.headers.cookie',
+      'request.headers.authorization',
+      'request.headers.proxyAuthorization',
+      'request.headers.setCookie*',
+      'request.headers.x*',
+      'response.headers.cookie',
+      'response.headers.authorization',
+      'response.headers.proxyAuthorization',
+      'response.headers.setCookie*',
+      'response.headers.x*'
+    ]
+  }
+}

package.json

@@ -82,6 +82,7 @@
     "mime-types": "^2.1.35",
     "minio": "^8.0.3",
     "multer": "^1.4.5-lts.1",
+    "newrelic": "^12.11.3",
     "node-cache": "^5.1.2",
     "node-cron": "^3.0.3",
     "openai": "^4.77.3",

src/main.ts

@@ -1,5 +1,6 @@
 // Import this first from sentry instrument!
 import '@utils/instrumentSentry';
+import './newrelic';
 
 // Now import other modules
 import { ProviderFiles } from '@api/provider/sessions';

src/newrelic.ts

@@ -0,0 +1,3 @@
+if (process.env.NODE_ENV === 'PROD') {
+  require('newrelic');
+}