Merge lp:~raof/mir/platform-probe-logging into lp:mir

[Chris Halse Rogers]

Add reporting for the graphics platform probe

Report (not log! ☺) the platform probing process

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1847
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2679/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1698/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1677/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1201/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/614/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2679/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

Nits:

35 +public:
36 + PlatformProbeReport() = default;
37 + virtual ~PlatformProbeReport() = default;
38 +
39 + PlatformProbeReport(PlatformProbeReport const&) = delete;
40 + PlatformProbeReport& operator=(PlatformProbeReport const&) = delete;

For abstract base classes, we usually make the constructor and and deleted CopyAssign ops protected (not that it matters functionally).

371 +
452 +
530 +
531 +

Unnecessary blank lines.

review: Approve

[lp:~raof/mir/platform-probe-logging]

1848. By Chris Halse Rogers on 2014-09-11

Merged private-library-loading into server-probe-logging.

1849. By Chris Halse Rogers on 2014-09-11

Merged private-library-loading into server-probe-logging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1849
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/650/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2704/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looks okay to me. (Although I'm not sure what to do about the ABI numbers. Seems we are changing the binary compatibility of the server library by changing DefaultServerConfiguration though)

review: Approve

[Daniel van Vugt (vanvugt)]

I think reporting and logging both have their place. Although I would have said this is a job for logging instead. But my opinion aside...

(1) The server ABI has been broken and needs bumping, due to: include/server/mir/default_server_configuration.h
Although you will likely run into the roadblock of bug 1293944 then. So we need at least one fix for bug 1293944 to land first.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I've now proposed the ABI bump as a separate branch, since this time round it's particularly troublesome.

review: Abstain

[Alan Griffiths (alan-griffiths)]

24 conflicts encountered.

review: Needs Fixing

[Robert Carr (robertcarr)]

I am inclined to agree with Daniel that this is really a case for logging. These aren't really interesting as instrumentation points and only as a historical record.

Unmerged revisions

1849. By Chris Halse Rogers on 2014-09-11

Merged private-library-loading into server-probe-logging.

1848. By Chris Halse Rogers on 2014-09-11

Merged private-library-loading into server-probe-logging.

1847. By Chris Halse Rogers on 2014-09-10

Remerge prereq

1846. By Chris Halse Rogers on 2014-09-05

Merged private-library-loading into server-probe-logging.

1845. By Chris Halse Rogers on 2014-09-04

Ooops. Actually implement the PlatformProbeReport

1844. By Chris Halse Rogers on 2014-09-04

Log when server platforms fail to probe

1843. By Chris Halse Rogers on 2014-09-04

Merge prereq

1842. By Chris Halse Rogers on 2014-09-04

Merged private-library-loading into server-probe-logging.

1841. By Chris Halse Rogers on 2014-09-03

Trivial style cleanup

1840. By Chris Halse Rogers on 2014-09-03

Update platform and server SHA1sums

=== added file 'include/platform/mir/graphics/platform_probe_report.h'
--- include/platform/mir/graphics/platform_probe_report.h	1970-01-01 00:00:00 +0000
+++ include/platform/mir/graphics/platform_probe_report.h	2014-09-11 23:16:08 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_PLATFORM_PROBE_REPORT_H_
+#define MIR_GRAPHICS_PLATFORM_PROBE_REPORT_H_
+
+#include "mir/graphics/platform.h"
+
+namespace mir
+{
+namespace graphics
+{
+
+class PlatformProbeReport
+{
+public:
+    PlatformProbeReport() = default;
+    virtual ~PlatformProbeReport() = default;
+
+    PlatformProbeReport(PlatformProbeReport const&) = delete;
+    PlatformProbeReport& operator=(PlatformProbeReport const&) = delete;
+
+    virtual void module_probed(ModuleProperties const& module, PlatformPriority probe_value) = 0;
+    virtual void invalid_module_probed(std::exception const& error) = 0;
+    virtual void module_selected(ModuleProperties const& module) =  0;
+};
+}
+}
+
+#endif // MIR_GRAPHICS_PLATFORM_PROBE_REPORT_H_
 
=== modified file 'include/platform/mir/options/configuration.h'
--- include/platform/mir/options/configuration.h	2014-09-11 23:16:06 +0000
+++ include/platform/mir/options/configuration.h	2014-09-11 23:16:08 +0000
@@ -43,6 +43,7 @@
 extern char const* const host_socket_opt;
 extern char const* const frontend_threads_opt;
 extern char const* const fatal_abort_opt;
+extern char const* const platform_probe_report_opt;
 
 extern char const* const name_opt;
 extern char const* const offscreen_opt;
 
=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2014-09-11 23:16:06 +0000
+++ include/server/mir/default_server_configuration.h	2014-09-11 23:16:08 +0000
@@ -110,6 +110,7 @@
 class CursorImage;
 class GLConfig;
 class GLProgramFactory;
+class PlatformProbeReport;
 namespace nested { class HostConnection; }
 }
 namespace input
