RubyGems - passenger - Versions diffs - 5.0.24 → 5.0.25 - Mend

passenger 5.0.24 → 5.0.25

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (1796) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0af1aea8f91dd9fc4b54c4c25c3ae15e36aabc62
-  data.tar.gz: 9f6890815b77b348c99a81b5dd3c1c28b9226520
+  metadata.gz: 8fea1067ed0421db03dd10099b852ddebacd6295
+  data.tar.gz: 6a47ee70569941dfc6eb7e76cbbfa5073c835c02
 SHA512:
-  metadata.gz: e59f5e66d3f9bf483ab9e4e32570b76ff9a63ac0c38e0c3bc2b8a161068012663d7ecc6b0ac0335017ea4da01bdf2b4b2db2bbe65fe462d889f508bccca31d40
-  data.tar.gz: d05d4492c67ba8d0135b4ae5ab6e81cdaa907ffe0457d996b604be838b8322007935fe42091ace80eec96eeecd25490d997962673beb954e051a4a6f3b87c018
+  metadata.gz: 4346207a4c3e3cbea9c48f788c6b64c4ef0d7eddeff47b6c37efa36f44c8c883c81c6432b38654116f46e6495b64c053e8b592d31779e5a5f253b9fcd30a39f4
+  data.tar.gz: af3057720643ee9d4a937ce264fb6736faa425535faf1017733d6c58952f0f26cfb315b1cddb4613ebff8a5d951eefa9e66e6aaf669a6a501fbb4de8bf254b3a

data/.editorconfig CHANGED

