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.

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

muz-2330 add remote times #44

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
16 changes: 16 additions & 0 deletions Converter/EntityConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use Symfony\Component\HttpFoundation\Request;
use Ecentria\Libraries\EcentriaRestBundle\Services\CRUD\CrudTransformer;
use Doctrine\Common\Persistence\ManagerRegistry;
use Symfony\Component\Stopwatch\Stopwatch;
use Symfony\Component\Validator\Exception\RuntimeException;

/**
Expand Down Expand Up @@ -52,22 +53,34 @@ public function __construct(CrudTransformer $crudTransformer, ManagerRegistry $r
*/
public function apply(Request $request, ParamConverter $configuration)
{
$stopWatch = new Stopwatch();
$stopWatch->start('EntityConverter');
$name = $configuration->getName();
$class = $configuration->getClass();
$options = $this->getOptions($configuration);
$mode = empty($options['mode']) ? CrudTransformer::MODE_RETRIEVE : $options['mode'];
$times = array();

if (null === $request->attributes->get($name, false)) {
$configuration->setIsOptional(true);
}

$stopWatch->start('findObject');
$object = $mode == CrudTransformer::MODE_CREATE ? null : $this->findObject($class, $request, $options, $name);
$stopWatch->stop('findObject');
$times['findObject'] = $stopWatch->getEvent('findObject')->getDuration();
if (empty($object) || $mode == CrudTransformer::MODE_UPDATE) {
$stopWatch->start('crudTransformer');
$data = $this->crudTransformer->getRequestData($request, $mode);
$this->crudTransformer->convertArrayToEntityAndValidate($data, $class, $mode, $object);
$this->crudTransformer->setIdsFromRequest($object, $request, $mode, !empty($options['generated_id']));
$stopWatch->stop('crudTransformer');
$times['crudTransformer'] = $stopWatch->getEvent('crudTransformer')->getDuration();
if (isset($options['references'])) {
$stopWatch->start('convertExternalReferences');
$this->convertExternalReferences($request, $object, $options);
$stopWatch->stop('convertExternalReferences');
$times['convertExternalReferences'] = $stopWatch->getEvent('convertExternalReferences')->getDuration();
}
}

Expand All @@ -79,6 +92,9 @@ public function apply(Request $request, ParamConverter $configuration)
*/
$request->attributes->set(Alias::DATA, $name);

$stopWatch->stop('EntityConverter');
$times['EntityConverter'] = $stopWatch->getEvent('EntityConverter')->getDuration();
$request->attributes->set('methodTimes', $times);
return true;
}

Expand Down
32 changes: 32 additions & 0 deletions Entity/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@ class Transaction
*/
private $messages = [];

/**
* Method times - Json encoded
*
* @var array
*
* @ORM\Column(name="method_times", type="json_array")
*/
private $methodTimes = [];

/**
* Response time in milliseconds
*
Expand Down Expand Up @@ -494,6 +503,29 @@ public function getMessages()
return new ArrayCollection($this->messages);
}

/**
* methodTimes setter
*
* @param array $methodTimes
*
* @return Transaction
*/
public function setMethodTimes($methodTimes)
{
$this->methodTimes = $methodTimes;
return $this;
}

/**
* methodTimes getter
*
* @return array
*/
public function getMethodTimes()
{
return $this->methodTimes;
}

/**
* ResponseTime setter
*
Expand Down
1 change: 1 addition & 0 deletions EventListener/TransactionalListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
}

$this->transactionUpdater->updateResponseTime($transaction, $request, microtime(true));
$this->transactionUpdater->addMethodTimes($transaction, $request);
}
}

Expand Down
30 changes: 30 additions & 0 deletions Model/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ class Transaction
*/
private $messages = [];

/**
* methodTimes - Json encoded
*
* @var array
*/
private $methodTimes = [];

/**
* Response time in milliseconds
*
Expand Down Expand Up @@ -420,6 +427,29 @@ public function getMessages()
return new ArrayCollection($this->messages);
}

/**
* methodTimes setter
*
* @param array $methodTimes
*
* @return Transaction
*/
public function setMethodTimes($methodTimes)
{
$this->methodTimes = $methodTimes;
return $this;
}

/**
* methodTimes getter
*
* @return array
*/
public function getMethodTimes()
{
return $this->methodTimes;
}

/**
* ResponseTime setter
*
Expand Down
2 changes: 2 additions & 0 deletions Services/Transaction/Storage/Doctrine.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ private function buildEntity(TransactionModel $transactionModel)
->setSuccess($transactionModel->getSuccess())
->setMessages($transactionModel->getMessages())
->setResponseTime($transactionModel->getResponseTime())
->setMethodTimes($transactionModel->getMethodTimes())
->setQueryParams($transactionModel->getQueryParams())
->setPostContent($transactionModel->getPostContent());

Expand Down Expand Up @@ -139,6 +140,7 @@ private function buildModel(TransactionEntity $transactionEntity)
->setSuccess($transactionEntity->getSuccess())
->setMessages($transactionEntity->getMessages())
->setResponseTime($transactionEntity->getResponseTime())
->setMethodTimes($transactionEntity->getMethodTimes())
->setQueryParams($transactionEntity->getQueryParams())
->setPostContent($transactionEntity->getPostContent());

Expand Down
17 changes: 17 additions & 0 deletions Services/Transaction/TransactionUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,21 @@ public function updateResponseTime(Transaction $transaction, Request $request, $
$transaction->setResponseTime($responseTime);
return $transaction;
}

/**
* Add method times
*
* @param Transaction $transaction
* @param Request $request
*
* @return Transaction
*/
public function addMethodTimes(Transaction $transaction, Request $request)
{
$methodTimes = $request->attributes->get('methodTimes');
if ($methodTimes) {
$transaction->setMethodTimes($methodTimes);
}
return $transaction;
}
}
2 changes: 1 addition & 1 deletion Tests/EventListener/TransactionalListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private function prepareGetResponseForControllerResultEvent(Transaction $transac
->with('violations')
->willReturn(null);
$request->server = new ParameterBag(array('REQUEST_TIME_FLOAT' => microtime(true) - 0.5));
$request->attributes = new ParameterBag();
$request->attributes = new ParameterBag(array('methodtimes' => array()));

$event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent')
->disableOriginalConstructor()
Expand Down