github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 17:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trim whitespace from process names

Browse Source 
This causes detailed node lookups for the grouped-by-process-name view to fail.  Also, add a test for process walker trimmming whitespace, and a test the process-by-name view gives the right result.
This commit is contained in:
Tom Wilkie
2015-06-24 11:33:48 +00:00
parent 81239f04ed
commit eb250ecb7c
5 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/report_fixture.go
View File

@@ -21,7 +21,8 @@ var (
ClientHostName = ClientHostID
ServerHostName = ServerHostID
ClientPID = "10001"
Client1PID = "10001"
Client2PID = "30020"
ServerPID = "215"
NonContainerPID = "1234"
@@ -36,7 +37,8 @@ var (
UnknownClient3NodeID = report.MakeEndpointNodeID(ServerHostID, "10.10.10.11", "54020") // Check this one isn't deduped
RandomClientNodeID = report.MakeEndpointNodeID(ServerHostID, "51.52.53.54", "12345") // this should become an internet node
ClientProcessNodeID = report.MakeProcessNodeID(ClientHostID, ClientPID)
ClientProcess1NodeID = report.MakeProcessNodeID(ClientHostID, Client1PID)
ClientProcess2NodeID = report.MakeProcessNodeID(ClientHostID, Client2PID)
ServerProcessNodeID = report.MakeProcessNodeID(ServerHostID, ServerPID)
NonContainerProcessNodeID = report.MakeProcessNodeID(ServerHostID, NonContainerPID)
@@ -72,13 +74,13 @@ var (
Client54001NodeID: report.NodeMetadata{
"addr": ClientIP,
"port": ClientPort54001,
"pid": ClientPID,
"pid": Client1PID,
report.HostNodeID: ClientHostNodeID,
},
Client54002NodeID: report.NodeMetadata{
"addr": ClientIP,
"port": ClientPort54002,
"pid": ClientPID, // should be same as above!
"pid": Client2PID,
report.HostNodeID: ClientHostNodeID,
},
Server80NodeID: report.NodeMetadata{
@@ -130,8 +132,14 @@ var (
Process: report.Topology{
Adjacency: report.Adjacency{},
NodeMetadatas: report.NodeMetadatas{
ClientProcessNodeID: report.NodeMetadata{
"pid": ClientPID,
ClientProcess1NodeID: report.NodeMetadata{
"pid": Client1PID,
"comm": "curl",
docker.ContainerID: ClientContainerID,
report.HostNodeID: ClientHostNodeID,
},
ClientProcess2NodeID: report.NodeMetadata{
"pid": Client2PID,
"comm": "curl",
docker.ContainerID: ClientContainerID,
report.HostNodeID: ClientHostNodeID,