Move procspy out of vendor into probe/endpoint.

weaveworks · Dec 9, 2015 · b94751a · b94751a
1 parent 8db21fb
commit b94751a
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 121 deletions.
diff --git a/vendor/github.com/weaveworks/procspy/LICENSE → probe/endpoint/procspy/LICENSE b/vendor/github.com/weaveworks/procspy/LICENSE → probe/endpoint/procspy/LICENSE
diff --git a/....com/weaveworks/procspy/benchmark_test.go → ...dpoint/procspy/benchmark_internal_test.go b/....com/weaveworks/procspy/benchmark_test.go → ...dpoint/procspy/benchmark_internal_test.go
diff --git a/...ub.com/weaveworks/procspy/example_test.go → probe/endpoint/procspy/example_test.go b/...ub.com/weaveworks/procspy/example_test.go → probe/endpoint/procspy/example_test.go
diff --git a/.../github.com/weaveworks/procspy/fixture.go → probe/endpoint/procspy/fixture.go b/.../github.com/weaveworks/procspy/fixture.go → probe/endpoint/procspy/fixture.go
diff --git a/vendor/github.com/weaveworks/procspy/lsof.go → probe/endpoint/procspy/lsof.go b/vendor/github.com/weaveworks/procspy/lsof.go → probe/endpoint/procspy/lsof.go
diff --git a/...ithub.com/weaveworks/procspy/lsof_test.go → probe/endpoint/procspy/lsof_internal_test.go b/...ithub.com/weaveworks/procspy/lsof_test.go → probe/endpoint/procspy/lsof_internal_test.go
@@ -12,8 +12,8 @@ func TestLSOFParsing(t *testing.T) {
 		"p25196\n" +
 			"ccello-app\n" +
 			"n127.0.0.1:48094->127.0.0.1:4039\n" +
-			"n*:4040\n": map[string]Proc{
-			"127.0.0.1:48094": Proc{
+			"n*:4040\n": {
+			"127.0.0.1:48094": {
 				PID:  25196,
 				Name: "cello-app",
 			},
@@ -23,7 +23,7 @@ func TestLSOFParsing(t *testing.T) {
 		"cdhclient\n" +
 			"n*:68\n" +
 			"n*:38282\n" +
-			"n*:40625\n": map[string]Proc{},
+			"n*:40625\n": {},
 
 		// A bunch
 		"p13100\n" +
@@ -39,28 +39,28 @@ func TestLSOFParsing(t *testing.T) {
 			"n192.168.2.111:56385->74.201.105.31:443\n" +
 			"p21356\n" +
 			"cssh\n" +
-			"n192.168.2.111:33963->192.168.2.71:22\n": map[string]Proc{
-			"[::1]:6600": Proc{
+			"n192.168.2.111:33963->192.168.2.71:22\n": {
+			"[::1]:6600": {
 				PID:  13100,
 				Name: "mpd",
 			},
-			"[2003:45:2b57:8900:1869:2947:f942:aba7]:55711": Proc{
+			"[2003:45:2b57:8900:1869:2947:f942:aba7]:55711": {
 				PID:  14612,
 				Name: "chromium",
 			},
-			"192.168.2.111:37158": Proc{
+			"192.168.2.111:37158": {
 				PID:  14612,
 				Name: "chromium",
 			},
-			"192.168.2.111:44013": Proc{
+			"192.168.2.111:44013": {
 				PID:  14612,
 				Name: "chromium",
 			},
-			"192.168.2.111:56385": Proc{
+			"192.168.2.111:56385": {
 				PID:  14612,
 				Name: "chromium",
 			},
-			"192.168.2.111:33963": Proc{
+			"192.168.2.111:33963": {
 				PID:  21356,
 				Name: "ssh",
 			},

diff --git a/.../github.com/weaveworks/procspy/netstat.go → probe/endpoint/procspy/netstat.go b/.../github.com/weaveworks/procspy/netstat.go → probe/endpoint/procspy/netstat.go
diff --git a/...ub.com/weaveworks/procspy/netstat_test.go → ...endpoint/procspy/netstat_internal_test.go b/...ub.com/weaveworks/procspy/netstat_test.go → ...endpoint/procspy/netstat_internal_test.go
diff --git a/vendor/github.com/weaveworks/procspy/proc.go → probe/endpoint/procspy/proc.go b/vendor/github.com/weaveworks/procspy/proc.go → probe/endpoint/procspy/proc.go
diff --git a/.../github.com/weaveworks/procspy/procnet.go → probe/endpoint/procspy/procnet.go b/.../github.com/weaveworks/procspy/procnet.go → probe/endpoint/procspy/procnet.go
diff --git a/...ub.com/weaveworks/procspy/procnet_test.go → ...endpoint/procspy/procnet_internal_test.go b/...ub.com/weaveworks/procspy/procnet_test.go → ...endpoint/procspy/procnet_internal_test.go
diff --git a/vendor/github.com/weaveworks/procspy/spy.go → probe/endpoint/procspy/spy.go b/vendor/github.com/weaveworks/procspy/spy.go → probe/endpoint/procspy/spy.go
diff --git a/...thub.com/weaveworks/procspy/spy_darwin.go → probe/endpoint/procspy/spy_darwin.go b/...thub.com/weaveworks/procspy/spy_darwin.go → probe/endpoint/procspy/spy_darwin.go
diff --git a/...ithub.com/weaveworks/procspy/spy_linux.go → probe/endpoint/procspy/spy_linux.go b/...ithub.com/weaveworks/procspy/spy_linux.go → probe/endpoint/procspy/spy_linux.go
diff --git a/probe/endpoint/reporter.go b/probe/endpoint/reporter.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/weaveworks/procspy"
+	"github.com/weaveworks/scope/probe/endpoint/procspy"
 	"github.com/weaveworks/scope/probe/process"
 	"github.com/weaveworks/scope/report"
 )

diff --git a/probe/endpoint/reporter_test.go b/probe/endpoint/reporter_test.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/weaveworks/procspy"
 	"github.com/weaveworks/scope/probe/docker"
 	"github.com/weaveworks/scope/probe/endpoint"
+	"github.com/weaveworks/scope/probe/endpoint/procspy"
 	"github.com/weaveworks/scope/report"
 )
 

diff --git a/vendor/github.com/weaveworks/procspy/Makefile b/vendor/github.com/weaveworks/procspy/Makefile
diff --git a/vendor/github.com/weaveworks/procspy/README.md b/vendor/github.com/weaveworks/procspy/README.md
diff --git a/vendor/github.com/weaveworks/procspy/lsproc/lsproc.go b/vendor/github.com/weaveworks/procspy/lsproc/lsproc.go
diff --git a/vendor/manifest b/vendor/manifest
@@ -723,12 +723,6 @@
 			"branch": "master",
 			"path": "/odp"
 		},
-		{
-			"importpath": "github.com/weaveworks/procspy",
-			"repository": "https://github.com/weaveworks/procspy",
-			"revision": "cb970aa190c374d1e47711dbffb3c2c6e9ef0dd1",
-			"branch": "master"
-		},
 		{
 			"importpath": "github.com/weaveworks/weave/common",
 			"repository": "https://github.com/weaveworks/weave",
@@ -931,4 +925,4 @@
 			"branch": "master"
 		}
 	]
-}
+}