Skip to content

Commit

Permalink
update references to library
Browse files Browse the repository at this point in the history 
Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
@codeboten
codeboten committed Jun 19, 2024
1 parent 88ba8d9 commit db6e28c
Show file tree
Hide file tree
Showing 87 changed files with 117 additions and 136 deletions.
1 change: 0 additions & 1 deletion cmd/oteltestbedcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ require (
github.com/prometheus/prometheus v0.51.2-0.20240405174432-b4a973753c6e // indirect
github.com/rs/cors v1.11.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shirou/gopsutil/v4 v4.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/integrationtest/collector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/shirou/gopsutil/v3/process"
"github.com/shirou/gopsutil/v4/process"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"
Expand Down
1 change: 0 additions & 1 deletion exporter/elasticsearchexporter/integrationtest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
2 changes: 0 additions & 2 deletions exporter/elasticsearchexporter/integrationtest/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion exporter/signalfxexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3
github.com/stretchr/testify v1.9.0
Expand Down
3 changes: 1 addition & 2 deletions exporter/signalfxexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions exporter/signalfxexporter/internal/hostmetadata/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"strconv"
"time"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/host"
"github.com/shirou/gopsutil/v4/mem"
)

// etcPath is the path to host etc and can be set using the env var "HOST_ETC"
Expand Down
6 changes: 3 additions & 3 deletions exporter/signalfxexporter/internal/hostmetadata/host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"errors"
"testing"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/host"
"github.com/shirou/gopsutil/v4/mem"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions exporter/signalfxexporter/internal/hostmetadata/metadata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"sync"
"testing"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/host"
"github.com/shirou/gopsutil/v4/mem"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down
2 changes: 1 addition & 1 deletion exporter/sumologicexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ require (
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shirou/gopsutil/v4 v4.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/sumologicexporter/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions extension/observer/hostobserver/extension.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"runtime"
"syscall"

"github.com/shirou/gopsutil/v3/net"
"github.com/shirou/gopsutil/v3/process"
"github.com/shirou/gopsutil/v4/net"
"github.com/shirou/gopsutil/v4/process"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions extension/observer/hostobserver/extension_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"testing"
"time"

psnet "github.com/shirou/gopsutil/v3/net"
"github.com/shirou/gopsutil/v3/process"
psnet "github.com/shirou/gopsutil/v4/net"
"github.com/shirou/gopsutil/v4/process"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
1 change: 0 additions & 1 deletion extension/observer/hostobserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.21.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
3 changes: 1 addition & 2 deletions extension/observer/hostobserver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion extension/opampextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/oklog/ulid/v2 v2.1.0
github.com/open-telemetry/opamp-go v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
3 changes: 1 addition & 2 deletions extension/opampextension/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/opampextension/monitor_ppid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"time"

"github.com/shirou/gopsutil/v3/process"
"github.com/shirou/gopsutil/v4/process"
"go.opentelemetry.io/collector/component"
)

Expand Down
2 changes: 1 addition & 1 deletion extension/sumologicextension/extension.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Showmax/go-fqdn"
"github.com/cenkalti/backoff/v4"
ps "github.com/mitchellh/go-ps"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v4/host"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/extension/auth"
Expand Down
1 change: 0 additions & 1 deletion extension/sumologicextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
github.com/Showmax/go-fqdn v1.0.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/mitchellh/go-ps v1.0.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
3 changes: 1 addition & 2 deletions extension/sumologicextension/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion processor/resourcedetectionprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
3 changes: 1 addition & 2 deletions processor/resourcedetectionprocessor/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion processor/resourcedetectionprocessor/internal/system/system.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net"
"strings"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v4/cpu"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/processor"
Expand Down
1 change: 0 additions & 1 deletion receiver/awscontainerinsightreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.103.0
Expand Down
3 changes: 1 addition & 2 deletions receiver/awscontainerinsightreceiver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions receiver/awscontainerinsightreceiver/internal/host/nodeCapacity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"context"
"os"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v4/common"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/mem"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions receiver/awscontainerinsightreceiver/internal/host/nodeCapacity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"os"
"testing"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/mem"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/mem"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
Expand Down
4 changes: 2 additions & 2 deletions receiver/hostmetricsreceiver/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"os"

"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v3/process"
"github.com/shirou/gopsutil/v4/host"
"github.com/shirou/gopsutil/v4/process"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.103.0
github.com/prometheus/procfs v0.15.1
github.com/shirou/gopsutil/v3 v3.24.5
github.com/shirou/gopsutil/v4 v4.24.5
github.com/stretchr/testify v1.9.0
github.com/yusufpapurcu/wmi v1.2.4
Expand Down Expand Up @@ -84,6 +83,7 @@ require (
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.8.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/hostmetrics_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"
"path/filepath"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
)

var gopsutilEnvVars = map[common.EnvKeyType]string{
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/hostmetrics_linux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"testing"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/hostmetrics_others.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package hostmetricsreceiver // import "github.com/open-telemetry/opentelemetry-c
import (
"fmt"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
)

func validateRootPath(rootPath string) error {
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/hostmetrics_receiver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/internal/scraper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package internal // import "github.com/open-telemetry/opentelemetry-collector-co
import (
"context"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v4/common"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
)
Expand Down
6 changes: 3 additions & 3 deletions receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"
"time"

"github.com/shirou/gopsutil/v3/common"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v3/host"
"github.com/shirou/gopsutil/v4/common"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/host"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package cpuscraper // import "github.com/open-telemetry/opentelemetry-collector-

import (
"github.com/prometheus/procfs"
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v4/cpu"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/receiver/scrapererror"

Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package cpuscraper // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper"

import (
"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v4/cpu"
"go.opentelemetry.io/collector/pdata/pcommon"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata"
Expand Down
2 changes: 1 addition & 1 deletion receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/shirou/gopsutil/v3/cpu"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
Loading

0 comments on commit db6e28c

Please sign in to comment.