Merge pull request #1031 from brefphp/statsd

Collect which layer was used for invocation
brefphp · Sep 20, 2021 · efa0819 · efa0819
2 parents 9d7a343 + 460a057
commit efa0819
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/runtime/layers/console/bootstrap b/runtime/layers/console/bootstrap
@@ -26,7 +26,7 @@ if (getenv('BREF_DOWNLOAD_VENDOR')) {
     require $appRoot . '/vendor/autoload.php';
 }
 
-$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable();
+$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('console');
 
 $handlerFile = $appRoot . '/' . getenv('_HANDLER');
 if (! is_file($handlerFile)) {

diff --git a/runtime/layers/fpm/bootstrap b/runtime/layers/fpm/bootstrap
@@ -25,7 +25,7 @@ if (getenv('BREF_DOWNLOAD_VENDOR')) {
     require $appRoot . '/vendor/autoload.php';
 }
 
-$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable();
+$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('fpm');
 
 $handlerFile = $appRoot . '/' . getenv('_HANDLER');
 if (! is_file($handlerFile)) {

diff --git a/runtime/layers/function/bootstrap.php b/runtime/layers/function/bootstrap.php
@@ -24,7 +24,7 @@
     require $appRoot . '/vendor/autoload.php';
 }
 
-$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable();
+$lambdaRuntime = LambdaRuntime::fromEnvironmentVariable('function');
 
 $container = Bref::getContainer();
 

diff --git a/runtime/ping/statsd.config.json b/runtime/ping/statsd.config.json
@@ -0,0 +1,7 @@
+  {
+    "debug": false,
+    "backends": ["aws-cloudwatch-statsd-backend"],
+    "cloudwatch": {
+      "region": "EU_WEST_1"
+    }
+  }
diff --git a/src/Runtime/LambdaRuntime.php b/src/Runtime/LambdaRuntime.php
@@ -42,19 +42,23 @@ final class LambdaRuntime
     /** @var Invoker */
     private $invoker;
 
-    public static function fromEnvironmentVariable(): self
+    /** @var string */
+    private $layer;
+
+    public static function fromEnvironmentVariable(string $layer): self
     {
-        return new self((string) getenv('AWS_LAMBDA_RUNTIME_API'));
+        return new self((string) getenv('AWS_LAMBDA_RUNTIME_API'), $layer);
     }
 
-    public function __construct(string $apiUrl)
+    public function __construct(string $apiUrl, string $layer)
     {
         if ($apiUrl === '') {
             die('At the moment lambdas can only be executed in an Lambda environment');
         }
 
         $this->apiUrl = $apiUrl;
         $this->invoker = new Invoker;
+        $this->layer = $layer;
     }
 
     public function __destruct()
@@ -313,7 +317,7 @@ private function postJson(string $url, $data): void
      * WHAT?
      * The data sent in the ping is anonymous.
      * It does not contain any identifiable data about anything (the project, users, etc.).
-     * The only data it contains is: "A Bref invocation happened".
+     * The only data it contains is: "A Bref invocation happened using a specific layer".
      * You can verify that by checking the content of the message in the function.
      *
      * HOW?
@@ -354,7 +358,7 @@ private function ping(): void
 
         /**
          * Here is the content sent to the Bref analytics server.
-         * It signals an invocation happened.
+         * It signals an invocation happened on which layer.
          * Nothing else is sent.
          *
          * `Invocations_100` is used to signal that this is 1 ping equals 100 invocations.
@@ -365,7 +369,7 @@ private function ping(): void
          *
          * See https://github.com/statsd/statsd/blob/master/docs/metric_types.md for more information.
          */
-        $message = 'Invocations_100:1|c';
+        $message = "Invocations_100:1|c\nLayer_{$this->layer}_100:1|c";
 
         $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
         // This IP address is the Bref server.

diff --git a/tests/Runtime/LambdaRuntimeTest.php b/tests/Runtime/LambdaRuntimeTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
     {
         ob_start();
         Server::start();
-        $this->runtime = new LambdaRuntime('localhost:8126');
+        $this->runtime = new LambdaRuntime('localhost:8126', 'phpunit');
     }
 
     protected function tearDown(): void