updates metric samples to latest version of the client library (GoogleCloudPlatform#468)

Author: bshaffer

monitoring/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
-        "google/cloud-monitoring": "^0.4",
-        "symfony/console": "^3.3"
+        "symfony/console": "^3.3",
+        "google/cloud-monitoring": "^0.6.0"
     },
     "autoload": {
         "files": [

monitoring/composer.lock

@@ -37,7 +37,7 @@
 
 try {
     $client = new MetricServiceClient();
-    $formattedProjectName = MetricServiceClient::formatProjectName($projectId);
+    $formattedProjectName = $client->projectName($projectId);
     $labels = [
         'instance_id' => $instanceId,
         'zone' => $zone,

monitoring/quickstart.php

@@ -46,7 +46,7 @@ function create_metric($projectId)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
 
     $descriptor = new MetricDescriptor();
     $descriptor->setDescription('Daily sales records from all branch stores.');

monitoring/src/create_metric.php

@@ -42,7 +42,7 @@ function delete_metric($projectId, $metricId)
         'projectId' => $projectId,
     ]);
 
-    $metricPath = $metrics->formatMetricDescriptorName($projectId, $metricId);
+    $metricPath = $metrics->metricDescriptorName($projectId, $metricId);
     $ret = $metrics->deleteMetricDescriptor($metricPath);
 
     printf('Deleted a metric: ' . $metricPath . PHP_EOL);

monitoring/src/delete_metric.php

@@ -42,7 +42,7 @@ function get_descriptor($projectId, $metricId)
         'projectId' => $projectId,
     ]);
 
-    $metricName = $metrics->formatMetricDescriptorName($projectId, $metricId);
+    $metricName = $metrics->metricDescriptorName($projectId, $metricId);
     $descriptor = $metrics->getMetricDescriptor($metricName);
 
     printf('Name: ' . $descriptor->getDisplayName() . PHP_EOL);

monitoring/src/get_descriptor.php

@@ -41,7 +41,7 @@ function list_descriptors($projectId)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $descriptors = $metrics->listMetricDescriptors($projectName);
 
     printf('Metric Descriptors:' . PHP_EOL);

monitoring/src/list_descriptors.php

@@ -47,7 +47,7 @@ function read_timeseries_align($projectId, $minutesAgo = 20)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $filter = 'metric.type="compute.googleapis.com/instance/cpu/utilization"';
 
     $startTime = new Timestamp();

monitoring/src/read_timeseries_align.php

@@ -44,7 +44,7 @@ function read_timeseries_fields($projectId, $minutesAgo = 20)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $filter = 'metric.type="compute.googleapis.com/instance/cpu/utilization"';
 
     $startTime = new Timestamp();

monitoring/src/read_timeseries_fields.php

@@ -48,7 +48,7 @@ function read_timeseries_reduce($projectId, $minutesAgo = 20)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $filter = 'metric.type="compute.googleapis.com/instance/cpu/utilization"';
 
     $startTime = new Timestamp();

monitoring/src/read_timeseries_reduce.php

@@ -44,7 +44,7 @@ function read_timeseries_simple($projectId, $minutesAgo = 20)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $filter = 'metric.type="compute.googleapis.com/instance/cpu/utilization"';
 
     // Limit results to the last 20 minutes

monitoring/src/read_timeseries_simple.php

@@ -48,7 +48,7 @@ function write_timeseries($projectId)
         'projectId' => $projectId,
     ]);
 
-    $projectName = $metrics->formatProjectName($projectId);
+    $projectName = $metrics->projectName($projectId);
     $filter = 'metric.type="compute.googleapis.com/instance/cpu/utilization"';
 
     $endTime = new Timestamp();