Merge pull request #402 from GreatFruitOmsk/issue_398

Add release submission to Sentry

.circleci/config.yml

@@ -51,7 +51,7 @@ jobs:
       - run:
           name: Build docker images
           command: |
-            docker-compose -p api build
+            docker-compose -p api build --build-arg CIRCLE_SHA1=${CIRCLE_SHA1}
       - run:
           name: Build docker test images
           command: |
@@ -68,18 +68,18 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               source $BASH_ENV
 
-                echo "$GCR_CREDS" | docker login -u _json_key --password-stdin https://gcr.io
+              echo "$GCR_CREDS" | docker login -u _json_key --password-stdin https://gcr.io
 
-                docker tag wott-api gcr.io/wott-prod/wott-api:${GITHASH}
-                docker tag wott-api gcr.io/wott-prod/wott-api:latest
-                docker tag wott-static gcr.io/wott-prod/wott-static:${GITHASH}
-                docker tag wott-static gcr.io/wott-prod/wott-static:latest
+              docker tag wott-api gcr.io/wott-prod/wott-api:${GITHASH}
+              docker tag wott-api gcr.io/wott-prod/wott-api:latest
+              docker tag wott-static gcr.io/wott-prod/wott-static:${GITHASH}
+              docker tag wott-static gcr.io/wott-prod/wott-static:latest
 
-                docker push gcr.io/wott-prod/wott-api:${GITHASH}
-                docker push gcr.io/wott-prod/wott-api:latest
-                docker push gcr.io/wott-prod/wott-static:${GITHASH}
-                docker push gcr.io/wott-prod/wott-static:latest
-                echo "Pushed gcr.io/wott-prod/wott-api:${GITHASH}"
+              docker push gcr.io/wott-prod/wott-api:${GITHASH}
+              docker push gcr.io/wott-prod/wott-api:latest
+              docker push gcr.io/wott-prod/wott-static:${GITHASH}
+              docker push gcr.io/wott-prod/wott-static:latest
+              echo "Pushed gcr.io/wott-prod/wott-api:${GITHASH}"
             fi
       - run:
           name: Deploy to GKE

Dockerfile

@@ -18,6 +18,8 @@ ENV CFSSL_SERVER wott-ca
 # This is such that we can override it during build
 ARG DJANGO_SETTINGS_MODULE=backend.settings.prod
 ENV DJANGO_SETTINGS_MODULE ${DJANGO_SETTINGS_MODULE}
+ARG CIRCLE_SHA1=UNKNOWN
+RUN echo ${CIRCLE_SHA1} > /usr/src/release.txt
 
 USER nobody
 CMD gunicorn \

backend/backend/settings/base.py

@@ -203,9 +203,13 @@ def check_ip_range(ipr):
 SENTRY_DSN = os.getenv('SENTRY_DSN')
 if SENTRY_DSN:
     import sentry_sdk
+
+    with open(os.path.join(REPO_DIR, 'release.txt'), 'r') as release_file:
+        release = release_file.read().strip()
+
     from sentry_sdk.integrations.django import DjangoIntegration
 
-    sentry_sdk.init(SENTRY_DSN, integrations=[DjangoIntegration()])
+    sentry_sdk.init(SENTRY_DSN, integrations=[DjangoIntegration()], release=release)
 
 # 'tagulous'
 SERIALIZATION_MODULES = {

backend/monitoring/urls.py

@@ -1,7 +1,8 @@
 from django.urls import path
 
-from .views import CeleryPulseTimestampView
+from .views import CeleryPulseTimestampView, ErrorView
 
 urlpatterns = [
-    path('celery/', CeleryPulseTimestampView.as_view(), name='celery_pulse')
+    path('celery/', CeleryPulseTimestampView.as_view(), name='celery_pulse'),
+    path('error/', ErrorView.as_view(), name='error')
 ]

backend/monitoring/views.py

@@ -19,3 +19,13 @@ class CeleryPulseTimestampView(LoginRequiredMixin, StaffuserRequiredMixin, View)
     def get(self, request, *args, **kwargs):
         pulse_obj = CeleryPulseTimestamp.objects.order_by('id').first()
         return HttpResponse(str(pulse_obj.timestamp) if pulse_obj else 'None', content_type='text/plain')
+
+
+class ErrorView(LoginRequiredMixin, StaffuserRequiredMixin, View):
+    """
+    A view for raising (for testing purposes) an uncaught Django exceptions (500).
+    """
+
+    def get(self, request, *args, **kwargs):
+        _ = 5 / 0  # ZeroDivisionError
+        return HttpResponse('No error', content_type='text/plain')

docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - DATASTORE_KEY_JSON
     build:
       context: .
+      args:
+        - CIRCLE_SHA1
     image: wott-api:latest
     volumes:
       - ./backend:/usr/src/app
@@ -40,7 +42,6 @@ services:
       - DB_PASSWORD=SuperSecurePassword
       - DB_USER=postgres
       - DATASTORE_KEY_JSON
-    image: api:latest
     build:
       context: .
     volumes: