From 7fb85df3ac3841872acf21df081da8a558ce0ebf Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Wed, 21 Jul 2021 10:52:37 +0300 Subject: [PATCH] Add version artifact --- .github/workflows/publish.yml | 8 ++++++++ cli/mizu/telemetry.go | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5beaeb446..b60987ee2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -66,6 +66,14 @@ jobs: COMMIT_HASH=${{ github.sha }} - name: Build and Push CLI run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}' + - shell: bash + run: | + expr '${{ steps.versioning.outputs.version }}' > version.txt + - name: Upload version artifact + uses: actions/upload-artifact@v2 + with: + name: version + path: version.txt - name: publish uses: ncipollo/release-action@v1 with: diff --git a/cli/mizu/telemetry.go b/cli/mizu/telemetry.go index 91735364b..f0a703866 100644 --- a/cli/mizu/telemetry.go +++ b/cli/mizu/telemetry.go @@ -8,22 +8,26 @@ import ( "net/http" ) -const telemetryUrl = "https://us-east4-up9-prod.cloudfunctions.net/mizu-telemetry" - func ReportRun(cmd string, args interface{}) { if Branch != "main" { rlog.Debugf("reporting only on main branch") return } - argsBytes, _ := json.Marshal(args) - argsMap := map[string]string{"telemetry_type": "mizu_execution", "cmd": cmd, "args": string(argsBytes), "component": "mizu_cli"} + argsMap := map[string]string{ + "telemetry_type": "execution", + "cmd": cmd, + "args": string(argsBytes), + "component": "mizu_cli", + "BuildTimestamp": BuildTimestamp, + "version": SemVer} argsMap["message"] = fmt.Sprintf("mizu %v - %v", argsMap["cmd"], string(argsBytes)) jsonValue, _ := json.Marshal(argsMap) - if resp, err := http.Post(telemetryUrl, "application/json", bytes.NewBuffer(jsonValue)); err != nil { - rlog.Debugf("error sending telemtry err: %v, response %v", err, resp) + if resp, err := http.Post("https://us-east4-up9-prod.cloudfunctions.net/mizu-telemetry", + "application/json", bytes.NewBuffer(jsonValue)); err != nil { + rlog.Debugf("error sending telemetry err: %v, response %v", err, resp) } else { rlog.Debugf("Successfully reported telemetry") }