From 9f4bca503ab838399087c9d38219b64288ea7b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Tue, 12 Mar 2019 15:08:46 +0100
Subject: [PATCH] Updated code stats collection

---
 scripts/circle-metrics.sh       | 17 ++++++++++++-----
 scripts/circle-test-frontend.sh |  7 ++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/scripts/circle-metrics.sh b/scripts/circle-metrics.sh
index a5d44a7dfc4..849fc0e1339 100755
--- a/scripts/circle-metrics.sh
+++ b/scripts/circle-metrics.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 
+echo "Collecting code stats (typescript errors & more)"
+
 ERROR_COUNT="$(./node_modules/.bin/tsc --project tsconfig.json --noEmit --noImplicitAny true | grep -oP 'Found \K(\d+)')"
 DIRECTIVES="$(grep -r -o  directive public/app/**/*  | wc -l)"
-CONTROLLERS="${grep -r -oP \"class .*Ctrl\" public/app/**/*  | wc -l}"
+CONTROLLERS="$(grep -r -oP 'class .*Ctrl' public/app/**/*  | wc -l)"
 
 echo "Typescript errors: $ERROR_COUNT"
 echo "Directives: $DIRECTIVES"
 echo "Controllers: $CONTROLLERS"
 
 curl \
-  -d "{\"metrics\":{\"noImplicitAny\": $ERROR_COUNT}}" \
-  -H "Content-Type: application/json" \
-  -u ci:$CIRCLE_STATS \
-  -X POST https://stats.grafana.org/metric-receiver
+   -d "{\"metrics\": {
+        \"ci.code.noImplicitAny\": $ERROR_COUNT,
+        \"ci.code.directives\": $DIRECTIVES,
+        \"ci.code.controllers\": $CONTROLLERS
+      }
+    }" \
+   -H "Content-Type: application/json" \
+   -u ci:$CIRCLE_STATS_PWD \
+   -X POST https://stats.grafana.org/metric-receiver
 
diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh
index d74565239fa..3366bf3d4fb 100755
--- a/scripts/circle-test-frontend.sh
+++ b/scripts/circle-test-frontend.sh
@@ -10,6 +10,11 @@ function exit_if_fail {
     fi
 }
 
-exit_if_fail ./scripts/circle-metrics.sh
 exit_if_fail npm run prettier:check
 exit_if_fail npm run test
+
+# On master also collect some and send some metrics
+branch="$(git rev-parse --abbrev-ref HEAD)"
+if [ "${branch}" == "master" ]; then
+  exit_if_fail ./scripts/circle-metrics.sh
+fi