Fixed "ID" lint warnings. (#210)

Author: jkohen

cmd/stackdriver-prometheus-sidecar/main.go

@@ -205,7 +205,7 @@ func main() {
 
 	a.Flag("config-file", "A configuration file.").StringVar(&cfg.ConfigFilename)
 
-	projectId := a.Flag("stackdriver.project-id", "The Google project ID where Stackdriver will store the metrics.").
+	projectID := a.Flag("stackdriver.project-id", "The Google project ID where Stackdriver will store the metrics.").
 		Required().
 		String()
 
@@ -312,8 +312,8 @@ func main() {
 
 	httpClient := &http.Client{Transport: &ochttp.Transport{}}
 
-	if *projectId == "" {
-		*projectId = getGCEProjectID()
+	if *projectID == "" {
+		*projectID = getGCEProjectID()
 	}
 
 	for _, backend := range cfg.MonitoringBackends {
@@ -330,7 +330,7 @@ func main() {
 		case "stackdriver":
 			const reportingInterval = 60 * time.Second
 			sd, err := oc_stackdriver.NewExporter(oc_stackdriver.Options{
-				ProjectID: *projectId,
+				ProjectID: *projectID,
 				// If the OpenCensus resource environment variables aren't set, the monitored resource will likely fall back to `generic_task`.
 				ResourceDetector:  resource.FromEnv,
 				ReportingInterval: reportingInterval,
@@ -359,7 +359,7 @@ func main() {
 	}
 
 	var staticLabels = map[string]string{
-		retrieval.ProjectIDLabel:             *projectId,
+		retrieval.ProjectIDLabel:             *projectID,
 		retrieval.KubernetesLocationLabel:    cfg.KubernetesLabels.Location,
 		retrieval.KubernetesClusterNameLabel: cfg.KubernetesLabels.ClusterName,
 		retrieval.GenericLocationLabel:       cfg.GenericLabels.Location,
@@ -378,7 +378,7 @@ func main() {
 		os.Exit(2)
 	}
 
-	cfg.ProjectIDResource = fmt.Sprintf("projects/%v", *projectId)
+	cfg.ProjectIDResource = fmt.Sprintf("projects/%v", *projectID)
 	if cfg.UseRestrictedIPs {
 		// manual.GenerateAndRegisterManualResolver generates a Resolver and a random scheme.
 		// It also registers the resolver. rb.InitialAddrs adds the addresses we are using
@@ -440,7 +440,7 @@ func main() {
 	} else {
 		scf = &stackdriverClientFactory{
 			logger:            log.With(logger, "component", "storage"),
-			projectIdResource: cfg.ProjectIDResource,
+			projectIDResource: cfg.ProjectIDResource,
 			url:               cfg.StackdriverAddress,
 			timeout:           10 * time.Second,
 			manualResolver:    cfg.manualResolver,
@@ -500,7 +500,7 @@ func main() {
 	if cfg.EnableStatusz {
 		http.Handle("/statusz", &statuszHandler{
 			logger:    logger,
-			projectId: *projectId,
+			projectID: *projectID,
 			cfg:       &cfg,
 		})
 	}
@@ -619,7 +619,7 @@ func main() {
 
 type stackdriverClientFactory struct {
 	logger            log.Logger
-	projectIdResource string
+	projectIDResource string
 	url               *url.URL
 	timeout           time.Duration
 	manualResolver    *manual.Resolver
@@ -628,7 +628,7 @@ type stackdriverClientFactory struct {
 func (s *stackdriverClientFactory) New() stackdriver.StorageClient {
 	return stackdriver.NewClient(&stackdriver.ClientConfig{
 		Logger:    s.logger,
-		ProjectId: s.projectIdResource,
+		ProjectID: s.projectIDResource,
 		URL:       s.url,
 		Timeout:   s.timeout,
 		Resolver:  s.manualResolver,
@@ -659,7 +659,7 @@ func (fcf *fileClientFactory) New() stackdriver.StorageClient {
 	return stackdriver.NewCreateTimeSeriesRequestWriterCloser(f, fcf.logger)
 }
 
-func (f *fileClientFactory) Name() string {
+func (fcf *fileClientFactory) Name() string {
 	return "fileClientFactory"
 }
 

cmd/stackdriver-prometheus-sidecar/statusz-tmpl.html

@@ -43,11 +43,11 @@ <h1>Status for {{.ServerName}}</h1>
         Build context: {{.BuildContext}}<br>
         Host details: {{.Uname}}<br>
         FD limits: {{.FdLimits}}<br>
-        {{if (and .GKEInfo.ProjectId .GKEInfo.ClusterLocation .GKEInfo.ClusterName .PodName .NodeName .NamespaceName)}}
+        {{if (and .GKEInfo.ProjectID .GKEInfo.ClusterLocation .GKEInfo.ClusterName .PodName .NodeName .NamespaceName)}}
         <p>
-          Pod <a href="https://console.cloud.google.com/kubernetes/pod/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}/{{if .NamespaceName}}{{.NamespaceName}}{{else}}default{{end}}/{{.PodName}}?project={{.GKEInfo.ProjectId}}">{{.PodName}}</a><br>
-          Node <a href="https://console.cloud.google.com/kubernetes/node/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}/{{.NodeName}}?project={{.GKEInfo.ProjectId}}">{{.NodeName}}</a><br>
-          Cluster <a href="https://console.cloud.google.com/kubernetes/clusters/details/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}?project={{.GKEInfo.ProjectId}}">{{.GKEInfo.ClusterName}}</a>
+          Pod <a href="https://console.cloud.google.com/kubernetes/pod/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}/{{if .NamespaceName}}{{.NamespaceName}}{{else}}default{{end}}/{{.PodName}}?project={{.GKEInfo.ProjectID}}">{{.PodName}}</a><br>
+          Node <a href="https://console.cloud.google.com/kubernetes/node/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}/{{.NodeName}}?project={{.GKEInfo.ProjectID}}">{{.NodeName}}</a><br>
+          Cluster <a href="https://console.cloud.google.com/kubernetes/clusters/details/{{.GKEInfo.ClusterLocation}}/{{.GKEInfo.ClusterName}}?project={{.GKEInfo.ProjectID}}">{{.GKEInfo.ClusterName}}</a>
         </p>
         {{end}}
       </div>

cmd/stackdriver-prometheus-sidecar/statusz.go

@@ -32,7 +32,7 @@ var (
 
 type statuszHandler struct {
 	logger    log.Logger
-	projectId string
+	projectID string
 	cfg       *mainConfig
 }
 
@@ -49,7 +49,7 @@ func (h *statuszHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		NodeName      string
 		NamespaceName string
 		GKEInfo       struct {
-			ProjectId       string
+			ProjectID       string
 			ClusterLocation string
 			ClusterName     string
 		}
@@ -74,7 +74,7 @@ func (h *statuszHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	data.NodeName = os.Getenv("NODE_NAME")
 	data.NamespaceName = os.Getenv("NAMESPACE_NAME")
 
-	data.GKEInfo.ProjectId = h.projectId
+	data.GKEInfo.ProjectID = h.projectID
 	data.GKEInfo.ClusterLocation = h.cfg.KubernetesLabels.Location
 	data.GKEInfo.ClusterName = h.cfg.KubernetesLabels.ClusterName
 

cmd/stackdriver-prometheus-sidecar/statusz_test.go

@@ -64,7 +64,7 @@ func TestStatuszHandler(t *testing.T) {
 
 	handler := &statuszHandler{
 		logger:    log.NewLogfmtLogger(os.Stdout),
-		projectId: "my-project",
+		projectID: "my-project",
 		cfg: &mainConfig{
 			Aggregations: retrieval.CounterAggregatorConfig{
 				"aggmetric1": {Matchers: [][]*labels.Matcher{{matcher}}},

retrieval/series_cache_test.go

@@ -209,8 +209,8 @@ func TestSeriesCache_Refresh(t *testing.T) {
 	defer cancel()
 
 	// Query unset reference.
-	const refId = 1
-	entry, ok, err := c.get(ctx, refId)
+	const refID = 1
+	entry, ok, err := c.get(ctx, refID)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -219,14 +219,14 @@ func TestSeriesCache_Refresh(t *testing.T) {
 	}
 
 	// Set a series but the metadata and target getters won't have sufficient information for it.
-	if err := c.set(ctx, refId, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
+	if err := c.set(ctx, refID, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	if !strings.Contains(logBuffer.String(), "target not found") {
 		t.Errorf("expected error \"target not found\", got: %v", logBuffer)
 	}
 	// We should still not receive anything.
-	entry, ok, err = c.get(ctx, refId)
+	entry, ok, err = c.get(ctx, refID)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -243,10 +243,10 @@ func TestSeriesCache_Refresh(t *testing.T) {
 
 	// Hack the timestamp of the last update to be sufficiently in the past that a refresh
 	// will be triggered.
-	c.entries[refId].lastRefresh = time.Now().Add(-2 * refreshInterval)
+	c.entries[refID].lastRefresh = time.Now().Add(-2 * refreshInterval)
 
 	// Now another get should trigger a refresh, which now finds data.
-	entry, ok, err = c.get(ctx, refId)
+	entry, ok, err = c.get(ctx, refID)
 	if entry == nil || !ok || err != nil {
 		t.Errorf("expected metadata but got none, error: %s", err)
 	}
@@ -284,21 +284,21 @@ func TestSeriesCache_RefreshTooManyLabels(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	const refId = 1
+	const refID = 1
 	lset := labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1")
 	for i := 0; i <= maxLabelCount; i++ {
 		lset = append(lset, labels.Label{fmt.Sprintf("label%d", i), "x"})
 	}
 	// Set will trigger a refresh.
-	if err := c.set(ctx, refId, lset, 5); err != nil {
+	if err := c.set(ctx, refID, lset, 5); err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	if !strings.Contains(logBuffer.String(), "too many labels") {
 		t.Errorf("expected error \"too many labels\", got: %v", logBuffer)
 	}
 
 	// Get shouldn't find data because of the previous error.
-	entry, ok, err := c.get(ctx, refId)
+	entry, ok, err := c.get(ctx, refID)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -336,17 +336,17 @@ func TestSeriesCache_RefreshUnknownResource(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	const refId = 1
+	const refID = 1
 	// Set will trigger a refresh.
-	if err := c.set(ctx, refId, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
+	if err := c.set(ctx, refID, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	if !strings.Contains(logBuffer.String(), "unknown resource") {
 		t.Errorf("expected error \"unknown resource\", got: %v", logBuffer)
 	}
 
 	// Get shouldn't find data because of the previous error.
-	entry, ok, err := c.get(ctx, refId)
+	entry, ok, err := c.get(ctx, refID)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -382,17 +382,17 @@ func TestSeriesCache_RefreshMetadataNotFound(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	const refId = 1
+	const refID = 1
 	// Set will trigger a refresh.
-	if err := c.set(ctx, refId, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
+	if err := c.set(ctx, refID, labels.FromStrings("__name__", "metric1", "job", "job1", "instance", "inst1"), 5); err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	if !strings.Contains(logBuffer.String(), "metadata not found") {
 		t.Errorf("expected error \"metadata not found\", got: %v", logBuffer)
 	}
 
 	// Get shouldn't find data because of the previous error.
-	entry, ok, err := c.get(ctx, refId)
+	entry, ok, err := c.get(ctx, refID)
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}

stackdriver/client.go

@@ -72,7 +72,7 @@ func init() {
 // number of these clients.
 type Client struct {
 	logger    log.Logger
-	projectId string
+	projectID string
 	url       *url.URL
 	timeout   time.Duration
 	resolver  *manual.Resolver
@@ -83,7 +83,7 @@ type Client struct {
 // ClientConfig configures a Client.
 type ClientConfig struct {
 	Logger    log.Logger
-	ProjectId string // The Stackdriver project id in "projects/name-or-number" format.
+	ProjectID string // The Stackdriver project ID in "projects/name-or-number" format.
 	URL       *url.URL
 	Timeout   time.Duration
 	Resolver  *manual.Resolver
@@ -97,7 +97,7 @@ func NewClient(conf *ClientConfig) *Client {
 	}
 	return &Client{
 		logger:    logger,
-		projectId: conf.ProjectId,
+		projectID: conf.ProjectID,
 		url:       conf.URL,
 		timeout:   conf.Timeout,
 		resolver:  conf.Resolver,
@@ -189,7 +189,7 @@ func (c *Client) Store(req *monitoring.CreateTimeSeriesRequest) error {
 		go func(begin int, end int) {
 			defer wg.Done()
 			req_copy := &monitoring.CreateTimeSeriesRequest{
-				Name:       c.projectId,
+				Name:       c.projectID,
 				TimeSeries: req.TimeSeries[begin:end],
 			}
 			_, err := service.CreateTimeSeries(ctx, req_copy)