From 9b4ef23d92e919fd628c77215a9540b36ce02122 Mon Sep 17 00:00:00 2001 From: shikhman Date: Tue, 16 Aug 2016 12:24:19 -0700 Subject: [PATCH] Change project to projectResource to better match Stackdriver sample code ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=130432024 --- .../monitoring/metrics/StackdriverWriter.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/java/google/registry/monitoring/metrics/StackdriverWriter.java b/java/google/registry/monitoring/metrics/StackdriverWriter.java index 5f0c7a86c..f1e60b90e 100644 --- a/java/google/registry/monitoring/metrics/StackdriverWriter.java +++ b/java/google/registry/monitoring/metrics/StackdriverWriter.java @@ -109,7 +109,7 @@ public class StackdriverWriter implements MetricWriter { */ private final HashMap, MetricDescriptor> registeredDescriptors = new HashMap<>(); - private final String project; + private final String projectResource; private final Monitoring monitoringClient; private final int maxPointsPerRequest; private final RateLimiter rateLimiter; @@ -128,7 +128,7 @@ public class StackdriverWriter implements MetricWriter { @Named("stackdriverMaxQps") int maxQps, @Named("stackdriverMaxPointsPerRequest") int maxPointsPerRequest) { this.monitoringClient = checkNotNull(monitoringClient); - this.project = "projects/" + checkNotNull(project); + this.projectResource = "projects/" + checkNotNull(project); this.monitoredResource = monitoredResource; this.maxPointsPerRequest = maxPointsPerRequest; this.timeSeriesBuffer = new ArrayDeque<>(maxPointsPerRequest); @@ -244,7 +244,7 @@ public class StackdriverWriter implements MetricWriter { CreateTimeSeriesRequest request = new CreateTimeSeriesRequest().setTimeSeries(timeSeriesList); rateLimiter.acquire(); - monitoringClient.projects().timeSeries().create(project, request).execute(); + monitoringClient.projects().timeSeries().create(projectResource, request).execute(); for (TimeSeries timeSeries : timeSeriesList) { pushedPoints.incrementBy(1, timeSeries.getMetricKind(), timeSeries.getValueType()); @@ -270,7 +270,11 @@ public class StackdriverWriter implements MetricWriter { try { rateLimiter.acquire(); descriptor = - monitoringClient.projects().metricDescriptors().create(project, descriptor).execute(); + monitoringClient + .projects() + .metricDescriptors() + .create(projectResource, descriptor) + .execute(); } catch (IOException e) { throw new RuntimeException("Error creating a MetricDescriptor"); }