Converged two separate config flags into one. Updated tests according…

…ly and made slight changes for clarity.

lib/Component.lua

@@ -187,9 +187,8 @@ end
 function Component:_update(newProps, newState)
 	self._setStateBlockedReason = "shouldUpdate"
 
-	-- TODO: Encapsulate the instrumentation more gracefully
 	local doUpdate
-	if GlobalConfig.getValue("shouldUpdateInstrumentation") then
+	if GlobalConfig.getValue("componentInstrumentation") then
 		-- Start timing
 		local time = tick()
 		doUpdate = self:shouldUpdate(newProps or self.props, newState or self.state)
@@ -248,9 +247,9 @@ function Component:_forceUpdate(newProps, newState)
 	end
 
 	self._setStateBlockedReason = "render"
-	-- TODO: Encapsulate the instrumentation more gracefully
+
 	local newChildElement
-	if GlobalConfig.getValue("renderInstrumentation") then
+	if GlobalConfig.getValue("componentInstrumentation") then
 		-- Start timing
 		local time = tick()
 		newChildElement = self:render()
@@ -261,6 +260,7 @@ function Component:_forceUpdate(newProps, newState)
 	else
 		newChildElement = self:render()
 	end
+
 	self._setStateBlockedReason = nil
 
 	self._setStateBlockedReason = "reconcile"
@@ -295,9 +295,8 @@ function Component:_reify(handle)
 
 	self._setStateBlockedReason = "render"
 
-	-- TODO: Encapsulate the instrumentation more gracefully
 	local virtualTree
-	if GlobalConfig.getValue("renderInstrumentation") then
+	if GlobalConfig.getValue("componentInstrumentation") then
 		-- Start timing
 		local time = tick()
 		virtualTree = self:render()

lib/Config.lua

@@ -17,9 +17,7 @@ local defaultConfig = {
 	-- Enables storage of `debug.traceback()` values on elements for debugging.
 	["elementTracing"] = false,
 	-- Enables instrumentation of shouldUpdate
-	["shouldUpdateInstrumentation"] = false,
-	-- Enables instrumentation of rendering
-	["renderInstrumentation"] = false,
+	["componentInstrumentation"] = false,
 }
 
 -- Build a list of valid configuration values up for debug messages.

lib/Instrumentation.spec.lua

@@ -7,7 +7,7 @@ return function()
 
 	it("should count and time renders when enabled", function()
 		GlobalConfig.set({
-			["renderInstrumentation"] = true,
+			["componentInstrumentation"] = true,
 		})
 		local triggerUpdate
 
@@ -44,11 +44,12 @@ return function()
 		Instrumentation.clearCollectedStats()
 		GlobalConfig.reset()
 	end)
-	it("should count and time shouldUpdate when enabled", function()
+
+	it("should count and time shouldUpdate calls when enabled", function()
 		GlobalConfig.set({
-			["shouldUpdateInstrumentation"] = true,
+			["componentInstrumentation"] = true,
 		})
-		local setValue
+		local triggerUpdate
 		local willDoUpdate = false
 
 		local TestComponent = Component:extend("TestComponent")
@@ -64,9 +65,9 @@ return function()
 		end
 
 		function TestComponent:didMount()
-			setValue = function(value)
+			triggerUpdate = function()
 				self:setState({
-					value = value,
+					value = self.state.value + 1,
 				})
 			end
 		end
@@ -76,17 +77,17 @@ return function()
 		local instance = Reconciler.reify(Core.createElement(TestComponent))
 
 		local stats = Instrumentation.getCollectedStats()
-		-- Not yet tracked, because only update processing is on
-		expect(stats.TestComponent).never.to.be.ok()
 
 		willDoUpdate = true
-		setValue("whatevs")
+		triggerUpdate()
+
 		expect(stats.TestComponent).to.be.ok()
 		expect(stats.TestComponent.updateReqCount).to.equal(1)
 		expect(stats.TestComponent.didUpdateCount).to.equal(1)
 
 		willDoUpdate = false
-		setValue("whatevs")
+		triggerUpdate()
+
 		expect(stats.TestComponent.updateReqCount).to.equal(2)
 		expect(stats.TestComponent.didUpdateCount).to.equal(1)
 		expect(stats.TestComponent.shouldUpdateTime).never.to.equal(0)