@@ -309,6 +310,7 @@
     virtual std::shared_ptr<time::Clock> the_clock();
     virtual std::shared_ptr<ServerActionQueue> the_server_action_queue();
     virtual std::shared_ptr<SharedLibraryProberReport> the_shared_library_prober_report();
+    virtual std::shared_ptr<graphics::PlatformProbeReport> the_platform_probe_report();
 
 protected:
     std::shared_ptr<options::Option> the_options() const;
@@ -410,6 +412,7 @@
     CachedPtr<EmergencyCleanup> emergency_cleanup;
     CachedPtr<shell::HostLifecycleEventListener> host_lifecycle_event_listener;
     CachedPtr<SharedLibraryProberReport> shared_library_prober_report;
+    CachedPtr<graphics::PlatformProbeReport> platform_probe_report;
 
 private:
     std::shared_ptr<options::Configuration> const configuration_options;
 
=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums	2014-09-11 23:16:06 +0000
+++ platform-ABI-sha1sums	2014-09-11 23:16:08 +0000
@@ -25,8 +25,9 @@
 815405c5aee8000bc18c1c9480bac620a451b416  include/platform/mir/graphics/event_handler_register.h
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
+3f38702323495a5f649155a967b7b88c3f5b356a  include/platform/mir/graphics/platform_probe_report.h
 15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-df61c1168b1798c628d087fc17900d58d608a6fa  include/platform/mir/options/configuration.h
+dfadb98ded10296a5fc900c97c29ba4e07427868  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
 
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2014-09-11 23:16:06 +0000
+++ server-ABI-sha1sums	2014-09-11 23:16:08 +0000
@@ -25,13 +25,14 @@
 815405c5aee8000bc18c1c9480bac620a451b416  include/platform/mir/graphics/event_handler_register.h
 5dc095474ef3e294c0aa4008e9ed997bdb21d34c  include/platform/mir/graphics/gl_config.h
 d0442a5d5d88a4be6e3e1f99e433c1c43a86bfce  include/platform/mir/graphics/gl_context.h
+3f38702323495a5f649155a967b7b88c3f5b356a  include/platform/mir/graphics/platform_probe_report.h
 15f201741a465de33e55ffc1ea775b507a5be950  include/platform/mir/graphics/renderable.h
-df61c1168b1798c628d087fc17900d58d608a6fa  include/platform/mir/options/configuration.h
+dfadb98ded10296a5fc900c97c29ba4e07427868  include/platform/mir/options/configuration.h
 47007c783c174f8e94d332c4b13c6b01358b48fb  include/platform/mir/options/default_configuration.h
 b45f14082c4f8b29efaa1b13de795dcb29deb738  include/platform/mir/options/option.h
 3c37cc31e8b290b89c311d82f02e07d342766451  include/platform/mir/options/program_option.h
 f4030e400baf8baa9c38e7c6ec6b4a5ad7134aeb  include/server/mir/compositor/compositor.h
-d69ff1401221ffa9adce7f8d85074a6f8b234baf  include/server/mir/default_server_configuration.h
+7431f70be1309f15ccd14e5f3973bd5ffc5bac5c  include/server/mir/default_server_configuration.h
 af1ff0714be973ac76d56006a2e5991f68cd1dec  include/server/mir/display_server.h
 65db331f1c0e956eced5c9fc73a2b2122dbc8dc7  include/server/mir/frontend/connection_creator.h
 e6e92642301fc9bb85e1d38087a5dd84e5d30fd7  include/server/mir/frontend/connections.h
 
=== modified file 'src/platform/graphics/platform_probe.cpp'
--- src/platform/graphics/platform_probe.cpp	2014-09-11 23:16:06 +0000
+++ src/platform/graphics/platform_probe.cpp	2014-09-11 23:16:08 +0000
@@ -20,7 +20,8 @@
 #include "platform_probe.h"
 
 std::shared_ptr<mir::SharedLibrary>
-mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules)
+mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules,
+                                 PlatformProbeReport& report)
 {
     mir::graphics::PlatformPriority best_priority_so_far = mir::graphics::unsupported;
     std::shared_ptr<mir::SharedLibrary> best_module_so_far;
@@ -31,19 +32,22 @@
             auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_platform",
                                                                              SERVER_PLATFORM_VERSION);
             auto module_priority = probe();
+            auto describe = module->load_function<DescribeModule>("describe_module");
+            report.module_probed(*describe(), module_priority);
             if (module_priority > best_priority_so_far)
             {
                 best_priority_so_far = module_priority;
                 best_module_so_far = module;
             }
         }
-        catch (std::runtime_error)
+        catch (std::runtime_error const& error)
         {
-            // Tried to probe a SharedLibrary that isn't a platform module?
+            report.invalid_module_probed(error);
         }
     }
     if (best_priority_so_far > mir::graphics::unsupported)
     {
+        report.module_selected(*best_module_so_far->load_function<DescribeModule>("describe_module")());
         return best_module_so_far;
     }
     throw std::runtime_error{"Failed to find platform for current system"};
 
