multi-server, multi-container tracking

Author: lmajano

handlers/Main.cfc

@@ -66,7 +66,7 @@ component extends="coldbox.system.RestHandler" {
 				debuggerService  : variables.debuggerService,
 				environment      : variables.debuggerService.getEnvironment(),
 				profilers        : variables.debuggerService.getProfilerStorage(),
-				currentProfiler  : variables.debuggerService.getProfilerStorage()[ 1 ],
+				currentProfiler  : variables.debuggerService.getProfilerStorage()[ 1 ] ?: {},
 				manifestRoot     : event.getModuleRoot( "cbDebugger" ) & "/includes"
 			}
 		);

models/DebuggerService.cfc

@@ -83,7 +83,6 @@ component
 
 		// Store Environment struct
 		variables.environment = {
-			"inetHost"            : discoverInetHost(),
 			"cfmlEngine"          : server.coldfusion.productName,
 			"cfmlVersion"         : ( server.keyExists( "lucee" ) ? server.lucee.version : server.coldfusion.productVersion ),
 			"javaVersion"         : variables.jvmRuntime.version().toString(),
@@ -95,9 +94,7 @@ component
 			"coldboxSuffix"       : variables.controller.getColdBoxSettings().suffix,
 			"appName"             : variables.controller.getSetting( "appName" ),
 			"appPath"             : variables.controller.getSetting( "applicationPath" ),
-			"appHash"             : variables.controller.getAppHash(),
-			"dockerHost"          : ( isNull( cgi.local_host ) ? "" : cgi.local_host ),
-			"dockerIp"            : ( isNull( cgi.local_addr ) ? "0.0.0.0" : cgi.local_addr )
+			"appHash"             : variables.controller.getAppHash()
 		};
 
 		// Initialize secret key
@@ -207,7 +204,10 @@ component
 			"queryString"   : cgi.QUERY_STRING,
 			"httpHost"      : cgi.HTTP_HOST,
 			"httpReferer"   : cgi.HTTP_REFERER,
-			"formData"      : serializeJSON( form ?: {} )
+			"formData"      : serializeJSON( form ?: {} ),
+			"inetHost"      : discoverInetHost(),
+			"dockerHost"    : ( isNull( cgi.local_host ) ? "" : cgi.local_host ),
+			"dockerIp"      : ( isNull( cgi.local_addr ) ? "0.0.0.0" : cgi.local_addr )
 		};
 
 		// Event before recording
@@ -313,6 +313,7 @@ component
 		}
 
 		// Close out the profiler
+		param request.cbDebugger.startCount = 0;
 		request.cbDebugger.append(
 			{
 				"timers"        : variables.timerService.getSortedTimers(),

views/main/partials/profilerReport.cfm

@@ -118,7 +118,7 @@
 					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
 						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
 					</svg>
-					#args.environment.inetHost#
+					#args.profiler.inetHost#
 				</div>
 
 				<div class="ml10" title="Thread Info">
@@ -128,12 +128,12 @@
 					#args.profiler.threadInfo.replaceNoCase( "Thread", "" )#
 				</div>
 
-				<cfif len( args.environment.dockerHost )>
+				<cfif len( args.profiler.dockerHost )>
 					<div class="ml10" title="Docker Info">
 						<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
 							<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />
 						</svg>
-						#args.environment.dockerHost# / #args.environment.dockerIp#
+						#args.profiler.dockerHost# / #args.profiler.dockerIp#
 					</div>
 				</cfif>
 

views/main/partials/profilers.cfm

@@ -7,7 +7,8 @@
 		</th>
 		<th align="left" width="150">
 			Server<br>
-			Thread
+			Thread<br>
+			Docker Info
 		</th>
 		<th align="left" width="75">
 			Response Type
@@ -32,9 +33,11 @@
 				<div>
 					#timeformat( thisProfiler.timestamp, "hh:mm:ss.l tt" )#
 				</div>
+
 				<div class="cbd-text-muted">
 					<small>#dateformat( thisProfiler.timestamp, "mmm.dd.yyyy" )#</small>
 				</div>
+
 				<div class="mt5">
 					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
 						<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
@@ -52,11 +55,17 @@
 			<!--- Machine Info + Thread Info --->
 			<td>
 				<div>
-					#args.environment.inetHost#
+					#thisProfiler.inetHost#
 				</div>
 				<div class="mt5">
 					#thisProfiler.threadInfo.replaceNoCase( "Thread", "" )#
 				</div>
+
+				<cfif len( thisProfiler.dockerHost )>
+					<div class="mt5">
+						#thisProfiler.dockerHost# / #thisProfiler.dockerIp#
+					</div>
+				</cfif>
 			</td>
 
 			<!--- Response & Content TYPE --->
@@ -121,4 +130,11 @@
 		</tr>
 	</cfloop>
 </table>
+
+<cfif !arrayLen( args.profilers )>
+	<div class="m10 cbd-text-red">
+		<em>No profilers found just yet! Go execute your app!</em>
+	</div>
+</cfif>
+
 </cfoutput>