From 57e9e71c23969436cbaa082669ed5da21aa03070 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 28 Aug 2024 12:12:36 +0200 Subject: [PATCH 1/2] Relax ECS container ID regex --- src/Elastic.Apm/Helpers/SystemInfoHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Elastic.Apm/Helpers/SystemInfoHelper.cs b/src/Elastic.Apm/Helpers/SystemInfoHelper.cs index c737dbb11..b114cef9c 100644 --- a/src/Elastic.Apm/Helpers/SystemInfoHelper.cs +++ b/src/Elastic.Apm/Helpers/SystemInfoHelper.cs @@ -18,7 +18,7 @@ internal class SystemInfoHelper { private readonly Regex _containerUidRegex = new Regex("^[0-9a-fA-F]{64}$"); private readonly Regex _shortenedUuidRegex = new Regex("^[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4,}"); - private readonly Regex _ecsContainerIdRegex = new Regex("^[a-z0-9]{32}-[0-9]{10}$"); + private readonly Regex _ecsContainerIdRegex = new Regex("^[a-z0-9]{32}-[0-9]{1,10}$"); private readonly Regex _podRegex = new Regex( @"(?:^/kubepods[\S]*/pod([^/]+)$)|(?:^/kubepods\.slice/(kubepods-[^/]+\.slice/)?kubepods[^/]*-pod([^/]+)\.slice$)"); From 16555eb2da15f537c962bdd45572c46aeb66442b Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 28 Aug 2024 12:21:02 +0200 Subject: [PATCH 2/2] Update changelog for v1.28.5 --- CHANGELOG.asciidoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index f279ef0f0..e1c99ccf5 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,13 @@ endif::[] [[release-notes-1.x]] === .NET Agent version 1.x +[[release-notes-1.28.5]] +==== 1.28.5 - 2024/08/28 + +===== Bug fixes + +{pull}2430[#2430] Relax ECS container ID regex. + [[release-notes-1.28.4]] ==== 1.28.4 - 2024/08/19