=== modified file 'src/platform/graphics/platform_probe.h'
--- src/platform/graphics/platform_probe.h	2014-09-11 23:16:06 +0000
+++ src/platform/graphics/platform_probe.h	2014-09-11 23:16:08 +0000
@@ -22,6 +22,7 @@
 #include <vector>
 #include <memory>
 #include "mir/shared_library.h"
+#include "mir/graphics/platform_probe_report.h"
 
 namespace mir
 {
@@ -29,7 +30,7 @@
 {
 class Platform;
 
-std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules);
+std::shared_ptr<SharedLibrary> module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules, PlatformProbeReport& report);
 
 }
 }
 
=== modified file 'src/platform/options/default_configuration.cpp'
--- src/platform/options/default_configuration.cpp	2014-09-11 23:16:06 +0000
+++ src/platform/options/default_configuration.cpp	2014-09-11 23:16:08 +0000
@@ -46,6 +46,7 @@
 char const* const mo::name_opt                    = "name";
 char const* const mo::offscreen_opt               = "offscreen";
 char const* const mo::fatal_abort_opt             = "on-fatal-error-abort";
+char const* const mo::platform_probe_report_opt   = "platform-probe-report";
 
 
 char const* const mo::glog                 = "glog";
@@ -140,6 +141,8 @@
             "How to handle to Input report. [{log,lttng,off}]")
         (legacy_input_report_opt, po::value<std::string>()->default_value(off_opt_value),
             "How to handle the Legacy Input report. [{log,off}]")
+        (platform_probe_report_opt, po::value<std::string>()->default_value(log_opt_value),
+            "How to handle the Platform Probe report. [{log,lttng,off}]")
         (session_mediator_report_opt, po::value<std::string>()->default_value(off_opt_value),
             "How to handle the SessionMediator report. [{log,lttng,off}]")
         (msg_processor_report_opt, po::value<std::string>()->default_value(off_opt_value),
@@ -193,6 +196,19 @@
     {
     }
 };
+
+class NullPlatformProbeReport : public mir::graphics::PlatformProbeReport
+{
+    void module_probed(mir::graphics::ModuleProperties const&, mir::graphics::PlatformPriority) override
+    {
+    }
+    void module_selected(mir::graphics::ModuleProperties const&) override
+    {
+    }
+    void invalid_module_probed(std::exception const&) override
+    {
+    }
+};
 }
 
 void mo::DefaultConfiguration::add_platform_options()
@@ -227,9 +243,10 @@
         else
         {
             auto const plugin_path = env_libpath ? env_libpath : options.get<std::string>(platform_graphics_path);
-            NullSharedLibraryProberReport nuller;
-            auto plugins = mir::libraries_for_path(plugin_path, nuller);
-            graphics_lib = mir::graphics::module_for_device(plugins);
+            NullSharedLibraryProberReport null_shared_library_report;
+            NullPlatformProbeReport null_platform_probe_report;
+            auto plugins = mir::libraries_for_path(plugin_path, null_shared_library_report);
+            graphics_lib = mir::graphics::module_for_device(plugins, null_platform_probe_report);
         }
 
         auto add_platform_options = graphics_lib->load_function<mir::graphics::AddPlatformOptions>(std::string("add_platform_options"));
 
=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2014-09-11 23:16:06 +0000
+++ src/platform/symbols.map	2014-09-11 23:16:08 +0000
@@ -242,6 +242,7 @@
     mir::options::Option::operator*;
     mir::options::Option::?Option*;
     mir::options::Option::Option*;
+    mir::options::platform_probe_report_opt*;
     mir::options::platform_graphics_lib*;
     mir::options::ProgramOption::get*;
     mir::options::ProgramOption::is_set*;
 
=== modified file 'src/server/graphics/default_configuration.cpp'
--- src/server/graphics/default_configuration.cpp	2014-09-11 23:16:06 +0000
+++ src/server/graphics/default_configuration.cpp	2014-09-11 23:16:08 +0000
@@ -89,7 +89,7 @@
                     {
                         throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
                     }
-                    platform_library = mir::graphics::module_for_device(platforms);
+                    platform_library = mir::graphics::module_for_device(platforms, *the_platform_probe_report());
                 }
                 auto create_platform = platform_library->load_function<mg::CreatePlatform>("create_platform",
                                                                                            SERVER_PLATFORM_VERSION);
@@ -104,7 +104,7 @@
         });
 }
 
