Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-metrics-lttng into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Added LTTng support to UbuntuMetrics.

Added LTTng support to UbuntuMetrics.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/927/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4953/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/927/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/956/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4954/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/956/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1172/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4958/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1172/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1156/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4963/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1156/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/622/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1156
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1172
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/956
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/927
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4964/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4963
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4958
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4954
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4953

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/622/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

No complains :)

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1252/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5317/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1252/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1036/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5318/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1036/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1005/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5319/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1005/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2055
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1240/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5320/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1240/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-08-09 03:19:08 +0000
+++ debian/control	2016-08-09 03:19:09 +0000
@@ -226,6 +226,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~),
+             liblttng-ust0,
              ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'debian/libubuntumetrics5.install'
--- debian/libubuntumetrics5.install	2016-08-09 03:19:08 +0000
+++ debian/libubuntumetrics5.install	2016-08-09 03:19:09 +0000
@@ -1,1 +1,2 @@
 usr/lib/*/libUbuntuMetrics.so.*
+usr/lib/*/qt5/plugins/ubuntu/metrics/libumlttng.so

=== modified file 'src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro'
--- src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro	2016-08-09 03:19:08 +0000
+++ src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro	2016-08-09 03:19:09 +0000
@@ -2,12 +2,16 @@
 TARGET=UbuntuMetrics
 QT += core-private gui-private quick-private
 CONFIG += dll no_keywords c++11
+LIBS += -ldl
 
 contains(QT_CONFIG, opengles2) {
     CONFIG += egl
     DEFINES += MESA_EGL_NO_X11_HEADERS
 }
 
+DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/libumlttng.so\\\"
+DEFINES += LTTNG_PLUGIN_BUILD_PATH=\\\"$$OUT_PWD/lttng/libumlttng.so\\\"
+
 load(qt_build_config)
 load(ubuntu_qt_module)
 

=== modified file 'src/Ubuntu/UbuntuMetrics/logger.cpp'
--- src/Ubuntu/UbuntuMetrics/logger.cpp	2016-08-09 03:19:08 +0000
+++ src/Ubuntu/UbuntuMetrics/logger.cpp	2016-08-09 03:19:09 +0000
@@ -21,6 +21,12 @@
 #include <QtCore/QDir>
 #include <QtCore/QTime>
 
