change database structure (tmp)

Author: SBOne-Kenobi

.github/workflows/night-statistics-monitoring.yml

@@ -5,20 +5,33 @@ on:
      - cron: '0 0 * * *'
 
 env:
+  data_branch: monitoring-data
+  data_path: monitoring/data
+  aggregated_data_branch: monitoring-aggregated-data
+  aggregated_data_path: monitoring/aggregated_data
   monitoring_properties: monitoring/monitoring.properties
   output_stats: stats.json
-  history_file: monitoring/history.json
-  coverage_graph_file: monitoring/coverage_graph.png
-  quantitative_graph_file: monitoring/quantitative_graph.png
   KOTLIN_HOME: /usr
 
 jobs:
   build_and_run_monitoring:
     runs-on: ubuntu-20.04
     steps:
-      - name: Checkout repository
+      - name: Checkout main
         uses: actions/checkout@v3
 
+      - name: Checkout monitoring data
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ env.data_branch }}
+          path: ${{ env.data_path }}
+
+      - name: Checkout aggregated monitoring data
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ env.aggregated_data_branch }}
+          path: ${{ env.aggregated_data_path }}
+
       - uses: actions/setup-java@v3
         with:
           java-version: '8'
@@ -30,9 +43,6 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
-          cache: 'pip'
-      - name: Install matplotlib
-        run: pip install matplotlib
 
       - name: Build and run monitoring UTBot Java
         run: |
@@ -42,23 +52,44 @@ jobs:
             utbot-junit-contest/build/libs/monitoring.jar \
             $output_stats
 
-      - name: Update history and render graphs
-        run: |
-          python monitoring/draw_stats_graphs.py \
-            $history_file \
-            $output_stats \
-            $coverage_graph_file \
-            $quantitative_graph_file
-
       - name: Get current date
         id: date
-        run: echo "::set-output name=date::$(date +'%d-%m-%Y')"
+        run: |
+          echo "::set-output name=date::$(date +'%Y-%m-%d')"
+          echo "::set-output name=timestamp::$(date +'%s')"
+
+      - name: Get commit hash
+        id: metadata
+        run: |
+          echo "::set-output name=commit::$(git rev-parse HEAD)"
+          echo "::set-output name=branch::$(git name-rev --name-only HEAD)"
 
-      - name: Commit and push graphs and statistics
+      - name: Insert metadata
+        run: |
+          python monitoring/insert_metadata.py \
+            $output_stats "$data_path/data-$branch-$date-$timestamp-$commit.json" \
+            $commit "$build"
+        env:
+          date: ${{ steps.date.outputs.date }}
+          timestamp: ${{ steps.date.outputs.timestamp }}
+          commit: ${{ steps.metadata.outputs.commit }}
+          branch: ${{ steps.metadata.outputs.branch }}
+          build: 0
+
+      - name: Commit and push statistics
+        uses: actions-js/push@master
+        with:
+          branch: ${{ env.data_branch }}
+          message: 'night-monitoring-${{ steps.date.outputs.date }}'
+          directory: ${{ env.data_path }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Commit and push aggregated statistics
         uses: actions-js/push@master
         with:
+          branch: ${{ env.aggregated_data_branch }}
           message: 'night-monitoring-${{ steps.date.outputs.date }}'
-          directory: './monitoring'
+          directory: ${{ env.aggregated_data_path }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload logs
@@ -67,10 +98,3 @@ jobs:
         with:
           name: logs
           path: logs/utbot.log
-
-      - name: Upload statistics
-        if: ${{ success() }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: statistics
-          path: ${{ env.output_stats }}

monitoring/draw_stats_graphs.py

@@ -0,0 +1,75 @@
+import json
+from collections import defaultdict
+from os.path import exists
+from sys import argv
+
+
+def load(json_file):
+    if exists(json_file):
+        with open(json_file, "r") as f:
+            return json.load(f)
+    return None
+
+
+def transform_stats(stats):
+    common_prefix = "covered_instructions_count"
+    denum = stats["total_instructions_count"]
+
+    nums_keys = [(key, key.removeprefix(common_prefix)) for key in stats.keys() if key.startswith(common_prefix)]
+
+    for (key, by) in nums_keys:
+        num = stats[key]
+        stats["total_coverage" + by] = 100 * num / denum if denum != 0 else 0
+        del stats[key]
+
+    del stats["total_instructions_count"]
+
+    return stats
+
+
+def transform_and_combine_stats(stats_list):
+    new_stats = defaultdict(lambda: 0.0)
+
+    # calculate average by all keys
+    for n, stats in enumerate(stats_list, start=1):
+        transformed = transform_stats(stats)
+        for key in transformed:
+            new_stats[key] = new_stats[key] + (transformed[key] - new_stats[key]) / n
+
+    return new_stats
+
+
+def insert_metadata(stats, commit, build):
+    stats['commit_hash'] = commit
+    stats['build_number'] = build
+
+    # TODO: insert environment information
+
+    return stats
+
+
+def transform_and_insert_metadata(stats_file, commit, build):
+    stats = load(stats_file)
+    if stats is None:
+        raise FileNotFoundError("File with stats does not exist!")
+    stats = transform_and_combine_stats(stats)
+    stats = insert_metadata(stats, commit, build)
+    return stats
+
+
+def main():
+    args = argv[1:]
+    if len(args) != 4:
+        raise RuntimeError(
+            f"Expected <stats file> <output file> "
+            f"<commit hash> <build number> "
+            f"but got {' '.join(args)}"
+        )
+    (stats_file, output_file, commit, build) = args
+    stats = transform_and_insert_metadata(stats_file, commit, build)
+    with open(output_file, "w") as f:
+        json.dump(stats, f, indent=4)
+
+
+if __name__ == "__main__":
+    main()