diff --git a/go.mod b/go.mod index 1f672cc20e6d..5bdc67a97f7e 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/golang/mock v1.4.3 github.com/golang/protobuf v1.4.2 github.com/google/go-cmp v0.5.0 - github.com/google/martian v2.1.0+incompatible + github.com/google/martian/v3 v3.0.0 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99 github.com/googleapis/gax-go/v2 v2.0.5 github.com/jstemmer/go-junit-report v0.9.1 diff --git a/go.sum b/go.sum index bd57014c2024..3736901a5121 100644 --- a/go.sum +++ b/go.sum @@ -113,6 +113,8 @@ github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57 h1:eqyIo2HjKhKe/mJzTG8n4VqvLXIOEG+SLdDqX7xGtkY= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f h1:Jnx61latede7zDD3DiiP4gmNz33uK0U5HDUaF0a/HVQ= @@ -221,6 +223,7 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= diff --git a/httpreplay/cmd/httpr/httpr.go b/httpreplay/cmd/httpr/httpr.go index cc734c4573b3..c0588e95755e 100644 --- a/httpreplay/cmd/httpr/httpr.go +++ b/httpreplay/cmd/httpr/httpr.go @@ -31,7 +31,7 @@ import ( "os/signal" "cloud.google.com/go/httpreplay/internal/proxy" - "github.com/google/martian/martianhttp" + "github.com/google/martian/v3/martianhttp" ) var ( diff --git a/httpreplay/internal/proxy/log.go b/httpreplay/internal/proxy/log.go index 98f0d9acdfe2..f3ab456ec0cc 100644 --- a/httpreplay/internal/proxy/log.go +++ b/httpreplay/internal/proxy/log.go @@ -22,7 +22,7 @@ import ( "strconv" "sync" - "github.com/google/martian" + "github.com/google/martian/v3" ) // Replacement for the HAR logging that comes with martian. HAR is not designed for diff --git a/httpreplay/internal/proxy/log_test.go b/httpreplay/internal/proxy/log_test.go index f7c11cdb4c6b..6043dfc9f636 100644 --- a/httpreplay/internal/proxy/log_test.go +++ b/httpreplay/internal/proxy/log_test.go @@ -23,7 +23,7 @@ import ( "cloud.google.com/go/internal/testutil" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/google/martian" + "github.com/google/martian/v3" ) func TestLogger(t *testing.T) { diff --git a/httpreplay/internal/proxy/record.go b/httpreplay/internal/proxy/record.go index 233148e847ed..89b2615fdc3d 100644 --- a/httpreplay/internal/proxy/record.go +++ b/httpreplay/internal/proxy/record.go @@ -32,11 +32,11 @@ import ( "sync" "time" - "github.com/google/martian" - "github.com/google/martian/fifo" - "github.com/google/martian/httpspec" - "github.com/google/martian/martianlog" - "github.com/google/martian/mitm" + "github.com/google/martian/v3" + "github.com/google/martian/v3/fifo" + "github.com/google/martian/v3/httpspec" + "github.com/google/martian/v3/martianlog" + "github.com/google/martian/v3/mitm" ) // A Proxy is an HTTP proxy that supports recording or replaying requests. diff --git a/httpreplay/internal/proxy/replay.go b/httpreplay/internal/proxy/replay.go index 87032eaa8f8a..ac15badf56cd 100644 --- a/httpreplay/internal/proxy/replay.go +++ b/httpreplay/internal/proxy/replay.go @@ -25,7 +25,7 @@ import ( "reflect" "sync" - "github.com/google/martian/martianlog" + "github.com/google/martian/v3/martianlog" ) // ForReplaying returns a Proxy configured to replay.