Update windows exporter dependency to v0.31.1 #4037

dehaansa · 2025-07-22T21:16:20Z

PR Description

Updating the windows exporter dependency, again. A few more breaking changes, a few upgrades, and a few panic fixes.

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

CHANGELOG.md updated
Documentation added
Tests updated
Config converters updated

github-actions · 2025-07-22T21:17:45Z

💻 Deploy preview available:

https://deploy-preview-alloy-4037-zb444pucvq-vp.a.run.app/docs/alloy/latest/

…ibility

dehaansa · 2025-07-27T02:51:01Z

internal/converter/internal/staticconvert/testdata-v2_windows/integrations_v2.alloy

@@ -1,6 +1,6 @@
 prometheus.remote_write "metrics_default" {
 	endpoint {
-		name = "default-b174ee"
+		name = "default-04b53d"


This is broken on main, probably from prom3.4 update.

dehaansa · 2025-07-27T02:51:06Z

internal/converter/internal/staticconvert/testdata_windows/promtail_prom.alloy

@@ -18,7 +18,7 @@ prometheus.scrape "metrics_name_jobName" {

 prometheus.remote_write "metrics_name" {
 	endpoint {
-		name = "name-b174ee"
+		name = "name-04b53d"


This is broken on main, probably from prom3.4 update.

ptodev · 2025-07-28T10:18:31Z

docs/sources/reference/components/prometheus/prometheus.exporter.windows.md

+| `exclude`                   | `string` | Regular expression of processes to exclude.    | `"^$"`   | no       |
+| `include`                   | `string` | Regular expression of processes to include.    | `"^.+$"` | no       |
+
+The `counter_version` may be `0`, `1`, or `2`. A value of `0` uses the latest available (currently V2), the other values specify which version of the process collector to utilize.


In the docs it's not clear what the difference in the versions is. Also, do you think it makes sense to default to v1 so that there are no breaking changes? And to open a "breaking change" Alloy GitHub issue for us to switch for v2 for Alloy v2? Is v1 going to be removed from the upstream exporter soon? If it's due to be removed soon, then we'll need to switch users to v2 sooner

It shouldn't be a breaking change, just an underlying implementation change, but I'll see if I can make some more clear documentation.

ptodev · 2025-07-28T10:36:38Z

Makefile

@@ -125,7 +125,8 @@ GO_LDFLAGS   := -X $(VPREFIX).Branch=$(GIT_BRANCH)                        \
 		-X $(VPREFIXSYNTAX).Version=$(VERSION)                    \
                -X $(VPREFIX).Revision=$(GIT_REVISION)                    \
                -X $(VPREFIX).BuildUser=$(shell whoami)@$(shell hostname) \
-                -X $(VPREFIX).BuildDate=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+                -X $(VPREFIX).BuildDate=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
+				-ld64


What does this do? Why is it necessary?

docs/sources/reference/components/prometheus/prometheus.exporter.windows.md

This reverts commit da33ae2.

clayton-cornell · 2025-07-28T14:35:21Z

docs/sources/reference/components/prometheus/prometheus.exporter.windows.md

-The `textfile` collector is currently configured with the `text_file` block. 
-To be consistent with the `textfile` collector name, the `text_file` block will be deprecated in a future release and replaced with a `textfile` block. 
+For backwards compatibility, the `textfile` collector can also be configured with the undocumented `text_file` block.
+It is identical to the `textfile` block, and will be removed in a future release.


I'm wondering if we should leave the text_file block in the docs, but marked as deprecated until it's actually removed.

I'm open to it, I chose this approach as it pushes users towards the corrected block name but they can still find the block if they're searching through the docs for text_file.

Co-authored-by: Paulin Todev <[email protected]>

clayton-cornell · 2025-07-28T15:32:08Z

docs/sources/reference/components/prometheus/prometheus.exporter.windows.md

@@ -69,11 +69,11 @@ You can use the following blocks with `prometheus.exporter.windows`:
 | [`smb`][smb]                               | Configures the `smb` collector.                | no       |
 | [`smtp`][smtp]                             | Configures the `smtp` collector.               | no       |
 | [`tcp`][tcp]                               | Configures the `tcp` collector.                | no       |
-| [`text_file`][text_file]                   | Configures the `textfile` collector.           | no       |
+| [`textfile`][textfile]                     | Configures the `textfile` collector.           | no       |


Suggested change

| [`textfile`][textfile] | Configures the `textfile` collector. | no |

| [`text_file`][text_file] | (Deprecated: use `textfile` instead) Configures the `textfile` collector. | no |

| [`textfile`][textfile] | Configures the `textfile` collector. | no |

We could document like this (as used elsewhere in the component docs - eg: in otelcol.connector.spanmetrics). We are a little inconsistent with how we document deprecated args and blocks. I just picked the style that provides the most useful information.

clayton-cornell · 2025-07-28T15:37:11Z

docs/sources/reference/components/prometheus/prometheus.exporter.windows.md

+For backwards compatibility, the `textfile` collector can also be configured with the undocumented `text_file` block.
+It is identical to the `textfile` block, and will be removed in a future release.


Suggested change

For backwards compatibility, the `textfile` collector can also be configured with the undocumented `text_file` block.

It is identical to the `textfile` block, and will be removed in a future release.

{{< admonition type="caution" >}}

Starting with v1.11, the `text_file ` block is deprecated.

It will be removed in a future release.

Use the `textfile` block to configure the `textfile` collector.

{{< /admonition >}}

Something like this to follow the advice here: https://grafana.com/docs/writers-toolkit/write/deprecate-remove/ (assuming the deprecation happens in 1.11?

dehaansa added 2 commits July 22, 2025 17:14

First pass implementing windows exporter v0.31.1

d343035

More updates to converter

f93ec25

dehaansa added 4 commits July 22, 2025 17:18

update windows exporter defaults test

938fe32

Update another windows test

c75a605

fix unmarshal test panic

563212b

Merge branch 'main' into windows-exporter-31

de7997d

dehaansa added the os:windows label Jul 23, 2025

dehaansa added 14 commits July 22, 2025 23:44

minimal windows exporter config for instance key test

0e41951

Merge branch 'main' into windows-exporter-31

1efa706

Fix tests

541450f

Preserve existing behavior of textfile config

8df8fc1

preserve previous behavior of textfile collector config

b514f01

Fix issues with propagating config between structs in windows exporter

ed1566d

Merge branch 'main' into windows-exporter-31

62b47c0

Revert change to static structs to protect converter backwards compat…

7f40d4d

…ibility

nits

02a1d69

fix readme

dd199f8

update windows tests from prom3.4 changes

bbfef39

Help static mode converter handle new textfile defaults behavior

7dae55d

Fix the equality check for default check

70cfbe3

Merge branch 'main' into windows-exporter-31

9bd7f69

dehaansa commented Jul 27, 2025

View reviewed changes

dehaansa marked this pull request as ready for review July 27, 2025 02:51

dehaansa requested review from clayton-cornell and a team as code owners July 27, 2025 02:51

try adding linker flag

da33ae2

ptodev reviewed Jul 28, 2025

View reviewed changes

ptodev self-assigned this Jul 28, 2025

Revert "try adding linker flag"

027cc25

This reverts commit da33ae2.

clayton-cornell reviewed Jul 28, 2025

View reviewed changes

dehaansa and others added 2 commits July 28, 2025 11:22

Apply suggestions from code review

4b4d87e

Co-authored-by: Paulin Todev <[email protected]>

Apply suggestions from code review

b86fa91

Co-authored-by: Paulin Todev <[email protected]>

clayton-cornell reviewed Jul 28, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update windows exporter dependency to v0.31.1 #4037

Update windows exporter dependency to v0.31.1 #4037

dehaansa commented Jul 22, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jul 22, 2025 •

edited

Loading

Uh oh!

dehaansa Jul 27, 2025

Uh oh!

dehaansa Jul 27, 2025

Uh oh!

ptodev Jul 28, 2025

Uh oh!

dehaansa Jul 28, 2025

Uh oh!

ptodev Jul 28, 2025

Uh oh!

Uh oh!

Uh oh!

clayton-cornell Jul 28, 2025

Uh oh!

dehaansa Jul 28, 2025

Uh oh!

clayton-cornell Jul 28, 2025

Uh oh!

clayton-cornell Jul 28, 2025

Uh oh!

Uh oh!

	\| [`textfile`][textfile] \| Configures the `textfile` collector. \| no \|
	\| [`text_file`][text_file] \| (Deprecated: use `textfile` instead) Configures the `textfile` collector. \| no \|
	\| [`textfile`][textfile] \| Configures the `textfile` collector. \| no \|

		For backwards compatibility, the `textfile` collector can also be configured with the undocumented `text_file` block.
		It is identical to the `textfile` block, and will be removed in a future release.

-For backwards compatibility, the `textfile` collector can also be configured with the undocumented `text_file` block.
-It is identical to the `textfile` block, and will be removed in a future release.
+{{< admonition type="caution" >}}
+Starting with v1.11, the `text_file ` block is deprecated.
+It will be removed in a future release.
+Use the `textfile` block to configure the `textfile` collector.
+{{< /admonition >}}

Update windows exporter dependency to v0.31.1 #4037

Are you sure you want to change the base?

Update windows exporter dependency to v0.31.1 #4037

Conversation

dehaansa commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Description

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

Uh oh!

github-actions bot commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dehaansa commented Jul 22, 2025 •

edited

Loading

github-actions bot commented Jul 22, 2025 •

edited

Loading