Skip to content

Commit bf49a86

Browse files
jessfrazjessfraz
committed
update versions
Signed-off-by: Jess Frazelle <[email protected]>
1 parent aab3578 commit bf49a86

File tree

12 files changed

+85
-42
lines changed

12 files changed

+85
-42
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster-slim as builder
1+
FROM debian:stretch-slim as builder
22
MAINTAINER Jessica Frazelle <[email protected]>
33

44
ENV PATH /go/bin:/usr/local/go/bin:$PATH

‎go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ require (
99
github.com/docker/go-units v0.3.3 // indirect
1010
github.com/genuinetools/pkg v0.0.0-20181004225747-e152a0f47ee4
1111
github.com/golang/protobuf v1.2.0
12-
github.com/iovisor/gobpf v0.0.0-20181008194316-68e787d82275
12+
github.com/iovisor/gobpf v0.0.0-20190329163444-e0d8d785d368
1313
github.com/pkg/errors v0.8.0 // indirect
1414
github.com/sirupsen/logrus v1.1.1
1515
github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
1616
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2
17-
golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd // indirect
1817
golang.org/x/net v0.0.0-20181005035420-146acd28ed58
1918
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e
2019
google.golang.org/grpc v1.15.0

‎go.sum

+3-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/docker/distribution v2.6.2+incompatible h1:4FI6af79dfCS/CYb+RRtkSHw3q1L/bnDjG1PcPZtQhM=
1010
github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
11-
github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M=
11+
github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
1212
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1313
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
1414
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
@@ -22,8 +22,8 @@ github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200j
2222
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
2323
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
2424
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
25-
github.com/iovisor/gobpf v0.0.0-20181008194316-68e787d82275 h1:AhMKPupxUSbxpBGMDLgLbuWW9XHnnf4ckJ2ZyZ4nkBQ=
26-
github.com/iovisor/gobpf v0.0.0-20181008194316-68e787d82275/go.mod h1:+5U5qu5UOu8YJ5oHVLvWKH7/Dr5QNHU7mZ2RfPEeXg8=
25+
github.com/iovisor/gobpf v0.0.0-20190329163444-e0d8d785d368 h1:y3708HMZuw+OpIdFPPzwSMC12f/LncanSCpVAaR8jCY=
26+
github.com/iovisor/gobpf v0.0.0-20190329163444-e0d8d785d368/go.mod h1:+5U5qu5UOu8YJ5oHVLvWKH7/Dr5QNHU7mZ2RfPEeXg8=
2727
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
2828
github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe h1:CHRGQ8V7OlCYtwaKPJi3iA7J+YdNKdo8j7nG5IgDhjs=
2929
github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -42,8 +42,6 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG
4242
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
4343
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
4444
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
45-
golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd h1:cgsAvzdqkDKdI02tIvDjO225vDPHMDCgfKqx5KEVI7U=
46-
golang.org/x/lint v0.0.0-20181011164241-5906bd5c48cd/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
4745
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
4846
golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE=
4947
golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -56,7 +54,6 @@ golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0
5654
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5755
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
5856
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
59-
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52 h1:JG/0uqcGdTNgq7FdU+61l5Pdmb8putNZlXb65bJBROs=
6057
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6158
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
6259
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=

‎tracer/dockeropenbreakout/dockeropenbreakout.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (p *bpftracer) Load() error {
122122
}
123123

124124
open := "do_sys_open"
125-
err = p.module.AttachKprobe(open, openKprobe)
125+
err = p.module.AttachKprobe(open, openKprobe, -1)
126126
if err != nil {
127127
return fmt.Errorf("attach sys_open kprobe: %v", err)
128128
}
@@ -132,7 +132,7 @@ func (p *bpftracer) Load() error {
132132
return fmt.Errorf("load sys_open kretprobe failed: %v", err)
133133
}
134134

135-
err = p.module.AttachKretprobe(open, openKretprobe)
135+
err = p.module.AttachKretprobe(open, openKretprobe, -1)
136136
if err != nil {
137137
return fmt.Errorf("attach sys_open kretprobe: %v", err)
138138
}

‎tracer/exec/exec.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (p *bpftracer) Load() error {
164164
}
165165

166166
execve := bpf.GetSyscallFnName("execve")
167-
err = p.module.AttachKprobe(execve, execKprobe)
167+
err = p.module.AttachKprobe(execve, execKprobe, -1)
168168
if err != nil {
169169
return fmt.Errorf("attach sys_execve kprobe: %v", err)
170170
}
@@ -174,7 +174,7 @@ func (p *bpftracer) Load() error {
174174
return fmt.Errorf("load sys_execve kretprobe failed: %v", err)
175175
}
176176

177-
err = p.module.AttachKretprobe(execve, execKretprobe)
177+
err = p.module.AttachKretprobe(execve, execKretprobe, -1)
178178
if err != nil {
179179
return fmt.Errorf("attach sys_execve kretprobe: %v", err)
180180
}

‎tracer/open/open.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (p *bpftracer) Load() error {
112112
}
113113

114114
open := "do_sys_open"
115-
err = p.module.AttachKprobe(open, openKprobe)
115+
err = p.module.AttachKprobe(open, openKprobe, -1)
116116
if err != nil {
117117
return fmt.Errorf("attach sys_open kprobe: %v", err)
118118
}
@@ -122,7 +122,7 @@ func (p *bpftracer) Load() error {
122122
return fmt.Errorf("load sys_open kretprobe failed: %v", err)
123123
}
124124

125-
err = p.module.AttachKretprobe(open, openKretprobe)
125+
err = p.module.AttachKretprobe(open, openKretprobe, -1)
126126
if err != nil {
127127
return fmt.Errorf("attach sys_open kretprobe: %v", err)
128128
}

‎tracer/tcpdrop/tcpdrop.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (p *bpftracer) Load() error {
183183
}
184184

185185
tcp := "tcp_drop"
186-
err = p.module.AttachKprobe(tcp, tcpKprobe)
186+
err = p.module.AttachKprobe(tcp, tcpKprobe, -1)
187187
if err != nil {
188188
return fmt.Errorf("attach tcp_drop kprobe: %v", err)
189189
}
@@ -193,7 +193,7 @@ func (p *bpftracer) Load() error {
193193
return fmt.Errorf("load tcp_drop kretprobe failed: %v", err)
194194
}
195195

196-
err = p.module.AttachKretprobe(tcp, tcpKretprobe)
196+
err = p.module.AttachKretprobe(tcp, tcpKretprobe, -1)
197197
if err != nil {
198198
return fmt.Errorf("attach tcp_drop kretprobe: %v", err)
199199
}

‎vendor/github.com/iovisor/gobpf/bcc/module.go

+68-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/iovisor/gobpf/bcc/perf.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/iovisor/gobpf/bcc/symbol.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/iovisor/gobpf/bcc/table.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ github.com/golang/protobuf/ptypes
3636
github.com/golang/protobuf/ptypes/any
3737
github.com/golang/protobuf/ptypes/duration
3838
github.com/golang/protobuf/ptypes/timestamp
39-
# github.com/iovisor/gobpf v0.0.0-20181008194316-68e787d82275
39+
# github.com/iovisor/gobpf v0.0.0-20190329163444-e0d8d785d368
4040
github.com/iovisor/gobpf/bcc
4141
github.com/iovisor/gobpf/pkg/cpuonline
4242
# github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe

0 commit comments

Comments
 (0)