passenger 5.3.4 → 5.3.5

data/src/agent/Core/ApplicationPool/Socket.h

@@ -253,7 +253,7 @@ public:
 	}
 
 	bool isTotallyBusy() const {
-		return concurrency != 0 && sessions >= concurrency;
+		return concurrency > 0 && sessions >= concurrency;
 	}
 
 	void recreateStrings(psg_pool_t *newPool) {

data/src/agent/Core/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -41,8 +41,10 @@
 #include <ConfigKit/PrefixTranslator.h>
 #include <ServerKit/Context.h>
 #include <ServerKit/HttpServer.h>
+#include <WrapperRegistry/Registry.h>
 #include <Core/Controller/Config.h>
 #include <Core/SecurityUpdateChecker.h>
+#include <Core/TelemetryCollector.h>
 #include <Core/ApiServer.h>
 #include <Core/AdminPanelConnector.h>
 #include <Shared/ApiAccountUtils.h>
@@ -154,13 +156,24 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/5.3.4")
+ *   server_software                                                 string             -          default("Phusion_Passenger/5.3.5")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_type                                        string             -          read_only
  *   single_app_mode_startup_file                                    string             -          read_only
  *   standalone_engine                                               string             -          default
  *   stat_throttle_rate                                              unsigned integer   -          default(10)
+ *   telemetry_collector_ca_certificate_path                         string             -          -
+ *   telemetry_collector_debug_curl                                  boolean            -          default(false)
+ *   telemetry_collector_disabled                                    boolean            -          default(false)
+ *   telemetry_collector_final_run_timeout                           unsigned integer   -          default(5)
+ *   telemetry_collector_first_interval                              unsigned integer   -          default(7200)
+ *   telemetry_collector_interval                                    unsigned integer   -          default(21600)
+ *   telemetry_collector_interval_jitter                             unsigned integer   -          default(7200)
+ *   telemetry_collector_proxy_url                                   string             -          -
+ *   telemetry_collector_timeout                                     unsigned integer   -          default(180)
+ *   telemetry_collector_url                                         string             -          default("https://anontelemetry.phusionpassenger.com/v1/collect.json")
+ *   telemetry_collector_verify_server                               boolean            -          default(true)
  *   turbocaching                                                    boolean            -          default(true),read_only
  *   user_switching                                                  boolean            -          default(true)
  *   vary_turbocache_by_cookie                                       string             -          -
@@ -241,7 +254,9 @@ private:
 		}
 	}
 