@@ -68,50 +68,40 @@ indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
-[ext/nginx/*.c]
+[src/nginx_module/*.c]
 indent_style = space
 indent_size = 4
-[ext/nginx/*.h]
+[src/nginx_module/*.h]
 indent_style = space
 indent_size = 4
-[ext/libev/*.c]
+[src/cxx_supportlib/vendor-modified/libev/*.c]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
-[ext/libev/*.h]
+[src/cxx_supportlib/vendor-modified/libev/*.h]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
-[ext/libeio/*.c]
+[src/cxx_supportlib/vendor-copy/libuv/src/*.c]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
-[ext/libeio/*.h]
+[src/cxx_supportlib/vendor-copy/libuv/src/*.h]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
-[ext/libuv/src/*.c]
+[src/cxx_supportlib/vendor-copy/libuv/src/unix/*.c]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
-[ext/libuv/src/*.h]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = false
-[ext/libuv/src/unix/*.c]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = false
-[ext/libuv/src/unix/*.h]
+[src/cxx_supportlib/vendor-copy/libuv/src/unix/*.h]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false

data/CHANGELOG CHANGED

@@ -1,3 +1,23 @@
+Release 5.0.25
+--------------
+ * Integrates into the `rails server` command. Please learn more at [the Passenger + Rails integration documentation](https://www.phusionpassenger.com/library/dev/ruby/rails_integration.html).
+ * Adds explicit support for Action Cable. Please learn more at the [Passenger Library](https://www.phusionpassenger.com/library/dev/ruby/rails_integration.html#action_cable).
+ * Removes packages for Ubuntu 15.04 Vivid and Debian 6. Ubuntu 15.04 and Debian 6 are still supported, we just don't supply packages for them anymore. If you are an Ubuntu 15.04 or Debian 6 user and you want to use Passenger >= 5.0.25, then please upgrade your distribution, or install Passenger from RubyGems/tarball.
+ * Fixes a potential crash due to memory corruption in code for `passenger-config reopen-logs`.
+ * Fixes a potential crash in the large (inbound/outbound) file buffering code.
+ * Fixes a crash that occurs when using Nginx + HTTPS + Sub-requests. Closes GH-1724.
+ * Fixes a crash that occurs when using Nginx + syslog and a logfile for Passenger. Also fixes edge cases where the Nginx logpath would override the Passenger logpath. Closes GH-1514 (again).
+ * [Union Station] Fixes a potential crash due to a wrong limit on snprintf (introduced in 5.0.24 by GH-1633). Closes GH-1744.
+ * [Union Station] Fixes Union Station Node.js request introspection to allow for application.use method chaining. Closes GH-1745.
+ * [Union Station] Fixes information about sinks sometimes missing from `passenger-status --show=union_station`.
+ * [Union Station] When one or more Union Station gateways are suffering from technical difficulties, the Union Station support code now tries more quickly to reestablish the connection.
+ * [Standalone] Don't reject the value 0 (meaning no limit) for `--max-request-queue-size`. Closes GH-1743.
+ * [Standalone] Makes the `--address` option work more reliably if the passed hostname may resolve to multiple addresses. For example, if you pass `--address localhost` then previous versions could fail because Passenger thinks it's an IPv6 address (::1) while Nginx thinks it's an IPv4 address (127.0.0.1). Hostname resolution is now done in a consistent manner.
+ * [Standalone] Adds the `--unlimited-concurrency-path` configuration option.
+ * [Standalone] Adds IPv6 support to the builtin engine.
 Release 5.0.24
 --------------

data/build/cplusplus_support.rb CHANGED

@@ -85,7 +85,7 @@ def generate_compilation_task_dependencies(source, options = nil)
     result.concat(dependencies)
   end
   if options && options[:deps]
-    result.concat(options[:deps])
+    result.concat([options[:deps]].flatten.compact)
   end
   result
 end
@@ -148,14 +148,14 @@ def create_shared_library(target, objects, options_or_flags = nil)
 end
 def define_c_object_compilation_task(object, source, options_or_flags = nil)
-  options = options_or_flags if options.is_a?(Hash)
+  options = options_or_flags if options_or_flags.is_a?(Hash)
   file(object => generate_compilation_task_dependencies(source, options)) do
     compile_c(object, source, options_or_flags)
   end
 end
 def define_cxx_object_compilation_task(object, source, options_or_flags = nil)
-  options = options_or_flags if options.is_a?(Hash)
+  options = options_or_flags if options_or_flags.is_a?(Hash)
   file(object => generate_compilation_task_dependencies(source, options)) do
     compile_cxx(object, source, options_or_flags)
   end

data/build/cxx_dependency_map.rb CHANGED

@@ -933,6 +933,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -946,8 +949,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1035,6 +1036,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1048,8 +1052,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1118,6 +1120,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1131,8 +1136,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1201,6 +1204,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1214,8 +1220,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1284,6 +1288,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1297,8 +1304,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1367,6 +1372,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1380,8 +1388,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1450,6 +1456,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1463,8 +1472,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1533,6 +1540,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1546,8 +1556,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1616,6 +1624,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -1629,8 +1640,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -1745,6 +1754,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -1774,7 +1784,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -1865,6 +1874,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -1894,7 +1904,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -1985,6 +1994,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2014,7 +2024,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2105,6 +2114,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2134,7 +2144,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2225,6 +2234,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2254,7 +2264,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2355,6 +2364,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2384,7 +2394,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2475,6 +2484,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2504,7 +2514,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2595,6 +2604,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2624,7 +2634,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2715,6 +2724,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2744,7 +2754,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2835,6 +2844,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2864,7 +2874,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -2955,6 +2964,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -2984,7 +2994,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -3051,6 +3060,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -3061,8 +3073,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -3111,7 +3121,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/Controller/Client.h",
    "src/agent/Core/Controller/Request.h",
    "src/cxx_supportlib/ServerKit/FdSinkChannel.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -3261,6 +3270,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -3271,8 +3283,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -3304,17 +3314,16 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/OptionParsing.h",
    "src/agent/UstRouter/Controller.h",
    "src/agent/UstRouter/Transaction.h",
-   "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/agent/UstRouter/Client.h",
    "src/cxx_supportlib/MessageReadersWriters.h",
    "src/agent/UstRouter/FileSink.h",
+   "src/agent/UstRouter/LogSink.h",
    "src/agent/UstRouter/RemoteSink.h",
    "src/agent/UstRouter/RemoteSender.h",
    "src/cxx_supportlib/Utils/BlockingQueue.h",
    "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/UnionStationFilterSupport.h",
+   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/agent/UstRouter/ApiServer.h",
    "src/cxx_supportlib/ServerKit/HttpServer.h",
    "src/cxx_supportlib/ServerKit/HttpClient.h",
@@ -3395,6 +3404,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -3405,8 +3417,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -3870,6 +3880,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -3899,7 +3910,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -4320,6 +4330,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -4333,8 +4346,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -4656,6 +4667,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -4667,8 +4681,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -4697,7 +4709,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h"],
  "src/agent/Core/Controller/Request.h"=>
   ["src/cxx_supportlib/ServerKit/HttpRequest.h",
@@ -4758,6 +4769,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -4769,8 +4783,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -4799,7 +4811,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h"],
  "src/agent/Core/Controller/TurboCaching.h"=>
   ["src/cxx_supportlib/oxt/backtrace.hpp",
@@ -4923,6 +4934,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/RandomGenerator.h",
    "src/agent/Core/SpawningKit/Config.h",
@@ -4952,7 +4964,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -5597,6 +5608,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -5607,8 +5621,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -5726,17 +5738,16 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/BufferedIO.h",
    "src/agent/UstRouter/Controller.h",
    "src/agent/UstRouter/Transaction.h",
-   "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/agent/UstRouter/Client.h",
    "src/cxx_supportlib/MessageReadersWriters.h",
    "src/agent/UstRouter/FileSink.h",
+   "src/agent/UstRouter/LogSink.h",
    "src/agent/UstRouter/RemoteSink.h",
    "src/agent/UstRouter/RemoteSender.h",
    "src/cxx_supportlib/Utils/BlockingQueue.h",
    "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/UnionStationFilterSupport.h",
+   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Shared/ApiServerUtils.h",
@@ -5751,6 +5762,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -5759,8 +5773,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -5790,15 +5802,17 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Group.h"],
  "src/agent/UstRouter/Client.h"=>
   ["src/agent/UstRouter/Transaction.h",
-   "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
    "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
+   "src/cxx_supportlib/MemoryKit/mbuf.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/Hasher.h",
    "src/cxx_supportlib/Utils/JsonUtils.h",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/Utils/../Exceptions.h",
-   "src/cxx_supportlib/Utils/StrIntUtils.h",
    "src/cxx_supportlib/Utils/VariantMap.h",
    "src/cxx_supportlib/oxt/backtrace.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
@@ -5817,13 +5831,10 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IOUtils.h",
    "src/cxx_supportlib/FileDescriptor.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/cxx_supportlib/ServerKit/Server.h",
    "src/cxx_supportlib/SafeLibev.h",
    "src/cxx_supportlib/Constants.h",
    "src/cxx_supportlib/ServerKit/Context.h",
-   "src/cxx_supportlib/MemoryKit/mbuf.h",
    "src/cxx_supportlib/ServerKit/Errors.h",
    "src/cxx_supportlib/ServerKit/http_parser.h",
    "src/cxx_supportlib/ServerKit/Hooks.h",
@@ -5879,22 +5890,21 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils.h",
    "src/cxx_supportlib/Utils/LargeFiles.h",
    "src/agent/UstRouter/Transaction.h",
-   "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
+   "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/UstRouter/Client.h",
    "src/cxx_supportlib/MessageReadersWriters.h",
    "src/agent/UstRouter/FileSink.h",
+   "src/agent/UstRouter/LogSink.h",
    "src/agent/UstRouter/RemoteSink.h",
    "src/agent/UstRouter/RemoteSender.h",
    "src/cxx_supportlib/Utils/BlockingQueue.h",
    "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/UnionStationFilterSupport.h",
+   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h"],
- "src/agent/UstRouter/DataStoreId.h"=>
-  ["src/cxx_supportlib/StaticString.h",
-   "src/cxx_supportlib/oxt/macros.hpp"],
  "src/agent/UstRouter/FileSink.h"=>
   ["src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/oxt/macros.hpp",
@@ -5909,9 +5919,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/JsonUtils.h",
+   "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StrIntUtils.h",
@@ -5924,10 +5933,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/ScopeGuard.h",
    "src/cxx_supportlib/Utils/IOUtils.h"],
  "src/agent/UstRouter/LogSink.h"=>
-  ["src/agent/UstRouter/DataStoreId.h",
+  ["src/cxx_supportlib/Utils/JsonUtils.h",
    "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/oxt/macros.hpp",
-   "src/cxx_supportlib/Utils/JsonUtils.h",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/Utils/../Exceptions.h",
@@ -6016,9 +6024,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/JsonUtils.h",
+   "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StrIntUtils.h",
@@ -6041,15 +6048,17 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/BlockingQueue.h",
    "src/cxx_supportlib/Utils/Curl.h"],
  "src/agent/UstRouter/Transaction.h"=>
-  ["src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/StaticString.h",
+  ["src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
+   "src/cxx_supportlib/MemoryKit/mbuf.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/Hasher.h",
    "src/cxx_supportlib/Utils/JsonUtils.h",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/Utils/../Exceptions.h",
-   "src/cxx_supportlib/Utils/StrIntUtils.h",
    "src/cxx_supportlib/Utils/VariantMap.h",
    "src/cxx_supportlib/oxt/backtrace.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
@@ -6067,9 +6076,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
    "src/cxx_supportlib/Utils/FastStringStream.h",
    "src/cxx_supportlib/Utils/IOUtils.h",
-   "src/cxx_supportlib/FileDescriptor.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h"],
+   "src/cxx_supportlib/FileDescriptor.h"],
  "src/agent/Watchdog/ApiServer.h"=>
   ["src/agent/Shared/ApiServerUtils.h",
    "src/cxx_supportlib/oxt/macros.hpp",
@@ -6130,6 +6137,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
@@ -6140,8 +6150,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -7624,6 +7632,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/DataStructures/StringKeyTable.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
@@ -7634,8 +7645,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -7835,6 +7844,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
@@ -7863,7 +7873,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/Controller/TurboCaching.h",
    "src/agent/Core/ResponseCache.h",
@@ -7936,6 +7945,9 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringScanning.h",
    "src/cxx_supportlib/Utils/SystemMetricsCollector.h",
    "src/cxx_supportlib/Utils/SpeedMeter.h",
+   "src/agent/Core/UnionStation/StopwatchLog.h",
+   "src/agent/Core/UnionStation/Transaction.h",
+   "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/ApplicationPool/Common.h",
    "src/cxx_supportlib/DataStructures/StringKeyTable.h",
    "src/agent/Core/ApplicationPool/Options.h",
@@ -7944,8 +7956,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/agent/Core/UnionStation/Context.h",
-   "src/agent/Core/UnionStation/Connection.h",
-   "src/agent/Core/UnionStation/Transaction.h",
    "src/agent/Core/SpawningKit/Config.h",
    "src/agent/Core/ApplicationPool/Context.h",
    "src/cxx_supportlib/Utils/ClassUtils.h",
@@ -7974,7 +7984,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/BasicGroupInfo.h",
    "src/agent/Shared/ApplicationPoolApiKey.h",
    "src/agent/Core/ApplicationPool/Group.h",
-   "src/agent/Core/UnionStation/StopwatchLog.h",
    "src/agent/Core/Controller/AppResponse.h",
    "src/agent/Core/ResponseCache.h",
    "src/cxx_supportlib/ServerKit/CookieUtils.h",
@@ -8151,17 +8160,19 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/ServerKit/FileBufferedChannel.h",
    "src/cxx_supportlib/ServerKit/ClientRef.h",
    "src/agent/UstRouter/Transaction.h",
-   "src/agent/UstRouter/LogSink.h",
-   "src/agent/UstRouter/DataStoreId.h",
-   "src/cxx_supportlib/UnionStationFilterSupport.h",
-   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
+   "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/UstRouter/Client.h",
    "src/cxx_supportlib/MessageReadersWriters.h",
    "src/agent/UstRouter/FileSink.h",
+   "src/agent/UstRouter/LogSink.h",
    "src/agent/UstRouter/RemoteSink.h",
    "src/agent/UstRouter/RemoteSender.h",
    "src/cxx_supportlib/Utils/BlockingQueue.h",
    "src/cxx_supportlib/Utils/Curl.h",
+   "src/cxx_supportlib/UnionStationFilterSupport.h",
+   "src/cxx_supportlib/Utils/ReleaseableScopedPointer.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h"],
  "test/cxx/CxxTestMain.cpp"=>
@@ -9014,6 +9025,47 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
    "src/cxx_supportlib/Utils/ScopeGuard.h"],
+ "test/cxx/UstRouter/TransactionTest.cpp"=>
+  ["test/cxx/TestSupport.h",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "test/cxx/../tut/tut.h",
+   "src/cxx_supportlib/ResourceLocator.h",
+   "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/InstanceDirectory.h",
+   "src/cxx_supportlib/RandomGenerator.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/Utils/IOUtils.h",
+   "src/cxx_supportlib/FileDescriptor.h",
+   "src/cxx_supportlib/BackgroundEventLoop.h",
+   "src/cxx_supportlib/Utils/SystemTime.h",
+   "src/cxx_supportlib/Utils/../Exceptions.h",
+   "src/agent/UstRouter/Transaction.h",
+   "src/cxx_supportlib/MemoryKit/palloc.h",
+   "src/cxx_supportlib/DataStructures/LString.h",
+   "src/cxx_supportlib/MemoryKit/mbuf.h",
+   "src/cxx_supportlib/Utils/Hasher.h",
+   "src/cxx_supportlib/Utils/JsonUtils.h",
+   "src/cxx_supportlib/Utils/VariantMap.h",
+   "src/cxx_supportlib/oxt/backtrace.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
+   "src/cxx_supportlib/Utils/MessageIO.h",
+   "src/cxx_supportlib/Utils/MemZeroGuard.h",
+   "src/cxx_supportlib/Utils/ScopeGuard.h"],
  "test/cxx/Utils/StrIntUtilsTest.cpp"=>
   ["test/cxx/TestSupport.h",
    "src/cxx_supportlib/oxt/thread.hpp",