Bump src/github.com/cloudfoundry/dropsonde, src/github.com/cloudfound…

…ry/hm9000, src/github.com/cloudfoundry/sonde-go

Bump cloudfoundry/hm9000
  Michael Fraenkel:
     Switch metrics accountant to use dropsonde
     Add dropsonde port to config
  Swetha Repakula:
     Change tests to use Expect

- Remove metrics server
- Adjust how hm9000 is packaged

[#111334138]

Signed-off-by: Jonathan Berkhahn <jaberkha@us.ibm.com>

.gitignore

@@ -7,3 +7,4 @@ hmperformance
 
 src/github.com/vito/gosub
 src/github.com/apcera/gnatsd
+src/github.com/nats-io/gnatsd

.gitmodules

@@ -1,24 +1,19 @@
 [submodule "src/github.com/cloudfoundry/hm9000"]
 	path = src/github.com/cloudfoundry/hm9000
-	url = https://github.com/cloudfoundry/hm9000.git
+	url = https://github.com/cloudfoundry/hm9000
+	branch = master
 [submodule "src/github.com/cloudfoundry/yagnats"]
 	path = src/github.com/cloudfoundry/yagnats
-	url = https://github.com/cloudfoundry/yagnats.git
+	url = https://github.com/cloudfoundry/yagnats
 [submodule "src/github.com/codegangsta/cli"]
 	path = src/github.com/codegangsta/cli
-	url = https://github.com/codegangsta/cli.git
+	url = https://github.com/codegangsta/cli
 [submodule "src/github.com/coreos/go-etcd"]
 	path = src/github.com/coreos/go-etcd
-	url = https://github.com/coreos/go-etcd.git
+	url = https://github.com/coreos/go-etcd
 [submodule "src/github.com/nu7hatch/gouuid"]
 	path = src/github.com/nu7hatch/gouuid
-	url = https://github.com/nu7hatch/gouuid.git
-[submodule "src/github.com/onsi/ginkgo"]
-	path = src/github.com/onsi/ginkgo
-	url = https://github.com/onsi/ginkgo.git
-[submodule "src/github.com/onsi/gomega"]
-	path = src/github.com/onsi/gomega
-	url = https://github.com/onsi/gomega.git
+	url = https://github.com/nu7hatch/gouuid
 [submodule "src/github.com/cloudfoundry/gosteno"]
 	path = src/github.com/cloudfoundry/gosteno
 	url = https://github.com/cloudfoundry/gosteno
@@ -30,52 +25,39 @@
 	url = https://github.com/cloudfoundry/gunk
 [submodule "src/github.com/bmizerany/pat"]
 	path = src/github.com/bmizerany/pat
-	url = https://github.com/bmizerany/pat.git
+	url = https://github.com/bmizerany/pat
 [submodule "src/github.com/goji/httpauth"]
 	path = src/github.com/goji/httpauth
-	url = https://github.com/goji/httpauth.git
+	url = https://github.com/goji/httpauth
 [submodule "src/github.com/tedsuo/rata"]
 	path = src/github.com/tedsuo/rata
-	url = https://github.com/tedsuo/rata.git
+	url = https://github.com/tedsuo/rata
 [submodule "src/github.com/tedsuo/ifrit"]
 	path = src/github.com/tedsuo/ifrit
-	url = https://github.com/tedsuo/ifrit.git
+	url = https://github.com/tedsuo/ifrit
 [submodule "src/github.com/pivotal-golang/lager"]
 	path = src/github.com/pivotal-golang/lager
-	url = https://github.com/pivotal-golang/lager.git
-[submodule "src/github.com/pivotal-golang/localip"]
-	path = src/github.com/pivotal-golang/localip
-	url = https://github.com/pivotal-golang/localip.git
+	url = https://github.com/pivotal-golang/lager
 [submodule "src/github.com/cloudfoundry-incubator/cf-debug-server"]
 	path = src/github.com/cloudfoundry-incubator/cf-debug-server
-	url = https://github.com/cloudfoundry-incubator/cf-debug-server.git
+	url = https://github.com/cloudfoundry-incubator/cf-debug-server
 [submodule "src/github.com/nats-io/nats"]
 	path = src/github.com/nats-io/nats
-	url = https://github.com/nats-io/nats.git
+	url = https://github.com/nats-io/nats
 [submodule "src/github.com/ugorji/go"]
 	path = src/github.com/ugorji/go
-	url = https://github.com/ugorji/go.git
+	url = https://github.com/ugorji/go
 [submodule "src/github.com/pivotal-golang/clock"]
 	path = src/github.com/pivotal-golang/clock
-	url = https://github.com/pivotal-golang/clock.git
-[submodule "src/github.com/golang/snappy"]
-	path = src/github.com/golang/snappy
-	url = https://github.com/golang/snappy
-[submodule "src/github.com/golang/net"]
-	path = src/github.com/golang/net
-	url = https://github.com/golang/net
-[submodule "src/github.com/golang/tools"]
-	path = src/github.com/golang/tools
-	url = https://github.com/golang/tools
-[submodule "src/github.com/golang/protobuf"]
-	path = src/github.com/golang/protobuf
-	url = https://github.com/golang/protobuf
+	url = https://github.com/pivotal-golang/clock
 [submodule "src/github.com/gogo/protobuf"]
 	path = src/github.com/gogo/protobuf
 	url = https://github.com/gogo/protobuf
-[submodule "src/dea_next"]
-	path = src/dea_next
-	url = https://github.com/cloudfoundry/dea_ng.git
-[submodule "src/warden"]
-	path = src/warden
-	url = https://github.com/cloudfoundry/warden.git
+[submodule "src/github.com/cloudfoundry/dropsonde"]
+	path = src/github.com/cloudfoundry/dropsonde
+	url = https://github.com/cloudfoundry/dropsonde
+	branch = master
+[submodule "src/github.com/cloudfoundry/sonde-go"]
+	path = src/github.com/cloudfoundry/sonde-go
+	url = https://github.com/cloudfoundry/sonde-go
+	branch = master

jobs/hm9000/monit

@@ -26,13 +26,6 @@ check process hm9000_sender
   stop program "/var/vcap/jobs/hm9000/bin/hm9000_sender_ctl stop"
   group vcap
 
-check process hm9000_metrics_server
-  with pidfile /var/vcap/sys/run/hm9000/hm9000_metrics_server.pid
-  start program "/var/vcap/jobs/hm9000/bin/hm9000_metrics_server_ctl start"
-    with timeout 60 seconds
-  stop program "/var/vcap/jobs/hm9000/bin/hm9000_metrics_server_ctl stop"
-  group vcap
-
 check process hm9000_api_server
   with pidfile /var/vcap/sys/run/hm9000/hm9000_api_server.pid
   start program "/var/vcap/jobs/hm9000/bin/hm9000_api_server_ctl start"

jobs/hm9000/spec

@@ -8,7 +8,6 @@ templates:
   hm9000_fetcher_ctl: bin/hm9000_fetcher_ctl
   hm9000_analyzer_ctl: bin/hm9000_analyzer_ctl
   hm9000_sender_ctl: bin/hm9000_sender_ctl
-  hm9000_metrics_server_ctl: bin/hm9000_metrics_server_ctl
   hm9000_api_server_ctl: bin/hm9000_api_server_ctl
   hm9000_evacuator_ctl: bin/hm9000_evacuator_ctl
   hm9000_shredder_ctl: bin/hm9000_shredder_ctl

packages/hm9000/packaging

@@ -3,6 +3,6 @@ set -e -x
 export GOROOT=$(readlink -nf /var/vcap/packages/golang1.5)
 export PATH=$GOROOT/bin:$PATH
 
-export GOPATH=$PWD/hm9000
+export GOPATH=$PWD/dea-hm-workspace
 go install github.com/cloudfoundry/hm9000
-cp -a $PWD/hm9000/bin/hm9000 ${BOSH_INSTALL_TARGET}
+cp -a $GOPATH/bin/hm9000 ${BOSH_INSTALL_TARGET}

packages/hm9000/spec

@@ -3,6 +3,58 @@ name: hm9000
 dependencies:
   - golang1.5
 files:
-  - hm9000/src/github.com/**/*
-excluded_files:
-  - hm9000/src/github.com/coreos/etcd/**/*
+  - dea-hm-workspace/src/github.com/bmizerany/pat/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry-incubator/cf-debug-server/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/emitter/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/envelope_sender/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/envelopes/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/factories/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/instrumented_handler/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/instrumented_round_tripper/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/log_sender/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/logs/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/metric_sender/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/metricbatcher/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/metrics/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/dropsonde/runtime_stats/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/gosteno/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/gosteno/syslog/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/gunk/workpool/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/actualstatelistener/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/analyzer/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/apiserver/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/apiserver/handlers/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/config/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/desiredstatefetcher/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/evacuator/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/helpers/httpclient/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/helpers/logger/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/helpers/metricsaccountant/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/hm/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/models/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/sender/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/shredder/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/hm9000/store/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/sonde-go/events/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/storeadapter/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/storeadapter/etcdstoreadapter/*.go # gosub
+  - dea-hm-workspace/src/github.com/cloudfoundry/yagnats/*.go # gosub
+  - dea-hm-workspace/src/github.com/codegangsta/cli/*.go # gosub
+  - dea-hm-workspace/src/github.com/coreos/go-etcd/etcd/*.go # gosub
+  - dea-hm-workspace/src/github.com/gogo/protobuf/gogoproto/*.go # gosub
+  - dea-hm-workspace/src/github.com/gogo/protobuf/proto/*.go # gosub
+  - dea-hm-workspace/src/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub
+  - dea-hm-workspace/src/github.com/goji/httpauth/*.go # gosub
+  - dea-hm-workspace/src/github.com/nats-io/nats/*.go # gosub
+  - dea-hm-workspace/src/github.com/nats-io/nats/encoders/builtin/*.go # gosub
+  - dea-hm-workspace/src/github.com/nu7hatch/gouuid/*.go # gosub
+  - dea-hm-workspace/src/github.com/pivotal-golang/clock/*.go # gosub
+  - dea-hm-workspace/src/github.com/pivotal-golang/lager/*.go # gosub
+  - dea-hm-workspace/src/github.com/tedsuo/ifrit/*.go # gosub
+  - dea-hm-workspace/src/github.com/tedsuo/ifrit/grouper/*.go # gosub
+  - dea-hm-workspace/src/github.com/tedsuo/ifrit/http_server/*.go # gosub
+  - dea-hm-workspace/src/github.com/tedsuo/ifrit/sigmon/*.go # gosub
+  - dea-hm-workspace/src/github.com/tedsuo/rata/*.go # gosub
+  - dea-hm-workspace/src/github.com/ugorji/go/codec/*.go # gosub

scripts/sync-package-specs

@@ -6,12 +6,8 @@ set -e
 go get github.com/vito/gosub
 go install github.com/vito/gosub
 
-cf_dir=$1
-if [ "$cf_dir" != "" ]; then
-    cd $cf_dir
-else
-    cd ~/workspace/cf-release
-fi
+scriptdir=$(realpath $0)
+prefix=$(basename $(dirname $(dirname $scriptdir)))/src
 
 function sync_package() {
   bosh_pkg=${1}
@@ -31,7 +27,7 @@ function sync_package() {
         if [ -d "../../src/${repo}/Godeps/_workspace/src/${package}" ]; then
           package="${repo}/Godeps/_workspace/src/${package}"
         fi
-        echo hm9000/src/${package} | sed -e 's/\(.*\)/  - \1\/*.go # gosub/g'
+        echo $prefix/${package} | sed -e 's/\(.*\)/  - \1\/*.go # gosub/g'
       done
     } > spec.new