-std::shared_ptr<mg::NativePlatform>  mir::DefaultServerConfiguration::the_graphics_native_platform()
+std::shared_ptr<mg::NativePlatform> mir::DefaultServerConfiguration::the_graphics_native_platform()
 {
     return graphics_native_platform(
         [this]()
@@ -120,7 +120,7 @@
                 {
                     throw std::runtime_error("Failed to find any platform plugins in: " MIR_SERVER_PLATFORM_PLUGIN_PATH);
                 }
-                platform_library = mir::graphics::module_for_device(platforms);
+                platform_library = mir::graphics::module_for_device(platforms, *the_platform_probe_report());
             }
             auto create_native_platform = platform_library->load_function<mg::CreateNativePlatform>("create_native_platform",
                                                                                                     SERVER_PLATFORM_VERSION);
 
=== modified file 'src/server/report/default_server_configuration.cpp'
--- src/server/report/default_server_configuration.cpp	2014-09-11 23:16:06 +0000
+++ src/server/report/default_server_configuration.cpp	2014-09-11 23:16:08 +0000
@@ -126,3 +126,12 @@
             return report_factory(options::shared_library_prober_report_opt)->create_shared_library_prober_report();
         });
 }
+
+auto mir::DefaultServerConfiguration::the_platform_probe_report() -> std::shared_ptr<mg::PlatformProbeReport>
+{
+    return platform_probe_report(
+        [this]() -> std::shared_ptr<mir::graphics::PlatformProbeReport>
+        {
+            return report_factory(options::platform_probe_report_opt)->create_platform_probe_report();
+        });
+}
 
=== modified file 'src/server/report/logging/CMakeLists.txt'
--- src/server/report/logging/CMakeLists.txt	2014-09-11 23:16:06 +0000
+++ src/server/report/logging/CMakeLists.txt	2014-09-11 23:16:08 +0000
@@ -11,6 +11,7 @@
   compositor_report.cpp
   scene_report.cpp
   logging_report_factory.cpp
+  platform_probe_report.cpp
 )
 
 add_library(
 
=== modified file 'src/server/report/logging/logging_report_factory.cpp'
--- src/server/report/logging/logging_report_factory.cpp	2014-09-11 23:16:06 +0000
+++ src/server/report/logging/logging_report_factory.cpp	2014-09-11 23:16:08 +0000
@@ -26,6 +26,7 @@
 #include "session_mediator_report.h"
 #include "input_report.h"
 #include "mir/logging/shared_library_prober_report.h"
+#include "platform_probe_report.h"
 
 #include "mir/default_server_configuration.h"
 
@@ -77,3 +78,8 @@
 {
     return std::make_shared<mir::logging::SharedLibraryProberReport>(logger);
 }
+
+std::shared_ptr<mir::graphics::PlatformProbeReport> mr::LoggingReportFactory::create_platform_probe_report()
+{
+    return std::make_shared<logging::PlatformProbeReport>(logger);
+}
 
=== added file 'src/server/report/logging/platform_probe_report.cpp'
--- src/server/report/logging/platform_probe_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/logging/platform_probe_report.cpp	2014-09-11 23:16:08 +0000
@@ -0,0 +1,55 @@
+#include "platform_probe_report.h"
+#include "mir/logging/logger.h"
+
+#include <sstream>
+#include <string>
+
+namespace ml = mir::logging;
+namespace mg = mir::graphics;
+
+mir::report::logging::PlatformProbeReport::PlatformProbeReport(std::shared_ptr<ml::Logger> const& logger)
+    : logger{logger}
+{
+}
+
+namespace
+{
+std::string priority_to_string(mg::PlatformPriority priority)
+{
+    switch (priority)
+    {
+    case mg::PlatformPriority::unsupported:
+        return "unsupported";
+    case mg::PlatformPriority::supported:
+        return "supported";
+    case mg::PlatformPriority::best:
+        return "best";
+    default:
+        return std::to_string(static_cast<int>(priority));
+    }
+}
+}
+
+
+void mir::report::logging::PlatformProbeReport::module_probed(mg::ModuleProperties const& module, mg::PlatformPriority probe_value)
+{
+    std::stringstream ss;
+    ss << "Module probed" << std::endl
+       << "\tName: " << module.name << std::endl
+       << "\tPriority: " << priority_to_string(probe_value);
+    logger->log(ml::Logger::informational, ss.str(), "Platform");
+}
+
+void mir::report::logging::PlatformProbeReport::invalid_module_probed(std::exception const& error)
+{
+    std::stringstream ss;
+    ss << "Failed to probe module. Error was: " << error.what();
+    logger->log(ml::Logger::warning, ss.str(), "Platform");
+}
+
+void mir::report::logging::PlatformProbeReport::module_selected(mg::ModuleProperties const& module)
+{
+    std::stringstream ss;
+    ss << "Selected module: " << module.name;
+    logger->log(ml::Logger::informational, ss.str(), "Platform");
+}
 
=== added file 'src/server/report/logging/platform_probe_report.h'
--- src/server/report/logging/platform_probe_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/logging/platform_probe_report.h	2014-09-11 23:16:08 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_LOGGING_PLATFORM_PROBE_REPORT_H_
+#define MIR_REPORT_LOGGING_PLATFORM_PROBE_REPORT_H_
+
+#include "mir/graphics/platform_probe_report.h"
+
+#include <memory>
+
+namespace mir
+{
+namespace logging
+{
+class Logger;
+}
+namespace report
+{
+namespace logging
+{
+
+class PlatformProbeReport : public graphics::PlatformProbeReport
+{
+public:
+    PlatformProbeReport(std::shared_ptr<mir::logging::Logger> const& logger);
+
+    void module_probed(const graphics::ModuleProperties &module, graphics::PlatformPriority probe_value);
+    void invalid_module_probed(const std::exception &error);
+    void module_selected(const graphics::ModuleProperties &module);
+
+private:
+    std::shared_ptr<mir::logging::Logger> const logger;
+};
+
+}
+}
+}
+
+
+#endif /* MIR_REPORT_LOGGING_PLATFORM_PROBE_REPORT_H_ */
 
=== modified file 'src/server/report/logging_report_factory.h'
--- src/server/report/logging_report_factory.h	2014-09-11 23:16:06 +0000
+++ src/server/report/logging_report_factory.h	2014-09-11 23:16:08 +0000
@@ -48,6 +48,7 @@
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
     std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
+    std::shared_ptr<graphics::PlatformProbeReport> create_platform_probe_report() override;
 
 
 private:
 
=== modified file 'src/server/report/lttng/CMakeLists.txt'
--- src/server/report/lttng/CMakeLists.txt	2014-09-11 23:16:06 +0000
+++ src/server/report/lttng/CMakeLists.txt	2014-09-11 23:16:08 +0000
@@ -14,6 +14,7 @@
   input_report.cpp
   message_processor_report.cpp
   lttng_report_factory.cpp
+  platform_probe_report.cpp
   session_mediator_report.cpp
   scene_report.cpp
   server_tracepoint_provider.cpp
 
=== modified file 'src/server/report/lttng/lttng_report_factory.cpp'
--- src/server/report/lttng/lttng_report_factory.cpp	2014-09-11 23:16:06 +0000
+++ src/server/report/lttng/lttng_report_factory.cpp	2014-09-11 23:16:08 +0000
@@ -23,6 +23,7 @@
 #include "display_report.h"
 #include "input_report.h"
 #include "message_processor_report.h"
+#include "platform_probe_report.h"
 #include "scene_report.h"
 #include "session_mediator_report.h"
 #include "shared_library_prober_report.h"
@@ -67,3 +68,8 @@
     return std::make_shared<lttng::SharedLibraryProberReport>();
 }
 
