Skip to content

Commit 559b4b6

Browse files
kurtisvgkurtisvg
committed
Rollback monitoring/cloud-client.
1 parent d66a59c commit 559b4b6

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

‎monitoring/cloud-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.google.cloud</groupId>
5757
<artifactId>google-cloud-monitoring</artifactId>
58-
<version>0.37.0-beta</version>
58+
<version>0.34.0-beta</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>com.google.guava</groupId>

‎monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.cloud.monitoring.v3.MetricServiceClient;
2525
import com.google.monitoring.v3.CreateTimeSeriesRequest;
2626
import com.google.monitoring.v3.Point;
27+
import com.google.monitoring.v3.ProjectName;
2728
import com.google.monitoring.v3.TimeInterval;
2829
import com.google.monitoring.v3.TimeSeries;
2930
import com.google.monitoring.v3.TypedValue;
@@ -64,6 +65,8 @@ public static void main(String... args) throws Exception {
6465
List<Point> pointList = new ArrayList<>();
6566
pointList.add(point);
6667

68+
ProjectName name = ProjectName.create(projectId);
69+
6770
// Prepares the metric descriptor
6871
Map<String, String> metricLabels = new HashMap<String, String>();
6972
metricLabels.put("store_id", "Pittsburg");
@@ -90,7 +93,7 @@ public static void main(String... args) throws Exception {
9093
timeSeriesList.add(timeSeries);
9194

9295
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
93-
.setName(projectId)
96+
.setNameWithProjectName(name)
9497
.addAllTimeSeries(timeSeriesList)
9598
.build();
9699

‎monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.api.MonitoredResource;
2222
import com.google.api.MonitoredResourceDescriptor;
2323
import com.google.cloud.monitoring.v3.MetricServiceClient;
24+
import com.google.cloud.monitoring.v3.PagedResponseWrappers;
2425
import com.google.monitoring.v3.Aggregation;
2526
import com.google.monitoring.v3.CreateMetricDescriptorRequest;
2627
import com.google.monitoring.v3.CreateTimeSeriesRequest;
@@ -30,6 +31,7 @@
3031
import com.google.monitoring.v3.MetricDescriptorName;
3132
import com.google.monitoring.v3.MonitoredResourceDescriptorName;
3233
import com.google.monitoring.v3.Point;
34+
import com.google.monitoring.v3.ProjectName;
3335
import com.google.monitoring.v3.TimeInterval;
3436
import com.google.monitoring.v3.TimeSeries;
3537
import com.google.monitoring.v3.TypedValue;
@@ -90,6 +92,7 @@ void createMetricDescriptor(String type) throws IOException {
9092
String metricType = CUSTOM_METRIC_DOMAIN + "/" + type;
9193

9294
final MetricServiceClient client = MetricServiceClient.create();
95+
ProjectName name = ProjectName.create(projectId);
9396

9497
MetricDescriptor descriptor = MetricDescriptor.newBuilder()
9598
.setType(metricType)
@@ -99,7 +102,7 @@ void createMetricDescriptor(String type) throws IOException {
99102
.build();
100103

101104
CreateMetricDescriptorRequest request = CreateMetricDescriptorRequest.newBuilder()
102-
.setName(projectId)
105+
.setNameWithProjectName(name)
103106
.setMetricDescriptor(descriptor)
104107
.build();
105108

@@ -116,7 +119,7 @@ void deleteMetricDescriptor(String name) throws IOException {
116119
// [START monitoring_delete_metric]
117120
String projectId = System.getProperty("projectId");
118121
final MetricServiceClient client = MetricServiceClient.create();
119-
MetricDescriptorName metricName = MetricDescriptorName.of(projectId, name);
122+
MetricDescriptorName metricName = MetricDescriptorName.create(projectId, name);
120123
client.deleteMetricDescriptor(metricName);
121124
System.out.println("Deleted descriptor " + name);
122125
// [END monitoring_delete_metric]
@@ -152,6 +155,8 @@ void writeTimeSeries() throws IOException {
152155
List<Point> pointList = new ArrayList<>();
153156
pointList.add(point);
154157

158+
ProjectName name = ProjectName.create(projectId);
159+
155160
// Prepares the metric descriptor
156161
Map<String, String> metricLabels = new HashMap<String, String>();
157162
Metric metric = Metric.newBuilder()
@@ -180,7 +185,7 @@ void writeTimeSeries() throws IOException {
180185
timeSeriesList.add(timeSeries);
181186

182187
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
183-
.setName(projectId)
188+
.setNameWithProjectName(name)
184189
.addAllTimeSeries(timeSeriesList)
185190
.build();
186191

@@ -198,6 +203,7 @@ void listTimeSeriesHeaders() throws IOException {
198203
// [START monitoring_read_timeseries_fields]
199204
MetricServiceClient metricServiceClient = MetricServiceClient.create();
200205
String projectId = System.getProperty("projectId");
206+
ProjectName name = ProjectName.create(projectId);
201207

202208
// Restrict time to last 20 minutes
203209
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -207,14 +213,14 @@ void listTimeSeriesHeaders() throws IOException {
207213
.build();
208214

209215
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
210-
.setName(projectId)
216+
.setNameWithProjectName(name)
211217
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
212218
.setInterval(interval)
213219
.setView(ListTimeSeriesRequest.TimeSeriesView.HEADERS);
214220

215221
ListTimeSeriesRequest request = requestBuilder.build();
216222

217-
MetricServiceClient.ListTimeSeriesPagedResponse response = metricServiceClient
223+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
218224
.listTimeSeries(request);
219225

220226
System.out.println("Got timeseries headers: ");
@@ -231,6 +237,7 @@ void listTimeSeries(String filter) throws IOException {
231237
// [START monitoring_read_timeseries_simple]
232238
MetricServiceClient metricServiceClient = MetricServiceClient.create();
233239
String projectId = System.getProperty("projectId");
240+
ProjectName name = ProjectName.create(projectId);
234241

235242
// Restrict time to last 20 minutes
236243
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -240,13 +247,13 @@ void listTimeSeries(String filter) throws IOException {
240247
.build();
241248

242249
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
243-
.setName(projectId)
250+
.setNameWithProjectName(name)
244251
.setFilter(filter)
245252
.setInterval(interval);
246253

247254
ListTimeSeriesRequest request = requestBuilder.build();
248255

249-
MetricServiceClient.ListTimeSeriesPagedResponse response = metricServiceClient
256+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
250257
.listTimeSeries(request);
251258

252259
System.out.println("Got timeseries: ");
@@ -263,6 +270,7 @@ void listTimeSeriesAggregrate() throws IOException {
263270
// [START monitoring_read_timeseries_align]
264271
MetricServiceClient metricServiceClient = MetricServiceClient.create();
265272
String projectId = System.getProperty("projectId");
273+
ProjectName name = ProjectName.create(projectId);
266274

267275
// Restrict time to last 20 minutes
268276
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -277,14 +285,14 @@ void listTimeSeriesAggregrate() throws IOException {
277285
.build();
278286

279287
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
280-
.setName(projectId)
288+
.setNameWithProjectName(name)
281289
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
282290
.setInterval(interval)
283291
.setAggregation(aggregation);
284292

285293
ListTimeSeriesRequest request = requestBuilder.build();
286294

287-
MetricServiceClient.ListTimeSeriesPagedResponse response = metricServiceClient
295+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
288296
.listTimeSeries(request);
289297

290298
System.out.println("Got timeseries: ");
@@ -301,6 +309,7 @@ void listTimeSeriesReduce() throws IOException {
301309
// [START monitoring_read_timeseries_reduce]
302310
MetricServiceClient metricServiceClient = MetricServiceClient.create();
303311
String projectId = System.getProperty("projectId");
312+
ProjectName name = ProjectName.create(projectId);
304313

305314
// Restrict time to last 20 minutes
306315
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -316,14 +325,14 @@ void listTimeSeriesReduce() throws IOException {
316325
.build();
317326

318327
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
319-
.setName(projectId)
328+
.setNameWithProjectName(name)
320329
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
321330
.setInterval(interval)
322331
.setAggregation(aggregation);
323332

324333
ListTimeSeriesRequest request = requestBuilder.build();
325334

326-
MetricServiceClient.ListTimeSeriesPagedResponse response = metricServiceClient
335+
PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
327336
.listTimeSeries(request);
328337

329338
System.out.println("Got timeseries: ");
@@ -342,12 +351,13 @@ void listMetricDescriptors() throws IOException {
342351
String projectId = System.getProperty("projectId");
343352

344353
final MetricServiceClient client = MetricServiceClient.create();
354+
ProjectName name = ProjectName.create(projectId);
345355

346356
ListMetricDescriptorsRequest request = ListMetricDescriptorsRequest
347357
.newBuilder()
348-
.setName(projectId)
358+
.setNameWithProjectName(name)
349359
.build();
350-
MetricServiceClient.ListMetricDescriptorsPagedResponse response =
360+
PagedResponseWrappers.ListMetricDescriptorsPagedResponse response =
351361
client.listMetricDescriptors(request);
352362

353363
System.out.println("Listing descriptors: ");
@@ -367,15 +377,16 @@ void listMonitoredResources() throws IOException {
367377
String projectId = System.getProperty("projectId");
368378

369379
final MetricServiceClient client = MetricServiceClient.create();
380+
ProjectName name = ProjectName.create(projectId);
370381

371382
ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest
372383
.newBuilder()
373-
.setName(projectId)
384+
.setNameWithProjectName(name)
374385
.build();
375386

376387
System.out.println("Listing monitored resource descriptors: ");
377388

378-
MetricServiceClient.ListMonitoredResourceDescriptorsPagedResponse response = client
389+
PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse response = client
379390
.listMonitoredResourceDescriptors(request);
380391

381392
for (MonitoredResourceDescriptor d : response.iterateAll()) {
@@ -395,7 +406,7 @@ void describeMonitoredResources(String type) throws IOException {
395406
String projectId = System.getProperty("projectId");
396407

397408
final MetricServiceClient client = MetricServiceClient.create();
398-
MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.of(projectId, type);
409+
MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.create(projectId, type);
399410
MonitoredResourceDescriptor response = client.getMonitoredResourceDescriptor(name);
400411

401412
System.out.println("Printing monitored resource descriptor: ");

0 commit comments

Comments
 (0)