From 976e055252cb1fdf1e7355d669ca4c7cfe055fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 10 Jul 2023 02:17:24 +0200 Subject: [PATCH] move directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- collector/collector.go | 3 ++- collector/perflib_test.go | 2 +- {wmi/perflib => perflib}/const.go | 0 {wmi/perflib => perflib}/nametable.go | 2 -- {wmi/perflib => perflib}/perflib.go | 0 {wmi/perflib => perflib}/perflib_test.go | 0 {wmi/perflib => perflib}/raw_types.go | 0 {wmi/perflib => perflib}/utf16.go | 0 8 files changed, 3 insertions(+), 4 deletions(-) rename {wmi/perflib => perflib}/const.go (100%) rename {wmi/perflib => perflib}/nametable.go (99%) rename {wmi/perflib => perflib}/perflib.go (100%) rename {wmi/perflib => perflib}/perflib_test.go (100%) rename {wmi/perflib => perflib}/raw_types.go (100%) rename {wmi/perflib => perflib}/utf16.go (100%) diff --git a/collector/collector.go b/collector/collector.go index 358179f5..90d33765 100644 --- a/collector/collector.go +++ b/collector/collector.go @@ -6,10 +6,11 @@ import ( "strconv" "strings" + "github.com/prometheus-community/windows_exporter/perflib" + "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/prometheus-community/windows_exporter/wmi/perflib" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sys/windows/registry" ) diff --git a/collector/perflib_test.go b/collector/perflib_test.go index 6126c648..ee5fe0db 100644 --- a/collector/perflib_test.go +++ b/collector/perflib_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/prometheus-community/windows_exporter/wmi/perflib" + "github.com/prometheus-community/windows_exporter/perflib" "github.com/go-kit/log" ) diff --git a/wmi/perflib/const.go b/perflib/const.go similarity index 100% rename from wmi/perflib/const.go rename to perflib/const.go diff --git a/wmi/perflib/nametable.go b/perflib/nametable.go similarity index 99% rename from wmi/perflib/nametable.go rename to perflib/nametable.go index 3bc44961..64ca6ebd 100644 --- a/wmi/perflib/nametable.go +++ b/perflib/nametable.go @@ -48,13 +48,11 @@ func QueryNameTable(tableName string) *NameTable { r := bytes.NewReader(buffer) for { index, err := readUTF16String(r) - if err != nil { break } desc, err := readUTF16String(r) - if err != nil { break } diff --git a/wmi/perflib/perflib.go b/perflib/perflib.go similarity index 100% rename from wmi/perflib/perflib.go rename to perflib/perflib.go diff --git a/wmi/perflib/perflib_test.go b/perflib/perflib_test.go similarity index 100% rename from wmi/perflib/perflib_test.go rename to perflib/perflib_test.go diff --git a/wmi/perflib/raw_types.go b/perflib/raw_types.go similarity index 100% rename from wmi/perflib/raw_types.go rename to perflib/raw_types.go diff --git a/wmi/perflib/utf16.go b/perflib/utf16.go similarity index 100% rename from wmi/perflib/utf16.go rename to perflib/utf16.go