diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 000000000..55639ab15 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,126 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/DataDog/datadog-agent" + packages = ["pkg/pidfile"] + revision = "92733ff01547103d5286afc9e272d501cb18f761" + +[[projects]] + name = "github.com/DataDog/datadog-go" + packages = ["statsd"] + revision = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d" + +[[projects]] + name = "github.com/StackExchange/wmi" + packages = ["."] + revision = "ea383cf3ba6ec950874b8486cd72356d007c768f" + +[[projects]] + name = "github.com/cihub/seelog" + packages = ["."] + revision = "d2c6e5aa9fbfdd1c624e140287063c7730654115" + version = "v2.6" + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "6d212800a42e8ab5c146b8ace3490ee17e5225f9" + +[[projects]] + name = "github.com/go-ini/ini" + packages = ["."] + revision = "74bdc99692c3408cb103221e38675ce8fda0a718" + version = "v1.25.2" + +[[projects]] + name = "github.com/go-ole/go-ole" + packages = [ + ".", + "oleutil" + ] + revision = "de8695c8edbf8236f30d6e1376e20b198a028d42" + +[[projects]] + name = "github.com/gogo/protobuf" + packages = [ + "gogoproto", + "proto", + "protoc-gen-gogo/descriptor" + ] + revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" + version = "v0.5" + +[[projects]] + name = "github.com/golang/protobuf" + packages = ["proto"] + revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" + +[[projects]] + name = "github.com/philhofer/fwd" + packages = ["."] + revision = "bb6d471dc95d4fe11e432687f8b70ff496cf3136" + version = "v1.0.0" + +[[projects]] + name = "github.com/pmezard/go-difflib" + packages = ["difflib"] + revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d" + +[[projects]] + name = "github.com/shirou/gopsutil" + packages = [ + "cpu", + "host", + "internal/common", + "mem", + "net", + "process" + ] + revision = "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58" + version = "v2.17.01" + +[[projects]] + branch = "master" + name = "github.com/shirou/w32" + packages = ["."] + revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b" + +[[projects]] + name = "github.com/stretchr/testify" + packages = [ + "assert", + "require" + ] + revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" + version = "v1.1.4" + +[[projects]] + name = "github.com/tinylib/msgp" + packages = ["msgp"] + revision = "362bfb3384d53ae4d5dd745983a4d70b6d23628c" + +[[projects]] + name = "golang.org/x/sys" + packages = [ + "windows", + "windows/registry", + "windows/svc", + "windows/svc/debug", + "windows/svc/eventlog", + "windows/svc/mgr" + ] + revision = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9" + +[[projects]] + branch = "v2" + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "77c57f58ee339b502c5e6c59a3f7214813c33ceb39af3278565f7fa2fcc4c8c4" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 000000000..ffb9886ce --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,45 @@ +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + + +[[constraint]] + name = "github.com/cihub/seelog" + version = "2.6.0" + +[[constraint]] + name = "github.com/go-ini/ini" + version = "1.25.2" + +[[constraint]] + name = "github.com/gogo/protobuf" + version = "0.5.0" + +[[constraint]] + name = "github.com/shirou/gopsutil" + version = "2.17.1" + +[[constraint]] + name = "github.com/stretchr/testify" + version = "1.1.4" + +[[constraint]] + branch = "v2" + name = "gopkg.in/yaml.v2" diff --git a/Makefile b/Makefile index bda4048ed..54969c23b 100644 --- a/Makefile +++ b/Makefile @@ -16,14 +16,10 @@ VERSION_MINOR := $(if $(VERSION_MINOR),$(VERSION_MINOR), 0) VERSION_PATCH := $(if $(VERSION_PATCH),$(VERSION_PATCH), 0) deps: - # downloads and installs dependencies - go get -d github.com/Masterminds/glide/... - # use a known version - cd $(GOPATH)/src/github.com/Masterminds/glide && git reset --hard v0.12.3 && cd - - # install it - go install github.com/Masterminds/glide/... - # get all dependencies - glide install + go get -d github.com/golang/dep/cmd/dep + cd $(GOPATH)/src/github.com/golang/dep && git reset --hard v0.3.2 && cd - + go install github.com/golang/dep/cmd/dep + dep ensure install: deps # prepares all dependencies by running the 'deps' task, generating diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 254db6345..000000000 --- a/glide.lock +++ /dev/null @@ -1,78 +0,0 @@ -hash: 2d03c6e4ed8dbc960336dcb0536f4835648801d07140320ca7853bc3ad25162e -updated: 2018-02-11T11:10:50.744329781+01:00 -imports: -- name: github.com/cihub/seelog - version: d2c6e5aa9fbfdd1c624e140287063c7730654115 -- name: github.com/DataDog/datadog-agent - version: 92733ff01547103d5286afc9e272d501cb18f761 - subpackages: - - pkg/pidfile -- name: github.com/DataDog/datadog-go - version: a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d - subpackages: - - statsd -- name: github.com/go-ini/ini - version: 74bdc99692c3408cb103221e38675ce8fda0a718 -- name: github.com/go-ole/go-ole - version: de8695c8edbf8236f30d6e1376e20b198a028d42 - subpackages: - - oleutil -- name: github.com/gogo/protobuf - version: 342cbe0a04158f6dcb03ca0079991a51a4248c02 - subpackages: - - gogoproto - - proto - - protoc-gen-gogo/descriptor -- name: github.com/golang/protobuf - version: 1e59b77b52bf8e4b449a57e6f79f21226d571845 - subpackages: - - proto - - protoc-gen-go -- name: github.com/golang/tools - version: 219e654bb7266d3b73c4610ed24c33d12560826a - subpackages: - - go/gcexportdata -- name: github.com/philhofer/fwd - version: bb6d471dc95d4fe11e432687f8b70ff496cf3136 -- name: github.com/shirou/gopsutil - version: 70a1b78fe69202d93d6718fc9e3a4d6f81edfd58 - subpackages: - - cpu - - host - - internal/common - - mem - - net - - process -- name: github.com/shirou/w32 - version: bb4de0191aa41b5507caa14b0650cdbddcd9280b -- name: github.com/StackExchange/wmi - version: ea383cf3ba6ec950874b8486cd72356d007c768f -- name: github.com/tinylib/msgp - version: 362bfb3384d53ae4d5dd745983a4d70b6d23628c - subpackages: - - msgp -- name: golang.org/x/sys - version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 - subpackages: - - windows - - windows/registry - - windows/svc - - windows/svc/debug - - windows/svc/eventlog - - windows/svc/mgr -- name: gopkg.in/yaml.v2 - version: d670f9405373e636a5a2765eea47fac0c9bc91a4 -testImports: -- name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 - subpackages: - - spew -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 - subpackages: - - assert - - require diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 9445526d2..000000000 --- a/glide.yaml +++ /dev/null @@ -1,45 +0,0 @@ -package: github.com/DataDog/datadog-trace-agent -import: -- package: github.com/DataDog/datadog-go - version: a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d - subpackages: - - statsd -- package: github.com/cihub/seelog - version: v2.6 -- package: github.com/DataDog/datadog-agent - subpackages: - - pkg/pidfile -- package: github.com/tinylib/msgp - version: 362bfb3384d53ae4d5dd745983a4d70b6d23628c - subpackages: - - msgp -- package: github.com/go-ini/ini - version: v1.25.2 -- package: github.com/golang/tools - version: 219e654bb7266d3b73c4610ed24c33d12560826a - subpackages: - - go/gcexportdata -- package: github.com/shirou/gopsutil - version: v2.17.01 - subpackages: - - cpu -- package: golang.org/x/sys - subpackages: - - windows/svc - - windows/svc/debug - - windows/svc/eventlog - - windows/svc/mgr -- package: github.com/golang/protobuf - subpackages: - - protoc-gen-go - - proto -- package: github.com/gogo/protobuf - version: v0.5 - subpackages: - - gogoproto -- package: gopkg.in/yaml.v2 -testImport: -- package: github.com/stretchr/testify - version: v1.1.4 - subpackages: - - assert