-
Notifications
You must be signed in to change notification settings - Fork 130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Windows MSI to the release #560
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
6f010ac
Add Windows MSI to the release
pjanotti c32d476
Add MSI support to generate-goreleaser
pjanotti a58435d
Setup wixl
pjanotti 68f396f
Remove InstallPrivileges and InstallScope from wxs
pjanotti 29673f5
Remove RemoveFile element
pjanotti 59da855
Directory is not supported on CustomAction
pjanotti ce52f3d
Remove path prefix from opentelemetry.ico
pjanotti a16feef
Path to opentelemetry.ico
pjanotti 459cb9b
Use sys.SOURCEFILEDIR to locate .ico file
pjanotti cef70da
Use sys.CURRENTDIR to locate ico file
pjanotti fb8ed65
Remove path not present on GH execution
pjanotti 599b2cb
Try to locate opentelmetry.ico
pjanotti 2791692
Fix location of ico file when building MSI
pjanotti b02cba8
CURRENTDIR since SOURCEFILEDIR gives the wxs file
pjanotti 2d78d20
Remove GH action step to locate ico file
pjanotti d9afe65
Temporarily duplicate windows folder for otelcol-contrib distribution
pjanotti 787dc72
Temporary action to upload artifacts
pjanotti 5a000ac
Register event source for the collector
pjanotti 30ad144
Use distribution name as service name
pjanotti 5bfe10f
Better provider name to show up on the event viewer
pjanotti b8ece30
Match both installer.wxs
pjanotti c60f97c
Add COLLECTOR_SVC_ARGS property
pjanotti 51f3eb6
Use ubuntu 22.04 in order to get latest wixl
pjanotti 68dd254
CURRENTDIR didn't work with wixl 101
pjanotti dc7339f
Change the location of opentelemetry.ico
pjanotti 3ecb3b8
Move wxs source
pjanotti 9c49554
Use the binary name as event provider name
pjanotti d4395d7
Remove temporary action to upload artifacts
pjanotti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | ||
<Product | ||
Name="OpenTelemetry Collector ({{ .Version }}) - {{ .Binary }} distribution" | ||
Id="B250A214-D463-4E9B-8902-1DE5C19EA951" | ||
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3" | ||
Version="{{ .Version }}" | ||
Manufacturer="OpenTelemetry" | ||
Language="1033"> | ||
|
||
<Package | ||
InstallerVersion="200" | ||
Compressed="yes" | ||
Comments="Windows Installer Package" | ||
InstallScope="perMachine"/> | ||
<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/> | ||
<Icon Id="ProductIcon" SourceFile="opentelemetry.ico"/> | ||
<Property Id="ARPPRODUCTICON" Value="ProductIcon"/> | ||
<Property Id="ARPHELPLINK" Value="https://opentelemetry.io/"/> | ||
<Property Id="ARPURLINFOABOUT" Value="https://opentelemetry.io/"/> | ||
<Property Id="ARPNOREPAIR" Value="1"/> | ||
<Property Id="ARPNOMODIFY" Value="1"/> | ||
|
||
<MajorUpgrade | ||
DowngradeErrorMessage="A later version of OpenTelemetry Collector already installed. Setup will now exit."/> | ||
|
||
<Feature Id="Feature" Level="1"> | ||
<ComponentRef Id="ApplicationComponent"/> | ||
</Feature> | ||
|
||
<Property Id="COLLECTOR_SVC_ARGS"/> | ||
<CustomAction | ||
Id="SetCollectorSvcArgs" | ||
Property="COLLECTOR_SVC_ARGS" | ||
Value="--config "[INSTALLDIR]config.yaml""/> | ||
|
||
<InstallExecuteSequence> | ||
<Custom Action="SetCollectorSvcArgs" Before="InstallFiles">NOT COLLECTOR_SVC_ARGS</Custom> | ||
</InstallExecuteSequence> | ||
|
||
<Directory Id="TARGETDIR" Name="SourceDir"> | ||
<Directory Id="ProgramFiles64Folder"> | ||
<Directory Id="INSTALLDIR" Name="OpenTelemetry Collector"> | ||
<Component Id="ApplicationComponent" Guid="1207C3C4-1830-4DC8-8A7B-2BD7DBE45BC3"> | ||
<!-- Files to include --> | ||
<File | ||
Id="{{ .Binary }}.exe" | ||
Name="{{ .Binary }}.exe" | ||
Source="{{ .Binary }}.exe" | ||
KeyPath="yes"/> | ||
<File | ||
Id="config.yaml" | ||
Name="config.yaml" | ||
Source="config.yaml"/> | ||
|
||
<ServiceInstall | ||
Id="Sevice" | ||
Name="{{ .Binary }}" | ||
DisplayName="OpenTelemetry Collector" | ||
Description="Collects, processes, and exports telemetry from various configurable sources." | ||
Type="ownProcess" | ||
Vital="yes" | ||
Start="auto" | ||
Account="LocalSystem" | ||
ErrorControl="normal" | ||
Arguments="[COLLECTOR_SVC_ARGS]" | ||
Interactive="no"/> | ||
<ServiceControl | ||
Id="StartStopRemoveService" | ||
Name="{{ .Binary }}" | ||
Start="install" | ||
Stop="both" | ||
Remove="uninstall" | ||
Wait="yes"/> | ||
|
||
<RegistryKey | ||
Root="HKLM" | ||
Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\{{ .Binary }}"> | ||
<RegistryValue | ||
Type="expandable" | ||
Name="EventMessageFile" | ||
Value="%SystemRoot%\System32\EventCreate.exe"/> | ||
</RegistryKey> | ||
</Component> | ||
</Directory> | ||
</Directory> | ||
</Directory> | ||
</Product> | ||
</Wix> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> | ||
<Product | ||
Name="OpenTelemetry Collector ({{ .Version }}) - {{ .Binary }} distribution" | ||
Id="B250A214-D463-4E9B-8902-1DE5C19EA951" | ||
UpgradeCode="B7C263DD-95A5-436A-A025-DCA5200C2BE3" | ||
Version="{{ .Version }}" | ||
Manufacturer="OpenTelemetry" | ||
Language="1033"> | ||
|
||
<Package | ||
InstallerVersion="200" | ||
Compressed="yes" | ||
Comments="Windows Installer Package" | ||
InstallScope="perMachine"/> | ||
<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/> | ||
<Icon Id="ProductIcon" SourceFile="opentelemetry.ico"/> | ||
<Property Id="ARPPRODUCTICON" Value="ProductIcon"/> | ||
<Property Id="ARPHELPLINK" Value="https://opentelemetry.io/"/> | ||
<Property Id="ARPURLINFOABOUT" Value="https://opentelemetry.io/"/> | ||
<Property Id="ARPNOREPAIR" Value="1"/> | ||
<Property Id="ARPNOMODIFY" Value="1"/> | ||
|
||
<MajorUpgrade | ||
DowngradeErrorMessage="A later version of OpenTelemetry Collector already installed. Setup will now exit."/> | ||
|
||
<Feature Id="Feature" Level="1"> | ||
<ComponentRef Id="ApplicationComponent"/> | ||
</Feature> | ||
|
||
<Property Id="COLLECTOR_SVC_ARGS"/> | ||
<CustomAction | ||
Id="SetCollectorSvcArgs" | ||
Property="COLLECTOR_SVC_ARGS" | ||
Value="--config "[INSTALLDIR]config.yaml""/> | ||
|
||
<InstallExecuteSequence> | ||
<Custom Action="SetCollectorSvcArgs" Before="InstallFiles">NOT COLLECTOR_SVC_ARGS</Custom> | ||
</InstallExecuteSequence> | ||
|
||
<Directory Id="TARGETDIR" Name="SourceDir"> | ||
<Directory Id="ProgramFiles64Folder"> | ||
<Directory Id="INSTALLDIR" Name="OpenTelemetry Collector"> | ||
<Component Id="ApplicationComponent" Guid="1207C3C4-1830-4DC8-8A7B-2BD7DBE45BC3"> | ||
<!-- Files to include --> | ||
<File | ||
Id="{{ .Binary }}.exe" | ||
Name="{{ .Binary }}.exe" | ||
Source="{{ .Binary }}.exe" | ||
KeyPath="yes"/> | ||
<File | ||
Id="config.yaml" | ||
Name="config.yaml" | ||
Source="config.yaml"/> | ||
|
||
<ServiceInstall | ||
Id="Sevice" | ||
Name="{{ .Binary }}" | ||
DisplayName="OpenTelemetry Collector" | ||
Description="Collects, processes, and exports telemetry from various configurable sources." | ||
Type="ownProcess" | ||
Vital="yes" | ||
Start="auto" | ||
Account="LocalSystem" | ||
ErrorControl="normal" | ||
Arguments="[COLLECTOR_SVC_ARGS]" | ||
Interactive="no"/> | ||
<ServiceControl | ||
Id="StartStopRemoveService" | ||
Name="{{ .Binary }}" | ||
Start="install" | ||
Stop="both" | ||
Remove="uninstall" | ||
Wait="yes"/> | ||
|
||
<RegistryKey | ||
Root="HKLM" | ||
Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\{{ .Binary }}"> | ||
<RegistryValue | ||
Type="expandable" | ||
Name="EventMessageFile" | ||
Value="%SystemRoot%\System32\EventCreate.exe"/> | ||
</RegistryKey> | ||
</Component> | ||
</Directory> | ||
</Directory> | ||
</Directory> | ||
</Product> | ||
</Wix> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't realise you could directly use the pro version, interesting.