add controller debug

Author: Brendan Doyle

ansible/roles/controller/tasks/deploy.yml

@@ -443,18 +443,27 @@
       >> /logs/{{ controller_name }}_logs.log 2>&1"
 
 - name: wait until the Controller in this host is up and running
-  uri:
-    url:
-      "{{controller.protocol}}://{{ansible_host}}:{{controller_port}}/ping"
-    validate_certs: "no"
-    client_key:
-      "{{ controller.confdir }}/{{ controller_name }}/{{ controller.ssl.key }}"
-    client_cert:
-      "{{ controller.confdir }}/{{ controller_name }}/{{ controller.ssl.cert }}"
-  register: result
-  until: result.status == 200
-  retries: 12
-  delay: 10
+  block:
+    - uri:
+        url: "{{ controller.protocol }}://{{ ansible_host }}:{{ controller_port }}/ping"
+        validate_certs: no
+        client_key: "{{ controller.confdir }}/{{ controller_name }}/{{ controller.ssl.key }}"
+        client_cert: "{{ controller.confdir }}/{{ controller_name }}/{{ controller.ssl.cert }}"
+      register: result
+      until: result.status == 200
+      retries: 12
+      delay: 10
+      failed_when: result.status is defined and result.status not in [200]
+  rescue:
+    - name: dump controller docker logs
+      shell: "docker logs {{ controller_name }}"
+      register: controller_logs
+      failed_when: false
+    - name: output controller logs for debugging
+      debug:
+        var: controller_logs.stdout_lines
+    - fail:
+        msg: "Controller failed to start; logs emitted above"
 
 - name: warm up activation path
   uri:

common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KamonMetricsReporter.scala

@@ -122,7 +122,6 @@ object KamonMetricsReporter {
   }
 
   def isCounterMetric(metric: KafkaMetric): Boolean = Try(metric.measurable()) match {
-    case Success(_: CumulativeSum)                         => true
     case Success(_: CumulativeCount)                       => true
     case Success(m) if m.getClass.getSimpleName == "Total" => true
     case Success(m) if m.getClass.getSimpleName == "WindowedSum" && metric.metricName().name().endsWith("-total") =>