usage test

2024-10-02 10:16:27 +13:00 · 2023-01-15 12:03:52 +02:00 · 2023-01-15 12:03:52 +02:00 · 44af561d06
commit 44af561d06
parent b61e6e0d5a
4 changed files with 149 additions and 139 deletions
--- a/composer.lock
+++ b/composer.lock
@ -2696,30 +2696,30 @@
        },
        {
            "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                "ext-pdo": "*",
                "ext-phar": "*",
                "phpbench/phpbench": "^0.16 || ^1",
                "phpstan/phpstan": "^1.4",
                "phpstan/phpstan-phpunit": "^1",
                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
            },
            "type": "library",
            "autoload": {
@ -2746,7 +2746,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
            },
            "funding": [
                {
@ -2762,7 +2762,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
        },
        {
            "name": "doctrine/lexer",
@ -3618,16 +3618,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.22",
+            "version": "9.2.23",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df"
+                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df",
-                "reference": "e4bf60d2220b4baaa0572986b5d69870226b06df",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
+                "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
                "shasum": ""
            },
            "require": {
@ -3683,7 +3683,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
            },
            "funding": [
                {
@ -3691,7 +3691,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-12-18T16:40:55+00:00"
+            "time": "2022-12-28T12:41:10+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@ -5267,16 +5267,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.4.16",
+            "version": "v5.4.17",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef"
+                "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
-                "reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
+                "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f",
+                "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f",
                "shasum": ""
            },
            "require": {
@ -5346,7 +5346,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.16"
+                "source": "https://github.com/symfony/console/tree/v5.4.17"
            },
            "funding": [
                {
@ -5362,7 +5362,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-25T14:09:27+00:00"
+            "time": "2022-12-28T14:15:31+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@ -5497,16 +5497,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v5.4.11",
+            "version": "v5.4.17",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
+                "reference": "40c08632019838dfb3350f18cf5563b8080055fc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
-                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc",
+                "reference": "40c08632019838dfb3350f18cf5563b8080055fc",
                "shasum": ""
            },
            "require": {
@ -5540,7 +5540,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.11"
+                "source": "https://github.com/symfony/finder/tree/v5.4.17"
            },
            "funding": [
                {
@ -5556,7 +5556,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-07-29T07:37:50+00:00"
+            "time": "2022-12-22T10:31:03+00:00"
        },
        {
            "name": "symfony/options-resolver",
@ -6370,16 +6370,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.4.3",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72",
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72",
                "shasum": ""
            },
            "require": {
@ -6394,7 +6394,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "3.5-dev"
                }
            },
            "autoload": {
@ -6430,7 +6430,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.4.3"
+                "source": "https://github.com/twigphp/Twig/tree/v3.5.0"
            },
            "funding": [
                {
@ -6442,7 +6442,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-09-28T08:42:51+00:00"
+            "time": "2022-12-27T12:28:18+00:00"
        },
        {
            "name": "webmozart/glob",
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@ -635,7 +635,7 @@ class FunctionsCustomServerTest extends Scope
        $this->assertStringContainsString('8.0', $execution['body']['response']);
        $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
        $this->assertEquals('', $execution['body']['stderr']);
-        $this->assertLessThan(1.500, $execution['body']['duration']);
+        $this->assertLessThan(3, $execution['body']['duration']);

        /**
         * Test for FAILURE
@ -915,7 +915,6 @@ class FunctionsCustomServerTest extends Scope
        $this->assertEquals($executions['body']['executions'][0]['statusCode'], 500);
        $this->assertGreaterThan(2, $executions['body']['executions'][0]['duration']);
        $this->assertLessThan(6, $executions['body']['executions'][0]['duration']);
-        $this->assertGreaterThan(4, $executions['body']['executions'][0]['duration']);
        $this->assertEquals($executions['body']['executions'][0]['response'], '');
        $this->assertEquals($executions['body']['executions'][0]['stderr'], 'An internal curl error has occurred within the executor! Error Msg: Operation timed out');

--- a/tests/resources/docker/docker-compose.yml
+++ b/tests/resources/docker/docker-compose.yml
@ -36,7 +36,7 @@ services:
        - TESTING=true
        - VERSION=dev
    restart: unless-stopped
-    ports: 
+    ports:
      - 9501:80
    networks:
      - appwrite
@ -63,7 +63,7 @@ services:
      - mariadb
      - redis
      # - clamav
-
+      - influxdb
    environment:
      - _APP_ENV
      - _APP_OPTIONS_ABUSE
@ -79,6 +79,8 @@ services:
      - _APP_DB_USER
      - _APP_DB_PASS
      - _APP_USAGE_STATS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
      - _APP_STORAGE_ANTIVIRUS=disabled
      - _APP_STORAGE_LIMIT
      - _APP_FUNCTIONS_TIMEOUT
@ -88,42 +90,23 @@ services:
      - _APP_FUNCTIONS_MEMORY_SWAP
      - _APP_EXECUTOR_HOST

-appwrite-worker-usage:
-  entrypoint: worker-usage
-  <<: *x-logging
-  container_name: appwrite-worker-usage
-  image: appwrite-dev
-  networks:
-    - appwrite
-  volumes:
-    - ./app:/usr/src/code/app
-    - ./src:/usr/src/code/src
-    - ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database
-  depends_on:
-    - redis
-    - mariadb
-  environment:
-    - _APP_ENV
-    - _APP_WORKER_PER_CORE
-    - _APP_CONNECTIONS_MAX
-    - _APP_POOL_CLIENTS
-    - _APP_OPENSSL_KEY_V1
-    - _APP_DB_HOST
-    - _APP_DB_PORT
-    - _APP_DB_SCHEMA
-    - _APP_DB_USER
-    - _APP_DB_PASS
-    - _APP_REDIS_HOST
-    - _APP_REDIS_PORT
-    - _APP_REDIS_USER
-    - _APP_REDIS_PASS
-    - _APP_CONNECTIONS_DB_CONSOLE
-    - _APP_CONNECTIONS_DB_PROJECT
-    - _APP_CONNECTIONS_CACHE
-    - _APP_CONNECTIONS_QUEUE
-    - _APP_USAGE_STATS
-    - DOCKERHUB_PULL_USERNAME
-    - DOCKERHUB_PULL_PASSWORD
+  appwrite-worker-usage:
+    entrypoint: worker-usage
+    container_name: appwrite-worker-usage
+    build:
+      context: .
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - telegraf
+    environment:
+      - _APP_ENV
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_STATSD_HOST
+      - _APP_STATSD_PORT

  appwrite-worker-audits:
    entrypoint: worker-audits
@ -199,7 +182,7 @@ appwrite-worker-usage:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-uploads:/storage/uploads:rw
      - appwrite-cache:/storage/cache:rw
    environment:
@ -224,7 +207,7 @@ appwrite-worker-usage:
    depends_on:
      - redis
      - mariadb
-    volumes: 
+    volumes:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
    environment:
@ -286,7 +269,7 @@ appwrite-worker-usage:
      - _APP_REDIS_PORT
      - _APP_SMTP_HOST
      - _APP_SMTP_PORT
-  
+
  appwrite-worker-builds:
    entrypoint: worker-builds
    container_name: appwrite-worker-builds
@ -294,7 +277,7 @@ appwrite-worker-usage:
      context: .
    networks:
      - appwrite
-    volumes: 
+    volumes:
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
@ -384,6 +367,23 @@ appwrite-worker-usage:
  #     - appwrite
  #   volumes:
  #     - appwrite-uploads:/storage/uploads
+
+  influxdb:
+    image: influxdb:1.6
+    container_name: appwrite-influxdb
+    restart: unless-stopped
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-influxdb:/var/lib/influxdb:rw
+
+  telegraf:
+    image: appwrite/telegraf:1.1.0
+    container_name: appwrite-telegraf
+    restart: unless-stopped
+    networks:
+      - appwrite
+
  # redis-commander:
  #   image: rediscommander/redis-commander:latest
  #   restart: unless-stopped
@ -406,6 +406,26 @@ appwrite-worker-usage:
  #     - RESQUE_WEB_PORT=6379
  #     - RESQUE_WEB_HTTP_BASIC_AUTH_USER=user
  #     - RESQUE_WEB_HTTP_BASIC_AUTH_PASSWORD=password
+
+  # chronograf:
+  #   image: chronograf:1.5
+  #   container_name: appwrite-chronograf
+  #   restart: unless-stopped
+  #   networks:
+  #   - appwrite
+  #   volumes:
+  #   - appwrite-chronograf:/var/lib/chronograf
+  #   ports:
+  #   - "8888:8888"
+  #   environment:
+  #   - INFLUXDB_URL=http://influxdb:8086
+  #   - KAPACITOR_URL=http://kapacitor:9092
+  #   - AUTH_DURATION=48h
+  #   - TOKEN_SECRET=duperduper5674829!jwt
+  #   - GH_CLIENT_ID=d86f7145a41eacfc52cc
+  #   - GH_CLIENT_SECRET=9e0081062367a2134e7f2ea95ba1a32d08b6c8ab
+  #   - GH_ORGS=appwrite
+
  # webgrind:
  #   image: 'jokkedk/webgrind:latest'
  #   volumes:
@ -424,4 +444,6 @@ volumes:
  appwrite-uploads:
  appwrite-certificates:
  appwrite-functions:
-  appwrite-config:
+  appwrite-influxdb:
+  appwrite-chronograf:
+  appwrite-config:
--- a/tests/unit/Usage/StatsTest.php
+++ b/tests/unit/Usage/StatsTest.php
@ -2,70 +2,59 @@

 namespace Tests\Unit\Usage;

-use Appwrite\Usage\Stats;
+use Appwrite\URL\URL as AppwriteURL;
 use PHPUnit\Framework\TestCase;
 use Utopia\App;
+use Utopia\DSN\DSN;
+use Utopia\Queue;
+use Utopia\Queue\Client;
+use Utopia\Queue\Connection;

 class StatsTest extends TestCase
 {
-//    /**
-//     * @var Stats
-//     */
-//    protected $object = null;
-//
-//    public function setUp(): void
-//    {
-//        $host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
-//        $port = App::getEnv('_APP_STATSD_PORT', 8125);
-//
-//        $connection = new \Domnikl\Statsd\Connection\UdpSocket($host, $port);
-//        $statsd = new \Domnikl\Statsd\Client($connection);
-//
-//        $this->object = new Stats($statsd);
-//    }
-//
-//    public function tearDown(): void
-//    {
-//    }
-//
-//    public function testNamespace(): void
-//    {
-//        $this->object->setNamespace('appwritetest.usage');
-//        $this->assertEquals('appwritetest.usage', $this->object->getNamespace());
-//    }
-//
-//    public function testParams(): void
-//    {
-//        $this->object
-//            ->setParam('projectId', 'appwrite_test')
-//            ->setParam('projectInternalId', 1)
-//            ->setParam('networkRequestSize', 100)
-//        ;
-//
-//        $this->assertEquals('appwrite_test', $this->object->getParam('projectId'));
-//        $this->assertEquals(1, $this->object->getParam('projectInternalId'));
-//        $this->assertEquals(100, $this->object->getParam('networkRequestSize'));
-//
-//        $this->object->submit();
-//
-//        $this->assertEquals(null, $this->object->getParam('projectId'));
-//        $this->assertEquals(null, $this->object->getParam('networkRequestSize'));
-//    }
-//
-//    public function testReset(): void
-//    {
-//        $this->object
-//            ->setParam('projectId', 'appwrite_test')
-//            ->setParam('networkRequestSize', 100)
-//        ;
-//
-//        $this->assertEquals('appwrite_test', $this->object->getParam('projectId'));
-//        $this->assertEquals(100, $this->object->getParam('networkRequestSize'));
-//
-//        $this->object->reset();
-//
-//        $this->assertEquals(null, $this->object->getParam('projectId'));
-//        $this->assertEquals(null, $this->object->getParam('networkRequestSize'));
-//        $this->assertEquals('appwrite.usage', $this->object->getNamespace());
-//    }
+    /**
+     * @var Connection
+     */
+    protected ?Connection $connection = null;
+    /**
+     * @var Client
+     */
+    protected ?Client $client = null;
+
+    const QUEUE_NAME = 'usage-test-q';
+
+    public function setUp(): void
+    {
+        $env =  App::getEnv('_APP_CONNECTIONS_QUEUE', AppwriteURL::unparse([
+                    'scheme' => 'redis',
+                    'host' => App::getEnv('_APP_REDIS_HOST', 'redis'),
+                    'port' => App::getEnv('_APP_REDIS_PORT', '6379'),
+                    'user' => App::getEnv('_APP_REDIS_USER', ''),
+                    'pass' => App::getEnv('_APP_REDIS_PASS', ''),
+                ]));
+
+        $dsn = explode('=', $env);
+        $dsn = $dsn[1] ?? '';
+        $dsn = new DSN($dsn);
+        $this->connection = new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort());
+        $this->client     = new Client(self::QUEUE_NAME, $this->connection);
+    }
+
+    public function tearDown(): void
+    {
+    }
+
+    public function testSamePayload(): void
+    {
+        $inToQueue = [
+            'key_1'  => 'value_1',
+            'key_2'  => 'value_2',
+        ];
+
+        $result = $this->client->enqueue($inToQueue);
+        $this->assertTrue($result);
+        $outFromQueue  = $this->connection->leftPopArray('utopia-queue.queue.' . self::QUEUE_NAME, 0)['payload'];
+        $this->assertNotEmpty($outFromQueue);
+        $this->assertSame($inToQueue, $outFromQueue);
+    }
 }