kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

telemetry: Normalize git URLs

Browse Source 
Normalize `https://github.com/dagger/dagger` and
`git@github.com:dagger/dagger.git` to `github.com/dagger/dagger`

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2022-03-18 12:29:44 -07:00
parent fead547df1
commit f7628adee5
3 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
telemetry/telemetry.go
View File

@@ -50,7 +50,7 @@ func Track(ctx context.Context, eventName string, properties ...*Property) {
return
}
repo := gitRepoURL(".")
repo := gitRepoURL(ctx, ".")
// Base properties
props := map[string]interface{}{
@@ -194,8 +194,8 @@ func hash(s string) string {
return fmt.Sprintf("%x", sha256.Sum256([]byte(s)))
}
// // gitRepoURL returns the git repository remote, if any.
func gitRepoURL(path string) string {
// gitRepoURL returns the git repository remote, if any.
func gitRepoURL(ctx context.Context, path string) string {
repo, err := git.PlainOpenWithOptions(path, &git.PlainOpenOptions{
DetectDotGit: true,
})
@@ -208,9 +208,16 @@ func gitRepoURL(path string) string {
return ""
}
if urls := origin.Config().URLs; len(urls) > 0 {
return urls[0]
urls := origin.Config().URLs
if len(urls) == 0 {
return ""
}
return ""
endpoint, err := parseGitURL(urls[0])
if err != nil {
log.Ctx(ctx).Debug().Err(err).Str("url", urls[0]).Msg("failed to parse git URL")
return ""
}
return endpoint
}