fix circleci

Author: replay

.circleci/config.yml

@@ -5,6 +5,7 @@ jobs:
     docker:
       - image: circleci/golang:1.10
     steps:
+      - run: sudo apt-get install libssl-dev openssl libsasl2-2 libsasl2-dev zlib1g-dev
       - checkout
       - run: scripts/build.sh
       - run: scripts/build_tools.sh
@@ -25,14 +26,15 @@ jobs:
       - image: circleci/golang:1.10
     steps:
       - checkout
-      - run: go test -v -race $(go list ./... | grep -v github.com/grafana/metrictank/chaos)
+      - run: go test -v -race -tags static $(go list ./... | grep -v github.com/grafana/metrictank/chaos)
 
   qa:
     working_directory: /go/src/github.com/grafana/metrictank
     docker:
       - image: circleci/golang:1.10
     steps:
       - checkout
+      - run: scripts/build_deps.sh
       - run: scripts/qa/gofmt.sh
       - run: scripts/qa/go-generate.sh
       - run: scripts/qa/ineffassign.sh

cmd/mt-kafka-mdm-sniff-out-of-order/main.go

@@ -3,10 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"math/rand"
 	"os"
 	"os/signal"
-	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -121,7 +119,6 @@ func main() {
 	}
 	flag.Parse()
 	log.NewLogger(0, "console", fmt.Sprintf(`{"level": %d, "formatting":false}`, 2))
-	instance := "mt-kafka-mdm-sniff-out-of-order" + strconv.Itoa(rand.Int())
 
 	// Only try and parse the conf file if it exists
 	path := ""
@@ -141,10 +138,8 @@ func main() {
 
 	// config may have had it disabled
 	inKafkaMdm.Enabled = true
-	// important: we don't want to share the same offset tracker as the mdm input of MT itself
-	inKafkaMdm.DataDir = "/tmp/" + instance
 
-	inKafkaMdm.ConfigProcess(instance)
+	inKafkaMdm.ConfigProcess()
 
 	stats.NewDevnull() // make sure metrics don't pile up without getting discarded
 

cmd/mt-kafka-mdm-sniff/main.go

@@ -3,10 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"math/rand"
 	"os"
 	"os/signal"
-	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -73,7 +71,6 @@ func main() {
 	}
 	flag.Parse()
 	log.NewLogger(0, "console", fmt.Sprintf(`{"level": %d, "formatting":false}`, 2))
-	instance := "mt-kafka-mdm-sniff" + strconv.Itoa(rand.Int())
 
 	// Only try and parse the conf file if it exists
 	path := ""
@@ -93,10 +90,8 @@ func main() {
 
 	// config may have had it disabled
 	inKafkaMdm.Enabled = true
-	// important: we don't want to share the same offset tracker as the mdm input of MT itself
-	inKafkaMdm.DataDir = "/tmp/" + instance
 
-	inKafkaMdm.ConfigProcess(instance)
+	inKafkaMdm.ConfigProcess()
 
 	stats.NewDevnull() // make sure metrics don't pile up without getting discarded
 

cmd/mt-replicator-via-tsdb/main.go

@@ -93,7 +93,7 @@ func main() {
 	cluster.Mode = cluster.ModeSingle
 	cluster.Init(*instance, gitHash, time.Now(), "", 0)
 
-	inKafkaMdm.ConfigProcess(*instance)
+	inKafkaMdm.ConfigProcess()
 	statsConfig.ConfigProcess(*instance)
 
 	sigChan := make(chan os.Signal, 1)

input/kafkamdm/kafkamdm.go

@@ -52,7 +52,6 @@ var netMaxOpenRequests int
 var offsetCommitInterval time.Duration
 var offsetStr string
 var partitionStr string
-var partitions []int32
 var sessionTimeout int
 var topicStr string
 

kafka/consumer.go

@@ -157,7 +157,7 @@ func (c *Consumer) Start(processBacklog *sync.WaitGroup) error {
 
 	go c.monitorLag(processBacklog)
 
-	for _ = range c.Partitions {
+	for range c.Partitions {
 		go c.consume()
 	}
 

mdata/notifierKafka/notifierKafka.go

@@ -151,6 +151,9 @@ func (c *NotifierKafka) flush() {
 
 		hasher.Reset()
 		_, err = hasher.Write(key)
+		if err != nil {
+			log.Fatal(4, "Unable to write key %s to hasher: %s", key, err)
+		}
 		partition := int32(hasher.Sum32()) % int32(len(c.consumer.Partitions))
 		if partition < 0 {
 			partition = -partition

scripts/build_deps.sh

@@ -11,6 +11,7 @@ cd $LIB_RDKAFKA_DIR
 ./configure --prefix=$TMP_DIR
 make
 make install
+make clean
 
 export PKG_CONFIG_PATH=$TMP_DIR/lib/pkgconfig
 
@@ -22,3 +23,10 @@ else
 fi
 
 cd $OLDPWD
+
+# cleanup
+rm \
+	vendor/github.com/edenhill/librdkafka/Makefile.config \
+	vendor/github.com/edenhill/librdkafka/config.cache \
+	vendor/github.com/edenhill/librdkafka/config.log \
+	vendor/github.com/edenhill/librdkafka/config.log.old

scripts/build_tools.sh

@@ -9,8 +9,8 @@ BUILDDIR=$(pwd)/build
 # Make dir
 mkdir -p $BUILDDIR
 
-# disable cgo
-export CGO_ENABLED=0
+# enable cgo
+export CGO_ENABLED=1
 
 function fail () {
 	echo "Aborting due to failure." >&2
@@ -24,10 +24,10 @@ for tool in *; do
   if [ "$1" == "-race" ]
   then
     set -x
-    CGO_ENABLED=1 go build -race -ldflags "-X main.gitHash=$GITVERSION" -o $BUILDDIR/$tool || fail
+    go build -tags static -race -ldflags "-X main.gitHash=$GITVERSION" -o $BUILDDIR/$tool || fail
   else
     set -x
-    CGO_ENABLED=1 go build -ldflags "-X main.gitHash=$GITVERSION" -o $BUILDDIR/$tool || fail
+    go build -tags static -ldflags "-X main.gitHash=$GITVERSION" -o $BUILDDIR/$tool || fail
   fi
   set +x
   cd ..