Skip to content
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

[Backport 7.64.x] [cluster-agent/languagedetection] Use strings.Builder to reduce allocations (#34743) #34793

Merged
merged 1 commit into from
Mar 5, 2025
Merged

[Backport 7.64.x] [cluster-agent/languagedetection] Use strings.Builder to reduce allocations (#34743) #34793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions cmd/cluster-agent/api/v1/languagedetection/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,14 @@ func (handler *languageDetectionHandler) leaderHandler(w http.ResponseWriter, r

ownersLanguagesFromRequest := getOwnersLanguages(requestData, time.Now().Add(handler.cfg.languageTTL))

log.Tracef("Owner Languages state pre merge-and-flush:\n %s", handler.ownersLanguages.String())
if log.ShouldLog(log.TraceLvl) { // Avoid call to String() if not needed
log.Tracef("Owner Languages state pre merge-and-flush: %s", handler.ownersLanguages.String())
}
err = handler.ownersLanguages.mergeAndFlush(ownersLanguagesFromRequest, handler.wlm)
log.Tracef("Owner Languages state post merge-and-flush:\n %s", handler.ownersLanguages.String())
if log.ShouldLog(log.TraceLvl) { // Avoid call to String() if not needed
log.Tracef("Owner Languages state post merge-and-flush: %s", handler.ownersLanguages.String())
}

if err != nil {
http.Error(w, fmt.Sprintf("failed to store some (or all) languages in workloadmeta store: %s", err), http.StatusInternalServerError)
ProcessedRequests.Inc(statusError)
Expand Down
37 changes: 27 additions & 10 deletions cmd/cluster-agent/api/v1/languagedetection/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,41 @@ func (ownersLanguages *OwnersLanguages) String() string {
ownersLanguages.mutex.Lock()
defer ownersLanguages.mutex.Unlock()

state := ""
var sb strings.Builder
sb.WriteString("[")

firstOwner := true
for owner, langs := range ownersLanguages.containersLanguages {
state += fmt.Sprintf("===== %s/%s/%s ====\n", owner.Namespace, owner.Kind, owner.Name)
if langs.dirty {
state += "dirty\n"
} else {
state += "clean\n"
if !firstOwner {
sb.WriteString(",")
}

sb.WriteString(fmt.Sprintf("(%s/%s/%s, %v,[", owner.Namespace, owner.Kind, owner.Name, langs.dirty))

firstContainer := true
for container, languageSet := range langs.languages {
state += container.Name + ": "
if !firstContainer {
sb.WriteString(",")
}
sb.WriteString(container.Name + ": (")

languages := make([]string, 0, len(languageSet))
for languagename := range languageSet {
state += fmt.Sprintf("%s,", languagename)
languages = append(languages, string(languagename))
}
state += "\n"
sb.WriteString(strings.Join(languages, ","))

sb.WriteString(")")
firstContainer = false
}

sb.WriteString("])")
firstOwner = false
}
return state

sb.WriteString("]")

return sb.String()
}

// getOrInitialize returns the containers languages for a specific namespaced owner, initialising it if it doesn't already
Expand Down
Loading