+// LTTng shared object runtime loading.
+#include <dlfcn.h>
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "lttng/lttng_p.h"
+
 UMFileLogger::UMFileLogger(const QString& fileName, bool parsable)
     : d_ptr(new UMFileLoggerPrivate(fileName, parsable))
 {
@@ -203,3 +209,84 @@
 {
     return !!(d_func()->m_flags & UMFileLoggerPrivate::Parsable);
 }
+
+UMLTTNGPlugin* UMLTTNGLogger::m_plugin = nullptr;
+bool UMLTTNGLogger::m_error = false;
+
+UMLTTNGLogger::UMLTTNGLogger()
+{
+    // The LTTng tracepoints are dlopen'd so that we don't directly link to
+    // liblttng-ust which spawns two threads when the lib is loaded. That allows
+    // to avoid the cost of it at startup when the user doesn't use LTTng (as
+    // well as not showing them in the metrics).
+
+    if (!m_error && !m_plugin) {
+        // Ensure the plugin is first loaded from the build path to ease
+        // development on the toolkit from uninstalled sources.
+        // FIXME(loicm) Security concerns?
+        void* handle = dlopen(LTTNG_PLUGIN_BUILD_PATH, RTLD_LAZY);
+        if (!handle) {
+            handle = dlopen(LTTNG_PLUGIN_INSTALL_PATH, RTLD_LAZY);
+            if (!handle) {
+                WARN("ApplicationMonitor: %s", dlerror());
+                m_error = true;
+                return;
+            }
+        }
+        m_plugin = static_cast<UMLTTNGPlugin*>(dlsym(handle, "umLttngPlugin"));
+        if (!m_plugin) {
+            WARN("ApplicationMonitor: %s", dlerror());
+            m_error = true;
+        }
+    }
+}
+
+void UMLTTNGLogger::log(const UMEvent& event)
+{
+    if (Q_LIKELY(m_plugin)) {
+        switch (event.type) {
+
+        case UMEvent::Process: {
+            UMLTTNGProcessEvent processEvent = {
+                .vszMemory = event.process.vszMemory,
+                .rssMemory = event.process.rssMemory,
+                .cpuUsage = event.process.cpuUsage,
+                .threadCount = event.process.threadCount
+            };
+            m_plugin->logProcessEvent(&processEvent);
+            break;
+        }
+
+        case UMEvent::Frame: {
+            UMLTTNGFrameEvent frameEvent = {
+                .window = event.frame.window,
+                .number = event.frame.number,
+                .deltaTime = event.frame.deltaTime * 0.000001f,
+                .syncTime = event.frame.syncTime * 0.000001f,
+                .renderTime = event.frame.renderTime * 0.000001f,
+                .gpuTime = event.frame.gpuTime * 0.000001f,
+                .swapTime = event.frame.swapTime * 0.000001f
+            };
+            m_plugin->logFrameEvent(&frameEvent);
+            break;
+        }
+
+        case UMEvent::Window: {
+            const char* stateString[] = { "Hidden", "Shown", "Resized" };
+            Q_STATIC_ASSERT(ARRAY_SIZE(stateString) == UMWindowEvent::StateCount);
+            UMLTTNGWindowEvent windowEvent = {
+                .state = stateString[event.window.state],
+                .id = event.window.id,
+                .width = event.window.width,
+                .height = event.window.height
+            };
+            m_plugin->logWindowEvent(&windowEvent);
+            break;
+        }
+
+        default:
+            DNOT_REACHED();
+            break;
+        }
+    }
+}

=== modified file 'src/Ubuntu/UbuntuMetrics/logger.h'
--- src/Ubuntu/UbuntuMetrics/logger.h	2016-08-09 03:19:08 +0000
+++ src/Ubuntu/UbuntuMetrics/logger.h	2016-08-09 03:19:09 +0000
@@ -23,6 +23,7 @@
 
 class UMEvent;
 class UMFileLoggerPrivate;
+struct UMLTTNGPlugin;
 
 // Log events to a specific device.
 class UBUNTU_METRICS_EXPORT UMLogger
@@ -56,4 +57,19 @@
     Q_DECLARE_PRIVATE(UMFileLogger);
 };
 
+// Log events to LTTng.
+class UBUNTU_METRICS_EXPORT UMLTTNGLogger : public UMLogger
+{
+public:
+    UMLTTNGLogger();
+    void log(const UMEvent& event) Q_DECL_OVERRIDE;
+    bool isOpen() Q_DECL_OVERRIDE { return true; }
+
+private:
+    static UMLTTNGPlugin* m_plugin;
+    static bool m_error;
+
+    void* __reserved;
+};
+
 #endif  // LOGGER_H

=== added directory 'src/Ubuntu/UbuntuMetrics/lttng'
=== added file 'src/Ubuntu/UbuntuMetrics/lttng/lttng.c'
--- src/Ubuntu/UbuntuMetrics/lttng/lttng.c	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/lttng.c	2016-08-09 03:19:09 +0000
@@ -0,0 +1,40 @@
+// Copyright © 2016 Canonical Ltd.
+// Authors: Loïc Molinari <[e-mail]>
+//          Albert Astals Cid <[e-mail]>
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software Foundation; version 3.
+//
+// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+// for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#include "tracepoints_p.h"
+
+static void logProcessEvent(UMLTTNGProcessEvent* event)
+{
+    tracepoint(UbuntuMetrics, process, event);
+}
+
+static void logFrameEvent(UMLTTNGFrameEvent* event)
+{
+    tracepoint(UbuntuMetrics, frame, event);
+}
+
+static void logWindowEvent(UMLTTNGWindowEvent* event)
+{
+    tracepoint(UbuntuMetrics, window, event);
+}
+
+const struct UMLTTNGPlugin umLttngPlugin = {
+    &logProcessEvent,
+    &logFrameEvent,
+    &logWindowEvent
+};

=== added file 'src/Ubuntu/UbuntuMetrics/lttng/lttng.pro'
--- src/Ubuntu/UbuntuMetrics/lttng/lttng.pro	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/lttng.pro	2016-08-09 03:19:09 +0000
@@ -0,0 +1,8 @@
+QT -= core gui
+TEMPLATE = lib
+TARGET = umlttng
+CONFIG += plugin
+LIBS += -llttng-ust
+SOURCES = tracepoints.c lttng.c
+target.path = $$[QT_INSTALL_PLUGINS]/ubuntu/metrics
+INSTALLS += target

