commit f84a1e557f47ade6a40343fb4fd5a356d6afb249
author Eric Boren <borenet@google.com> Thu Dec 20 14:39:46 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 20 19:53:01 2018 +0000
tree 1c07447f10070f6618b3e7faafd22e5b14e26333
parent ae922f6c7b647b2c8ac9672583a90382eed87c10

Fix datahopper

Bug: skia:
Change-Id: I06abd3563d33f4d7b8e93435126db8cb5fae00e5
Reviewed-on: https://skia-review.googlesource.com/c/179625
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

datahopper/go/datahopper/main.go

diff --git a/datahopper/go/datahopper/main.go b/datahopper/go/datahopper/main.go
index cc3f320..d743feb 100644
--- a/datahopper/go/datahopper/main.go
+++ b/datahopper/go/datahopper/main.go
@@ -164,7 +164,7 @@
 	}()
 
 	// Tasks metrics.
-	newTs, err := auth.NewDefaultTokenSource(*local, pubsub.AUTH_SCOPE, bigtable.Scope)
+	newTs, err := auth.NewDefaultTokenSource(*local, auth.SCOPE_USERINFO_EMAIL, pubsub.AUTH_SCOPE, bigtable.Scope)
 	if err != nil {
 		sklog.Fatal(err)
 	}

datahopper/sys/datahopperd.service

diff --git a/datahopper/sys/datahopperd.service b/datahopper/sys/datahopperd.service
index e2cdb3f..72a87d6 100644
--- a/datahopper/sys/datahopperd.service
+++ b/datahopper/sys/datahopperd.service
@@ -8,6 +8,7 @@
     --logtostderr \
     --bigtable_project=skia-public \
     --bigtable_instance=production \
+    --pubsub_topic_set=prod \
     --workdir=/mnt/pd0/datahopper_workdir \
 Restart=always
 User=default

task_scheduler/go/task_scheduler/main.go

diff --git a/task_scheduler/go/task_scheduler/main.go b/task_scheduler/go/task_scheduler/main.go
index fd012b1..f5617ea 100644
--- a/task_scheduler/go/task_scheduler/main.go
+++ b/task_scheduler/go/task_scheduler/main.go
@@ -59,6 +59,7 @@
 var (
 	// "Constants"
 	VALID_DB_EMAILS = []string{
+		"datahopper@skia-buildbots.google.com.iam.gserviceaccount.com",
 		"skia-status@skia-public.iam.gserviceaccount.com",
 		"skia-status-internal@skia-public.iam.gserviceaccount.com",
 	}