TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-07 06:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use a single translator for middleware (#10633)

Browse Source 
# Which Problems Are Solved

Comparing the v3 and v4 deployments we noticed an increase in memory
usage. A first analysis revealed that it might be related to the
(multiple) initialization of the `i18n.Translator`, partially related

# How the Problems Are Solved

Initialize the tranlator once (apart from the translator interceptor,
which uses context / request specific information) and pass it to all
necessary middleware.

# Additional Changes

Removed unnecessary error return parameter from the translator
initialization.

# Additional Context

- noticed internally
- backport to v4.x

(cherry picked from commit a0c3ccecf7)
This commit is contained in:
Livio Spring
2025-09-09 08:34:59 +02:00
parent 0753ed2d6b
commit 0f6380b474
19 changed files with 118 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/i18n/bundle.go
View File

@@ -31,7 +31,7 @@ func init() {
}
}
func newBundle(ns Namespace, defaultLanguage language.Tag, allowedLanguages []language.Tag) (*i18n.Bundle, error) {
func newBundle(ns Namespace, defaultLanguage language.Tag, allowedLanguages []language.Tag) *i18n.Bundle {
bundle := i18n.NewBundle(defaultLanguage)
for lang, file := range translationMessages[ns] {
@@ -41,7 +41,7 @@ func newBundle(ns Namespace, defaultLanguage language.Tag, allowedLanguages []la
bundle.MustAddMessages(lang, file.Messages...)
}
return bundle, nil
return bundle
}
func loadTranslationsFromNamespace(ns Namespace) {

16
internal/i18n/translator.go
View File

@@ -32,32 +32,28 @@ type Message struct {
}
// NewZitadelTranslator translates to all supported languages, as the ZITADEL texts are not customizable.
func NewZitadelTranslator(defaultLanguage language.Tag) (*Translator, error) {
func NewZitadelTranslator(defaultLanguage language.Tag) *Translator {
return newTranslator(ZITADEL, defaultLanguage, SupportedLanguages(), "")
}
func NewNotificationTranslator(defaultLanguage language.Tag, allowedLanguages []language.Tag) (*Translator, error) {
func NewNotificationTranslator(defaultLanguage language.Tag, allowedLanguages []language.Tag) *Translator {
return newTranslator(NOTIFICATION, defaultLanguage, allowedLanguages, "")
}
func NewLoginTranslator(defaultLanguage language.Tag, allowedLanguages []language.Tag, cookieName string) (*Translator, error) {
func NewLoginTranslator(defaultLanguage language.Tag, allowedLanguages []language.Tag, cookieName string) *Translator {
return newTranslator(LOGIN, defaultLanguage, allowedLanguages, cookieName)
}
func newTranslator(ns Namespace, defaultLanguage language.Tag, allowedLanguages []language.Tag, cookieName string) (*Translator, error) {
func newTranslator(ns Namespace, defaultLanguage language.Tag, allowedLanguages []language.Tag, cookieName string) *Translator {
t := new(Translator)
var err error
t.allowedLanguages = allowedLanguages
if len(t.allowedLanguages) == 0 {
t.allowedLanguages = SupportedLanguages()
}
t.bundle, err = newBundle(ns, defaultLanguage, t.allowedLanguages)
if err != nil {
return nil, err
}
t.bundle = newBundle(ns, defaultLanguage, t.allowedLanguages)
t.cookieHandler = http_util.NewCookieHandler()
t.cookieName = cookieName
return t, nil
return t
}
func (t *Translator) SupportedLanguages() []language.Tag {