Merge pull request #5582 from dodona-edu/chore/sentry-releases

Fix sentry release information
dodona-edu · Jun 5, 2024 · 454ba8e · 454ba8e
2 parents 4e32c0b + 15c76c4
commit 454ba8e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 38 deletions.
diff --git a/.github/workflows/deploy-naos.yml b/.github/workflows/deploy-naos.yml
@@ -32,18 +32,3 @@ jobs:
         token: ${{secrets.GITHUB_TOKEN}}
         label: deploy naos
         type: remove
-    - name: Get tag name
-      id: tag_name
-      run: echo "tag_name=$(date +'%Y.%m.%d-%H:%M')" >> "$GITHUB_ENV"
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Create Sentry release
-      uses: getsentry/action-release@v1
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        SENTRY_ORG: dodona
-        SENTRY_PROJECT: dodona-frontend
-      with:
-        environment: staging
-        version: ${{ env.tag_name }}
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -22,18 +22,3 @@ jobs:
     - name: Run deploy
       run: |
         echo "deploy production $GITHUB_SHA" | ssh -p 4840 [email protected]
-    - name: Get tag name
-      id: tag_name
-      run: echo "tag_name=$(date +'%Y.%m.%d-%H:%M')" >> "$GITHUB_ENV"
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Create Sentry release
-      uses: getsentry/action-release@v1
-      env:
-        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        SENTRY_ORG: dodona
-        SENTRY_PROJECT: dodona-frontend
-      with:
-        environment: production
-        version: ${{ env.tag_name }}
diff --git a/app/assets/javascripts/sentry.ts b/app/assets/javascripts/sentry.ts
@@ -1,18 +1,15 @@
 import * as Sentry from "@sentry/browser";
 
-const HOST_TO_ENVIRONMENT: Record<string, string> = {
-    "dodona.localhost": "development",
-    "naos.dodona.be": "staging",
-    "dodona.be": "production",
-};
-
 export function initSentry(): void {
-    const environment = window.location.hostname in HOST_TO_ENVIRONMENT ?
-        HOST_TO_ENVIRONMENT[window.location.hostname] : "unknown";
+    const environmentTag = document.querySelector("meta[name='environment']");
+    const environment = environmentTag?.getAttribute("content") ?? "unknown";
+    const releaseTag = document.querySelector("meta[name='version']");
+    const release = releaseTag?.getAttribute("content") ?? "unknown";
 
     // config options can be found at https://docs.sentry.io/platforms/javascript/configuration/
     Sentry.init({
         dsn: "https://18315b6d60f9329de56983fd94f67db9@o4507329115783168.ingest.de.sentry.io/4507333215256657",
         environment,
+        release,
     });
 }
diff --git a/app/javascript/packs/frame.js b/app/javascript/packs/frame.js
@@ -1,5 +1,7 @@
 import "core-js/stable";
 import "regenerator-runtime/runtime";
+import { initSentry } from "sentry";
+initSentry();
 
 // bootstrap
 import { Alert, Button, Collapse, Dropdown, Modal, Popover, Tab, Tooltip } from "bootstrap";

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -16,6 +16,8 @@
   <meta property="og:image" content="<%= root_url(locale: nil) %>social-image.png">
   <meta name="msapplication-TileColor" content="#2196F3"/>
   <meta name="msapplication-TileImage" content="/icon.png"/>
+  <meta name="version" content="<%= Dodona::Application::VERSION %>">
+  <meta name="environment" content="<%= Rails.env %>">
   <link rel="apple-touch-icon-precomposed" href="/icon.png"/>
   <link rel="shortcut icon" sizes="192x192" href="<%= @dot_icon&.any? ? "/icon-not.png" : "/icon.png" %>">
   <link rel="shortcut icon" href="<%= @dot_icon&.any? ? "/favicon-not.ico" : "/favicon.ico" %>">

diff --git a/app/views/layouts/frame.html.erb b/app/views/layouts/frame.html.erb
@@ -7,6 +7,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="version" content="<%= Dodona::Application::VERSION %>">
+  <meta name="environment" content="<%= Rails.env %>">
   <%= yield :meta_tags %>
   <meta property="og:image" content="<%= root_url(locale: nil) %>icon.png">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,400&display=swap" rel="stylesheet">

diff --git a/app/views/layouts/lti.html.erb b/app/views/layouts/lti.html.erb
@@ -4,6 +4,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="version" content="<%= Dodona::Application::VERSION %>">
+  <meta name="environment" content="<%= Rails.env %>">
   <%= yield :meta_tags %>
   <title>Dodona<%= " - #{@title}" if @title %></title>
   <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,400&display=swap" rel="stylesheet">