handlecount: rename handles package

The `handles` package name actually clashed with a ton of other places that had variables called `handles`. This commit renames the package to `handlecount`.
open-telemetry · Jun 27, 2023 · 4eefda7 · 4eefda7
1 parent 57dbeb6
commit 4eefda7
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod
@@ -8,24 +8,14 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.80.0
 	github.com/shirou/gopsutil/v3 v3.23.5
 	github.com/stretchr/testify v1.8.4
-<<<<<<< HEAD
+	github.com/yusufpapurcu/wmi v1.2.3
 	go.opentelemetry.io/collector v0.80.0
 	go.opentelemetry.io/collector/component v0.80.0
 	go.opentelemetry.io/collector/confmap v0.80.0
 	go.opentelemetry.io/collector/consumer v0.80.0
 	go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
 	go.opentelemetry.io/collector/receiver v0.80.0
 	go.opentelemetry.io/collector/semconv v0.80.0
-=======
-	github.com/yusufpapurcu/wmi v1.2.3
-	go.opentelemetry.io/collector v0.79.0
-	go.opentelemetry.io/collector/component v0.79.0
-	go.opentelemetry.io/collector/confmap v0.79.0
-	go.opentelemetry.io/collector/consumer v0.79.0
-	go.opentelemetry.io/collector/pdata v1.0.0-rcv0012
-	go.opentelemetry.io/collector/receiver v0.79.0
-	go.opentelemetry.io/collector/semconv v0.79.0
->>>>>>> a3ce3db1fd (run make gotidy)
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/sys v0.9.0

diff --git a/...rocessscraper/internal/handles/handles.go → ...ssscraper/internal/handlecount/handles.go b/...rocessscraper/internal/handles/handles.go → ...ssscraper/internal/handlecount/handles.go
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package handles // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handles"
+package handlecount // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount"
 
 type Manager interface {
 	Refresh() error

diff --git a/...craper/internal/handles/handles_others.go → ...er/internal/handlecount/handles_others.go b/...craper/internal/handles/handles_others.go → ...er/internal/handlecount/handles_others.go
@@ -4,7 +4,7 @@
 //go:build !windows
 // +build !windows
 
-package handles // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handles"
+package handlecount // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount"
 
 import "errors"
 

diff --git a/.../internal/handles/handlers_others_test.go → ...ternal/handlecount/handles_others_test.go b/.../internal/handles/handlers_others_test.go → ...ternal/handlecount/handles_others_test.go
@@ -4,7 +4,7 @@
 //go:build !windows
 // +build !windows
 
-package handles
+package handlecount
 
 import (
 	"testing"

diff --git a/...raper/internal/handles/handles_windows.go → ...r/internal/handlecount/handles_windows.go b/...raper/internal/handles/handles_windows.go → ...r/internal/handlecount/handles_windows.go
@@ -4,7 +4,7 @@
 //go:build windows
 // +build windows
 
-package handles // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handles"
+package handlecount // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount"
 
 import (
 	"errors"

diff --git a/.../internal/handles/handles_windows_test.go → ...ernal/handlecount/handles_windows_test.go b/.../internal/handles/handles_windows_test.go → ...ernal/handlecount/handles_windows_test.go
@@ -4,7 +4,7 @@
 //go:build windows
 // +build windows
 
-package handles
+package handlecount
 
 import (
 	"errors"

diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/receiver/scrapererror"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handles"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal"
 )
@@ -51,7 +51,7 @@ type scraper struct {
 	getProcessCreateTime func(p processHandle) (int64, error)
 	getProcessHandles    func() (processHandles, error)
 
-	handleCountManager handles.Manager
+	handleCountManager handlecount.Manager
 }
 
 // newProcessScraper creates a Process Scraper
@@ -63,7 +63,7 @@ func newProcessScraper(settings receiver.CreateSettings, cfg *Config) (*scraper,
 		getProcessHandles:    getProcessHandlesInternal,
 		scrapeProcessDelay:   cfg.ScrapeProcessDelay,
 		ucals:                make(map[int32]*ucal.CPUUtilizationCalculator),
-		handleCountManager:   handles.NewManager(),
+		handleCountManager:   handlecount.NewManager(),
 	}
 
 	var err error