+std::shared_ptr<mir::graphics::PlatformProbeReport> mir::report::LttngReportFactory::create_platform_probe_report()
+{
+    return std::make_shared<lttng::PlatformProbeReport>();
+}
+
 
=== added file 'src/server/report/lttng/platform_probe_report.cpp'
--- src/server/report/lttng/platform_probe_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/platform_probe_report.cpp	2014-09-11 23:16:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "platform_probe_report.h"
+
+#include "mir/report/lttng/mir_tracepoint.h"
+
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "platform_probe_report_tp.h"
+
+
+
+void mir::report::lttng::PlatformProbeReport::module_probed(mir::graphics::ModuleProperties const& module, mir::graphics::PlatformPriority probe_value)
+{
+    mir_tracepoint(mir_server_platform_probe, module_probed, module.name, probe_value);
+}
+
+void mir::report::lttng::PlatformProbeReport::invalid_module_probed(std::exception const& error)
+{
+    mir_tracepoint(mir_server_platform_probe, invalid_module_probed, error.what());
+}
+
+void mir::report::lttng::PlatformProbeReport::module_selected(mir::graphics::ModuleProperties const& module)
+{
+    mir_tracepoint(mir_server_platform_probe, module_selected, module.name);
+}
 
=== added file 'src/server/report/lttng/platform_probe_report.h'
--- src/server/report/lttng/platform_probe_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/platform_probe_report.h	2014-09-11 23:16:08 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_LTTNG_PLATFORM_PROBE_REPORT_H_
+#define MIR_REPORT_LTTNG_PLATFORM_PROBE_REPORT_H_
+
+#include "server_tracepoint_provider.h"
+
+#include "mir/graphics/platform_probe_report.h"
+
+namespace mir
+{
+namespace report
+{
+namespace lttng
+{
+class PlatformProbeReport : public graphics::PlatformProbeReport
+{
+public:
+    void module_probed(graphics::ModuleProperties const& module,
+                       graphics::PlatformPriority probe_value) override;
+    void invalid_module_probed(std::exception const& error) override;
+    void module_selected(graphics::ModuleProperties const& module) override;
+
+private:
+    ServerTracepointProvider tp_provider;
+};
+}
+}
+}
+
+#endif /* MIR_REPORT_LTTNG_PLATFORM_PROBE_REPORT_H_ */
 
