Use native Pub/Sub library primitives.

common/tsmon/iface.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package tsmon
 
 import (
         "fmt"
         "net/http"
         "net/url"
         "strings"
 
         "golang.org/x/net/context"
 
         "github.com/luci/luci-go/common/auth"
-        "github.com/luci/luci-go/common/gcloud/pubsub"
+        gcps "github.com/luci/luci-go/common/gcloud/pubsub"
         "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/tsmon/monitor"
         "github.com/luci/luci-go/common/tsmon/store"
         "github.com/luci/luci-go/common/tsmon/target"
         "github.com/luci/luci-go/common/tsmon/types"
 )
 
 // Store returns the global metric store that contains all the metric values for
 // this process.  Applications shouldn't need to access this directly - instead
 // use the metric objects which provide type-safe accessors.
@@ skipping 174 matching lines @@
 
         endpointURL, err := url.Parse(config.Endpoint)
         if err != nil {
                 return nil, err
         }
 
         switch endpointURL.Scheme {
         case "file":
                 return monitor.NewDebugMonitor(endpointURL.Path), nil
         case "pubsub":
-                client := clientFactory(config.Credentials)
-                return monitor.NewPubsubMonitor(client, endpointURL.Host, strings.TrimPrefix(endpointURL.Path, "/"))
+                client, err := clientFactory(c, config.Credentials)
+                if err != nil {
+                        return nil, err
+                }
+
+                return monitor.NewPubsubMonitor(c, client, gcps.NewTopic(endpointURL.Host, strings.TrimPrefix(endpointURL.Path, "/")))
         default:
                 return nil, fmt.Errorf("unknown tsmon endpoint url: %s", config.Endpoint)
         }
 }
 
 // makeClient returns http.Client that knows how to send authenticated requests
 // to PubSub API.
-func clientFactory(credentials string) monitor.ClientFactory {
-        return func(ctx context.Context) (*http.Client, error) {
-                authOpts := auth.Options{
-                        Context: ctx,
-                        Scopes:  pubsub.PublisherScopes,
-                }
-                if credentials == GCECredentials {
-                        authOpts.Method = auth.GCEMetadataMethod
-                } else {
-                        authOpts.Method = auth.ServiceAccountMethod
-                        authOpts.ServiceAccountJSONPath = credentials
-                }
-                return auth.NewAuthenticator(auth.SilentLogin, authOpts).Client()
+func clientFactory(ctx context.Context, credentials string) (*http.Client, error) {
+        authOpts := auth.Options{
+                Context: ctx,
+                Scopes:  gcps.PublisherScopes,
         }
+        if credentials == GCECredentials {
+                authOpts.Method = auth.GCEMetadataMethod
+        } else {
+                authOpts.Method = auth.ServiceAccountMethod
+                authOpts.ServiceAccountJSONPath = credentials
+        }
+        return auth.NewAuthenticator(auth.SilentLogin, authOpts).Client()
 }