Skip to content

Commit 8c23d7c

Browse files
authored
Fix CNS and CNI ETW log interference issue (#3692)
* fix(log): Fix CNS and CNI ETW log interference issue Signed-off-by: Yerlan Baiturinov <[email protected]> * fix: Docker containers version updated Signed-off-by: Yerlan Baiturinov <[email protected]> * fix: ETW Event Name changed for CNI Signed-off-by: Yerlan Baiturinov <[email protected]> * fix: Revert changing Profilename in the ETW loggers Signed-off-by: Yerlan Baiturinov <[email protected]> --------- Signed-off-by: Yerlan Baiturinov <[email protected]>
1 parent 4f9a4d0 commit 8c23d7c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cni/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG OS_VERSION
66
ARG OS
77

88
# mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0
9-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc9d564dc7279c749a9bb1abfa03f872d24f60bf7e37e61f35dda98c2ccec0c4 AS go
9+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:f1cb092e89f5f3448b6db87729039c61541cb85747c690f760b3017218d449bb AS go
1010

1111
# mcr.microsoft.com/cbl-mariner/base/core:2.0
1212
FROM --platform=linux/${ARCH} mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core

cni/log/logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var (
1717
const (
1818
maxLogFileSizeInMb = 5
1919
maxLogFileCount = 8
20-
etwCNIEventName = "Azure-CNI"
20+
etwCNIEventName = "AzureCNI"
2121
loggingLevel = zapcore.DebugLevel
2222
)
2323

cns/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG OS_VERSION
55
ARG OS
66

77
# mcr.microsoft.com/oss/go/microsoft/golang:1.23-cbl-mariner2.0
8-
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:bc9d564dc7279c749a9bb1abfa03f872d24f60bf7e37e61f35dda98c2ccec0c4 AS go
8+
FROM --platform=linux/${ARCH} mcr.microsoft.com/oss/go/microsoft/golang@sha256:f1cb092e89f5f3448b6db87729039c61541cb85747c690f760b3017218d449bb AS go
99

1010
# mcr.microsoft.com/cbl-mariner/base/core:2.0
1111
FROM mcr.microsoft.com/cbl-mariner/base/core@sha256:12480ee9f027c304fabc17d70afc7d5da6c49ad46f0401947478e7218ea0ff6c AS mariner-core

0 commit comments

Comments
 (0)