Skip to content

feat: add organization name to metrics #2439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migmartri merged 2 commits into from
Sep 19, 2025
Merged

feat: add organization name to metrics #2439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f1172
feat(telemetry): improvements on org info
migmartri Sep 19, 2025
1b6dfb2
feat(telemetry): improvements on org info
migmartri Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions app/cli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,13 @@ func recordCommand(executedCmd *cobra.Command, authInfo *token.ParsedToken) erro
}

cmdTracker := telemetry.NewCommandTracker(telemetryClient)
controlplaneURL, controlplaneHash := hashControlPlaneURL()

tags := telemetry.Tags{
"cli_version": Version,
"cp_url_hash": hashControlPlaneURL(),
"chainloop_source": "cli",
"cli_version": Version,
"cp_url_hash": controlplaneHash,
"cp_installation_url": controlplaneURL,
"chainloop_source": "cli",
}

// It tries to extract the token from the context and add it to the tags. If it fails, it will ignore it.
Expand All @@ -424,6 +427,12 @@ func recordCommand(executedCmd *cobra.Command, authInfo *token.ParsedToken) erro
tags["org_id"] = authInfo.OrgID
}

// Add organization name if available
orgName := viper.GetString(confOptions.organization.viperKey)
if orgName != "" {
tags["organization_name"] = orgName
}

if err = cmdTracker.Track(executedCmd.Context(), extractCmdLineFromCommand(executedCmd), tags); err != nil {
return fmt.Errorf("sending event: %w", err)
}
Expand All @@ -447,10 +456,9 @@ func extractCmdLineFromCommand(cmd *cobra.Command) string {
}

// hashControlPlaneURL returns a hash of the control plane URL
func hashControlPlaneURL() string {
url := viper.GetString("control-plane.API")

return fmt.Sprintf("%x", sha256.Sum256([]byte(url)))
func hashControlPlaneURL() (url string, hash string) {
url = viper.GetString(confOptions.controlplaneAPI.viperKey)
return url, fmt.Sprintf("%x", sha256.Sum256([]byte(url)))
}

func apiInsecure() bool {
Expand Down
Loading