=== added file 'src/Ubuntu/UbuntuMetrics/lttng/lttng_p.h'
--- src/Ubuntu/UbuntuMetrics/lttng/lttng_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/lttng_p.h	2016-08-09 03:19:09 +0000
@@ -0,0 +1,58 @@
+// Copyright © 2016 Canonical Ltd.
+// Authors: Loïc Molinari <[e-mail]>
+//          Albert Astals Cid <[e-mail]>
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software Foundation; version 3.
+//
+// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+// for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef LTTNG_P_H
+#define LTTNG_P_H
+
+#include <stdint.h>
+
+typedef struct _UMLTTNGProcessEvent UMLTTNGProcessEvent;
+typedef struct _UMLTTNGFrameEvent UMLTTNGFrameEvent;
+typedef struct _UMLTTNGWindowEvent UMLTTNGWindowEvent;
+
+struct UMLTTNGPlugin {
+    void (*logProcessEvent)(UMLTTNGProcessEvent*);
+    void (*logFrameEvent)(UMLTTNGFrameEvent*);
+    void (*logWindowEvent)(UMLTTNGWindowEvent*);
+};
+
+struct _UMLTTNGProcessEvent {
+    uint32_t vszMemory;
+    uint32_t rssMemory;
+    uint16_t cpuUsage;
+    uint16_t threadCount;
+};
+
+struct _UMLTTNGFrameEvent {
+    uint32_t window;
+    uint32_t number;
+    float deltaTime;
+    float syncTime;
+    float renderTime;
+    float gpuTime;
+    float swapTime;
+};
+
+struct _UMLTTNGWindowEvent {
+    const char* state;
+    uint32_t id;
+    uint16_t width;
+    uint16_t height;
+};
+
+#endif  // LTTNG_P_H

=== added file 'src/Ubuntu/UbuntuMetrics/lttng/tracepoints.c'
--- src/Ubuntu/UbuntuMetrics/lttng/tracepoints.c	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/tracepoints.c	2016-08-09 03:19:09 +0000
@@ -0,0 +1,21 @@
+// Copyright © 2016 Canonical Ltd.
+// Authors: Loïc Molinari <[e-mail]>
+//          Albert Astals Cid <[e-mail]>
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software Foundation; version 3.
+//
+// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+// for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#define TRACEPOINT_CREATE_PROBES
+#define TRACEPOINT_DEFINE
+#include "tracepoints_p.h"

=== added file 'src/Ubuntu/UbuntuMetrics/lttng/tracepoints_p.h'
--- src/Ubuntu/UbuntuMetrics/lttng/tracepoints_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/tracepoints_p.h	2016-08-09 03:19:09 +0000
@@ -0,0 +1,72 @@
+// Copyright © 2016 Canonical Ltd.
+// Authors: Loïc Molinari <[e-mail]>
+//          Albert Astals Cid <[e-mail]>
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software Foundation; version 3.
+//
+// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+// for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#include "lttng_p.h"
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER UbuntuMetrics
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./tracepoints_p.h"
+#if !defined(TRACEPOINTS_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define TRACEPOINTS_P_H
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(
+    UbuntuMetrics, process,
+    TP_ARGS(
+        UMLTTNGProcessEvent*, processEvent
+    ),
+    TP_FIELDS(
+        ctf_integer(uint16_t, cpu_usage, processEvent->cpuUsage)
+        ctf_integer(uint32_t, vsz_memory, processEvent->vszMemory)
+        ctf_integer(uint32_t, rss_memory, processEvent->rssMemory)
+        ctf_integer(uint16_t, thread_count, processEvent->threadCount)
+    )
+)
+
+TRACEPOINT_EVENT(
+    UbuntuMetrics, frame,
+    TP_ARGS(
+        UMLTTNGFrameEvent*, frameEvent
+    ),
+    TP_FIELDS(
+        ctf_integer(uint32_t, window, frameEvent->window)
+        ctf_integer(uint32_t, number, frameEvent->number)
+        ctf_float(float, delta_time, frameEvent->deltaTime)
+        ctf_float(float, sync_time, frameEvent->syncTime)
+        ctf_float(float, render_time, frameEvent->renderTime)
+        ctf_float(float, gpu_time, frameEvent->gpuTime)
+        ctf_float(float, swap_time, frameEvent->swapTime)
+    )
+)
+
+TRACEPOINT_EVENT(
+    UbuntuMetrics, window,
+    TP_ARGS(
+        UMLTTNGWindowEvent*, windowEvent
+    ),
+    TP_FIELDS(
+        ctf_integer(uint32_t, id, windowEvent->id)
+        ctf_string(state, windowEvent->state)
+        ctf_integer(uint16_t, width, windowEvent->width)
+        ctf_integer(uint16_t, height, windowEvent->height)
+    )
+)
+
+#endif  // TRACEPOINTS_P_H
+#include <lttng/tracepoint-event.h>