=== added file 'src/server/report/lttng/platform_probe_report_tp.h'
--- src/server/report/lttng/platform_probe_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/server/report/lttng/platform_probe_report_tp.h	2014-09-11 23:16:08 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_server_platform_probe
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./platform_probe_report_tp.h"
+
+#if !defined(MIR_LTTNG_PLATFORM_PROBE_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_LTTNG_PLATFORM_PROBE_REPORT_TP_H_
+
+#include "lttng_utils.h"
+
+MIR_LTTNG_VOID_TRACE_CLASS(mir_server_platform_probe)
+
+TRACEPOINT_EVENT(
+    TRACEPOINT_PROVIDER,
+    module_probed,
+    TP_ARGS(char const*, name, int, priority),
+    TP_FIELDS(ctf_string(name, name), ctf_integer(int, priority, priority))
+)
+
+TRACEPOINT_EVENT(
+    TRACEPOINT_PROVIDER,
+    invalid_module_probed,
+    TP_ARGS(char const*, error),
+    TP_FIELDS(ctf_string(name, name))
+)
+
+TRACEPOINT_EVENT(
+    TRACEPOINT_PROVIDER,
+    module_selected,
+    TP_ARGS(char const*, name),
+    TP_FIELDS(ctf_string(name, name))
+)
+
+#include "lttng_utils_pop.h"
+
+#endif /* MIR_LTTNG_COMPOSITOR_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>
 
=== modified file 'src/server/report/lttng_report_factory.h'
--- src/server/report/lttng_report_factory.h	2014-09-11 23:16:06 +0000
+++ src/server/report/lttng_report_factory.h	2014-09-11 23:16:08 +0000
@@ -36,6 +36,7 @@
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
     std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
+    std::shared_ptr<graphics::PlatformProbeReport> create_platform_probe_report() override;
 };
 }
 }
 
=== modified file 'src/server/report/null/CMakeLists.txt'
--- src/server/report/null/CMakeLists.txt	2014-09-11 23:16:06 +0000
+++ src/server/report/null/CMakeLists.txt	2014-09-11 23:16:08 +0000
@@ -7,7 +7,8 @@
     input_report.cpp
     message_processor_report.cpp
     null_report_factory.cpp
+    platform_probe_report.cpp
     scene_report.cpp
     session_mediator_report.cpp
     shared_library_prober_report.cpp
-    )
+)
 
=== modified file 'src/server/report/null/null_report_factory.cpp'
--- src/server/report/null/null_report_factory.cpp	2014-09-11 23:16:06 +0000
+++ src/server/report/null/null_report_factory.cpp	2014-09-11 23:16:08 +0000
@@ -24,6 +24,7 @@
 #include "session_mediator_report.h"
 #include "display_report.h"
 #include "input_report.h"
+#include "platform_probe_report.h"
 #include "scene_report.h"
 #include "shared_library_prober_report.h"
 
@@ -67,6 +68,11 @@
     return std::make_shared<null::SharedLibraryProberReport>();
 }
 
+std::shared_ptr<mir::graphics::PlatformProbeReport> mir::report::NullReportFactory::create_platform_probe_report()
+{
+    return std::make_shared<null::PlatformProbeReport>();
+}
+
 std::shared_ptr<mir::compositor::CompositorReport> mir::report::null_compositor_report()
 {
     return NullReportFactory{}.create_compositor_report();
@@ -101,3 +107,8 @@
 {
     return NullReportFactory{}.create_shared_library_prober_report();
 }
+
+std::shared_ptr<mir::graphics::PlatformProbeReport> mir::report::null_platform_probe_report()
+{
+    return NullReportFactory{}.create_platform_probe_report();
+}
 
=== added file 'src/server/report/null/platform_probe_report.cpp'
--- src/server/report/null/platform_probe_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/null/platform_probe_report.cpp	2014-09-11 23:16:08 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#include "platform_probe_report.h"
+
+void mir::report::null::PlatformProbeReport::module_probed(mir::graphics::ModuleProperties const&,
+                                                           mir::graphics::PlatformPriority)
+{
+}
+
+void mir::report::null::PlatformProbeReport::invalid_module_probed(std::exception const&)
+{
+}
+
+void mir::report::null::PlatformProbeReport::module_selected(mir::graphics::ModuleProperties const&)
+{
+}
 
=== added file 'src/server/report/null/platform_probe_report.h'
--- src/server/report/null/platform_probe_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/null/platform_probe_report.h	2014-09-11 23:16:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_REPORT_NULL_PLATFORM_PROBE_REPORT_H_
+#define MIR_REPORT_NULL_PLATFORM_PROBE_REPORT_H_
+
+#include "mir/graphics/platform_probe_report.h"
+
+namespace mir
+{
+namespace report
+{
+namespace null
+{
+class PlatformProbeReport : public graphics::PlatformProbeReport
+{
+public:
+    void module_probed(graphics::ModuleProperties const& module,
+                       graphics::PlatformPriority probe_value) override;
+    void invalid_module_probed(std::exception const& error) override;
+    void module_selected(graphics::ModuleProperties const& module) override;
+};
+}
+}
+}
+
+#endif /* MIR_REPORT_NULL_PLATFORM_PROBE_REPORT_H_ */
 
=== modified file 'src/server/report/null_report_factory.h'
--- src/server/report/null_report_factory.h	2014-09-11 23:16:06 +0000
+++ src/server/report/null_report_factory.h	2014-09-11 23:16:08 +0000
@@ -36,6 +36,7 @@
     std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() override;
     std::shared_ptr<input::InputReport> create_input_report() override;
     std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() override;
+    std::shared_ptr<graphics::PlatformProbeReport> create_platform_probe_report() override;
 };
 
 std::shared_ptr<compositor::CompositorReport> null_compositor_report();
