From 8dbfdf9424904ffea899b5587254157d6d4478a6 Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Fri, 13 Jan 2023 14:29:28 -0500 Subject: [PATCH 1/2] starter project telemetry event tracking source added to registry server. Signed-off-by: Michael Valdron --- index/server/pkg/server/endpoint.go | 20 ++++++++++++++++++++ index/server/pkg/server/index.go | 7 ++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/index/server/pkg/server/endpoint.go b/index/server/pkg/server/endpoint.go index 0457e1202..092c2a816 100644 --- a/index/server/pkg/server/endpoint.go +++ b/index/server/pkg/server/endpoint.go @@ -305,6 +305,26 @@ func serveDevfileStarterProjectWithVersion(c *gin.Context) { return } + // Track event for telemetry. Ignore events from the registry-viewer and DevConsole since those are tracked on the client side. Ignore indirect calls from clients. + if enableTelemetry && !util.IsWebClient(c) && !util.IsIndirectCall(c) { + + user := util.GetUser(c) + client := util.GetClient(c) + + err := util.TrackEvent(analytics.Track{ + Event: eventTrackMap["spdownload"], + UserId: user, + Context: util.SetContext(c), + Properties: analytics.NewProperties(). + Set("devfile", devfileName). + Set("starterProject", starterProjectName). + Set("client", client), + }) + if err != nil { + log.Println(err) + } + } + c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s.zip\"", starterProjectName)) c.Data(http.StatusAccepted, starterProjectMediaType, downloadBytes) } diff --git a/index/server/pkg/server/index.go b/index/server/pkg/server/index.go index 94a98bd07..095a7f139 100644 --- a/index/server/pkg/server/index.go +++ b/index/server/pkg/server/index.go @@ -41,9 +41,10 @@ import ( ) var eventTrackMap = map[string]string{ - "list": "list devfile", - "view": "view devfile", - "download": "download devfile", + "list": "list devfile", + "view": "view devfile", + "download": "download devfile", + "spdownload": "Starter Project Downloaded", } var mediaTypeMapping = map[string]string{ From e2ca77e9103c02fa2445a0f736cdf2869332bc5c Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Thu, 19 Jan 2023 17:27:10 -0500 Subject: [PATCH 2/2] copyright years in headers changed to year ranges for endpoint.go and index.go Signed-off-by: Michael Valdron --- index/server/pkg/server/endpoint.go | 2 +- index/server/pkg/server/index.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index/server/pkg/server/endpoint.go b/index/server/pkg/server/endpoint.go index 092c2a816..b93eb3d07 100644 --- a/index/server/pkg/server/endpoint.go +++ b/index/server/pkg/server/endpoint.go @@ -1,5 +1,5 @@ // -// Copyright 2022 Red Hat, Inc. +// Copyright 2022-2023 Red Hat, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/index/server/pkg/server/index.go b/index/server/pkg/server/index.go index 095a7f139..d8e68a7fd 100644 --- a/index/server/pkg/server/index.go +++ b/index/server/pkg/server/index.go @@ -1,5 +1,5 @@ // -// Copyright 2022 Red Hat, Inc. +// Copyright 2022-2023 Red Hat, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.