From 63e7fa3054b8d087fa3197910394be2f52ef19c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= <mail@jkroepke.de>
Date: Tue, 5 Dec 2023 08:47:40 +0100
Subject: [PATCH 1/3] Remove old event source registry key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
---
 installer/windows_exporter.wxs | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/installer/windows_exporter.wxs b/installer/windows_exporter.wxs
index 85762781..34c5d1ca 100644
--- a/installer/windows_exporter.wxs
+++ b/installer/windows_exporter.wxs
@@ -24,7 +24,25 @@
     <Property Id="REMOTE_ADDR" Secure="yes" />
     <SetProperty Id="RemoteAddressFlag" After="InstallFiles" Sequence="execute" Value="[REMOTE_ADDR]" Condition="REMOTE_ADDR" />
 
-    
+    <!-- https://github.com/prometheus-community/windows_exporter/issues/1318 -->
+    <!-- https://wixtoolset.org/docs/tools/wixext/quietexec/ -->
+    <SetProperty
+            Id="WixQuietExecCmdLine"
+            Value="&quot;[%ComSpec]&quot; /c reg delete HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\windows_exporter /f"
+            Before="ConvolutedCoreCountCustomAction"
+            Sequence="execute"
+    />
+    <CustomAction
+            Id="RemoveEventSource"
+            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
+            DllEntry="WixSilentExec"
+            Execute="deferred"
+            Impersonate="no"
+            Return="ignore"
+    />
+    <InstallExecuteSequence>
+      <Custom Action="RemoveEventSource" After="InstallInitialize" />
+    </InstallExecuteSequence>
 
     <Property Id="TEXTFILE_DIR" Secure="yes" />
     <SetProperty Id="TextfileDirFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directory [TEXTFILE_DIR]" Condition="TEXTFILE_DIR" />
@@ -51,11 +69,11 @@
     <Feature Id="DefaultFeature" Level="1">
       <ComponentGroupRef Id="Files" />
     </Feature>
-  
-      <Directory Id="$(var.PlatformProgramFiles)">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
-          <Directory Id="textfile_inputs" Name="textfile_inputs" />
-        </Directory>
+
+    <Directory Id="$(var.PlatformProgramFiles)">
+      <Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
+        <Directory Id="textfile_inputs" Name="textfile_inputs" />
       </Directory>
-    </Package>
+    </Directory>
+  </Package>
 </Wix>

From 49d9097bf9385c1b317daddf5f7b6dfb1af1c51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= <mail@jkroepke.de>
Date: Tue, 5 Dec 2023 08:48:07 +0100
Subject: [PATCH 2/3] Remove old event source registry key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
---
 installer/windows_exporter.wxs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/installer/windows_exporter.wxs b/installer/windows_exporter.wxs
index 34c5d1ca..a88d3097 100644
--- a/installer/windows_exporter.wxs
+++ b/installer/windows_exporter.wxs
@@ -59,7 +59,6 @@
           <ServiceDependency Id="wmiApSrv" />
         </ServiceInstall>
         <ServiceControl Id="ServiceStateControl" Name="windows_exporter" Remove="uninstall" Start="install" Stop="both" />
-        <util:EventSource Log="Application" Name="windows_exporter" EventMessageFile="%SystemRoot%\System32\EventCreate.exe" />
       </Component>
       <Component Id="CreateTextfileDirectory" Directory="textfile_inputs" Guid="d03ef58a-9cbf-4165-ad39-d143e9b27e14">
         <CreateFolder />

From e76b739e30c30b988f296bdb8221e9975bd11d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= <mail@jkroepke.de>
Date: Tue, 5 Dec 2023 09:06:05 +0100
Subject: [PATCH 3/3] Remove old event source registry key
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
---
 installer/windows_exporter.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/windows_exporter.wxs b/installer/windows_exporter.wxs
index a88d3097..a67eff95 100644
--- a/installer/windows_exporter.wxs
+++ b/installer/windows_exporter.wxs
@@ -29,7 +29,7 @@
     <SetProperty
             Id="WixQuietExecCmdLine"
             Value="&quot;[%ComSpec]&quot; /c reg delete HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\windows_exporter /f"
-            Before="ConvolutedCoreCountCustomAction"
+            Before="RemoveEventSource"
             Sequence="execute"
     />
     <CustomAction