Merge branch 'main' of github.com:newrelic/relibank into ftr/chaos-mesh

Author: hrmyd

.env-example

@@ -0,0 +1,7 @@
+OPENAI_LOG=info
+OPENAI_API_KEY=key
+BASE_URL=openai_url
+NEW_RELIC_API_KEY=NEW_RELIC_USER_API_KEY
+NEW_RELIC_ACCOUNT_ID=NEW_RELIC_ACCOUNT_ID
+NEW_RELIC_LICENSE_KEY=NEW_RELIC_LICENSE_KEY
+APP_NAME=your_name

.gitignore

@@ -5,4 +5,15 @@ act-secrets.env
 **/.DS_Store
 **/keys.txt
 **/*.log*
-*.env
+__pycache__/
+*.pyc
+.venv/
+env/
+venv/
+.env
+*.tar
+*.log
+.vscode/
+*.cache
+model/
+todos.md

README.md

@@ -2,22 +2,27 @@
 
 A microservices banking application built for chaos engineering and resilience testing.
 
-## TODOs
+---
 
-DB interface python with endpoints for auth service
-DONE placeholder for posts/puts, so we can implement adding new accounts later
+### ⚙️ Test connection to New Relic
 
-DONE In Transactions, add a DB table that stores outstanding balance on a loan/credit account, amount on a checking/savings account
-Add Transaction types:
-shopping | credit_card | loan | entertainment | utilities | groceries | gas | etc
+1. Connect to the service's container, docker example `docker exec -it bill-pay /bin/sh`
 
-DONE In Bill Pay, add from/to account
-DONE Enforce uniqueness on BillIDs
-Check that to/fromaccount is valid, check balance on each before initiating payment or cancel if it's impossible
+2. newrelic-admin validate-config LOCATION_OF_NEWRELIC.INI
 
-In Accounts, add an account for Relibank that will handle all loan payments. Build out loan payments in the code
+3. If needed, add a logfile to newrelic.ini
+```[newrelic]
+log_file = /app/newrelic.log
+log_level = info
+```
+
+4. Validate logs with ```docker exec -it bill-pay cat newrelic-agent.log```
+
+---
+
+### ⚙️ Formatting
 
-Convert logging.info calls to json instead of flat logs
+1. ```ruff format``` https://docs.astral.sh/ruff/formatter/#ruff-format 
 
 ## What is this?
 

accounts_service/Dockerfile

@@ -4,22 +4,34 @@ FROM python:3.12-slim
 # Set the working directory in the container
 WORKDIR /app
 
+ARG NEW_RELIC_APP_NAME="${APP_NAME} - Accounts Service"
+ENV NEW_RELIC_APP_NAME=$NEW_RELIC_APP_NAME
+
+ARG NEW_RELIC_USER_API_KEY
+ENV NEW_RELIC_API_KEY=$NEW_RELIC_USER_API_KEY
+
+ARG NEW_RELIC_ACCOUNT_ID
+ENV NEW_RELIC_ACCOUNT_ID=$NEW_RELIC_ACCOUNT_ID
+
+ARG NEW_RELIC_LICENSE_KEY
+ENV NEW_RELIC_LICENSE_KEY=$NEW_RELIC_LICENSE_KEY
+
+ENV NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=true
+
 # Install build dependencies required for psycopg2-binary
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libpq-dev \
     gcc
 
-# Copy the requirements file into the container
-COPY requirements.txt .
+# Copy the application code file
+COPY . .
 
 # Install Python dependencies
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy the application code file
-COPY accounts_service.py .
+# RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install uv && uv sync
 
 # Expose the port the FastAPI app will run on
 EXPOSE 5000
 
 # Command to run the application using Uvicorn
-CMD ["uvicorn", "accounts_service:app", "--host", "0.0.0.0", "--port", "5000", "--workers", "1"]
+CMD ["uv", "run", "newrelic-admin", "run-program", "uvicorn", "accounts_service:app", "--host", "0.0.0.0", "--port", "5000", "--workers", "1", "--log-config", "logging.conf"]