diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 35bf528..0000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -sudo: false -language: go -env: - - GIMME_ARCH=amd64 - - GIMME_ARCH=386 -go: - - 1.4 - - 1.6 - - 1.7 -os: - - linux - - osx -script: make vendor test \ No newline at end of file diff --git a/glide.lock b/glide.lock deleted file mode 100644 index b1819e5..0000000 --- a/glide.lock +++ /dev/null @@ -1,55 +0,0 @@ -hash: 4ebbd5afba4a96a96d61429f912861f3c5e29158a4c58456bd77ed1c13fdb5b2 -updated: 2016-06-14T12:03:19.851358667-04:00 -imports: -- name: github.com/coreos/go-systemd - version: 6dc8b843c670f2027cc26b164935635840a40526 - subpackages: - - journal -- name: github.com/bluele/slack - version: b4b4d354a079fbf4bd948faad01b32cecb2ffe03 -- name: github.com/mattn/go-xmpp - version: f4550b5399387339df5ce4c3f88c1ef85333bdd5 -- name: github.com/montanaflynn/stats - version: db72e6cae808b936b0c01fd330ff1fcd2c86c95e -- name: github.com/fuyufjh/splunk-hec-go - version: 10df423a9f3633e5395eaf8132da3a257251b189 -- name: github.com/andygrunwald/go-jira - version: c8c6680f245f3721d613b773ea4ab9ee7741b828 -- name: github.com/google/go-github - version: 7a51fb928f52a196d5f31daefb8a489453ef54ff - -# gopsutil and its dependencies -- name: github.com/shirou/gopsutil - version: v3.21.3 -- name: github.com/tklauser/go-sysconf - version: v0.3.4 -- name: github.com/tklauser/numcpus - version: v0.2.1 -- name: github.com/shirou/w32 - version: bb4de0191aa41b5507caa14b0650cdbddcd9280b -- name: github.com/StackExchange/wmi - version: cbe66965904dbe8a6cd589e2298e5d8b986bd7dd -- name: github.com/go-ole/go-ole - version: 97b6244175ae18ea6eef668034fd6565847501c9 - -- name: github.com/stretchr/testify - version: 890a5c3458b43e6104ff5da8dfa139d013d77544 -- name: github.com/pkg/errors - version: 248dadf4e9068a0b3e79f02ed0a610d935de5302 -- name: github.com/google/uuid - version: c2e93f3ae59f2904160ceaab466009f965df46d6 -- name: golang.org/x/oauth2 - version: f047394b6d14284165300fd82dad67edb3a4d7f6 -- name: golang.org/x/sys - version: 93ed5bcd2bfe7230f8abd84e0663ab1cb9148722 - -- name: github.com/trivago/tgo - version: 27c472027c1e3b665eb2f6368d000ce9b879f34a -- name: github.com/fatih/structs - version: 74a29b9fac7397d933f47e33eba94d2d83a464a2 -- name: github.com/google/go-querystring - version: 53e6ce116135b80d037921a7fdd5138cf32d7a8a -- name: github.com/dghubble/oauth1 - version: 96a35f616385a5c02ffd39a19922f1742e117acb - -devImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index ccff719..0000000 --- a/glide.yaml +++ /dev/null @@ -1,22 +0,0 @@ -package: . -import: - - package: github.com/coreos/go-systemd - version: ^9.0.0 - subpackages: - - journal - - package: github.com/bluele/slack - - package: github.com/mattn/go-xmpp - - package: github.com/montanaflynn/stats - - package: github.com/shirou/gopsutil - - package: github.com/shirou/w32 - - package: github.com/StackExchange/wmi - - package: github.com/go-ole/go-ole - - package: github.com/fuyufjh/splunk-hec-go - - package: github.com/google/uuid - - package: github.com/andygrunwald/go-jira - - package: github.com/trivago/tgo - - package: github.com/fatih/structs - - package: github.com/google/go-querystring - - package: github.com/google/go-github - - package: golang.org/x/oauth2 - - package: golang.org/x/sys diff --git a/go.mod b/go.mod index a0f99f3..7b40e11 100644 --- a/go.mod +++ b/go.mod @@ -12,26 +12,15 @@ require ( github.com/mattn/go-xmpp v0.0.0-20161121012536-f4550b539938 github.com/montanaflynn/stats v0.0.0-20180911141734-db72e6cae808 github.com/pkg/errors v0.9.1 - github.com/shirou/gopsutil v3.21.9+incompatible github.com/stretchr/testify v1.7.0 github.com/trivago/tgo v1.0.7 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 ) require ( - github.com/StackExchange/wmi v1.2.1 // indirect - github.com/davecgh/go-spew v1.1.0 // indirect github.com/fatih/structs v1.1.0 // indirect - github.com/go-ole/go-ole v1.2.5 // indirect - github.com/golang/protobuf v1.4.2 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/tklauser/go-sysconf v0.3.9 // indirect - github.com/tklauser/numcpus v0.3.0 // indirect - golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect - golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 // indirect + github.com/shirou/gopsutil/v3 v3.21.10 google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.25.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index a7def30..7c8414f 100644 --- a/go.sum +++ b/go.sum @@ -62,8 +62,9 @@ github.com/fuyufjh/splunk-hec-go v0.3.4-0.20190414090710-10df423a9f36/go.mod h1: github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -98,8 +99,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v8.0.1-0.20170604030111-7a51fb928f52+incompatible h1:XfCpf6Ak5XPaZpv2rlCqfBuKoFQH5SvXvpQIiV1H7H4= github.com/google/go-github v8.0.1-0.20170604030111-7a51fb928f52+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -129,6 +131,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/mattn/go-xmpp v0.0.0-20161121012536-f4550b539938 h1:mly5gFat+EGyszRBkOAG9GG7PEQhdsPlLlzxLpB6XfY= github.com/mattn/go-xmpp v0.0.0-20161121012536-f4550b539938/go.mod h1:Cs5mF0OsrRRmhkyOod//ldNPOwJsrBvJ+1WRspv0xoc= github.com/montanaflynn/stats v0.0.0-20180911141734-db72e6cae808 h1:pmpDGKLw4n82EtrNiLqB+xSz/JQwFOaZuMALYUHwX5s= @@ -139,8 +143,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/shirou/gopsutil v3.21.9+incompatible h1:LTLpUnfX81MkHeCtSrwNKZwuW5Id6kCa7/P43NdcNn4= -github.com/shirou/gopsutil v3.21.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil/v3 v3.21.10 h1:flTg1DrnV/UVrBqjLgVgDJzx6lf+91rC64/dBHmO2IA= +github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -263,8 +267,9 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 h1:ikCpsnYR+Ew0vu99XlDp55lGgDJdIMx3f4a18jfse/s= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8= +golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/message/platform_darwin.go b/message/platform_darwin.go index b0a92c4..f3465a9 100644 --- a/message/platform_darwin.go +++ b/message/platform_darwin.go @@ -1,5 +1,5 @@ package message -import "github.com/shirou/gopsutil/cpu" +import "github.com/shirou/gopsutil/v3/cpu" var cpuTicks = cpu.ClocksPerSec diff --git a/message/platform_linux.go b/message/platform_linux.go index b0a92c4..f3465a9 100644 --- a/message/platform_linux.go +++ b/message/platform_linux.go @@ -1,5 +1,5 @@ package message -import "github.com/shirou/gopsutil/cpu" +import "github.com/shirou/gopsutil/v3/cpu" var cpuTicks = cpu.ClocksPerSec diff --git a/message/platform_openbsd.go b/message/platform_openbsd.go index b0a92c4..f3465a9 100644 --- a/message/platform_openbsd.go +++ b/message/platform_openbsd.go @@ -1,5 +1,5 @@ package message -import "github.com/shirou/gopsutil/cpu" +import "github.com/shirou/gopsutil/v3/cpu" var cpuTicks = cpu.ClocksPerSec diff --git a/message/process_info.go b/message/process_info.go index 478640d..96ba3ca 100644 --- a/message/process_info.go +++ b/message/process_info.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/mongodb/grip/level" - "github.com/shirou/gopsutil/net" - "github.com/shirou/gopsutil/process" + "github.com/shirou/gopsutil/v3/net" + "github.com/shirou/gopsutil/v3/process" ) // ProcessInfo holds the data for per-process statistics (e.g. cpu, @@ -221,7 +221,11 @@ func (p *ProcessInfo) populate(proc *process.Process) { p.Threads = int(threads) p.saveError("num_threads", err) - p.NetStat, err = proc.NetIOCounters(false) + // TODO: should this be removed entirely? process.NetIOCounters is not + // useful on Linux and is equivalent to the system-wide net.IOCounters, + // which is not per-process. + // Issue: https://github.com/shirou/gopsutil/issues/429 + p.NetStat, err = net.IOCounters(false) p.saveError("netstat", err) p.Command, err = proc.Cmdline() diff --git a/message/process_info_test.go b/message/process_info_test.go index ba4d5f1..401fd66 100644 --- a/message/process_info_test.go +++ b/message/process_info_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "testing" - "github.com/shirou/gopsutil/process" + "github.com/shirou/gopsutil/v3/process" "github.com/stretchr/testify/assert" ) diff --git a/message/system_info.go b/message/system_info.go index 7f33c0a..7473512 100644 --- a/message/system_info.go +++ b/message/system_info.go @@ -6,10 +6,10 @@ import ( "runtime" "github.com/mongodb/grip/level" - "github.com/shirou/gopsutil/cpu" - "github.com/shirou/gopsutil/disk" - "github.com/shirou/gopsutil/mem" - "github.com/shirou/gopsutil/net" + "github.com/shirou/gopsutil/v3/cpu" + "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v3/net" ) // SystemInfo is a type that implements message.Composer but also