fix: prevent add_message metric duplicate

.github/workflows/quality.yml

@@ -2,8 +2,7 @@ name: Format check on push
 on:
   pull_request:
     types: [opened, reopened, edited, synchronize, ready_for_review]
-    # branches:
-    #   - feature/software-quality-tools
+
 jobs:
   dotnet-format:
     runs-on: ubuntu-latest
@@ -25,10 +24,26 @@ jobs:
       - name: Format
         run: dotnet format ./csharp-minitwit/csharp-minitwit.sln --verbosity diagnostic
 
+      - name: Lint Dockerfile
+        uses: hadolint/hadolint-action@master
+        with:
+          dockerfile: ./csharp-minitwit/Dockerfile
+
+    #  - name: Lint C# code
+      #  run: dotnet build
+
       - name: Push changes
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git commit -am "Automated formatting"
-          git push
+          git fetch --all
+          git checkout 'origin/${{ github.head_ref }}'
+          git add .
+          # Check if there are any changes to commit
+          if git diff --staged --quiet; then
+            echo "No changes to commit."
+          else
+            git commit -am "Automated formatting"
+            git push
+          fi

csharp-minitwit/Controllers/HomeController.cs

@@ -6,12 +6,12 @@
 using csharp_minitwit.Models.ViewModels;
 using csharp_minitwit.Services.Interfaces;
 using csharp_minitwit.Services.Repositories;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.EntityFrameworkCore.Query;
 
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query;
 
 namespace csharp_minitwit.Controllers;

csharp-minitwit/Dockerfile

@@ -6,9 +6,8 @@ WORKDIR /app
 
 COPY . .
 
-RUN dotnet restore
-
-RUN dotnet publish -c Release -o out
+RUN dotnet restore && \
+    dotnet publish -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
@@ -17,7 +16,7 @@ WORKDIR /app
 ARG ENVIRONMENT
 ENV ASPNETCORE_ENVIRONMENT=${ENVIRONMENT}
 
-COPY --from=build /app/out .
+COPY --from=build /app/out . 
 COPY ./Databases/schema.sql ./schema.sql
 COPY ./Databases/volume/minitwit.db ./Databases/volume/minitwit.db
 COPY ./Services/latest_processed_sim_action_id.txt ./Services/latest_processed_sim_action_id.txt

csharp-minitwit/Metrics/ApplicationMetrics.cs

@@ -1,30 +1,30 @@
-using Prometheus;
-
-public static class ApplicationMetrics
-{
-    public static readonly Histogram HttpRequestDuration = Metrics
-        .CreateHistogram("minitwit_http_request_duration_seconds", "Histogram of HTTP request duration.",
-            new HistogramConfiguration
-            {
-                // Define buckets with appropriate ranges for your application
-                Buckets = Histogram.LinearBuckets(start: 0.1, width: 0.1, count: 10),
-                LabelNames = new[] { "endpoint" }
-            });
-
-    public static readonly Counter HttpResponseStatusCodeTotal = Metrics
-        .CreateCounter("minitwit_http_response_status_code_total", "Total number of HTTP responses sent by the application by status code.",
-            new CounterConfiguration
-            {
-                // Add a label for the HTTP status code
-                LabelNames = new[] { "status_code" }
-            });
-
-    public static readonly Counter HttpRequestTotal = Metrics
-        .CreateCounter("minitwit_http_requests_total", "Total number of HTTP requests made to the application.",
-        new CounterConfiguration
-        {
-            LabelNames = new[] { "endpoint" }
-        });
-
-
-}
+using Prometheus;
+
+public static class ApplicationMetrics
+{
+    public static readonly Histogram HttpRequestDuration = Metrics
+        .CreateHistogram("minitwit_http_request_duration_seconds", "Histogram of HTTP request duration.",
+            new HistogramConfiguration
+            {
+                // Define buckets with appropriate ranges for your application
+                Buckets = Histogram.LinearBuckets(start: 0.1, width: 0.1, count: 10),
+                LabelNames = new[] { "endpoint" }
+            });
+
+    public static readonly Counter HttpResponseStatusCodeTotal = Metrics
+        .CreateCounter("minitwit_http_response_status_code_total", "Total number of HTTP responses sent by the application by status code.",
+            new CounterConfiguration
+            {
+                // Add a label for the HTTP status code
+                LabelNames = new[] { "status_code" }
+            });
+
+    public static readonly Counter HttpRequestTotal = Metrics
+        .CreateCounter("minitwit_http_requests_total", "Total number of HTTP requests made to the application.",
+        new CounterConfiguration
+        {
+            LabelNames = new[] { "endpoint" }
+        });
+
+
+}

csharp-minitwit/Middlewares/CatchAllMiddleware.cs

@@ -1,38 +1,39 @@
-using System.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
-using csharp_minitwit.Utils;
-// Assuming ApplicationMetrics is in the same namespace, or add the appropriate using statement
-
-namespace csharp_minitwit.Middlewares
-{
-    public class CatchAllMiddleware
-    {
-        private readonly RequestDelegate _next;
-
-        public CatchAllMiddleware(RequestDelegate next)
-        {
-            _next = next;
-        }
-
-        public async Task InvokeAsync(HttpContext context)
-        {
-            var watch = Stopwatch.StartNew();
-
-            // Used to monitor total requests received grouped by endpoint
-            ApplicationMetrics.HttpRequestTotal.WithLabels(MetricsHelpers.SanitizePath(context.Request.Path)).Inc();
-
-            await _next(context);
-
-            watch.Stop();
-
-            // Used to monitor response delay grouped by endpoint
-            ApplicationMetrics.HttpRequestDuration
-                .WithLabels(MetricsHelpers.SanitizePath(context.Request.Path))
-                .Observe(watch.Elapsed.TotalSeconds);
-
-            // Used to monitor response status codes grouped by endpoint
-            ApplicationMetrics.HttpResponseStatusCodeTotal.WithLabels(context.Response.StatusCode.ToString()).Inc();
-        }
-    }
-}
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+using csharp_minitwit.Utils;
+
+using Microsoft.AspNetCore.Http;
+// Assuming ApplicationMetrics is in the same namespace, or add the appropriate using statement
+
+namespace csharp_minitwit.Middlewares
+{
+    public class CatchAllMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public CatchAllMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            var watch = Stopwatch.StartNew();
+
+            // Used to monitor total requests received grouped by endpoint
+            ApplicationMetrics.HttpRequestTotal.WithLabels(MetricsHelpers.SanitizePath(context.Request.Path)).Inc();
+
+            await _next(context);
+
+            watch.Stop();
+            // Used to monitor response delay grouped by endpoint
+            ApplicationMetrics.HttpRequestDuration
+                .WithLabels(MetricsHelpers.SanitizePath(context.Request.Path))
+                .Observe(watch.Elapsed.TotalSeconds);
+
+            // Used to monitor response status codes grouped by endpoint
+            ApplicationMetrics.HttpResponseStatusCodeTotal.WithLabels(context.Response.StatusCode.ToString()).Inc();
+        }
+    }
+}