Merge branch 'master' into discovery-endpoints-migration

Author: lesv

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

@@ -115,11 +115,13 @@ void createMetricDescriptor(String type) throws IOException {
    * @param name Name of metric descriptor to delete
    */
   void deleteMetricDescriptor(String name) throws IOException {
+    // [START monitoring_delete_metric]
     String projectId = System.getProperty("projectId");
     final MetricServiceClient client = MetricServiceClient.create();
     MetricDescriptorName metricName = MetricDescriptorName.create(projectId, name);
     client.deleteMetricDescriptor(metricName);
     System.out.println("Deleted descriptor " + name);
+    // [END monitoring_delete_metric]
   }
 
   /**
@@ -447,15 +449,15 @@ void listMonitoredResources() throws IOException {
     for (MonitoredResourceDescriptor d : descriptors) {
       System.out.println(d.getType());
     }
-    // [START monitoring_list_resources]
+    // [END monitoring_list_resources]
   }
 
   /**
    * Gets full information for a monitored resource.
    * @param The resource type
    */
   void describeMonitoredResources(String type) throws IOException {
-    // [START monitoring_list_resources]
+    // [START monitoring_get_descriptor]
     // Your Google Cloud Platform project ID
     String projectId = System.getProperty("projectId");
 
@@ -465,8 +467,7 @@ void describeMonitoredResources(String type) throws IOException {
 
     System.out.println("Printing monitored resource descriptor: ");
     System.out.println(response);
-
-    // [END monitoring_list_resources]
+    // [END monitoring_get_descriptor]
   }