Merge pull request #3785 from weaveworks/go-1-14-2

Update tools: Go 1.4.2 and JS kind-of 6.0.3

backend/Dockerfile

-FROM golang:1.13.9
+FROM golang:1.14.2
 ENV SCOPE_SKIP_UI_ASSETS true
 RUN set -eux; \
    export arch_val="$(dpkg --print-architecture)"; \

client/yarn.lock

@@ -5060,8 +5060,9 @@ kind-of@^5.0.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.2:
   version "3.0.2"

go.mod

@@ -4,146 +4,89 @@ go 1.13
 
 require (
 	camlistore.org v0.0.0-20171230002226-a5a65f0d8b22
-	github.com/Azure/go-autorest v9.8.1+incompatible // indirect
 	github.com/NYTimes/gziphandler v1.0.2-0.20180227021810-5032c8878b9d
-	github.com/PuerkitoBio/purell v1.1.1-0.20171117214151-1c4bec281e4b // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/VividCortex/gohistogram v1.0.0 // indirect
-	github.com/apache/thrift v0.0.0-20180717161949-f2867c24984a // indirect
 	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878
 	github.com/armon/go-radix v0.0.0-20160115234725-4239b77079c7
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/aws/aws-sdk-go v1.15.78
-	github.com/aws/aws-sdk-go-v2 v2.0.0-preview.4.0.20180612204834-f401f4e72ca1+incompatible // indirect
-	github.com/blang/semver v3.1.0+incompatible // indirect
 	github.com/bluele/gcache v0.0.0-20150827032927-fb6c0b0e1ff0
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
 	github.com/bradfitz/gomemcache v0.0.0-20160117192205-fb1f79c6b65a
 	github.com/c9s/goprocinfo v0.0.0-20151025191153-19cb9f127a9c
-	github.com/cactus/go-statsd-client v3.1.2-0.20180516050940-5e3c483eb932+incompatible // indirect
 	github.com/certifi/gocertifi v0.0.0-20150906030631-84c0a38a18fc
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
-	github.com/containernetworking/cni v0.3.1-0.20160725233558-c1ff202179dc // indirect
 	github.com/coocood/freecache v0.0.0-20150903053832-a27035d5537f
 	github.com/cpuguy83/go-md2man v1.0.4 // indirect
-	github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b // indirect
 	github.com/davecgh/go-spew v1.1.1
-	github.com/dgrijalva/jwt-go v3.1.0+incompatible // indirect
-	github.com/dimchansky/utfbom v0.0.0-20170328061312-6c6132ff69f0 // indirect
 	github.com/docker/docker v1.4.2-0.20180827131323-0c5f8d2b9b23
-	github.com/docker/engine-api v0.3.2-0.20160615162419-f50fbe5f9c4c // indirect
-	github.com/docker/libcontainer v2.2.2-0.20150701164209-83a102cc68a0+incompatible // indirect
-	github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
 	github.com/dustin/go-humanize v0.0.0-20160923163517-bd88f87ad3a4
-	github.com/emicklei/go-restful v2.5.0+incompatible // indirect
-	github.com/emicklei/go-restful-swagger12 v0.0.0-20170926063155-7524189396c6 // indirect
 	github.com/evanphx/json-patch v0.0.0-20170719203123-944e07253867 // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fsouza/go-dockerclient v1.3.0
-	github.com/garyburd/redigo v0.0.0-20151018180855-3d0709611e0e // indirect
-	github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 // indirect
-	github.com/go-ini/ini v1.8.6-0.20151216053507-467243bad6cb // indirect
-	github.com/go-openapi/jsonpointer v0.0.0-20170102174223-779f45308c19 // indirect
-	github.com/go-openapi/jsonreference v0.0.0-20161105162150-36d33bfe519e // indirect
-	github.com/go-openapi/spec v0.0.0-20171219195406-fa03337d7da5 // indirect
-	github.com/go-openapi/swag v0.0.0-20180102232305-84f4bee7c0a6 // indirect
 	github.com/gogo/protobuf v1.3.0
 	github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d
 	github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 // indirect
 	github.com/golang/protobuf v1.3.2
-	github.com/golang/snappy v0.0.0-20170215233205-553a64147049 // indirect
 	github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a // indirect
-	github.com/google/cadvisor v0.19.2 // indirect
 	github.com/google/gopacket v1.1.17
-	github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e // indirect
 	github.com/googleapis/gnostic v0.1.1-0.20180110061420-49e5b5b1abae // indirect
-	github.com/gophercloud/gophercloud v0.0.0-20180123185012-4a3f5ae58624 // indirect
 	github.com/gorilla/handlers v0.0.0-20151024084542-9a8d6fa6e647
 	github.com/gorilla/mux v1.6.2
-	github.com/gorilla/schema v0.0.0-20171228183507-afe77393c53b // indirect
-	github.com/gorilla/securecookie v0.0.0-20150820082958-e95799a481bb // indirect
 	github.com/gorilla/websocket v0.0.0-20160221213430-5c91b59efa23
 	github.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f // indirect
-	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/hashicorp/consul v0.6.4-0.20160227001210-2a4436075dbb
 	github.com/hashicorp/go-cleanhttp v0.5.0
-	github.com/hashicorp/go-version v0.0.0-20160214002439-2e7f5ea8e27b // indirect
+	github.com/hashicorp/go-msgpack v1.1.5 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/serf v0.7.1-0.20160225025727-b00b7b98ce2b // indirect
-	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
 	github.com/imdario/mergo v0.3.5 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/influxdata/influxdb v1.5.1-0.20180718194353-468497c11f25 // indirect
 	github.com/iovisor/gobpf v0.0.0-20180826141936-4ece6c56f936 // indirect
-	github.com/jessevdk/go-flags v1.3.1-0.20170926144705-f88afde2fa19 // indirect
 	github.com/k-sone/critbitgo v1.2.0
 	github.com/kr/pty v1.1.1
-	github.com/lsegal/gucumber v0.0.0-20150609075149-e8116c9c66e6 // indirect
-	github.com/m3db/prometheus_client_golang v0.9.0-pre1.0.20180416233856-82f5ff156b29 // indirect
-	github.com/mailru/easyjson v0.0.0-20171120080333-32fa128f234d // indirect
-	github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/miekg/dns v0.0.0-20160129163459-3d66e3747d22
-	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
-	github.com/mjibson/appstats v0.0.0-20151004071057-0542d5f0e87e // indirect
-	github.com/mwitkow/go-grpc-middleware v1.0.1-0.20180522105215-e9c5d9645c43 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/nats-io/gnatsd v0.8.1-0.20160607194326-f2c17eb159e1 // indirect
 	github.com/nats-io/nats v1.2.1-0.20160607194537-ce9cdc9addff
 	github.com/nats-io/nuid v0.0.0-20160402145409-a5152d67cf63 // indirect
-	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
-	github.com/olekukonko/tablewriter v0.0.0-20160923125401-bdcc175572fd // indirect
 	github.com/opencontainers/runc v1.0.0-rc5 // indirect
 	github.com/openebs/k8s-snapshot-client v0.0.0-20180831100134-a6506305fb16
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/paypal/ionet v0.0.0-20130919195445-ed0aaebc5417
 	github.com/pborman/uuid v0.0.0-20150824212802-cccd189d45f7
-	github.com/performancecopilot/speed v3.0.1-0.20180614024626-d49dd9b77adc+incompatible // indirect
-	github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
 	github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible // indirect
 	github.com/peterbourgon/runsvinit v2.0.0+incompatible
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.5.0
 	github.com/richo/GOSHOUT v0.0.0-20190205170632-a1a6db7f26e9
 	github.com/russross/blackfriday v0.0.0-20151020174500-a18a46c9b943 // indirect
-	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
 	github.com/shurcooL/sanitized_anchor_name v0.0.0-20150822220530-244f5ac324cb // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spaolacci/murmur3 v0.0.0-20150829172844-0d12bf811670
 	github.com/spf13/cobra v0.0.0-20151013225139-8b2293c74173 // indirect
 	github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95 // indirect
-	github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983 // indirect
 	github.com/stretchr/testify v1.4.0
-	github.com/syndtr/goleveldb v0.0.0-20171214120811-34011bf325bc // indirect
 	github.com/tylerb/graceful v1.2.13
 	github.com/typetypetype/conntrack v1.0.1-0.20181112022515-9d9dd841d4eb
-	github.com/uber-go/tally v3.3.8-0.20180718230131-d0a004a77fc9+incompatible // indirect
 	github.com/uber/jaeger-client-go v2.22.1+incompatible // indirect
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
 	github.com/ugorji/go v0.0.0-20170918222552-54210f4e076c
-	github.com/urfave/negroni v0.2.1-0.20160830030302-5d815f907a18 // indirect
 	github.com/vishvananda/netlink v1.0.1-0.20190913165827-36d367fd76f9
 	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc
 	github.com/weaveworks/billing-client v0.5.0
 	github.com/weaveworks/common v0.0.0-20200310113808-2708ba4e60a4
 	github.com/weaveworks/go-checkpoint v0.0.0-20160428112813-62324982ab51
-	github.com/weaveworks/go-odp v0.0.0-20151030115644-f8c8c40c1889 // indirect
 	github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76
 	github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0
 	github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible
 	github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c
-	go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df // indirect
-	go4.org v0.0.0-20170117104548-7ce08ca145db // indirect
 	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
 	golang.org/x/sys v0.0.0-20200122134326-e047566fdf82
 	golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 // indirect
 	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
-	golang.org/x/tools v0.0.0-20190226205152-f727befe758c
-	google.golang.org/api v0.0.0-20170223235537-64485db7e8c8 // indirect
+	golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b
 	google.golang.org/grpc v1.19.0
 	gopkg.in/inf.v0 v0.9.0 // indirect
-	gopkg.in/tylerb/graceful.v1 v1.2.13 // indirect
-	gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 // indirect
-	gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect
 	k8s.io/api v0.0.0-20181204000039-89a74a8d264d
 	k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
 	k8s.io/cli-runtime v0.0.0-20181204004549-a04da5c88c07 // indirect
@@ -151,6 +94,7 @@ require (
 	k8s.io/klog v0.1.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20180108222231-a07b7bbb58e7 // indirect
 	k8s.io/kubernetes v1.13.0
+	k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )
 

probe/endpoint/connection_tracker.go

@@ -362,7 +362,7 @@ func (t *connectionTracker) addDNS(rpt *report.Report, addr string) {
 
 func (t *connectionTracker) Stop() error {
 	if t.ebpfTracker != nil {
-		t.ebpfTracker.stop()
+		t.ebpfTracker.Stop()
 	}
 	if t.flowWalker != nil {
 		t.flowWalker.stop()

probe/endpoint/ebpf.go

@@ -56,7 +56,7 @@ type EbpfTracker struct {
 	sync.Mutex
 	tracer          *tracer.Tracer
 	ready           bool
-	stopping        bool
+	stopping        chan struct{}
 	dead            bool
 	lastTimestampV4 uint64
 
@@ -373,27 +373,38 @@ func (t *EbpfTracker) isDead() bool {
 	return t.dead
 }
 
+func (t *EbpfTracker) Stop() {
+	t.stop()
+	if t.stopping != nil {
+		<-t.stopping
+	}
+}
+
 func (t *EbpfTracker) stop() {
 	t.Lock()
-	alreadyDead := t.dead || t.stopping
-	t.stopping = true
+	alreadyDead := t.dead || (t.stopping != nil)
+	if t.stopping == nil {
+		t.stopping = make(chan struct{})
+	}
 	t.Unlock()
 
-	// Do not call tracer.Stop() in this thread, otherwise tracer.Stop() will
-	// deadlock waiting for this thread to pick up the next event.
-	go func() {
-		if !alreadyDead && t.tracer != nil {
-			t.tracer.Stop()
-			t.tracer = nil
-		}
+	if !alreadyDead {
+		// Do not call tracer.Stop() in this thread, otherwise tracer.Stop() will
+		// deadlock waiting for this thread to pick up the next event.
+		go func() {
+			if t.tracer != nil {
+				t.tracer.Stop()
+				t.tracer = nil
+			}
 
-		// Only advertise the tracer as dead after the tracer is fully stopped so that
-		// restart() is not called in parallel in another thread.
-		t.Lock()
-		t.stopping = false
-		t.dead = true
-		t.Unlock()
-	}()
+			// Only advertise the tracer as dead after the tracer is fully stopped so that
+			// restart() is not called in parallel in another thread.
+			t.Lock()
+			close(t.stopping)
+			t.dead = true
+			t.Unlock()
+		}()
+	}
 }
 
 func (t *EbpfTracker) restart() error {
@@ -401,6 +412,7 @@ func (t *EbpfTracker) restart() error {
 	defer t.Unlock()
 
 	t.dead = false
+	t.stopping = nil
 	t.ready = false
 
 	t.openConnections = map[ebpfKey]ebpfDetail{}