Merge branch 'main' into changelog_8.16.3

elastic · Jan 14, 2025 · f486f74 · f486f74
2 parents 4e531c9 + 53bbcaf
commit f486f74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -3,6 +3,10 @@
 
 https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits]
 
+[float]
+==== Bug fixes
+- Fix overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures {pull}15216[15216]
+
 [float]
 ==== Breaking Changes
 

diff --git a/internal/beater/config/agentconfig.go b/internal/beater/config/agentconfig.go
@@ -63,7 +63,7 @@ func (c *AgentConfig) Unpack(in *config.C) error {
 }
 
 func (c *AgentConfig) setup(log *logp.Logger, outputESCfg *config.C) error {
-	if float64(int(c.Cache.Expiration.Seconds())) != c.Cache.Expiration.Seconds() {
+	if c.Cache.Expiration%time.Second != 0 {
 		return errors.New(msgInvalidConfigAgentCfg)
 	}
 	if outputESCfg != nil {