diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-27 12:17:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 12:17:33 +0300 |
| commit | e1dc81556e7f24d93900282228b31ef28a32afb9 (patch) | |
| tree | a7869cafdffea76fe29077849322e9dcd9f0f043 /plugins | |
| parent | cd8c762a3df4440e69c8fce1d407ef62f6f185a7 (diff) | |
Live API: New 'generationTimeMilliseconds' field used to process Average generation time in Visitor Profile (#11095)
* Live API: New 'generationTimeMilliseconds' field used to process Average generation time in Visitor Profile
fixes #11066
* more precision
* Expected test files
* Reporting API: showColumns and hideColumns should be applied recursively (#11100)
* Recursively delete columns specified with hideColumns
* Custom Dimensions tests
* Invalid argument supplied for foreach() + Contents tests
* New unit test for ColumnDelete filter
* Submodules
Diffstat (limited to 'plugins')
9 files changed, 14 insertions, 3 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 292d9feadf..d912bf9433 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> @@ -118,6 +119,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 292d9feadf..d912bf9433 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> @@ -118,6 +119,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 292d9feadf..d912bf9433 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> @@ -118,6 +119,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 292d9feadf..d912bf9433 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> @@ -118,6 +119,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 292d9feadf..d912bf9433 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -13,6 +13,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> @@ -118,6 +119,7 @@ <pageIdAction>2</pageIdAction> <pageId>13</pageId> + <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> <timeSpent>271</timeSpent> diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject df12314762e14babe08143edc8225a207cfb0b8 +Subproject 8372a86d1681ebd98ae682d0ab0884146d1c7e9 diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 112a3221d7..f50e495537 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -306,6 +306,7 @@ class Visitor implements VisitorInterface $actionDetail['eventValue'] = round($actionDetail['custom_float'], self::EVENT_VALUE_PRECISION); } } elseif ($actionDetail['custom_float'] > 0) { + $actionDetail['generationTimeMilliseconds'] = $actionDetail['custom_float']; $actionDetail['generationTime'] = $formatter->getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000, true); } unset($actionDetail['custom_float']); diff --git a/plugins/Live/VisitorProfile.php b/plugins/Live/VisitorProfile.php index b92ead75e6..181c8bb302 100644 --- a/plugins/Live/VisitorProfile.php +++ b/plugins/Live/VisitorProfile.php @@ -355,14 +355,14 @@ class VisitorProfile { if ($this->profile['totalPageViewsWithTiming']) { $this->profile['averagePageGenerationTime'] = - round($this->pageGenerationTimeTotal / $this->profile['totalPageViewsWithTiming'], $precision = 2); + round($this->pageGenerationTimeTotal / (1000 * $this->profile['totalPageViewsWithTiming']), $precision = 3); } } private function handleIfPageGenerationTime($action) { - if (isset($action['generationTime'])) { - $this->pageGenerationTimeTotal += $action['generationTime']; + if (isset($action['generationTimeMilliseconds'])) { + $this->pageGenerationTimeTotal += $action['generationTimeMilliseconds']; ++$this->profile['totalPageViewsWithTiming']; } } diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 0863b58a1c357a1ba1089a45ca80cd62843e407 +Subproject aef66a071ca376813d56585974120e95a1478e3 |