Merge pull request #806 from mackerelio/remove-unused-code

remove unused codes
mackerelio · Sep 2, 2022 · 6ebc41b · 6ebc41b
2 parents 213146f + 2972f35
commit 6ebc41b
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 93 deletions.
diff --git a/spec/darwin/memory.go b/spec/darwin/memory.go
@@ -9,16 +9,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 )
 
 // MemoryGenerator collects the host's memory specs.
 type MemoryGenerator struct {
 }
 
-var memoryLogger = logging.GetLogger("spec.memory")
-
 const bytesInKibibytes = 1024
 
 // Generate returns memory specs.

diff --git a/spec/freebsd/cpu.go b/spec/freebsd/cpu.go
@@ -16,24 +16,9 @@ type CPUGenerator struct {
 
 var cpuLogger = logging.GetLogger("spec.cpu")
 
-type cpuSpec map[string]interface{}
-
 // MEMO: sysctl -a machdep.cpu.brand_string
 
 // Generate collects CPU specs.
-// Returns an array of cpuSpec.
-// Each spec is expected to have keys below:
-// - model_name (used in Web)
-// - vendor_id
-// - family
-// - model
-// - stepping
-// - physical_id
-// - core_id
-// - cores
-// - mhz
-// - cache_size
-// - flags
 func (g *CPUGenerator) Generate() (interface{}, error) {
 	brandBytes, err := exec.Command("sysctl", "-n", "hw.model").Output()
 	if err != nil {

diff --git a/spec/freebsd/memory.go b/spec/freebsd/memory.go
@@ -9,16 +9,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 )
 
 // MemoryGenerator collects the host's memory specs.
 type MemoryGenerator struct {
 }
 
-var memoryLogger = logging.GetLogger("spec.memory")
-
 const bytesInKibibytes = 1024
 
 // Generate returns memory specs.

diff --git a/spec/linux/cpu_test.go b/spec/linux/cpu_test.go
@@ -39,18 +39,6 @@ func TestCPUGenerate(t *testing.T) {
 	if _, ok := cpu1["stepping"]; !ok {
 		t.Error("cpu should have stepping")
 	}
-	if _, ok := cpu1["physical_id"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have physical_id")
-	}
-	if _, ok := cpu1["core_id"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have core_id")
-	}
-	if _, ok := cpu1["cores"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have cores")
-	}
 	if _, ok := cpu1["model_name"]; !ok {
 		t.Error("cpu should have model_name")
 	}

diff --git a/spec/netbsd/cpu.go b/spec/netbsd/cpu.go
@@ -16,24 +16,9 @@ type CPUGenerator struct {
 
 var cpuLogger = logging.GetLogger("spec.cpu")
 
-type cpuSpec map[string]interface{}
-
 // MEMO: sysctl -a machdep.cpu.brand_string
 
 // Generate collects CPU specs.
-// Returns an array of cpuSpec.
-// Each spec is expected to have keys below:
-// - model_name (used in Web)
-// - vendor_id
-// - family
-// - model
-// - stepping
-// - physical_id
-// - core_id
-// - cores
-// - mhz
-// - cache_size
-// - flags
 func (g *CPUGenerator) Generate() (interface{}, error) {
 	brandBytes, err := exec.Command("sysctl", "-n", "hw.model").Output()
 	if err != nil {

diff --git a/spec/windows/block_device.go b/spec/windows/block_device.go
@@ -7,7 +7,6 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 
 	"github.com/mackerelio/mackerel-agent/util/windows"
@@ -17,8 +16,6 @@ import (
 type BlockDeviceGenerator struct {
 }
 
-var blockDeviceLogger = logging.GetLogger("spec.block_device")
-
 // Generate XXX
 func (g *BlockDeviceGenerator) Generate() (interface{}, error) {
 	results := make(mackerel.BlockDevice)

diff --git a/spec/windows/cpu.go b/spec/windows/cpu.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 
 	"github.com/mackerelio/mackerel-agent/util/windows"
@@ -17,8 +16,6 @@ import (
 type CPUGenerator struct {
 }
 
-var cpuLogger = logging.GetLogger("spec.cpu")
-
 // Generate collects CPU specs.
 func (g *CPUGenerator) Generate() (interface{}, error) {
 	var results mackerel.CPU

diff --git a/spec/windows/cpu_test.go b/spec/windows/cpu_test.go
@@ -29,40 +29,13 @@ func TestCPUGenerate(t *testing.T) {
 	if _, ok := cpu1["vendor_id"]; !ok {
 		t.Error("cpu should have vendor_id")
 	}
-	if _, ok := cpu1["family"]; !ok {
-		//t.Error("cpu should have family")
-	}
 	if _, ok := cpu1["model"]; !ok {
 		t.Error("cpu should have model")
 	}
-	if _, ok := cpu1["stepping"]; !ok {
-		//t.Error("cpu should have stepping")
-	}
-	if _, ok := cpu1["physical_id"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have physical_id")
-	}
-	if _, ok := cpu1["core_id"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have core_id")
-	}
-	if _, ok := cpu1["cores"]; !ok {
-		// fails on some environments
-		// t.Error("cpu should have cores")
-	}
 	if _, ok := cpu1["model_name"]; !ok {
 		t.Error("cpu should have model_name")
 	}
 	if _, ok := cpu1["mhz"]; !ok {
 		t.Error("cpu should have mhz")
 	}
-	if _, ok := cpu1["cache_size"]; !ok {
-		//t.Error("cpu should have cache_size")
-	}
-	if _, ok := cpu1["flags"]; !ok {
-		//t.Error("cpu should have flags")
-	}
-	if _, ok := cpu1["flags"].([]string); !ok {
-		//t.Error("cpu.flags should be slice of string")
-	}
 }
diff --git a/spec/windows/filesystem.go b/spec/windows/filesystem.go
@@ -4,7 +4,6 @@
 package windows
 
 import (
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 
 	"github.com/mackerelio/mackerel-agent/util/windows"
@@ -14,8 +13,6 @@ import (
 type FilesystemGenerator struct {
 }
 
-var filesystemLogger = logging.GetLogger("spec.filesystem")
-
 // Generate specs of filesystems.
 func (g *FilesystemGenerator) Generate() (interface{}, error) {
 

diff --git a/spec/windows/interface.go b/spec/windows/interface.go
@@ -6,7 +6,6 @@ package windows
 import (
 	"net"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-agent/util/windows"
 	mkr "github.com/mackerelio/mackerel-client-go"
 )
@@ -15,8 +14,6 @@ import (
 type InterfaceGenerator struct {
 }
 
-var interfaceLogger = logging.GetLogger("spec.interface")
-
 // Generate XXX
 func (g *InterfaceGenerator) Generate() ([]mkr.Interface, error) {
 	var results []mkr.Interface

diff --git a/spec/windows/kernel.go b/spec/windows/kernel.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 
 	"github.com/mackerelio/mackerel-agent/util/windows"
@@ -19,8 +18,6 @@ const registryKey = `Software\Microsoft\Windows NT\CurrentVersion`
 type KernelGenerator struct {
 }
 
-var kernelLogger = logging.GetLogger("spec.kernel")
-
 // Generate XXX
 func (g *KernelGenerator) Generate() (interface{}, error) {
 	results := make(mackerel.Kernel)

diff --git a/spec/windows/memory.go b/spec/windows/memory.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/mackerelio/golib/logging"
 	"github.com/mackerelio/mackerel-client-go"
 
 	"github.com/mackerelio/mackerel-agent/util/windows"
@@ -17,8 +16,6 @@ import (
 type MemoryGenerator struct {
 }
 
-var memoryLogger = logging.GetLogger("spec.memory")
-
 // Generate XXX
 func (g *MemoryGenerator) Generate() (interface{}, error) {
 	result := make(mackerel.Memory)