-	static void validateSingleAppMode(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
+	static void validateSingleAppMode(const ConfigKit::Store &config,
+		const WrapperRegistry::Registry *wrapperRegistry, vector<ConfigKit::Error> &errors)
+	{
 		typedef ConfigKit::Error Error;
 
 		if (config["multi_app"].asBool()) {
@@ -251,7 +266,8 @@ private:
 		// single_app_mode_app_type and single_app_mode_startup_file are
 		// autodetected in initializeSingleAppMode()
 
-		ControllerSingleAppModeSchema::validateAppType("single_app_mode_app_type", config, errors);
+		ControllerSingleAppModeSchema::validateAppType("single_app_mode_app_type",
+			wrapperRegistry, config, errors);
 	}
 
 	static void validateControllerSecureHeadersPassword(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
@@ -348,9 +364,13 @@ public:
 		ControllerSchema schema;
 		ConfigKit::TableTranslator translator;
 	} controller;
-	struct {
+	struct ControllerSingleAppModeSubschemaContainer {
 		ControllerSingleAppModeSchema schema;
 		ConfigKit::PrefixTranslator translator;
+
+		ControllerSingleAppModeSubschemaContainer(const WrapperRegistry::Registry *registry)
+			: schema(registry)
+			{ }
 	} controllerSingleAppMode;
 	struct {
 		ServerKit::Schema schema;
@@ -360,6 +380,10 @@ public:
 		SecurityUpdateChecker::Schema schema;
 		ConfigKit::PrefixTranslator translator;
 	} securityUpdateChecker;
+	struct {
+		TelemetryCollector::Schema schema;
+		ConfigKit::PrefixTranslator translator;
+	} telemetryCollector;
 	struct {
 		ApiServer::Schema schema;
 		ConfigKit::TableTranslator translator;
@@ -373,7 +397,9 @@ public:
 		ConfigKit::TableTranslator translator;
 	} adminPanelConnector;
 
-	Schema() {
+	Schema(const WrapperRegistry::Registry *wrapperRegistry = NULL)
+		: controllerSingleAppMode(wrapperRegistry)
+	{
 		using namespace ConfigKit;
 
 		// Add subschema: loggingKit
@@ -410,6 +436,10 @@ public:
 		erase("security_update_checker_server_identifier");
 		erase("security_update_checker_web_server_version");
 
+		// Add subschema: telemetryCollector
+		telemetryCollector.translator.setPrefixAndFinalize("telemetry_collector_");
+		addSubSchema(telemetryCollector.schema, telemetryCollector.translator);
+
 		// Add subschema: apiServer
 		apiServer.translator.add("api_server_authorizations", "authorizations");
 		addSubSchemaPrefixTranslations<ServerKit::HttpServerSchema>(
@@ -453,7 +483,8 @@ public:
 		add("file_descriptor_ulimit", UINT_TYPE, OPTIONAL | READ_ONLY, 0);
 
 		addValidator(validateMultiAppMode);
-		addValidator(validateSingleAppMode);
+		addValidator(boost::bind(validateSingleAppMode, boost::placeholders::_1,
+			wrapperRegistry, boost::placeholders::_2));
 		addValidator(validateControllerSecureHeadersPassword);
 		addValidator(validateApplicationPool);
 		addValidator(validateController);

data/src/agent/Core/ConfigChange.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -49,6 +49,7 @@ struct ConfigChangeRequest {
 	boost::scoped_ptr<ConfigKit::Store> config;
 	LoggingKit::ConfigChangeRequest forLoggingKit;
 	SecurityUpdateChecker::ConfigChangeRequest forSecurityUpdateChecker;
+	TelemetryCollector::ConfigChangeRequest forTelemetryCollector;
 	vector<ServerKit::ConfigChangeRequest *> forControllerServerKit;
 	vector<Controller::ConfigChangeRequest *> forController;
 	ServerKit::ConfigChangeRequest forApiServerKit;
@@ -188,6 +189,13 @@ asyncPrepareConfigChange(const Json::Value &updates, ConfigChangeRequest *req,
 		coreSchema->securityUpdateChecker.translator,
 		req->config->inspectEffectiveValues(),
 		req->errors, req->forSecurityUpdateChecker);
+	if (workingObjects->telemetryCollector != NULL) {
+		ConfigKit::prepareConfigChangeForSubComponent(
+			*workingObjects->telemetryCollector,
+			coreSchema->telemetryCollector.translator,
+			req->config->inspectEffectiveValues(),
+			req->errors, req->forTelemetryCollector);
+	}
 
 	req->forControllerServerKit.resize(wo->threadWorkingObjects.size(), NULL);
 	req->forController.resize(wo->threadWorkingObjects.size(), NULL);
@@ -287,6 +295,10 @@ asyncCommitConfigChange(ConfigChangeRequest *req, const CommitConfigChangeCallba
 	LoggingKit::context->commitConfigChange(req->forLoggingKit);
 	workingObjects->securityUpdateChecker->commitConfigChange(
 		req->forSecurityUpdateChecker);
+	if (workingObjects->telemetryCollector != NULL) {
+		workingObjects->telemetryCollector->commitConfigChange(
+			req->forTelemetryCollector);
+	}
 
 	wo->appPool->setMax(coreConfig->get("max_pool_size").asInt());
 	wo->appPool->setMaxIdleTime(coreConfig->get("pool_idle_time").asInt() * 1000000ULL);

data/src/agent/Core/Controller.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -71,6 +71,7 @@
 #include <MemoryKit/palloc.h>
 #include <DataStructures/LString.h>
 #include <DataStructures/StringKeyTable.h>
+#include <WrapperRegistry/Registry.h>
 #include <StaticString.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
@@ -365,6 +366,7 @@ public:
 
 	// Dependencies
 	ResourceLocator *resourceLocator;
+	WrapperRegistry::Registry *wrapperRegistry;
 	PoolPtr appPool;
 
 

data/src/agent/Core/Controller/Config.h

@@ -39,7 +39,7 @@
 #include <MemoryKit/palloc.h>
 #include <ServerKit/HttpServer.h>
 #include <SystemTools/UserDatabase.h>
-#include <AppTypes.h>
+#include <WrapperRegistry/Registry.h>
 #include <Constants.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -113,7 +113,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/5.3.4")
+ *   server_software                                     string             -          default("Phusion_Passenger/5.3.5")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -230,7 +230,7 @@ public:
  * END
  */
 struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
-	ControllerSingleAppModeSchema() {
+	ControllerSingleAppModeSchema(const WrapperRegistry::Registry *wrapperRegistry = NULL) {
 		using namespace ConfigKit;
 
 		addWithDynamicDefault("app_root", STRING_TYPE, OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE,
@@ -238,7 +238,7 @@ struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
 		add("app_type", STRING_TYPE, REQUIRED | READ_ONLY);
 		add("startup_file", STRING_TYPE, REQUIRED | READ_ONLY);
 
-		addValidator(boost::bind(validateAppType, "app_type",
+		addValidator(boost::bind(validateAppType, "app_type", wrapperRegistry,
 			boost::placeholders::_1, boost::placeholders::_2));
 		addNormalizer(normalizeAppRoot);
 		addNormalizer(normalizeStartupFile);
@@ -258,21 +258,24 @@ struct ControllerSingleAppModeSchema: public ConfigKit::Schema {
 	}
 
 	static void validateAppType(const string &appTypeKey,
+		const WrapperRegistry::Registry *wrapperRegistry,
 		const ConfigKit::Store &config, vector<ConfigKit::Error> &errors)
 	{
 		typedef ConfigKit::Error Error;
 
-		if (!config[appTypeKey].isNull()) {
-			PassengerAppType appType = getAppType(config[appTypeKey].asString());
-			if (appType == PAT_NONE || appType == PAT_ERROR) {
+		if (!config[appTypeKey].isNull() && wrapperRegistry != NULL) {
+			const WrapperRegistry::Entry &entry =
+				wrapperRegistry->lookup(config[appTypeKey].asString());
+			if (entry.isNull()) {
 				string message = "'{{" + appTypeKey + "}}' is set to '"
 					+ config[appTypeKey].asString() + "', which is not a"
 					" valid application type. Supported app types are:";
-				const AppTypeDefinition *definition = &appTypeDefinitions[0];
-				while (definition->type != PAT_NONE) {
+				WrapperRegistry::Registry::ConstIterator it(
+					wrapperRegistry->getIterator());
+				while (*it != NULL) {
 					message.append(1, ' ');
-					message.append(definition->name);
-					definition++;
+					message.append(it.getValue().language);
+					it.next();
 				}
 				errors.push_back(Error(message));
 			}

data/src/agent/Core/Controller/InitRequest.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,6 +24,7 @@
  *  THE SOFTWARE.
  */
 #include <Core/Controller.h>
+#include <AppTypeDetector/Detector.h>
 
 /*************************************************************************
  *
@@ -336,13 +337,13 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 
 	const LString *appType = secureHeaders.lookup("!~PASSENGER_APP_TYPE");
 	if (appType == NULL || appType->size == 0) {
-		AppTypeDetector detector;
-		PassengerAppType type = detector.checkAppRoot(options.appRoot);
-		if (type == PAT_NONE || type == PAT_ERROR) {
+		AppTypeDetector::Detector detector(*wrapperRegistry);
+		AppTypeDetector::Detector::Result result = detector.checkAppRoot(options.appRoot);
+		if (result.isNull()) {
 			disconnectWithError(&client, "client did not send a recognized !~PASSENGER_APP_TYPE header");
 			return;
 		}
-		options.appType = getAppTypeName(type);
+		options.appType = result.wrapperRegistryEntry->language;
 	} else {
 		fillPoolOption(req, options.appType, "!~PASSENGER_APP_TYPE");
 	}

data/src/agent/Core/Controller/InitializationAndShutdown.cpp

@@ -94,6 +94,9 @@ Controller::initialize() {
 	if (resourceLocator == NULL) {
 		throw RuntimeException("ResourceLocator not initialized");
 	}
+	if (wrapperRegistry == NULL) {
+		throw RuntimeException("WrapperRegistry not initialized");
+	}
 	if (appPool == NULL) {
 		throw RuntimeException("AppPool not initialized");
 	}

data/src/agent/Core/CoreMain.cpp

@@ -81,6 +81,7 @@
 #include <ConfigKit/SubComponentUtils.h>
 #include <ServerKit/Server.h>
 #include <ServerKit/AcceptLoadBalancer.h>
+#include <AppTypeDetector/Detector.h>
 #include <MessageReadersWriters.h>
 #include <FileDescriptor.h>
 #include <ResourceLocator.h>
@@ -98,6 +99,7 @@
 #include <Core/ConfigChange.h>
 #include <Core/ApplicationPool/Pool.h>
 #include <Core/SecurityUpdateChecker.h>
+#include <Core/TelemetryCollector.h>
 #include <Core/AdminPanelConnector.h>
 
 using namespace boost;
@@ -165,6 +167,7 @@ namespace Core {
 		oxt::thread *prestarterThread;
 
 		SecurityUpdateChecker *securityUpdateChecker;
+		TelemetryCollector *telemetryCollector;
 		AdminPanelConnector *adminPanelConnector;
 		oxt::thread *adminPanelConnectorThread;
 
@@ -175,6 +178,7 @@ namespace Core {
 			  shutdownCounter(0),
 			  prestarterThread(NULL),
 			  securityUpdateChecker(NULL),
+			  telemetryCollector(NULL),
 			  adminPanelConnector(NULL),
 			  adminPanelConnectorThread(NULL)
 			  /*******************/
@@ -190,6 +194,7 @@ namespace Core {
 			delete adminPanelConnectorThread;
 			delete adminPanelConnector;
 			delete securityUpdateChecker;
+			delete telemetryCollector;
 
 			/*******************/
 			/*******************/
@@ -211,6 +216,7 @@ namespace Core {
 
 using namespace Passenger::Core;
 
+static WrapperRegistry::Registry *coreWrapperRegistry;
 static Schema *coreSchema;
 static ConfigKit::Store *coreConfig;
 static WorkingObjects *workingObjects;
@@ -257,9 +263,9 @@ initializeSingleAppMode() {
 
 	if (coreConfig->get("single_app_mode_app_type").isNull()) {
 		P_DEBUG("Autodetecting application type...");
-		AppTypeDetector detector(NULL, 0);
-		PassengerAppType appTypeEnum = detector.checkAppRoot(appRoot);
-		if (appTypeEnum == PAT_NONE || appTypeEnum == PAT_ERROR) {
+		AppTypeDetector::Detector detector(*coreWrapperRegistry, NULL, 0);
+		AppTypeDetector::Detector::Result result = detector.checkAppRoot(appRoot);
+		if (result.isNull()) {
 			fprintf(stderr, "ERROR: unable to autodetect what kind of application "
 				"lives in %s. Please specify information about the app using "
 				"--app-type and --startup-file, or specify a correct location to "
@@ -269,13 +275,18 @@ initializeSingleAppMode() {
 			exit(1);
 		}
 
-		appType = getAppTypeName(appTypeEnum);
+		appType = result.wrapperRegistryEntry->language;
 	} else {
 		appType = coreConfig->get("single_app_mode_app_type").asString();
 	}
 
 	if (coreConfig->get("single_app_mode_startup_file").isNull()) {
-		startupFile = appRoot + "/" + getAppTypeStartupFile(getAppType(appType));
+		const WrapperRegistry::Entry &entry = coreWrapperRegistry->lookup(appType);
+		if (entry.defaultStartupFiles.empty()) {
+			startupFile = appRoot + "/";
+		} else {
+			startupFile = appRoot + "/" + entry.defaultStartupFiles[0];
+		}
 	} else {
 		startupFile = coreConfig->get("single_app_mode_startup_file").asString();
 	}
@@ -551,39 +562,62 @@ printInfoInThread() {
 }
 
 static void
-dumpDiagnosticsOnCrash(void *userData) {
-	WorkingObjects *wo = workingObjects;
-	unsigned int i;
-
-	cerr << "### Backtraces\n";
+dumpOxtBacktracesOnCrash(void *userData) {
 	cerr << oxt::thread::all_backtraces();
 	cerr.flush();
+}
+
+static void
+dumpControllerStatesOnCrash(void *userData) {
+	WorkingObjects *wo = workingObjects;
+	unsigned int i;
 
 	for (i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
-		cerr << "### Request handler state (thread " << (i + 1) << ")\n";
+		cerr << "####### Controller state (thread " << (i + 1) << ") #######\n";
 		cerr << two->controller->inspectStateAsJson();
-		cerr << "\n";
+		cerr << "\n\n";
 		cerr.flush();
 	}
+}
+
+static void
+dumpControllerConfigsOnCrash(void *userData) {
+	WorkingObjects *wo = workingObjects;
+	unsigned int i;
 
 	for (i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
-		cerr << "### Request handler config (thread " << (i + 1) << ")\n";
+		cerr << "####### Controller config (thread " << (i + 1) << ") #######\n";
 		cerr << two->controller->inspectConfig();
-		cerr << "\n";
+		cerr << "\n\n";
 		cerr.flush();
 	}
+}
+
+static void
+dumpPoolStateOnCrash(void *userData) {
+	WorkingObjects *wo = workingObjects;
 
-	cerr << "### Pool state (simple)\n";
+	cerr << "####### Pool state (simple) #######\n";
 	// Do not lock, the crash may occur within the pool.
 	Pool::InspectOptions options(Pool::InspectOptions::makeAuthorized());
 	options.verbose = true;
 	cerr << wo->appPool->inspect(options, false);
-	cerr << "\n";
+	cerr << "\n\n";
 	cerr.flush();
 
-	cerr << "### mbuf stats\n\n";
+	cerr << "####### Pool state (XML) #######\n";
+	Pool::ToXmlOptions options2(Pool::ToXmlOptions::makeAuthorized());
+	options2.secrets = true;
+	cerr << wo->appPool->toXml(options2, false);
+	cerr << "\n\n";
+	cerr.flush();
+}
+
+static void
+dumpMbufStatsOnCrash(void *userData) {
+	WorkingObjects *wo = workingObjects;
 	cerr << "nfree_mbuf_blockq  : " <<
 		wo->threadWorkingObjects[0].serverKitContext->mbuf_pool.nfree_mbuf_blockq << "\n";
 	cerr << "nactive_mbuf_blockq: " <<
@@ -592,13 +626,6 @@ dumpDiagnosticsOnCrash(void *userData) {
 		wo->threadWorkingObjects[0].serverKitContext->mbuf_pool.mbuf_block_chunk_size << "\n";
 	cerr << "\n";
 	cerr.flush();
-
-	cerr << "### Pool state (XML)\n";
-	Pool::ToXmlOptions options2(Pool::ToXmlOptions::makeAuthorized());
-	options2.secrets = true;
-	cerr << wo->appPool->toXml(options2, false);
-	cerr << "\n\n";
-	cerr.flush();
 }
 
 static void
@@ -653,6 +680,7 @@ initializeNonPrivilegedWorkingObjects() {
 	wo->spawningKitContext = boost::make_shared<SpawningKit::Context>(
 		wo->spawningKitContextSchema);
 	wo->spawningKitContext->resourceLocator = &wo->resourceLocator;
+	wo->spawningKitContext->wrapperRegistry = coreWrapperRegistry;
 	wo->spawningKitContext->randomGenerator = wo->randomGenerator;
 	wo->spawningKitContext->integrationMode = coreConfig->get("integration_mode").asString();
 	wo->spawningKitContext->instanceDir = coreConfig->get("instance_dir").asString();
@@ -713,6 +741,7 @@ initializeNonPrivilegedWorkingObjects() {
 			&wo->singleAppModeConfig,
 			coreSchema->controllerSingleAppMode.translator);
 		two.controller->resourceLocator = &wo->resourceLocator;
+		two.controller->wrapperRegistry = coreWrapperRegistry;
 		two.controller->appPool = wo->appPool;
 		two.controller->shutdownFinishCallback = controllerShutdownFinished;
 		two.controller->initialize();
@@ -821,6 +850,27 @@ initializeSecurityUpdateChecker() {
 	checker->start();
 }
 
+static void
+initializeTelemetryCollector() {
+	return; // disable for now
+	TRACE_POINT();
+	WorkingObjects &wo = *workingObjects;
+
+	Json::Value config = coreConfig->inspectEffectiveValues();
+	TelemetryCollector *collector = new TelemetryCollector(
+		coreSchema->telemetryCollector.schema,
+		coreConfig->inspectEffectiveValues(),
+		coreSchema->telemetryCollector.translator);
+	wo.telemetryCollector = collector;
+	for (unsigned int i = 0; i < wo.threadWorkingObjects.size(); i++) {
+		ThreadWorkingObjects *two = &wo.threadWorkingObjects[i];
+		collector->controllers.push_back(two->controller);
+	}
+	collector->initialize();
+	collector->start();
+	wo.shutdownCounter.fetch_add(1, boost::memory_order_relaxed);
+}
+
 static void
 runAdminPanelConnector(AdminPanelConnector *connector) {
 	connector->run();
@@ -968,6 +1018,50 @@ reportInitializationInfo() {
 	}
 }
 
+static void
+initializeAbortHandlerCustomerDiagnostics() {
+	if (!Agent::Fundamentals::abortHandlerInstalled()) {
+		return;
+	}
+
+	Agent::Fundamentals::AbortHandlerConfig::DiagnosticsDumper *diagnosticsDumpers
+		= &Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumpers[0];
+
+	diagnosticsDumpers[0].name = "OXT backtraces";
+	diagnosticsDumpers[0].logFileName = "backtrace_oxt.log";
+	diagnosticsDumpers[0].func = dumpOxtBacktracesOnCrash;
+
+	diagnosticsDumpers[1].name = "controller states";
+	diagnosticsDumpers[1].logFileName = "controller_states.log";
+	diagnosticsDumpers[1].func = dumpControllerStatesOnCrash;
+
+	diagnosticsDumpers[2].name = "controller configs";
+	diagnosticsDumpers[2].logFileName = "controller_configs.log";
+	diagnosticsDumpers[2].func = dumpControllerConfigsOnCrash;
+
+	diagnosticsDumpers[3].name = "pool state";
+	diagnosticsDumpers[3].logFileName = "pool.log";
+	diagnosticsDumpers[3].func = dumpPoolStateOnCrash;
+
+	diagnosticsDumpers[4].name = "mbuf statistics";
+	diagnosticsDumpers[4].logFileName = "mbufs.log";
+	diagnosticsDumpers[4].func = dumpMbufStatsOnCrash;
+
+	Agent::Fundamentals::abortHandlerConfigChanged();
+}
+
+static void
+uninstallAbortHandlerCustomDiagnostics() {
+	if (!Agent::Fundamentals::abortHandlerInstalled()) {
+		return;
+	}
+
+	for (unsigned int i = 0; i < Agent::Fundamentals::AbortHandlerConfig::MAX_DIAGNOSTICS_DUMPERS; i++) {
+		Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumpers[i].func = NULL;
+	}
+	Agent::Fundamentals::abortHandlerConfigChanged();
+}
+
 static void
 mainLoop() {
 	TRACE_POINT();
@@ -978,9 +1072,6 @@ mainLoop() {
 			&& maxCpus <= CPU_SETSIZE;
 	#endif
 
-	Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumper = dumpDiagnosticsOnCrash;
-	Agent::Fundamentals::abortHandlerConfigChanged();
-
 	for (unsigned int i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
 		two->bgloop->start("Main event loop: thread " + toString(i + 1), 0);
@@ -1064,6 +1155,20 @@ apiServerShutdownFinished(Core::ApiServer::ApiServer *server) {
 	serverShutdownFinished();
 }
 
+static void
+telemetryCollectorAsyncShutdownThreadMain() {
+	WorkingObjects *wo = workingObjects;
+	wo->telemetryCollector->stop();
+	serverShutdownFinished();
+}
+
+static void
+asyncShutdownTelemetryCollector() {
+	oxt::thread(telemetryCollectorAsyncShutdownThreadMain,
+		"Telemetry collector shutdown",
+		512 * 1024);
+}
+
 /* Wait until the watchdog closes the feedback fd (meaning it
  * was killed) or until we receive an exit message.
  */
@@ -1085,8 +1190,7 @@ waitForExitEvent() {
 	TRACE_POINT();
 	if (syscalls::select(largestFd + 1, &fds, NULL, NULL, NULL) == -1) {
 		int e = errno;
-		Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumper = NULL;
-		Agent::Fundamentals::abortHandlerConfigChanged();
+		uninstallAbortHandlerCustomDiagnostics();
 		throw SystemException("select() failed", e);
 	}
 
@@ -1122,6 +1226,9 @@ waitForExitEvent() {
 		if (wo->apiWorkingObjects.apiServer != NULL) {
 			wo->apiWorkingObjects.bgloop->safe->runLater(shutdownApiServer);
 		}
+		if (wo->telemetryCollector != NULL) {
+			asyncShutdownTelemetryCollector();
+		}
 		if (wo->adminPanelConnector != NULL) {
 			wo->adminPanelConnector->asyncShutdown();
 		}
@@ -1133,8 +1240,7 @@ waitForExitEvent() {
 			&fds, NULL, NULL, NULL) == -1)
 		{
 			int e = errno;
-			Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumper = NULL;
-			Agent::Fundamentals::abortHandlerConfigChanged();
+			uninstallAbortHandlerCustomDiagnostics();
 			throw SystemException("select() failed", e);
 		}
 
@@ -1150,8 +1256,7 @@ cleanup() {
 	P_DEBUG("Shutting down " SHORT_PROGRAM_NAME " core...");
 	wo->appPool->destroy();
 
-	Agent::Fundamentals::context->abortHandlerConfig.diagnosticsDumper = dumpDiagnosticsOnCrash;
-	Agent::Fundamentals::abortHandlerConfigChanged();
+	uninstallAbortHandlerCustomDiagnostics();
 
 	for (unsigned i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
@@ -1160,6 +1265,11 @@ cleanup() {
 	if (wo->apiWorkingObjects.apiServer != NULL) {
 		wo->apiWorkingObjects.bgloop->stop();
 	}
+	if (wo->telemetryCollector != NULL
+	&& !coreConfig->get("telemetry_collector_disabled").asBool())
+	{
+		wo->telemetryCollector->runOneCycle(true);
+	}
 	wo->appPool.reset();
 	for (unsigned i = 0; i < wo->threadWorkingObjects.size(); i++) {
 		ThreadWorkingObjects *two = &wo->threadWorkingObjects[i];
@@ -1210,12 +1320,14 @@ runCore() {
 		initializeCurl();
 		initializeNonPrivilegedWorkingObjects();
 		initializeSecurityUpdateChecker();
+		initializeTelemetryCollector();
 		initializeAdminPanelConnector();
 		prestartWebApps();
 
 		UPDATE_TRACE_POINT();
 		warnIfPassengerRootVulnerable();
 		reportInitializationInfo();
+		initializeAbortHandlerCustomerDiagnostics();
 		mainLoop();
 
 		UPDATE_TRACE_POINT();
@@ -1277,7 +1389,9 @@ int
 coreMain(int argc, char *argv[]) {
 	int ret;
 
-	coreSchema = new Schema();
+	coreWrapperRegistry = new WrapperRegistry::Registry();
+	coreWrapperRegistry->finalize();
+	coreSchema = new Schema(coreWrapperRegistry);
 	coreConfig = new ConfigKit::Store(*coreSchema);
 	initializeAgent(argc, &argv, SHORT_PROGRAM_NAME " core",
 		*coreConfig, coreSchema->loggingKit.translator,
@@ -1289,5 +1403,6 @@ coreMain(int argc, char *argv[]) {
 
 	ret = runCore();
 	shutdownAgent(coreSchema, coreConfig);
+	delete coreWrapperRegistry;
 	return ret;
 }