Prepare release/1.9 for 1.9.1 (#3776)

dehaansa · michaelPotter · thampiotr · web-flow · commit d3d79312dd75 · 2025-06-05T12:45:18.000+01:00
* Update aws_firehose collector to use CW event timestamps (#3725) * SISENG-2728: Update aws_firehose collector to use CW event timestamps If the useIncomingTs flag is set to true, the loki.aws_firehose collector will now use the timestamps attached to specific log entries when processing cloudwatch logs-subscription data. For direct put data, the timestamp attached to the firehose wrapper is still used. * SISENG-2728: Use millisecond resolution for cloudwatch timestamps (cherry picked from commit a153152) * reduce CPU use in zapadapter (#3773) * Improve zadapter benchmark. * Fix slow zadapter. * comments and changelog (cherry picked from commit f9e1b15) * Add new collectors enabled_list to dns collector and update windows exporter version (#3742) * Add new collectors enabled_list to dns collector and update windows exporter version * Fix typo from windows exporter docs * fix changelog * fix VERSION * fix gomod --------- Co-authored-by: Michael Potter <7788329+michaelPotter@users.noreply.github.com> Co-authored-by: Piotr <17101802+thampiotr@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+v1.9.1
+-----------------
+
+### Features
+
+- Update the `prometheus.exporter.windows` component to version v0.30.7. This adds new metrics to the `dns` collector. (@dehaansa)
+
+### Bugfixes
+
+- Update the `prometheus.exporter.windows` component to version v0.30.7. This fixes an error with the exchange collector and terminal_services collector (@dehaansa)
+
+- Fix `loki.source.firehose` to propagate specific cloudwatch event timestamps when useIncomingTs is set to true. (@michaelPotter)
+
+- Fix elevated CPU usage when using some `otelcol` components due to debug logging. (@thampiotr)
+
 v1.9.0
 -----------------
 
diff --git a/VERSION b/VERSION
@@ -20,4 +20,4 @@
 #
 # Lines starting with "#" and blank lines are ignored.
 
-v1.9.0
+v1.9.1
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
@@ -4,9 +4,9 @@ title: Grafana Alloy
 description: Grafana Alloy is a vendor-neutral distribution of the OTel Collector
 weight: 350
 cascade:
-  ALLOY_RELEASE: v1.9.0
+  ALLOY_RELEASE: v1.9.1
   OTEL_VERSION: v0.122.0
-  PROM_WIN_EXP_VERSION: v0.30.6
+  PROM_WIN_EXP_VERSION: v0.30.7
   SNMP_VERSION: v0.29.0
   BEYLA_VERSION: v2.1
   FULL_PRODUCT_NAME: Grafana Alloy
diff --git a/docs/sources/_index.md.t b/docs/sources/_index.md.t
@@ -6,7 +6,7 @@ weight: 350
 cascade:
   ALLOY_RELEASE: $ALLOY_VERSION
   OTEL_VERSION: v0.122.0
-  PROM_WIN_EXP_VERSION: v0.30.6
+  PROM_WIN_EXP_VERSION: v0.30.7
   SNMP_VERSION: v0.29.0
   BEYLA_VERSION: v2.1
   FULL_PRODUCT_NAME: Grafana Alloy
diff --git a/docs/sources/reference/components/prometheus/prometheus.exporter.windows.md b/docs/sources/reference/components/prometheus/prometheus.exporter.windows.md
@@ -50,6 +50,7 @@ You can use the following blocks with `prometheus.exporter.windows`:
 | Name                                       | Description                                    | Required |
 | ------------------------------------------ | ---------------------------------------------- | -------- |
 | [`dfsr`][dfsr]                             | Configures the `dfsr` collector.               | no       |
+| [`dns`][dns]                               | Configures the `dns` collector.                | no       |
 | [`exchange`][exchange]                     | Configures the `exchange` collector.           | no       |
 | [`filetime`][filetime]                     | Configures the `filetime` collector.           | no       |
 | [`iis`][iis]                               | Configures the `iis` collector.                | no       |
@@ -71,6 +72,7 @@ You can use the following blocks with `prometheus.exporter.windows`:
 | [`text_file`][text_file]                   | Configures the `text_file` collector.          | no       |
 
 [dfsr]: #dfsr
+[dns]: #dns
 [exchange]: #exchange
 [filetime]: #filetime
 [iis]: #iis
@@ -97,6 +99,12 @@ You can use the following blocks with `prometheus.exporter.windows`:
 | ---------------- | -------------- | -------------------------------------- | ---------------------------------- | -------- |
 | `source_enabled` | `list(string)` | A list of DFSR Perflib sources to use. | `["connection","folder","volume"]` | no       |
 
+### `dns`
+
+| Name           | Type           | Description                  | Default                      | Required |
+|----------------|----------------|------------------------------|------------------------------|----------|
+| `enabled_list` | `list(string)` | A list of collectors to use. | `["metrics", "wmi_stats"]` | no       |
+
 ### `exchange`
 
 | Name           | Type           | Description                  | Default       | Required |
diff --git a/go.mod b/go.mod
@@ -174,7 +174,7 @@ require (
 	github.com/prometheus-community/elasticsearch_exporter v1.5.0
 	github.com/prometheus-community/postgres_exporter v0.11.1
 	github.com/prometheus-community/stackdriver_exporter v0.18.0
-	github.com/prometheus-community/windows_exporter v0.30.6 // if you update the windows_exporter version, make sure to update the PROM_WIN_EXP_VERSION in _index
+	github.com/prometheus-community/windows_exporter v0.30.7 // if you update the windows_exporter version, make sure to update the PROM_WIN_EXP_VERSION in _index
 	github.com/prometheus-operator/prometheus-operator v0.69.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.69.1
diff --git a/go.sum b/go.sum
@@ -2456,8 +2456,8 @@ github.com/prometheus-community/prom-label-proxy v0.7.0 h1:1iNHXF7V8z2iOCinEyxKD
 github.com/prometheus-community/prom-label-proxy v0.7.0/go.mod h1:wR9C/Mwp5aBbiqM6gQ+FZdFRwL8pCzzhsje8lTAx/aA=
 github.com/prometheus-community/stackdriver_exporter v0.18.0 h1:nB7JwloiBziunaujql5XEjB06WOo0ePgBTCJxFeaOhY=
 github.com/prometheus-community/stackdriver_exporter v0.18.0/go.mod h1:f7T7XXRVc390sVc7rk2yNflf+RkClE4mlfsaSsW2K5Q=
-github.com/prometheus-community/windows_exporter v0.30.6 h1:xoZvbMUKKxmZJ6F5CHQhxQmUDL9S52TUxQLzSFSdwHA=
-github.com/prometheus-community/windows_exporter v0.30.6/go.mod h1:qn12efWBV5wguLBvQ2soKdgP5pTgVHx3ec4Di0bWb7M=
+github.com/prometheus-community/windows_exporter v0.30.7 h1:p+T2O7XthamlSpeQtKmBylA2sQVGcWKMCwD+qnkZwcE=
+github.com/prometheus-community/windows_exporter v0.30.7/go.mod h1:qn12efWBV5wguLBvQ2soKdgP5pTgVHx3ec4Di0bWb7M=
 github.com/prometheus-operator/prometheus-operator v0.69.1 h1:pqNMssMBBaM6mYg7FKK7kQi9sIyWYCA33z5FSmmbybw=
 github.com/prometheus-operator/prometheus-operator v0.69.1/go.mod h1:1GSjL8dKOO9be+b7aSowZo7cuTdsdTqLT3ZETktVqvU=
 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1 h1:hOnp+1FLBm+ifsyiRbunmfSs99jKAq+Tr5elCmo5l5U=
diff --git a/internal/component/loki/source/aws_firehose/internal/handler.go b/internal/component/loki/source/aws_firehose/internal/handler.go
@@ -274,6 +274,9 @@ func (h *Handler) handleCloudwatchLogsRecord(ctx context.Context, data []byte, c
 	cwLogsLabels.Set("__aws_cw_msg_type", cwRecord.MessageType)
 
 	for _, event := range cwRecord.LogEvents {
+		if h.useIncomingTs {
+			timestamp = time.UnixMilli(event.Timestamp)
+		}
 		h.sender.Send(ctx, loki.Entry{
 			Labels: h.postProcessLabels(cwLogsLabels.Labels()),
 			Entry: logproto.Entry{
diff --git a/internal/component/loki/source/aws_firehose/internal/handler_test.go b/internal/component/loki/source/aws_firehose/internal/handler_test.go
@@ -36,6 +36,24 @@ const (
 //go:embed testdata/*
 var testData embed.FS
 
+// These timestamps line up with the log entries in the testdata/cw_logs_mixed.json file.
+var cwLogsTimestamps = []int64{
+	1684423980083,
+	1684424003641,
+	1684424003820,
+	1684424003822,
+	1684424003859,
+	1684424003859,
+	1684424005707,
+	1684424005708,
+	1684424005718,
+	1684424005718,
+	1684424007492,
+	1684424007493,
+	1684424007494,
+	1684424007494,
+}
+
 func readTestData(t *testing.T, name string) string {
 	f, err := testData.ReadFile(name)
 	if err != nil {
@@ -196,8 +214,8 @@ func TestHandler(t *testing.T) {
 				require.Equal(t, "86208cf6-2bcc-47e6-9010-02ca9f44a025", r.RequestID)
 
 				require.Len(t, entries, 14)
-				expectedTimestamp := time.Unix(cwRequestTimestamp/1000, 0)
-				for _, e := range entries {
+				for i, e := range entries {
+					var expectedTimestamp = time.UnixMilli(cwLogsTimestamps[i])
 					require.Equal(t, expectedTimestamp, e.Timestamp, "timestamp is other than expected")
 				}
 			},
diff --git a/internal/component/prometheus/exporter/windows/config.go b/internal/component/prometheus/exporter/windows/config.go
@@ -50,6 +50,7 @@ type Arguments struct {
 	PerformanceCounter PerformanceCounterConfig `alloy:"performancecounter,block,optional"`
 	MSCluster          MSClusterConfig          `alloy:"mscluster,block,optional"`
 	NetFramework       NetFrameworkConfig       `alloy:"netframework,block,optional"`
+	DNS                DNSConfig                `alloy:"dns,block,optional"`
 }
 
 // Convert converts the component's Arguments to the integration's Config.
@@ -380,3 +381,15 @@ func (t NetFrameworkConfig) Convert() windows_integration.NetFrameworkConfig {
 		EnabledList: strings.Join(t.EnabledList, ","),
 	}
 }
+
+// DNSConfig handles settings for the windows_exporter DNS collector
+type DNSConfig struct {
+	EnabledList []string `alloy:"enabled_list,attr,optional"`
+}
+
+// Convert converts the component's DNSConfig to the integration's DNSConfig.
+func (t DNSConfig) Convert() windows_integration.DNSConfig {
+	return windows_integration.DNSConfig{
+		EnabledList: strings.Join(t.EnabledList, ","),
+	}
+}
diff --git a/internal/component/prometheus/exporter/windows/config_default_windows_test.go b/internal/component/prometheus/exporter/windows/config_default_windows_test.go
@@ -43,6 +43,9 @@ func TestAlloyUnmarshalWithDefaultConfig(t *testing.T) {
 	require.Equal(t, defaultArgs.SMTP.Exclude, args.SMTP.Exclude)
 	require.Equal(t, defaultArgs.SMTP.Include, args.SMTP.Include)
 	require.Equal(t, defaultArgs.TextFile.TextFileDirectory, args.TextFile.TextFileDirectory)
+	require.Equal(t, defaultArgs.TCP.EnabledList, args.TCP.EnabledList)
+	require.Equal(t, defaultArgs.Filetime.FilePatterns, args.Filetime.FilePatterns)
+	require.Equal(t, defaultArgs.DNS.EnabledList, args.DNS.EnabledList)
 
 }
 
@@ -77,6 +80,7 @@ func TestDefaultConfig(t *testing.T) {
 		TextFile:          TextFileConfig{TextFileDirectory: getDefaultTextFilePath()},
 		TCP:               TCPConfig{EnabledList: []string{"metrics", "connections_state"}},
 		Filetime:          FiletimeConfig{FilePatterns: []string{}},
+		DNS:               DNSConfig{EnabledList: []string{"metrics", "wmi_stats"}},
 	}
 
 	var args Arguments
diff --git a/internal/component/prometheus/exporter/windows/config_windows.go b/internal/component/prometheus/exporter/windows/config_windows.go
@@ -93,5 +93,8 @@ func (a *Arguments) SetToDefault() {
 		NetFramework: NetFrameworkConfig{
 			EnabledList: slices.Clone(col.ConfigDefaults.NetFramework.CollectorsEnabled),
 		},
+		DNS: DNSConfig{
+			EnabledList: slices.Clone(col.ConfigDefaults.DNS.CollectorsEnabled),
+		},
 	}
 }
diff --git a/internal/converter/internal/staticconvert/internal/build/windows_exporter.go b/internal/converter/internal/staticconvert/internal/build/windows_exporter.go
@@ -108,6 +108,9 @@ func toWindowsExporter(config *windows_exporter.Config) *windows.Arguments {
 		TCP: windows.TCPConfig{
 			EnabledList: split(config.TCP.EnabledList),
 		},
+		DNS: windows.DNSConfig{
+			EnabledList: split(config.DNS.EnabledList),
+		},
 		// add update collector settings
 	}
 }
diff --git a/internal/static/integrations/windows_exporter/config.go b/internal/static/integrations/windows_exporter/config.go
@@ -40,6 +40,7 @@ type Config struct {
 	Update             UpdateConfig             `yaml:"update,omitempty"`
 	Filetime           FiletimeConfig           `yaml:"filetime,omitempty"`
 	PerformanceCounter PerformanceCounterConfig `yaml:"performancecounter,omitempty"`
+	DNS                DNSConfig                `yaml:"dns,omitempty"`
 }
 
 // Name returns the name used, "windows_explorer"
@@ -77,6 +78,11 @@ type NetFrameworkConfig struct {
 	EnabledList string `yaml:"enabled_list,omitempty"`
 }
 
+// DNSConfig handles settings for the windows_exporter DNS collector
+type DNSConfig struct {
+	EnabledList string `yaml:"enabled_list,omitempty"`
+}
+
 // TCPConfig handles settings for the windows_exporter TCP collector
 type TCPConfig struct {
 	EnabledList string `yaml:"enabled_list,omitempty"`
diff --git a/internal/static/integrations/windows_exporter/config_windows.go b/internal/static/integrations/windows_exporter/config_windows.go
@@ -129,6 +129,8 @@ func (c *Config) ToWindowsExporterConfig() (collector.Config, error) {
 		}
 	}
 
+	cfg.DNS.CollectorsEnabled = strings.Split(c.DNS.EnabledList, ",")
+
 	return cfg, errors.Join(errs...)
 }
 
@@ -231,6 +233,9 @@ var DefaultConfig = Config{
 	PerformanceCounter: PerformanceCounterConfig{
 		Objects: "", // default is empty, we yaml unmarshal the config
 	},
+	DNS: DNSConfig{
+		EnabledList: strings.Join(collector.ConfigDefaults.DNS.CollectorsEnabled, ","),
+	},
 }
 
 // UnmarshalYAML implements yaml.Unmarshaler for Config.
diff --git a/internal/util/zapadapter/zapadapter.go b/internal/util/zapadapter/zapadapter.go
@@ -40,7 +40,7 @@ func (lc *loggerCore) Enabled(zapcore.Level) bool {
 // With implements zapcore.Core, returning a new logger core with ff appended
 // to the list of fields.
 func (lc *loggerCore) With(ff []zapcore.Field) zapcore.Core {
-	// Encode all of the fields so that they're go-kit compatible and create a
+	// Encode all the fields so that they're go-kit compatible and create a
 	// new logger from it.
 	enc := newFieldEncoder()
 	defer func() { _ = enc.Close() }()
@@ -132,30 +132,34 @@ func (fe *fieldEncoder) Close() error {
 }
 
 func (fe *fieldEncoder) AddArray(key string, marshaler zapcore.ArrayMarshaler) error {
-	enc := newArrayFieldEncoder()
-	err := marshaler.MarshalLogArray(enc)
-	if err != nil {
-		return err
-	}
-	b, err := enc.jsonMarshal()
-	if err != nil {
-		return err
-	}
-	fe.fields = append(fe.fields, fe.keyName(key), string(b))
+	fe.fields = append(fe.fields, fe.keyName(key), lazyStringer{f: func() string {
+		enc := newArrayFieldEncoder()
+		err := marshaler.MarshalLogArray(enc)
+		if err != nil {
+			return err.Error()
+		}
+		b, err := enc.jsonMarshal()
+		if err != nil {
+			return err.Error()
+		}
+		return string(b)
+	}})
 	return nil
 }
 
 func (fe *fieldEncoder) AddObject(key string, marshaler zapcore.ObjectMarshaler) error {
-	enc := newObjectFieldEncoder()
-	err := marshaler.MarshalLogObject(enc)
-	if err != nil {
-		return err
-	}
-	b, err := enc.jsonMarshal()
-	if err != nil {
-		return err
-	}
-	fe.fields = append(fe.fields, fe.keyName(key), string(b))
+	fe.fields = append(fe.fields, fe.keyName(key), lazyStringer{f: func() string {
+		enc := newObjectFieldEncoder()
+		err := marshaler.MarshalLogObject(enc)
+		if err != nil {
+			return err.Error()
+		}
+		b, err := enc.jsonMarshal()
+		if err != nil {
+			return err.Error()
+		}
+		return string(b)
+	}})
 	return nil
 }
 
@@ -488,3 +492,11 @@ func (fe *arrayFieldEncoder) AppendReflected(value interface{}) error {
 	fe.arr = append(fe.arr, value)
 	return nil
 }
+
+type lazyStringer struct {
+	f func() string
+}
+
+func (l lazyStringer) String() string {
+	return l.f()
+}
diff --git a/internal/util/zapadapter/zapadapter_test.go b/internal/util/zapadapter/zapadapter_test.go

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@`
`20`	`20`	`#`
`21`	`21`	`# Lines starting with "#" and blank lines are ignored.`
`22`	`22`
`23`		`-v1.9.0`
	`23`	`+v1.9.1`