Merge branch 'master' into check_size

Signed-off-by: Jan-Otto Kröpke <[email protected]>

Author: jkroepke

.idea/dictionaries/project.xml

@@ -18,34 +18,63 @@
 package mssql
 
 import (
+	"fmt"
+	"log/slog"
+
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/sys/windows/registry"
 )
 
 type collectorInstance struct {
-	instances *prometheus.GaugeVec
+	instances *prometheus.Desc
 }
 
 func (c *Collector) buildInstance() error {
-	c.instances = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Namespace: types.Namespace,
-			Subsystem: Name,
-			Name:      "instance_info",
-			Help:      "A metric with a constant '1' value labeled with mssql instance information",
-		},
+	c.instances = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "instance_info"),
+		"A metric with a constant '1' value labeled with mssql instance information",
 		[]string{"edition", "mssql_instance", "patch", "version"},
+		nil,
 	)
 
-	for _, instance := range c.mssqlInstances {
-		c.instances.WithLabelValues(instance.edition, instance.name, instance.patchVersion, instance.majorVersion.String()).Set(1)
-	}
-
 	return nil
 }
 
 func (c *Collector) collectInstance(ch chan<- prometheus.Metric) error {
-	c.instances.Collect(ch)
+	for _, instance := range c.mssqlInstances {
+		regKeyName := fmt.Sprintf(`Software\Microsoft\Microsoft SQL Server\%s\Setup`, instance.instanceName)
+
+		regKey, err := registry.OpenKey(registry.LOCAL_MACHINE, regKeyName, registry.QUERY_VALUE)
+		if err != nil {
+			c.logger.Debug(fmt.Sprintf("couldn't open registry %s:", regKeyName),
+				slog.Any("err", err),
+			)
+
+			continue
+		}
+
+		patchVersion, _, err := regKey.GetStringValue("PatchLevel")
+		_ = regKey.Close()
+
+		if err != nil {
+			c.logger.Debug("couldn't get version from registry",
+				slog.Any("err", err),
+			)
+
+			continue
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.instances,
+			prometheus.GaugeValue,
+			1,
+			instance.edition,
+			instance.name,
+			patchVersion,
+			instance.majorVersion.String(),
+		)
+	}
 
 	return nil
 }

internal/collector/mssql/mssql_instance.go

@@ -26,8 +26,8 @@ import (
 
 type mssqlInstance struct {
 	name            string
+	instanceName    string
 	majorVersion    mssqlServerMajorVersion
-	patchVersion    string
 	edition         string
 	isFirstInstance bool
 }
@@ -54,14 +54,15 @@ func newMssqlInstance(key, name string) (mssqlInstance, error) {
 		return mssqlInstance{}, fmt.Errorf("couldn't get version from registry: %w", err)
 	}
 
+	instanceName := name
 	_, name, _ = strings.Cut(name, ".")
 
 	return mssqlInstance{
 		edition:         edition,
 		name:            name,
 		majorVersion:    newMajorVersion(patchVersion),
-		patchVersion:    patchVersion,
 		isFirstInstance: key == "MSSQLSERVER",
+		instanceName:    instanceName,
 	}, nil
 }
 

internal/collector/mssql/types.go

@@ -22,7 +22,9 @@ import (
 	"time"
 
 	"github.com/prometheus-community/windows_exporter/internal/mi"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/sys/windows"
 )
 
 type win32Process struct {
@@ -234,3 +236,54 @@ func Test_MI_Query_Unmarshal(t *testing.T) {
 	err = application.Close()
 	require.NoError(t, err)
 }
+
+func Test_MI_FD_Leak(t *testing.T) {
+	application, err := mi.ApplicationInitialize()
+	require.NoError(t, err)
+	require.NotEmpty(t, application)
+
+	session, err := application.NewSession(nil)
+	require.NoError(t, err)
+	require.NotEmpty(t, session)
+
+	currentFileHandle, err := testutils.GetProcessHandleCount(windows.CurrentProcess())
+	require.NoError(t, err)
+
+	t.Log("Current File Handle Count: ", currentFileHandle)
+
+	queryPrinter, err := mi.NewQuery("SELECT Name FROM Win32_Process")
+	require.NoError(t, err)
+
+	for range 300 {
+		var processes []win32Process
+
+		err := session.Query(&processes, mi.NamespaceRootCIMv2, queryPrinter)
+		require.NoError(t, err)
+
+		currentFileHandle, err = testutils.GetProcessHandleCount(windows.CurrentProcess())
+		require.NoError(t, err)
+
+		t.Log("Current File Handle Count: ", currentFileHandle)
+	}
+
+	currentFileHandle, err = testutils.GetProcessHandleCount(windows.CurrentProcess())
+	require.NoError(t, err)
+
+	t.Log("Current File Handle Count: ", currentFileHandle)
+
+	err = session.Close()
+	require.NoError(t, err)
+
+	currentFileHandle, err = testutils.GetProcessHandleCount(windows.CurrentProcess())
+	require.NoError(t, err)
+
+	t.Log("Current File Handle Count: ", currentFileHandle)
+
+	err = application.Close()
+	require.NoError(t, err)
+
+	currentFileHandle, err = testutils.GetProcessHandleCount(windows.CurrentProcess())
+	require.NoError(t, err)
+
+	t.Log("Current File Handle Count: ", currentFileHandle)
+}

internal/mi/callbacks.go

@@ -41,11 +41,7 @@ var OperationOptionsTimeout = UTF16PtrFromString[*uint16]("__MI_OPERATIONOPTIONS
 type OperationFlags uint32
 
 const (
-	OperationFlagsDefaultRTTI  OperationFlags = 0x0000
-	OperationFlagsBasicRTTI    OperationFlags = 0x0002
-	OperationFlagsNoRTTI       OperationFlags = 0x0400
 	OperationFlagsStandardRTTI OperationFlags = 0x0800
-	OperationFlagsFullRTTI     OperationFlags = 0x0004
 )
 
 // Operation represents an operation.
@@ -123,7 +119,7 @@ func (o *Operation) Cancel() error {
 		return ErrNotInitialized
 	}
 
-	r0, _, _ := syscall.SyscallN(o.ft.Close, uintptr(unsafe.Pointer(o)), 0)
+	r0, _, _ := syscall.SyscallN(o.ft.Cancel, uintptr(unsafe.Pointer(o)), 0)
 
 	if result := ResultError(r0); !errors.Is(result, MI_RESULT_OK) {
 		return result
@@ -229,10 +225,14 @@ func (o *Operation) Unmarshal(dst any) error {
 				field.SetInt(int64(element.value))
 			case ValueTypeSTRING:
 				if element.value == 0 {
-					return fmt.Errorf("%s: invalid pointer: value is nil", miTag)
+					field.SetString("") // Set empty string for nil values
+
+					continue
 				}
 
-				// Convert the UTF-16 string to a Go string
+				// Convert uintptr to *uint16 for Windows UTF-16 string
+				// This is safe because element.value comes directly from Windows MI API
+				//goland:noinspection GoVetUnsafePointer
 				stringValue := windows.UTF16PtrToString((*uint16)(unsafe.Pointer(element.value)))
 
 				field.SetString(stringValue)