=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-08-09 03:19:08 +0000
+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-08-09 03:19:09 +0000
@@ -294,8 +294,14 @@
     }
     const QByteArray metricsLogging = qgetenv("UC_METRICS_LOGGING");
     if (!metricsLogging.isNull()) {
-        UMLogger* logger = (metricsLogging.isEmpty() || metricsLogging == "stdout")
-            ? new UMFileLogger(stdout) : new UMFileLogger(metricsLogging);
+        UMLogger* logger;
+        if (metricsLogging.isEmpty() || metricsLogging == "stdout") {
+            logger = new UMFileLogger(stdout);
+        } else if (metricsLogging == "lttng") {
+            logger = new UMLTTNGLogger();
+        } else {
+            logger = new UMFileLogger(metricsLogging);
+        }
         if (logger->isOpen()) {
             applicationMonitor->installLogger(logger);
             applicationMonitor->setLogging(true);

=== modified file 'src/src.pro'
--- src/src.pro	2016-08-09 03:19:08 +0000
+++ src/src.pro	2016-08-09 03:19:09 +0000
@@ -6,6 +6,9 @@
 src_metrics.subdir = Ubuntu/UbuntuMetrics
 src_metrics.target = sub-metrics
 
+src_metrics_lttng.subdir = Ubuntu/UbuntuMetrics/lttng
+src_metrics_lttng.target = sub-metrics-lttng
+
 src_toolkitlib.subdir = Ubuntu/UbuntuToolkit
 src_toolkitlib.target = sub-libtoolkit
 src_toolkitlib.depends = sub-gestures sub-metrics
@@ -27,6 +30,7 @@
 SUBDIRS += \
     src_gestures \
     src_metrics \
+    src_metrics_lttng \
     src_toolkitlib \
     src_components \
     src_layouts \

=== modified file 'ubuntu-ui-toolkit-launcher/launcher.cpp'
--- ubuntu-ui-toolkit-launcher/launcher.cpp	2016-08-09 03:19:08 +0000
+++ ubuntu-ui-toolkit-launcher/launcher.cpp	2016-08-09 03:19:09 +0000
@@ -76,7 +76,7 @@
     QCommandLineOption _desktop_file_hint("desktop_file_hint", "Desktop file - ignored", "desktop_file");
     QCommandLineOption _metricsOverlay("metrics-overlay", "Enable the metrics overlay");
     QCommandLineOption _metricsLogging(
-        "metrics-logging", "Enable metrics logging, <device> can be 'stdout' or a local or "
+        "metrics-logging", "Enable metrics logging, <device> can be 'stdout', 'lttng', a local or "
         "absolute filename", "device");
     QCommandLineOption _metricsLoggingFilter(
         "metrics-logging-filter", "Filter metrics logging, <filter> is a list of events separated "
@@ -233,9 +233,15 @@
         applicationMonitor->setLoggingFilter(filter);
     }
     if (args.isSet(_metricsLogging)) {
+        UMLogger* logger;
         QString device = args.value(_metricsLogging);
-        UMLogger* logger = (device.isEmpty() || device == "stdout")
-            ? new UMFileLogger(stdout) : new UMFileLogger(device);
+        if (device.isEmpty() || device == "stdout") {
+            logger = new UMFileLogger(stdout);
+        } else if (device == "lttng") {
+            logger = new UMLTTNGLogger();
+        } else {
+            logger = new UMFileLogger(device);
+        }
         if (logger->isOpen()) {
             applicationMonitor->installLogger(logger);
             applicationMonitor->setLogging(true);