Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Live API: New 'generationTimeMilliseconds' field used to process Average generation time in Visitor Profile #11095

Merged
merged 5 commits into from Dec 27, 2016
Merged

Live API: New 'generationTimeMilliseconds' field used to process Average generation time in Visitor Profile #11095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
584e98d
Live API: New 'generationTimeMilliseconds' field used to process Aver…
mattab Dec 26, 2016
f341f19
more precision
mattab Dec 26, 2016
0928486
Expected test files
mattab Dec 27, 2016
4dbf069
Reporting API: showColumns and hideColumns should be applied recursiv…
mattab Dec 27, 2016
bbe0828
Submodules
mattab Dec 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 44 additions & 18 deletions core/DataTable/Filter/ColumnDelete.php
View file
Open in desktop
Expand Up @@ -101,25 +101,8 @@ public function filter($table)

// remove columns specified in $this->columnsToRemove
if (!empty($this->columnsToRemove)) {
foreach ($table as $index => $row) {
foreach ($this->columnsToRemove as $column) {
if (!array_key_exists($column, $row)) {
continue;
}

if ($this->deleteIfZeroOnly) {
$value = $row[$column];
if ($value === false || !empty($value)) {
continue;
}
}

unset($table[$index][$column]);
}
}

$this->removeColumnsFromTable($table);
$recurse = true;

}

// remove columns not specified in $columnsToKeep
Expand All @@ -128,6 +111,7 @@ public function filter($table)
$columnsToDelete = array();
foreach ($row as $name => $value) {
$keep = false;

// @see self::APPEND_TO_COLUMN_NAME_TO_KEEP
foreach ($this->columnsToKeep as $nameKeep => $true) {
if (strpos($name, $nameKeep . self::APPEND_TO_COLUMN_NAME_TO_KEEP) === 0) {
Expand Down Expand Up @@ -161,4 +145,46 @@ public function filter($table)

return $table;
}

/**
* @param $table
* @return array
*/
protected function removeColumnsFromTable(&$table)
{
if(!$this->isArrayAccess($table)) {
return;
}
foreach ($table as $index => &$row) {
if(!$this->isArrayAccess($row)) {
continue;
}
foreach ($this->columnsToRemove as $column) {

if (!array_key_exists($column, $row)) {
continue;
}

if ($this->deleteIfZeroOnly) {
$value = $row[$column];
if ($value === false || !empty($value)) {
continue;
}
}

unset($table[$index][$column]);
}

$this->removeColumnsFromTable($row);
}
}

/**
* @param $table
* @return bool
*/
protected function isArrayAccess(&$table)
{
return is_array($table) || $table instanceof \ArrayAccess;
}
}
2 changes: 2 additions & 0 deletions plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
<pageIdAction>2</pageIdAction>

<pageId>1</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down Expand Up @@ -118,6 +119,7 @@
<pageIdAction>2</pageIdAction>

<pageId>13</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down
2 changes: 2 additions & 0 deletions plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
<pageIdAction>2</pageIdAction>

<pageId>1</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down Expand Up @@ -118,6 +119,7 @@
<pageIdAction>2</pageIdAction>

<pageId>13</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down
2 changes: 2 additions & 0 deletions .../System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
<pageIdAction>2</pageIdAction>

<pageId>1</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down Expand Up @@ -118,6 +119,7 @@
<pageIdAction>2</pageIdAction>

<pageId>13</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down
2 changes: 2 additions & 0 deletions ...tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
<pageIdAction>2</pageIdAction>

<pageId>1</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down Expand Up @@ -118,6 +119,7 @@
<pageIdAction>2</pageIdAction>

<pageId>13</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down
2 changes: 2 additions & 0 deletions ...s/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
<pageIdAction>2</pageIdAction>

<pageId>1</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down Expand Up @@ -118,6 +119,7 @@
<pageIdAction>2</pageIdAction>

<pageId>13</pageId>
<generationTimeMilliseconds>333</generationTimeMilliseconds>
<generationTime>0.33s</generationTime>
<interactionPosition>1</interactionPosition>
<timeSpent>271</timeSpent>
Expand Down
2 changes: 1 addition & 1 deletion plugins/CustomDimensions
Open in desktop
Submodule CustomDimensions updated from df1231 to 8372a8
1 change: 1 addition & 0 deletions plugins/Live/Visitor.php
View file
Open in desktop
Expand Up @@ -306,6 +306,7 @@ public static function enrichVisitorArrayWithActions($visitorDetailsArray, $acti
$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']);
Expand Down
6 changes: 3 additions & 3 deletions plugins/Live/VisitorProfile.php
View file
Open in desktop
Expand Up @@ -355,14 +355,14 @@ private function handleAveragePageGenerationTime()
{
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'];
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/SecurityInfo
Open in desktop
Submodule SecurityInfo updated from 0863b5 to aef66a