@@ -46,6 +47,7 @@
 std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
 std::shared_ptr<input::InputReport> null_input_report();
 std::shared_ptr<SharedLibraryProberReport> null_shared_library_prober_report();
+std::shared_ptr<graphics::PlatformProbeReport> null_platform_probe_report();
 }
 }
 
 
=== modified file 'src/server/report/report_factory.h'
--- src/server/report/report_factory.h	2014-09-11 23:16:06 +0000
+++ src/server/report/report_factory.h	2014-09-11 23:16:08 +0000
@@ -38,6 +38,7 @@
 namespace graphics
 {
 class DisplayReport;
+class PlatformProbeReport;
 }
 namespace input
 {
@@ -62,6 +63,7 @@
     virtual std::shared_ptr<frontend::MessageProcessorReport> create_message_processor_report() = 0;
     virtual std::shared_ptr<input::InputReport> create_input_report() = 0;
     virtual std::shared_ptr<SharedLibraryProberReport> create_shared_library_prober_report() = 0;
+    virtual std::shared_ptr<graphics::PlatformProbeReport> create_platform_probe_report() = 0;
 
 protected:
     ReportFactory() = default;
 
=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2014-09-11 23:16:06 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2014-09-11 23:16:08 +0000
@@ -17,9 +17,11 @@
  */
 
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include "src/platform/graphics/platform_probe.h"
 #include "mir/graphics/platform.h"
+#include "mir/graphics/platform_probe_report.h"
 
 #include "mir/raii.h"
 
@@ -37,6 +39,7 @@
 
 namespace mtf = mir_test_framework;
 namespace mtd = mir::test::doubles;
+namespace mg = mir::graphics;
 
 namespace
 {
@@ -97,17 +100,32 @@
     return std::shared_ptr<void>{};
 #endif
 }
+
+class MockPlatformProbeReport : public mir::graphics::PlatformProbeReport
+{
+public:
+    MOCK_METHOD2(module_probed, void(mg::ModuleProperties const&, mg::PlatformPriority));
+    MOCK_METHOD1(module_selected, void(mg::ModuleProperties const&));
+    MOCK_METHOD1(invalid_module_probed, void(std::exception const&));
+};
+using StubPlatformProbeReport = testing::NiceMock<MockPlatformProbeReport>;
+
+class ServerPlatformProbe : public testing::Test
+{
+public:
+    StubPlatformProbeReport stub_probe_report;
+};
 }
 
-TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
+TEST_F(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
 {
     std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
-    EXPECT_THROW(mir::graphics::module_for_device(empty_modules),
+    EXPECT_THROW(mir::graphics::module_for_device(empty_modules, stub_probe_report),
                  std::runtime_error);
 }
 
 #ifdef MIR_BUILD_PLATFORM_MESA
-TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
+TEST_F(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
 {
     using namespace testing;
     auto block_android = ensure_android_probing_fails();
@@ -115,7 +133,7 @@
 
     auto modules = available_platforms();
 
-    auto module = mir::graphics::module_for_device(modules);
+    auto module = mir::graphics::module_for_device(modules, stub_probe_report);
     ASSERT_NE(nullptr, module);
 
     auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
@@ -126,7 +144,7 @@
 #endif
 
 #ifdef MIR_BUILD_PLATFORM_ANDROID
-TEST(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds)
+TEST_F(ServerPlatformProbe, LoadsAndroidPlatformWhenHwaccessSucceeds)
 {
     using namespace testing;
 
@@ -135,7 +153,7 @@
 
     auto modules = available_platforms();
 
-    auto module = mir::graphics::module_for_device(modules);
+    auto module = mir::graphics::module_for_device(modules, stub_probe_report);
     ASSERT_NE(nullptr, module);
 
     auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
@@ -145,18 +163,18 @@
 }
 #endif
 
-TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
+TEST_F(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
 {
     using namespace testing;
     auto block_android = ensure_android_probing_fails();
     auto block_mesa = ensure_mesa_probing_fails();
 
 
-    EXPECT_THROW(mir::graphics::module_for_device(available_platforms()),
+    EXPECT_THROW(mir::graphics::module_for_device(available_platforms(), stub_probe_report),
                  std::runtime_error);
 }
 
-TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
+TEST_F(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
 {
     using namespace testing;
     auto block_android = ensure_android_probing_fails();
@@ -165,7 +183,7 @@
     auto modules = available_platforms();
     add_dummy_platform(modules);
 
-    auto module = mir::graphics::module_for_device(modules);
+    auto module = mir::graphics::module_for_device(modules, stub_probe_report);
     ASSERT_NE(nullptr, module);
 
     auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
@@ -174,7 +192,7 @@
     EXPECT_THAT(description->name, HasSubstr("dummy"));
 }
 
-TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
+TEST_F(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
 {
     using namespace testing;
 
@@ -184,7 +202,7 @@
     auto modules = available_platforms();
     add_dummy_platform(modules);
 
-    auto module = mir::graphics::module_for_device(modules);
+    auto module = mir::graphics::module_for_device(modules, stub_probe_report);
     ASSERT_NE(nullptr, module);
 
     auto descriptor = module->load_function<mir::graphics::DescribeModule>("describe_module");
@@ -193,7 +211,123 @@
     EXPECT_THAT(description->name, Not(HasSubstr("dummy")));
 }
 
-TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
+TEST_F(ServerPlatformProbe, LogsEachModuleProbed)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    NiceMock<MockPlatformProbeReport> report;
+    EXPECT_CALL(report, module_probed(_,_)).Times(modules.size());
+
+    auto module = mir::graphics::module_for_device(modules, report);
+}
+
+namespace
+{
+MATCHER_P(ModuleNameMatches, name, "")
+{
+    return strcmp(name, arg.name) == 0;
+}
+}
+
+TEST_F(ServerPlatformProbe, LogsWithCorrectPriorityAllSupported)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    NiceMock<MockPlatformProbeReport> report;
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("dummy"),mir::graphics::supported));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("mesa"),mir::graphics::best))
+        .Times(AtMost(1));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("android"),mir::graphics::best))
+        .Times(AtMost(1));
+
+    auto module = mir::graphics::module_for_device(modules, report);
+}
+
+TEST_F(ServerPlatformProbe, LogsWithCorrectPriorityOnlyAndroidSupported)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_fails();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    NiceMock<MockPlatformProbeReport> report;
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("dummy"),mir::graphics::supported));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("mesa"),mir::graphics::unsupported))
+        .Times(AtMost(1));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("android"),mir::graphics::best))
+        .Times(AtMost(1));
+
+    auto module = mir::graphics::module_for_device(modules, report);
+}
+
+TEST_F(ServerPlatformProbe, LogsWithCorrectPriorityOnlyMesaSupported)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_fails();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    NiceMock<MockPlatformProbeReport> report;
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("dummy"),mir::graphics::supported));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("mesa"),mir::graphics::best))
+        .Times(AtMost(1));
+    EXPECT_CALL(report,
+                module_probed(ModuleNameMatches("android"),mir::graphics::unsupported))
+        .Times(AtMost(1));
+
+    auto module = mir::graphics::module_for_device(modules, report);
+}
+
+TEST_F(ServerPlatformProbe, LogsSelectedPlugin)
+{
+    using namespace testing;
+
+    auto ensure_mesa = ensure_mesa_probing_succeeds();
+    auto ensure_android = ensure_android_probing_succeeds();
+
+    auto modules = available_platforms();
+    add_dummy_platform(modules);
+
+    NiceMock<MockPlatformProbeReport> report;
+    char const* selected_name;
+    EXPECT_CALL(report, module_selected(_))
+        .WillOnce(Invoke([&selected_name](mir::graphics::ModuleProperties const& descriptor)
+                         {
+                             selected_name = descriptor.name;
+                         }));
+
+    auto module = mir::graphics::module_for_device(modules, report);
+    auto describe = module->load_function<mir::graphics::DescribeModule>("describe_module");
+    EXPECT_STREQ(describe()->name, selected_name);
+}
+
+TEST_F(ServerPlatformProbe, IgnoresNonPlatformModules)
 {
     using namespace testing;
 
@@ -207,6 +341,27 @@
                                                            "/libmirclient.so"));
 
 
-    auto module = mir::graphics::module_for_device(modules);
+    NiceMock<MockPlatformProbeReport> report;
+    auto module = mir::graphics::module_for_device(modules, report);
     EXPECT_NE(nullptr, module);
 }
+
+TEST_F(ServerPlatformProbe, LogsModulesThatFailToLoad)
+{
+    using namespace testing;
+
+    std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
+    modules.push_back(std::make_shared<mir::SharedLibrary>(mtf::library_path() +
+                                                           "/libmirclient.so"));
+    add_dummy_platform(modules);
+
+
+    NiceMock<MockPlatformProbeReport> report;
+    EXPECT_CALL(report, invalid_module_probed(_))
+        .WillOnce(Invoke([](std::exception const& error)
+    {
+        EXPECT_THAT(error.what(), HasSubstr("libmirclient")) << "Name of the failing module";
+        EXPECT_THAT(error.what(), HasSubstr("probe_platform")) << "Name of the expected function";
+    }));
+    auto module = mir::graphics::module_for_device(modules, report);
+}