Merge branch '1.9.x' into docsdb-fixes

Merge pull request #11893 from appwrite/codex/disable-graphql-functional
Merge pull request #11885 from appwrite/fix-gql-route-reset
2026-05-26 13:51:13 +00:00 · 2026-04-15 09:42:05 +05:30 · 2026-04-14 19:19:14 +05:30 · 2026-04-15 01:26:02 +12:00 · 2026-04-14 15:32:29 +03:00 · 2026-04-14 15:17:37 +03:00
38 changed files with 850 additions and 334 deletions
@@ -512,7 +512,7 @@ jobs:
            # Services that rely on sequential test method execution (shared static state)
            FUNCTIONAL_FLAG="--functional"
            case "${{ matrix.service }}" in
-              Databases|TablesDB|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
+              Databases|TablesDB|Functions|Realtime|GraphQL) FUNCTIONAL_FLAG="" ;;
            esac

            docker compose exec -T \
@@ -872,18 +872,18 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_BUILD_TIMEOUT',
-                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 900 seconds.',
+                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 2700 seconds.',
                'introduction' => '0.13.0',
-                'default' => '900',
+                'default' => '2700',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
            [
                'name' => '_APP_COMPUTE_BUILD_TIMEOUT',
-                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 900 seconds.',
+                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 2700 seconds.',
                'introduction' => '1.7.0',
-                'default' => '900',
+                'default' => '2700',
                'required' => false,
                'question' => '',
                'filter' => ''
@@ -231,7 +231,7 @@ function execute(
    $validations = GraphQL::getStandardValidationRules();

    if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {
-        $validations[] = new DisableIntrospection();
+        $validations[] = new DisableIntrospection(DisableIntrospection::ENABLED);
    }

    if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
@@ -92,7 +92,7 @@
        "chillerlan/php-qrcode": "4.3.*",
        "adhocore/jwt": "1.1.*",
        "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "14.11.*",
+        "webonyx/graphql-php": "15.31.*",
        "league/csv": "9.14.*",
        "enshrined/svg-sanitize": "0.22.*"
    },
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "4fb974e9843f6104e40396e7cad4a833",
+    "content-hash": "f6a87c1012b316e614258f8f57a28e48",
    "packages": [
        {
            "name": "adhocore/jwt",
@@ -3850,16 +3850,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "5.3.20",
+            "version": "5.3.21",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "fad8e6b93c4d08cc611e41a828df3bbe0d9cfa24"
+                "reference": "ee2d7d4c87b3a3fae954089ad7494ceb454f619d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/fad8e6b93c4d08cc611e41a828df3bbe0d9cfa24",
-                "reference": "fad8e6b93c4d08cc611e41a828df3bbe0d9cfa24",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/ee2d7d4c87b3a3fae954089ad7494ceb454f619d",
+                "reference": "ee2d7d4c87b3a3fae954089ad7494ceb454f619d",
                "shasum": ""
            },
            "require": {
@@ -3903,9 +3903,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/5.3.20"
+                "source": "https://github.com/utopia-php/database/tree/5.3.21"
            },
-            "time": "2026-04-10T08:27:41+00:00"
+            "time": "2026-04-10T12:38:57+00:00"
        },
        {
            "name": "utopia-php/detector",
@@ -5381,38 +5381,48 @@
        },
        {
            "name": "webonyx/graphql-php",
-            "version": "v14.11.10",
+            "version": "v15.31.5",
            "source": {
                "type": "git",
                "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19"
+                "reference": "089c4ef7e112df85788cfe06596278a8f99f4aa9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9c2fdebc6aa01d831bc2969da00e8588cffef19",
-                "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/089c4ef7e112df85788cfe06596278a8f99f4aa9",
+                "reference": "089c4ef7e112df85788cfe06596278a8f99f4aa9",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "ext-mbstring": "*",
-                "php": "^7.1 || ^8"
+                "php": "^7.4 || ^8"
            },
            "require-dev": {
-                "amphp/amp": "^2.3",
-                "doctrine/coding-standard": "^6.0",
-                "nyholm/psr7": "^1.2",
+                "amphp/amp": "^2.6",
+                "amphp/http-server": "^2.1",
+                "dms/phpunit-arraysubset-asserts": "dev-master",
+                "ergebnis/composer-normalize": "^2.28",
+                "friendsofphp/php-cs-fixer": "3.94.2",
+                "mll-lab/php-cs-fixer-config": "5.13.0",
+                "nyholm/psr7": "^1.5",
                "phpbench/phpbench": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "0.12.82",
-                "phpstan/phpstan-phpunit": "0.12.18",
-                "phpstan/phpstan-strict-rules": "0.12.9",
-                "phpunit/phpunit": "^7.2 || ^8.5",
-                "psr/http-message": "^1.0",
-                "react/promise": "2.*",
-                "simpod/php-coveralls-mirror": "^3.0"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "2.1.46",
+                "phpstan/phpstan-phpunit": "2.0.16",
+                "phpstan/phpstan-strict-rules": "2.0.10",
+                "phpunit/phpunit": "^9.5 || ^10.5.21 || ^11",
+                "psr/http-message": "^1 || ^2",
+                "react/http": "^1.6",
+                "react/promise": "^2.0 || ^3.0",
+                "rector/rector": "^2.0",
+                "symfony/polyfill-php81": "^1.23",
+                "symfony/var-exporter": "^5 || ^6 || ^7 || ^8",
+                "thecodingmachine/safe": "^1.3 || ^2 || ^3",
+                "ticketswap/phpstan-error-formatter": "1.3.0"
            },
            "suggest": {
+                "amphp/http-server": "To leverage async resolving with webserver on AMPHP platform",
                "psr/http-message": "To use standard GraphQL server",
                "react/promise": "To leverage async resolving on React PHP platform"
            },
@@ -5434,15 +5444,19 @@
            ],
            "support": {
                "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v14.11.10"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.31.5"
            },
            "funding": [
+                {
+                    "url": "https://github.com/spawnia",
+                    "type": "github"
+                },
                {
                    "url": "https://opencollective.com/webonyx-graphql-php",
                    "type": "open_collective"
                }
            ],
-            "time": "2023-07-05T14:23:37+00:00"
+            "time": "2026-04-11T18:06:15+00:00"
        }
    ],
    "packages-dev": [
@@ -8449,5 +8463,5 @@
    "platform-dev": {
        "ext-fileinfo": "*"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
@@ -7,6 +7,8 @@ use Appwrite\Event\Message\Execution as ExecutionMessage;
 use Appwrite\Event\Publisher\Execution as ExecutionPublisher;
 use Utopia\Bus\Listener;
 use Utopia\Database\Document;
+use Utopia\Span\Span;
+use Utopia\System\System;

 class Log extends Listener
 {
@@ -30,9 +32,27 @@ class Log extends Listener

    public function handle(ExecutionCompleted $event, ExecutionPublisher $publisherForExecutions): void
    {
+        $project = new Document($event->project);
+        $execution = new Document($event->execution);
+        if ($execution->getAttribute('resourceType', '') === 'functions') {
+            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+            $resourceId = $execution->getAttribute('resourceId', '');
+            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $resourceId === $traceFunctionId) {
+                Span::init('execution.trace.v1_executions_enqueue');
+                Span::add('datetime', gmdate('c'));
+                Span::add('projectId', $project->getId());
+                Span::add('functionId', $resourceId);
+                Span::add('executionId', $execution->getId());
+                Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
+                Span::add('status', $execution->getAttribute('status', ''));
+                Span::current()?->finish();
+            }
+        }
+
        $publisherForExecutions->enqueue(new ExecutionMessage(
-            project: new Document($event->project),
-            execution: new Document($event->execution),
+            project: $project,
+            execution: $execution,
        ));
    }
 }
@@ -53,4 +53,23 @@ class Execution extends Event
            'execution' => $this->execution,
        ];
    }
+
+    /**
+     * Trim payload for the execution event.
+     * Only the project ID is needed — the worker DI fetches the full project from the platform database.
+     *
+     * @return array
+     */
+    protected function trimPayload(): array
+    {
+        $trimmed = [];
+
+        if ($this->project) {
+            $trimmed['project'] = new Document([
+                '$id' => $this->project->getId(),
+            ]);
+        }
+
+        return $trimmed;
+    }
 }
@@ -61,6 +61,26 @@ class Realtime extends Event
        return $this->subscribers;
    }

+    /**
+     * Reset the event state for long-lived worker processes.
+     *
+     * `Event::reset()` clears params/sensitive/event/payload only. Realtime routing also
+     * depends on `context`, `subscribers`, and `project`/`user` fields, so we clear them too
+     * to prevent stale state from affecting subsequent triggers.
+     */
+    public function reset(): self
+    {
+        parent::reset();
+
+        $this->subscribers = [];
+        $this->context = [];
+        $this->project = null;
+        $this->user = null;
+        $this->userId = null;
+
+        return $this;
+    }
+
    /**
     * Execute Event.
     *
@@ -81,8 +81,8 @@ abstract class Adapter implements PromiseAdapter
    /**
     * Create a new promise that resolves when all passed in promises resolve.
     *
-     * @param array $promisesOrValues
+     * @param iterable $promisesOrValues
     * @return GQLPromise
     */
-    abstract public function all(array $promisesOrValues): GQLPromise;
+    abstract public function all(iterable $promisesOrValues): GQLPromise;
 }
@@ -35,8 +35,12 @@ class Swoole extends Adapter
        return new GQLPromise($promise, $this);
    }

-    public function all(array $promisesOrValues): GQLPromise
+    public function all(iterable $promisesOrValues): GQLPromise
    {
+        if ($promisesOrValues instanceof \Traversable) {
+            $promisesOrValues = \iterator_to_array($promisesOrValues);
+        }
+
        return new GQLPromise(SwoolePromise::all($promisesOrValues), $this);
    }
 }
@@ -264,6 +264,8 @@ class Resolvers
        $response->setContentType(Response::CONTENT_TYPE_NULL);
        $response->clearSent();

+        $original = $utopia->getRoute();
+
        try {
            $route = $utopia->match($request, fresh: true);

@@ -274,6 +276,10 @@ class Resolvers
            }
            $reject($e);
            return;
+        } finally {
+            if ($original !== null) {
+                $utopia->setRoute($original);
+            }
        }

        $payload = $response->getPayload();
@@ -3,12 +3,13 @@
 namespace Appwrite\GraphQL\Types;

 use GraphQL\Language\AST\Node;
+use GraphQL\Language\AST\StringValueNode;

 // https://github.com/webonyx/graphql-php/issues/129#issuecomment-309366803
 class Assoc extends Json
 {
-    public $name = 'Assoc';
-    public $description = 'The `Assoc` scalar type represents associative array values.';
+    public string $name = 'Assoc';
+    public ?string $description = 'The `Assoc` scalar type represents associative array values.';

    public function serialize($value)
    {
@@ -30,6 +31,10 @@ class Assoc extends Json

    public function parseLiteral(Node $valueNode, ?array $variables = null)
    {
-        return \json_decode($valueNode->value, true);
+        if ($valueNode instanceof StringValueNode) {
+            return \json_decode($valueNode->value, true);
+        }
+
+        return parent::parseLiteral($valueNode, $variables);
    }
 }
@@ -8,8 +8,8 @@ use GraphQL\Type\Definition\ScalarType;

 class InputFile extends ScalarType
 {
-    public $name = 'InputFile';
-    public $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
+    public string $name = 'InputFile';
+    public ?string $description = 'The `InputFile` special type represents a file to be uploaded in the same HTTP request as specified by
 [graphql-multipart-request-spec](https://github.com/jaydenseric/graphql-multipart-request-spec).';

    public function serialize($value)
@@ -14,8 +14,8 @@ use GraphQL\Type\Definition\ScalarType;
 // https://github.com/webonyx/graphql-php/issues/129#issuecomment-309366803
 class Json extends ScalarType
 {
-    public $name = 'Json';
-    public $description = 'The `JSON` scalar type represents JSON values as specified by
+    public string $name = 'Json';
+    public ?string $description = 'The `JSON` scalar type represents JSON values as specified by
        [ECMA-404](https://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).';

    public function serialize($value)
@@ -50,6 +50,11 @@ class Create extends Action
        return UtopiaResponse::MODEL_DOCUMENT_LIST;
    }

+    protected function getSupportForEmptyDocument()
+    {
+        return false;
+    }
+
    public function __construct()
    {
        $this
@@ -139,30 +144,42 @@ class Create extends Action
            ->inject('eventProcessor')
            ->callback($this->action(...));
    }
+
    public function action(string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, ?array $documents, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan, Authorization $authorization, EventProcessor $eventProcessor): void
    {
        $data = \is_string($data)
            ? \json_decode($data, true)
            : $data;

+        $supportsEmptyDocument = $this->getSupportForEmptyDocument();
+        $hasData = !empty($data);
+        $hasDocuments = !empty($documents);
+
        /**
         * Determine which internal path to call, single or bulk
         */
-        if (empty($data) && empty($documents)) {
+        if (!$supportsEmptyDocument && !$hasData && !$hasDocuments) {
            // No single or bulk documents provided
            throw new Exception($this->getMissingDataException());
        }
-        if (!empty($data) && !empty($documents)) {
+
+        // When empty documents are supported, an empty payload should still be treated as single create.
+        if ($supportsEmptyDocument && !$hasData && !$hasDocuments) {
+            $data = [];
+            $hasData = true;
+        }
+
+        if ($hasData && $hasDocuments) {
            // Both single and bulk documents provided
            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'You can only send one of the following parameters: data, ' . $this->getSDKGroup());
        }
-        if (!empty($data) && empty($documentId)) {
+        if ($hasData && empty($documentId)) {
            // Single document provided without document ID
            $document = $this->isCollectionsAPI() ? 'Document' : 'Row';
            $message = "$document ID is required when creating a single " . strtolower($document) . '.';
            throw new Exception($this->getMissingDataException(), $message);
        }
-        if (!empty($documents) && !empty($documentId)) {
+        if ($hasDocuments && !empty($documentId)) {
            // Bulk documents provided with document ID
            $documentId = $this->isCollectionsAPI() ? 'documentId' : 'rowId';
            throw new Exception(
@@ -170,13 +187,13 @@ class Create extends Action
                "Param \"$documentId\" is not allowed when creating multiple " . $this->getSDKGroup() . ', set "$id" on each instead.'
            );
        }
-        if (!empty($documents) && !empty($permissions)) {
+        if ($hasDocuments && !empty($permissions)) {
            // Bulk documents provided with permissions
            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Param "permissions" is disallowed when creating multiple ' . $this->getSDKGroup() . ', set "$permissions" on each instead');
        }

-        $isBulk = true;
-        if (!empty($data)) {
+        $isBulk = $hasDocuments;
+        if ($hasData) {
            // Single document provided, convert to single item array
            // But remember that it was single to respond with a single document
            $isBulk = false;
@@ -34,6 +34,12 @@ class Create extends DocumentCreate
        return UtopiaResponse::MODEL_DOCUMENT_LIST;
    }

+    protected function getSupportForEmptyDocument()
+    {
+        return true;
+    }
+
+
    public function __construct()
    {
        $this
@@ -1,59 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Logs;
-
-use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Logs\XList as DocumentLogXList;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Query\Limit;
-use Utopia\Database\Validator\Query\Offset;
-use Utopia\Database\Validator\UID;
-use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
-
-class XList extends DocumentLogXList
-{
-    public static function getName(): string
-    {
-        return 'listDocumentsDBDocumentLogs';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/documentsdb/:databaseId/collections/:collectionId/documents/:documentId/logs')
-            ->desc('List document logs')
-            ->groups(['api', 'database'])
-            ->label('scope', 'documents.read')
-            ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('sdk', new Method(
-                namespace: 'documentsDB',
-                group: 'logs',
-                name: 'listDocumentLogs',
-                description: '/docs/references/documentsdb/get-document-logs.md',
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: SwooleResponse::STATUS_CODE_OK,
-                        model: $this->getResponseModel(),
-                    )
-                ],
-                contentType: ContentType::JSON,
-            ))
-            ->param('databaseId', '', new UID(), 'Database ID.')
-            ->param('collectionId', '', new UID(), 'Collection ID.')
-            ->param('documentId', '', new UID(), 'Document ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('getDatabasesDB')
-            ->inject('locale')
-            ->inject('geodb')
-            ->inject('authorization')
-            ->inject('audit')
-            ->callback($this->action(...));
-    }
-}
@@ -1,58 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Logs;
-
-use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Logs\XList as CollectionLogXList;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Query\Limit;
-use Utopia\Database\Validator\Query\Offset;
-use Utopia\Database\Validator\UID;
-use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
-
-class XList extends CollectionLogXList
-{
-    public static function getName(): string
-    {
-        return 'listDocumentsDBCollectionLogs';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/documentsdb/:databaseId/collections/:collectionId/logs')
-            ->desc('List collection logs')
-            ->groups(['api', 'database'])
-            ->label('scope', 'collections.read')
-            ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('sdk', new Method(
-                namespace: 'documentsDB',
-                group: $this->getSdkGroup(),
-                name: 'listCollectionLogs',
-                description: '/docs/references/documentsdb/get-collection-logs.md',
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: SwooleResponse::STATUS_CODE_OK,
-                        model: $this->getResponseModel(),
-                    )
-                ],
-                contentType: ContentType::JSON
-            ))
-            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
-            ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('locale')
-            ->inject('geodb')
-            ->inject('authorization')
-            ->inject('audit')
-            ->callback($this->action(...));
-    }
-}
@@ -1,59 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Logs;
-
-use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Logs\XList as DocumentLogXList;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Query\Limit;
-use Utopia\Database\Validator\Query\Offset;
-use Utopia\Database\Validator\UID;
-use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
-
-class XList extends DocumentLogXList
-{
-    public static function getName(): string
-    {
-        return 'listVectorsDBDocumentLogs';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/vectorsdb/:databaseId/collections/:collectionId/documents/:documentId/logs')
-            ->desc('List document logs')
-            ->groups(['api', 'database'])
-            ->label('scope', 'documents.read')
-            ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('sdk', new Method(
-                namespace: 'vectorsDB',
-                group: 'logs',
-                name: 'listDocumentLogs',
-                description: '/docs/references/vectorsdb/get-document-logs.md',
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: SwooleResponse::STATUS_CODE_OK,
-                        model: $this->getResponseModel(),
-                    )
-                ],
-                contentType: ContentType::JSON,
-            ))
-            ->param('databaseId', '', new UID(), 'Database ID.')
-            ->param('collectionId', '', new UID(), 'Collection ID.')
-            ->param('documentId', '', new UID(), 'Document ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('getDatabasesDB')
-            ->inject('locale')
-            ->inject('geodb')
-            ->inject('authorization')
-            ->inject('audit')
-            ->callback($this->action(...));
-    }
-}
@@ -1,57 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Logs;
-
-use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Logs\XList as CollectionLogXList;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Query\Limit;
-use Utopia\Database\Validator\Query\Offset;
-use Utopia\Database\Validator\UID;
-use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
-
-class XList extends CollectionLogXList
-{
-    public static function getName(): string
-    {
-        return 'listVectorsDBCollectionLogs';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/vectorsdb/:databaseId/collections/:collectionId/logs')
-            ->desc('List collection logs')
-            ->groups(['api', 'database'])
-            ->label('scope', 'collections.read')
-            ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('sdk', new Method(
-                namespace: 'vectorsDB',
-                group: $this->getSdkGroup(),
-                name: 'listCollectionLogs',
-                description: '/docs/references/vectorsdb/get-collection-logs.md',
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: SwooleResponse::STATUS_CODE_OK,
-                        model: $this->getResponseModel(),
-                    )
-                ],
-                contentType: ContentType::JSON
-            ))
-            ->param('databaseId', '', new UID(), 'Database ID.')
-            ->param('collectionId', '', new UID(), 'Collection ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('locale')
-            ->inject('geodb')
-            ->inject('authorization')
-            ->inject('audit')
-            ->callback($this->action(...));
-    }
-}
@@ -12,7 +12,6 @@ use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\B
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Create as CreateRow;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Delete as DeleteRow;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Get as GetRow;
-use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Logs\XList as ListRowLogs;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Update as UpdateRow;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\Upsert as UpsertRow;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Documents\XList as ListRows;
@@ -21,7 +20,6 @@ use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Indexes\Cre
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Indexes\Delete as DeleteColumnIndex;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Indexes\Get as GetColumnIndex;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Indexes\XList as ListColumnIndexes;
-use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Logs\XList as ListTableLogs;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Update as UpdateTable;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\Usage\Get as GetTableUsage;
 use Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Collections\XList as ListTables;
@@ -69,7 +67,6 @@ class DocumentsDB extends Base
        $service->addAction(UpdateTable::getName(), new UpdateTable());
        $service->addAction(DeleteTable::getName(), new DeleteTable());
        $service->addAction(ListTables::getName(), new ListTables());
-        $service->addAction(ListTableLogs::getName(), new ListTableLogs());
        $service->addAction(GetTableUsage::getName(), new GetTableUsage());
    }

@@ -92,7 +89,6 @@ class DocumentsDB extends Base
        $service->addAction(DeleteRow::getName(), new DeleteRow());
        $service->addAction(DeleteRows::getName(), new DeleteRows());
        $service->addAction(ListRows::getName(), new ListRows());
-        $service->addAction(ListRowLogs::getName(), new ListRowLogs());
        $service->addAction(IncrementRowColumn::getName(), new IncrementRowColumn());
        $service->addAction(DecrementRowColumn::getName(), new DecrementRowColumn());
    }
@@ -10,7 +10,6 @@ use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Bul
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Create as CreateDocument;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Delete as DeleteDocument;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Get as GetDocument;
-use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Logs\XList as ListDocumentLogs;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Update as UpdateDocument;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\Upsert as UpsertDocument;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Documents\XList as ListDocuments;
@@ -19,7 +18,6 @@ use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Indexes\Creat
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Indexes\Delete as DeleteIndex;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Indexes\Get as GetIndex;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Indexes\XList as ListIndexes;
-use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Logs\XList as ListCollectionLogs;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Update as UpdateCollection;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\Usage\Get as GetCollectionUsage;
 use Appwrite\Platform\Modules\Databases\Http\VectorsDB\Collections\XList as ListCollections;
@@ -69,7 +67,6 @@ class VectorsDB extends Base
        $service->addAction(UpdateCollection::getName(), new UpdateCollection());
        $service->addAction(DeleteCollection::getName(), new DeleteCollection());
        $service->addAction(ListCollections::getName(), new ListCollections());
-        $service->addAction(ListCollectionLogs::getName(), new ListCollectionLogs());
        $service->addAction(GetCollectionUsage::getName(), new GetCollectionUsage());
    }

@@ -92,7 +89,6 @@ class VectorsDB extends Base
        $service->addAction(UpdateDocuments::getName(), new UpdateDocuments());
        $service->addAction(UpsertDocuments::getName(), new UpsertDocuments());
        $service->addAction(DeleteDocuments::getName(), new DeleteDocuments());
-        $service->addAction(ListDocumentLogs::getName(), new ListDocumentLogs());
    }

    private function registerTransactionActions(Service $service): void
@@ -650,26 +650,30 @@ class Databases extends Action
        Document|null $attribute = null,
        Document|null $index = null,
    ): void {
-        $queueForRealtime
-            ->setProject($project)
-            ->setSubscribers(['console'])
-            ->setEvent($event)
-            ->setParam('databaseId', $database->getId())
-            ->setParam('tableId', $collection->getId())
-            ->setParam('collectionId', $collection->getId());
+        try {
+            $queueForRealtime
+                ->setProject($project)
+                ->setSubscribers(['console'])
+                ->setEvent($event)
+                ->setParam('databaseId', $database->getId())
+                ->setParam('tableId', $collection->getId())
+                ->setParam('collectionId', $collection->getId());

-        if (! empty($attribute)) {
-            $queueForRealtime
-                ->setParam('columnId', $attribute->getId())
-                ->setParam('attributeId', $attribute->getId())
-                ->setPayload($attribute->getArrayCopy());
-        }
-        if (! empty($index)) {
-            $queueForRealtime
-                ->setParam('indexId', $index->getId())
-                ->setPayload($index->getArrayCopy());
+            if (! empty($attribute)) {
+                $queueForRealtime
+                    ->setParam('columnId', $attribute->getId())
+                    ->setParam('attributeId', $attribute->getId())
+                    ->setPayload($attribute->getArrayCopy());
+            }
+            if (! empty($index)) {
+                $queueForRealtime
+                    ->setParam('indexId', $index->getId())
+                    ->setPayload($index->getArrayCopy());
+            }
+            $queueForRealtime->trigger();
+        } finally {
+            $queueForRealtime->reset();
        }

-        $queueForRealtime->trigger();
    }
 }
@@ -21,6 +21,7 @@ use Utopia\Platform\Scope\HTTP;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Multiple;
+use Utopia\Validator\Nullable;
 use Utopia\Validator\Text;
 use Utopia\Validator\URL;

@@ -68,6 +69,7 @@ class Create extends Action
            ->param('tls', false, new Boolean(), 'Certificate verification, false for disabled or true for enabled.', true)
            ->param('authUsername', '', new Text(256), 'Webhook HTTP user. Max length: 256 chars.', true)
            ->param('authPassword', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
+            ->param('secret', null, new Nullable(new Text(256, 8)), 'Webhook secret key. If not provided, a new key will be generated automatically. Key must be at least 8 characters long, and at max 256 characters.', optional: true)
            ->inject('response')
            ->inject('project')
            ->inject('queueForEvents')
@@ -88,6 +90,7 @@ class Create extends Action
        bool $tls,
        string $authUsername,
        string $authPassword,
+        ?string $secret,
        Response $response,
        Document $project,
        QueueEvent $queueForEvents,
@@ -107,7 +110,7 @@ class Create extends Action
            'security' => $tls,
            'httpUser' => $authUsername,
            'httpPass' => $authPassword,
-            'signatureKey' => \bin2hex(\random_bytes(64)),
+            'signatureKey' => $secret ?? \bin2hex(\random_bytes(64)),
            'enabled' => $enabled,
        ]);

@@ -72,6 +72,8 @@ class Get extends Action
            throw new Exception(Exception::WEBHOOK_NOT_FOUND);
        }

+        $webhook->removeAttribute('signatureKey');
+
        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
    }
 }
@@ -1,6 +1,6 @@
 <?php

-namespace Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Signature;
+namespace Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Secret;

 use Appwrite\Event\Event as QueueEvent;
 use Appwrite\Extend\Exception;
@@ -15,6 +15,8 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
+use Utopia\Validator\Nullable;
+use Utopia\Validator\Text;

 class Update extends Action
 {
@@ -22,7 +24,7 @@ class Update extends Action

    public static function getName()
    {
-        return 'updateWebhookSignature';
+        return 'updateWebhookSecret';
    }

    public function __construct()
@@ -52,6 +54,7 @@ class Update extends Action
                ]
            ))
            ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook ID.', false, ['dbForPlatform'])
+            ->param('secret', null, new Nullable(new Text(256, 8)), 'Webhook secret key. If not provided, a new key will be generated automatically. Key must be at least 8 characters long, and at max 256 characters.', optional: true)
            ->inject('response')
            ->inject('project')
            ->inject('queueForEvents')
@@ -62,6 +65,7 @@ class Update extends Action

    public function action(
        string $webhookId,
+        ?string $secret,
        Response $response,
        Document $project,
        QueueEvent $queueForEvents,
@@ -78,7 +82,7 @@ class Update extends Action
        }

        $updates = new Document([
-            'signatureKey' => \bin2hex(\random_bytes(64)),
+            'signatureKey' => $secret ?? \bin2hex(\random_bytes(64)),
        ]);

        $webhook = $authorization->skip(fn () => $dbForPlatform->updateDocument('webhooks', $webhook->getId(), $updates));
@@ -118,6 +118,8 @@ class Update extends Action

        $queueForEvents->setParam('webhookId', $webhook->getId());

+        $webhook->removeAttribute('signatureKey');
+
        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
    }
 }
@@ -120,6 +120,10 @@ class XList extends Action
            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
        }

+        foreach ($webhooks as $webhook) {
+            $webhook->removeAttribute('signatureKey');
+        }
+
        $response->dynamic(new Document([
            'webhooks' => $webhooks,
            'total' => $total,
@@ -6,7 +6,7 @@ use Appwrite\Platform\Modules\Webhooks\Http\Init;
 use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Create as CreateWebhook;
 use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Delete as DeleteWebhook;
 use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Get as GetWebhook;
-use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Signature\Update as UpdateWebhookSignature;
+use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Secret\Update as UpdateWebhookSecret;
 use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\Update as UpdateWebhook;
 use Appwrite\Platform\Modules\Webhooks\Http\Webhooks\XList as ListWebhooks;
 use Utopia\Platform\Service;
@@ -26,6 +26,6 @@ class Http extends Service
        $this->addAction(GetWebhook::getName(), new GetWebhook());
        $this->addAction(DeleteWebhook::getName(), new DeleteWebhook());
        $this->addAction(UpdateWebhook::getName(), new UpdateWebhook());
-        $this->addAction(UpdateWebhookSignature::getName(), new UpdateWebhookSignature());
+        $this->addAction(UpdateWebhookSecret::getName(), new UpdateWebhookSecret());
    }
 }
@@ -7,6 +7,8 @@ use Cron\CronExpression;
 use Utopia\Console;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
+use Utopia\Span\Span;
+use Utopia\System\System;

 /**
 * ScheduleFunctions
@@ -88,7 +90,7 @@ class ScheduleFunctions extends ScheduleBase
                    $scheduleKey = $delayConfig['key'];
                    // Ensure schedule was not deleted
                    if (!\array_key_exists($scheduleKey, $this->schedules)) {
-                        return;
+                        continue;
                    }

                    $schedule = $this->schedules[$scheduleKey];
@@ -102,8 +104,22 @@ class ScheduleFunctions extends ScheduleBase
                        ->setFunction($schedule['resource'])
                        ->setMethod('POST')
                        ->setPath('/')
-                        ->setProject($schedule['project'])
-                        ->trigger();
+                        ->setProject($schedule['project']);
+
+                    $projectDoc = $schedule['project'];
+                    $functionDoc = $schedule['resource'];
+                    $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+                    $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+                    if ($traceProjectId !== '' && $traceFunctionId !== '' && $projectDoc->getId() === $traceProjectId && $functionDoc->getId() === $traceFunctionId) {
+                        Span::init('execution.trace.v1_functions_enqueue');
+                        Span::add('datetime', gmdate('c'));
+                        Span::add('projectId', $projectDoc->getId());
+                        Span::add('functionId', $functionDoc->getId());
+                        Span::add('scheduleId', $schedule['$id'] ?? '');
+                        Span::current()?->finish();
+                    }
+
+                    $queueForFunctions->trigger();

                    $this->recordEnqueueDelay($delayConfig['nextDate']);
                }
@@ -759,11 +759,19 @@ class Deletes extends Action
                    $databasesToClean
                ));
            } elseif ($sharedTablesV1) {
+                /**
+                 * Temporary disabling deletes for internal collections
+                 */
+                $queries = \array_map(
+                    fn ($id) => Query::notEqual('$id', $id),
+                    $projectCollectionIds
+                );
+
+                $queries[] = Query::orderAsc();
+
                $this->deleteByGroup(
                    Database::METADATA,
-                    [
-                        Query::orderAsc()
-                    ],
+                    $queries,
                    $dbForProject
                );
            } elseif ($sharedTablesV2) {
@@ -7,6 +7,8 @@ use Exception;
 use Utopia\Database\Database;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
+use Utopia\Span\Span;
+use Utopia\System\System;

 class Executions extends Action
 {
@@ -39,6 +41,20 @@ class Executions extends Action
            throw new Exception('Missing execution');
        }

+        $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+        $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+        $resourceId = $execution->getAttribute('resourceId', '');
+        if ($traceProjectId !== '' && $traceFunctionId !== '' && $executionMessage->project->getId() === $traceProjectId && $resourceId === $traceFunctionId) {
+            Span::init('execution.trace.executions_worker_upsert');
+            Span::add('datetime', gmdate('c'));
+            Span::add('projectId', $executionMessage->project->getId());
+            Span::add('functionId', $resourceId);
+            Span::add('executionId', $execution->getId());
+            Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
+            Span::add('resourceType', $execution->getAttribute('resourceType', ''));
+            Span::current()?->finish();
+        }
+
        $dbForProject->upsertDocument('executions', $execution);
    }
 }
@@ -23,6 +23,7 @@ use Utopia\Database\Query;
 use Utopia\Logger\Log;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
+use Utopia\Span\Span;
 use Utopia\System\System;

 class Functions extends Action
@@ -115,6 +116,22 @@ class Functions extends Action
        $log->addTag('projectId', $project->getId());
        $log->addTag('type', $type);

+        if (empty($events) && !$function->isEmpty()) {
+            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $function->getId() === $traceFunctionId) {
+                Span::init('execution.trace.functions_worker_dequeue');
+                Span::add('datetime', gmdate('c'));
+                Span::add('projectId', $project->getId());
+                Span::add('functionId', $function->getId());
+                Span::add('payloadType', $type);
+                Span::add('queuePid', $message->getPid());
+                Span::add('queueName', $message->getQueue());
+                Span::add('messageTimestamp', (string) $message->getTimestamp());
+                Span::current()?->finish();
+            }
+        }
+
        if (!empty($events)) {
            $limit = 100;
            $sum = 100;
@@ -304,6 +321,20 @@ class Functions extends Action
            'duration' => 0.0,
        ]);

+        $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+        $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+        if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $function->getId() === $traceFunctionId) {
+            Span::init('execution.trace.functions_worker_before_execution_completed_bus_fail');
+            Span::add('datetime', gmdate('c'));
+            Span::add('projectId', $project->getId());
+            Span::add('functionId', $function->getId());
+            Span::add('executionId', $execution->getId());
+            Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
+            Span::add('trigger', $trigger);
+            Span::add('status', $execution->getAttribute('status', ''));
+            Span::current()?->finish();
+        }
+
        $bus->dispatch(new ExecutionCompleted(
            execution: $execution->getArrayCopy(),
            project: $project->getArrayCopy(),
@@ -522,6 +553,18 @@ class Functions extends Action
            $source = $deployment->getAttribute('buildPath', '');
            $extension = str_ends_with($source, '.tar') ? 'tar' : 'tar.gz';
            $command = $version === 'v2' ? '' : "cp /tmp/code.$extension /mnt/code/code.$extension && nohup helpers/start.sh \"$command\"";
+            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $functionId === $traceFunctionId) {
+                Span::init('execution.trace.functions_worker_before_executor');
+                Span::add('datetime', gmdate('c'));
+                Span::add('projectId', $project->getId());
+                Span::add('functionId', $functionId);
+                Span::add('executionId', $executionId);
+                Span::add('deploymentId', $deployment->getId());
+                Span::add('trigger', $trigger);
+                Span::current()?->finish();
+            }
            $executionResponse = $executor->createExecution(
                projectId: $project->getId(),
                deploymentId: $deploymentId,
@@ -594,6 +637,19 @@ class Functions extends Action
            $errorCode = $th->getCode();
        } finally {
            /** Persist final execution status and record usage */
+            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $functionId === $traceFunctionId) {
+                Span::init('execution.trace.functions_worker_before_execution_completed_bus');
+                Span::add('datetime', gmdate('c'));
+                Span::add('projectId', $project->getId());
+                Span::add('functionId', $functionId);
+                Span::add('executionId', $execution->getId());
+                Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
+                Span::add('status', $execution->getAttribute('status', ''));
+                Span::add('trigger', $trigger);
+                Span::current()?->finish();
+            }
            $bus->dispatch(new ExecutionCompleted(
                execution: $execution->getArrayCopy(),
                project: $project->getArrayCopy(),
@@ -71,7 +71,7 @@ class Webhook extends Model
            ])
            ->addRule('secret', [
                'type' => self::TYPE_STRING,
-                'description' => 'Signature key which can be used to validate incoming webhook payloads.',
+                'description' => 'Signature key which can be used to validate incoming webhook payloads. Only returned on creation and secret rotation.',
                'default' => '',
                'example' => 'ad3d581ca230e2b7059c545e5a',
            ])
@@ -22,7 +22,7 @@ class Comment
        'Every Git commit and branch gets its own deployment URL automatically',
        'Custom domains work with both CNAME for subdomains and NS records for apex domains',
        'HTTPS and SSL certificates are handled automatically for all your Sites',
-        'Functions can run for up to 15 minutes before timing out',
+        'Function builds can take up to 45 minutes before timing out',
        'Schedule functions to run as often as every minute with cron expressions',
        'Environment variables can be scoped per function or shared across your project',
        'Function scopes give you fine-grained control over API permissions',
@@ -11539,4 +11539,162 @@ trait DatabasesBase
        $this->assertEquals('Product B', $rows['body'][$this->getRecordResource()][0]['name']);
        $this->assertEquals(139.99, $rows['body'][$this->getRecordResource()][0]['price']);
    }
+    public function testDocumentWithEmptyPayload(): void
+    {
+        $data = $this->setupCollection();
+        $databaseId = $data['databaseId'];
+        $document = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $data['moviesId']), array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            $this->getRecordIdParam() => ID::unique(),
+            'data' => [],
+            'permissions' => [
+                Permission::read(Role::user($this->getUser()['$id'])),
+                Permission::update(Role::user($this->getUser()['$id'])),
+                Permission::delete(Role::user($this->getUser()['$id'])),
+            ]
+        ]);
+        if ($this->getSupportForAttributes()) {
+            $this->assertEquals(400, $document['headers']['status-code']);
+        } else {
+            $this->assertEquals(201, $document['headers']['status-code']);
+            $this->assertEquals($data['moviesId'], $document['body'][$this->getContainerIdResponseKey()]);
+            $this->assertArrayNotHasKey('$collection', $document['body']);
+            $this->assertEquals($databaseId, $document['body']['$databaseId']);
+            $this->assertTrue(array_key_exists('$sequence', $document['body']));
+            $this->assertIsString($document['body']['$sequence']);
+
+            $documentId = $document['body']['$id'];
+
+            $fetched = $this->client->call(
+                Client::METHOD_GET,
+                $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+                array_merge([
+                    'content-type' => 'application/json',
+                    'x-appwrite-project' => $this->getProject()['$id'],
+                ], $this->getHeaders())
+            );
+
+            $this->assertEquals(200, $fetched['headers']['status-code']);
+            $this->assertEqualsCanonicalizing([
+                '$id',
+                '$databaseId',
+                '$createdAt',
+                '$updatedAt',
+                '$permissions',
+                '$sequence',
+                $this->getContainerIdResponseKey(),
+            ], \array_keys($fetched['body']));
+            $this->assertFalse(array_key_exists('$tenant', $fetched['body']));
+
+            $updated = $this->client->call(
+                Client::METHOD_PATCH,
+                $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+                array_merge([
+                    'content-type' => 'application/json',
+                    'x-appwrite-project' => $this->getProject()['$id'],
+                ], $this->getHeaders()),
+                [
+                    'data' => [
+                        'status' => 'draft',
+                    ],
+                ]
+            );
+
+            $this->assertEquals(200, $updated['headers']['status-code']);
+            $this->assertEquals('draft', $updated['body']['status']);
+
+            $refetched = $this->client->call(
+                Client::METHOD_GET,
+                $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+                array_merge([
+                    'content-type' => 'application/json',
+                    'x-appwrite-project' => $this->getProject()['$id'],
+                ], $this->getHeaders())
+            );
+
+            $this->assertEquals(200, $refetched['headers']['status-code']);
+            $this->assertEquals('draft', $refetched['body']['status']);
+        }
+    }
+
+    /**
+     * API keys may set $createdAt / $updatedAt; invalid strings must return 400, not 500.
+     * Assertions are HTTP status codes only (no error body matching).
+     */
+    public function testInvalidDate(): void
+    {
+        $data = $this->setupAttributes();
+        $databaseId = $data['databaseId'];
+        $invalidDatetime = '1dfs:12:55+sdf:00';
+        $validUpdatedAt = '2024-01-01T00:00:00Z';
+
+        $apiKeyHeaders = [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ];
+
+        $documentPayload = [
+            'title' => 'Captain America',
+            'releaseYear' => 1944,
+            'actors' => [
+                'Chris Evans',
+                'Samuel Jackson',
+            ],
+        ];
+        $permissions = [
+            Permission::read(Role::user($this->getUser()['$id'])),
+            Permission::update(Role::user($this->getUser()['$id'])),
+            Permission::delete(Role::user($this->getUser()['$id'])),
+        ];
+
+        $invalidCreate = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $data['moviesId']), $apiKeyHeaders, [
+            $this->getRecordIdParam() => ID::unique(),
+            'data' => \array_merge($documentPayload, ['$updatedAt' => $invalidDatetime]),
+            'permissions' => $permissions,
+        ]);
+        $this->assertEquals(400, $invalidCreate['headers']['status-code']);
+
+        $document = $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $data['moviesId']), $apiKeyHeaders, [
+            $this->getRecordIdParam() => ID::unique(),
+            'data' => $documentPayload,
+            'permissions' => $permissions,
+        ]);
+        $this->assertEquals(201, $document['headers']['status-code']);
+        $documentId = $document['body']['$id'];
+        $this->assertNotEmpty($documentId);
+
+        $invalidPatch = $this->client->call(
+            Client::METHOD_PATCH,
+            $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+            $apiKeyHeaders,
+            [
+                'data' => [
+                    '$updatedAt' => $invalidDatetime,
+                ],
+            ]
+        );
+        $this->assertEquals(400, $invalidPatch['headers']['status-code']);
+
+        $updated = $this->client->call(
+            Client::METHOD_PATCH,
+            $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+            $apiKeyHeaders,
+            [
+                'data' => [
+                    '$updatedAt' => $validUpdatedAt,
+                ],
+            ]
+        );
+        $this->assertEquals(200, $updated['headers']['status-code']);
+
+        $refetched = $this->client->call(
+            Client::METHOD_GET,
+            $this->getRecordUrl($databaseId, $data['moviesId'], $documentId),
+            $apiKeyHeaders
+        );
+        $this->assertEquals(200, $refetched['headers']['status-code']);
+    }
 }
@@ -694,10 +694,10 @@ trait WebhooksBase
        $this->assertEquals(128, \strlen($updated['body']['secret']));
        $this->assertNotEquals($originalSecret, $updated['body']['secret']);

-        // Verify new secret persisted via GET
+        // Verify secret is not exposed via GET
        $get = $this->getWebhook($webhookId);
        $this->assertEquals(200, $get['headers']['status-code']);
-        $this->assertNotEquals($originalSecret, $get['body']['secret']);
+        $this->assertEmpty($get['body']['secret']);

        // Test secret update on non-existent webhook
        $notFound = $this->updateWebhookSecret('non-existent-id');
@@ -708,6 +708,351 @@ trait WebhooksBase
        $this->deleteWebhook($webhookId);
    }

+    public function testSecretRotationZeroDowntime(): void
+    {
+        // Create webhook pointing to request-catcher so deliveries are captured
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Rotation Test Webhook',
+            ['users.*.create'],
+            null,
+            'http://request-catcher-webhook:5000/',
+            false,
+            null,
+            null
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $webhookId = $webhook['body']['$id'];
+        $originalSecret = $webhook['body']['secret'];
+        $this->assertNotEmpty($originalSecret);
+        $this->assertEquals(128, \strlen($originalSecret));
+
+        // Step 1: Trigger user creation with the original auto-generated secret
+        $email1 = uniqid() . 'rotation1@localhost.test';
+        $user1 = $this->client->call(Client::METHOD_POST, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'userId' => ID::unique(),
+            'email' => $email1,
+            'password' => 'password',
+            'name' => 'Rotation User 1',
+        ]);
+
+        $this->assertEquals(201, $user1['headers']['status-code']);
+        $userId1 = $user1['body']['$id'];
+
+        // Verify webhook delivery is signed with the original secret
+        $this->assertEventually(function () use ($userId1, $originalSecret) {
+            $delivery = $this->getLastRequest(function (array $request) use ($userId1) {
+                $this->assertStringContainsString(
+                    "users.{$userId1}.create",
+                    $request['headers']['X-Appwrite-Webhook-Events'] ?? ''
+                );
+            });
+
+            $this->assertNotEmpty($delivery);
+            $payload = json_encode($delivery['data']);
+            $url = $delivery['url'];
+            $signatureExpected = base64_encode(hash_hmac('sha1', $url . $payload, $originalSecret, true));
+            $this->assertEquals($signatureExpected, $delivery['headers']['X-Appwrite-Webhook-Signature']);
+        }, 15000, 500);
+
+        // Step 2: Rotate the secret to a known custom value
+        $newSecret = 'new-key-after-rotation';
+        $updated = $this->updateWebhookSecret($webhookId, $newSecret);
+
+        $this->assertEquals(200, $updated['headers']['status-code']);
+        $this->assertEquals($newSecret, $updated['body']['secret']);
+        $this->assertNotEquals($originalSecret, $updated['body']['secret']);
+
+        // Step 3: Trigger another user creation — should be signed with the new secret
+        $email2 = uniqid() . 'rotation2@localhost.test';
+        $user2 = $this->client->call(Client::METHOD_POST, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'userId' => ID::unique(),
+            'email' => $email2,
+            'password' => 'password',
+            'name' => 'Rotation User 2',
+        ]);
+
+        $this->assertEquals(201, $user2['headers']['status-code']);
+        $userId2 = $user2['body']['$id'];
+
+        // Verify webhook delivery is signed with the new rotated secret
+        $this->assertEventually(function () use ($userId2, $newSecret) {
+            $delivery = $this->getLastRequest(function (array $request) use ($userId2) {
+                $this->assertStringContainsString(
+                    "users.{$userId2}.create",
+                    $request['headers']['X-Appwrite-Webhook-Events'] ?? ''
+                );
+            });
+
+            $this->assertNotEmpty($delivery);
+            $payload = json_encode($delivery['data']);
+            $url = $delivery['url'];
+            $signatureExpected = base64_encode(hash_hmac('sha1', $url . $payload, $newSecret, true));
+            $this->assertEquals($signatureExpected, $delivery['headers']['X-Appwrite-Webhook-Signature']);
+        }, 15000, 500);
+
+        // Cleanup
+        $this->deleteWebhook($webhookId);
+    }
+
+    public function testCreateWebhookWithCustomSecret(): void
+    {
+        $customSecret = 'custom-secret-key';
+
+        // Create webhook with a custom secret pointing to request-catcher
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Custom Secret Webhook',
+            ['users.*.create'],
+            null,
+            'http://request-catcher-webhook:5000/',
+            false,
+            null,
+            null,
+            $customSecret
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $webhookId = $webhook['body']['$id'];
+        $this->assertEquals($customSecret, $webhook['body']['secret']);
+
+        // Trigger user creation to generate a webhook delivery
+        $email = uniqid() . 'customsecret@localhost.test';
+        $user = $this->client->call(Client::METHOD_POST, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'userId' => ID::unique(),
+            'email' => $email,
+            'password' => 'password',
+            'name' => 'Custom Secret User',
+        ]);
+
+        $this->assertEquals(201, $user['headers']['status-code']);
+        $userId = $user['body']['$id'];
+
+        // Verify webhook delivery is signed with the custom secret
+        $this->assertEventually(function () use ($userId, $customSecret) {
+            $delivery = $this->getLastRequest(function (array $request) use ($userId) {
+                $this->assertStringContainsString(
+                    "users.{$userId}.create",
+                    $request['headers']['X-Appwrite-Webhook-Events'] ?? ''
+                );
+            });
+
+            $this->assertNotEmpty($delivery);
+            $payload = json_encode($delivery['data']);
+            $url = $delivery['url'];
+            $signatureExpected = base64_encode(hash_hmac('sha1', $url . $payload, $customSecret, true));
+            $this->assertEquals($signatureExpected, $delivery['headers']['X-Appwrite-Webhook-Signature']);
+        }, 15000, 500);
+
+        // Cleanup
+        $this->deleteWebhook($webhookId);
+    }
+
+    public function testCreateWebhookSecretMinLength(): void
+    {
+        // 7 chars — below minimum of 8
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Short Secret Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null,
+            'short12'
+        );
+
+        $this->assertEquals(400, $webhook['headers']['status-code']);
+
+        // 8 chars — exactly at minimum
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Min Secret Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null,
+            'exact8ch'
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $this->assertEquals('exact8ch', $webhook['body']['secret']);
+
+        // Cleanup
+        $this->deleteWebhook($webhook['body']['$id']);
+    }
+
+    public function testCreateWebhookSecretMaxLength(): void
+    {
+        // 256 chars — exactly at maximum
+        $maxSecret = str_repeat('a', 256);
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Max Secret Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null,
+            $maxSecret
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $this->assertEquals($maxSecret, $webhook['body']['secret']);
+
+        // Cleanup
+        $this->deleteWebhook($webhook['body']['$id']);
+
+        // 257 chars — above maximum
+        $tooLongSecret = str_repeat('a', 257);
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Too Long Secret Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null,
+            $tooLongSecret
+        );
+
+        $this->assertEquals(400, $webhook['headers']['status-code']);
+    }
+
+    public function testUpdateWebhookSecretMinLength(): void
+    {
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Secret Min Update Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $webhookId = $webhook['body']['$id'];
+
+        // 7 chars — below minimum of 8
+        $updated = $this->updateWebhookSecret($webhookId, 'short12');
+        $this->assertEquals(400, $updated['headers']['status-code']);
+
+        // 8 chars — exactly at minimum
+        $updated = $this->updateWebhookSecret($webhookId, 'exact8ch');
+        $this->assertEquals(200, $updated['headers']['status-code']);
+        $this->assertEquals('exact8ch', $updated['body']['secret']);
+
+        // Cleanup
+        $this->deleteWebhook($webhookId);
+    }
+
+    public function testUpdateWebhookSecretMaxLength(): void
+    {
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Secret Max Update Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $webhookId = $webhook['body']['$id'];
+
+        // 256 chars — exactly at maximum
+        $maxSecret = str_repeat('a', 256);
+        $updated = $this->updateWebhookSecret($webhookId, $maxSecret);
+        $this->assertEquals(200, $updated['headers']['status-code']);
+        $this->assertEquals($maxSecret, $updated['body']['secret']);
+
+        // 257 chars — above maximum
+        $tooLongSecret = str_repeat('a', 257);
+        $updated = $this->updateWebhookSecret($webhookId, $tooLongSecret);
+        $this->assertEquals(400, $updated['headers']['status-code']);
+
+        // Cleanup
+        $this->deleteWebhook($webhookId);
+    }
+
+    public function testWebhookSecretNotExposedInResponses(): void
+    {
+        // Create webhook — secret IS returned on creation
+        $webhook = $this->createWebhook(
+            ID::unique(),
+            'Secret Exposure Test',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null,
+            'my-custom-secret'
+        );
+
+        $this->assertEquals(201, $webhook['headers']['status-code']);
+        $webhookId = $webhook['body']['$id'];
+        $this->assertEquals('my-custom-secret', $webhook['body']['secret']);
+        $this->assertArrayNotHasKey('signatureKey', $webhook['body']);
+
+        // Get webhook — secret must not be exposed
+        $get = $this->getWebhook($webhookId);
+        $this->assertEquals(200, $get['headers']['status-code']);
+        $this->assertEmpty($get['body']['secret']);
+        $this->assertArrayNotHasKey('signatureKey', $get['body']);
+
+        // List webhooks — secret must not be exposed
+        $list = $this->listWebhooks(null, true);
+        $this->assertEquals(200, $list['headers']['status-code']);
+        foreach ($list['body']['webhooks'] as $item) {
+            $this->assertEmpty($item['secret']);
+            $this->assertArrayNotHasKey('signatureKey', $item);
+        }
+
+        // Update webhook — secret must not be exposed
+        $updated = $this->updateWebhook(
+            $webhookId,
+            'Secret Exposure Test Updated',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null
+        );
+        $this->assertEquals(200, $updated['headers']['status-code']);
+        $this->assertEmpty($updated['body']['secret']);
+        $this->assertArrayNotHasKey('signatureKey', $updated['body']);
+
+        // Update webhook secret — secret IS returned on rotation
+        $rotated = $this->updateWebhookSecret($webhookId, 'rotated-secret-key');
+        $this->assertEquals(200, $rotated['headers']['status-code']);
+        $this->assertEquals('rotated-secret-key', $rotated['body']['secret']);
+        $this->assertArrayNotHasKey('signatureKey', $rotated['body']);
+
+        // Cleanup
+        $this->deleteWebhook($webhookId);
+    }
+
    // URL validation tests

    public function testCreateWebhookWithPrivateDomain(): void
@@ -883,6 +1228,12 @@ trait WebhooksBase
    {
        $customId = 'my-custom-webhook-id';

+        // Clean up stale webhook from a previous run if it exists
+        $existing = $this->getWebhook($customId);
+        if ($existing['headers']['status-code'] === 200) {
+            $this->deleteWebhook($customId);
+        }
+
        $webhook = $this->createWebhook(
            $customId,
            'Custom ID Webhook',
@@ -902,6 +1253,19 @@ trait WebhooksBase
        $this->assertEquals(200, $get['headers']['status-code']);
        $this->assertEquals($customId, $get['body']['$id']);

+        // Ensure duplicate creation fails
+        $duplicate = $this->createWebhook(
+            $customId,
+            'Duplicate Custom ID Webhook',
+            ['users.*.create'],
+            null,
+            'https://appwrite.io',
+            null,
+            null,
+            null
+        );
+        $this->assertEquals(409, $duplicate['headers']['status-code']);
+
        // Cleanup
        $this->deleteWebhook($customId);
    }
@@ -937,8 +1301,7 @@ trait WebhooksBase
        $this->assertEquals(true, $get['body']['tls']);
        $this->assertEquals('myuser', $get['body']['authUsername']);
        $this->assertEquals('mypass', $get['body']['authPassword']);
-        $this->assertNotEmpty($get['body']['secret']);
-        $this->assertEquals(128, \strlen($get['body']['secret']));
+        $this->assertEmpty($get['body']['secret']);
        $this->assertEquals(0, $get['body']['attempts']);
        $this->assertEquals('', $get['body']['logs']);

@@ -1645,7 +2008,7 @@ trait WebhooksBase
        $this->assertEquals(true, $get['body']['security']);
        $this->assertEquals('getuser', $get['body']['httpUser']);
        $this->assertEquals('getpass', $get['body']['httpPass']);
-        $this->assertNotEmpty($get['body']['signatureKey']);
+        $this->assertEmpty($get['body']['signatureKey']);

        // Cleanup
        $this->deleteWebhook($webhookId);
@@ -1779,7 +2142,7 @@ trait WebhooksBase
        return $webhook;
    }

-    protected function createWebhook(string $webhookId, string $name, array $events, ?bool $enabled, ?string $url, ?bool $tls, ?string $authUsername, ?string $authPassword): mixed
+    protected function createWebhook(string $webhookId, string $name, array $events, ?bool $enabled, ?string $url, ?bool $tls, ?string $authUsername, ?string $authPassword, ?string $secret = null): mixed
    {
        $params = [
            'webhookId' => $webhookId,
@@ -1800,6 +2163,9 @@ trait WebhooksBase
        if ($authPassword !== null) {
            $params['authPassword'] = $authPassword;
        }
+        if ($secret !== null) {
+            $params['secret'] = $secret;
+        }

        $webhook = $this->client->call(Client::METHOD_POST, '/webhooks', array_merge([
            'content-type' => 'application/json',
@@ -1838,12 +2204,17 @@ trait WebhooksBase
        return $webhook;
    }

-    protected function updateWebhookSecret(string $webhookId): mixed
+    protected function updateWebhookSecret(string $webhookId, ?string $secret = null): mixed
    {
+        $params = [];
+        if ($secret !== null) {
+            $params['secret'] = $secret;
+        }
+
        $webhook = $this->client->call(Client::METHOD_PATCH, '/webhooks/' . $webhookId . '/secret', array_merge([
            'content-type' => 'application/json',
            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+        ], $this->getHeaders()), $params);

        return $webhook;
    }
@@ -4,6 +4,7 @@ namespace Tests\Unit\GraphQL;

 use Appwrite\GraphQL\Types\Mapper;
 use Appwrite\Utopia\Response;
+use GraphQL\Type\Definition\NamedType;
 use PHPUnit\Framework\TestCase;
 use Swoole\Http\Response as SwooleResponse;

@@ -24,6 +25,7 @@ class BuilderTest extends TestCase
    {
        $model = $this->response->getModel(Response::MODEL_TABLE);
        $type = Mapper::model(\ucfirst($model->getType()));
-        $this->assertEquals('Table', $type->name);
+        $this->assertInstanceOf(NamedType::class, $type);
+        $this->assertEquals('Table', $type->name());
    }
 }
Author	SHA1	Message	Date
ArnabChatterjee20kandGitHub	ebc3febc38	Merge branch '1.9.x' into docsdb-fixes	2026-04-15 09:42:05 +05:30
Chirag AggarwalandGitHub	8fcba8b5c9	Merge pull request #11893 from appwrite/codex/disable-graphql-functional	2026-04-14 19:19:14 +05:30
Jake BarnbyandGitHub	6c8b34c230	Merge pull request #11885 from appwrite/fix-gql-route-reset (fix): reset route to avoid clobbering otel	2026-04-15 01:26:02 +12:00
Shimon NewmanandGitHub	377ade3c44	Merge pull request #11892 from appwrite/schedule-functions-debug-2 Schedule functions debug	2026-04-14 15:32:29 +03:00
Shimon Newman GitHubgreptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>	71533aaaf3	Update app/cli.php Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>	2026-04-14 15:17:37 +03:00
shimon	ccbe7e5d3f	Merge branch '1.9.x' of github.com:appwrite/appwrite into schedule-functions-debug-2	2026-04-14 15:11:56 +03:00
Chirag AggarwalandGitHub	bea7739d7e	Merge branch '1.9.x' into codex/disable-graphql-functional	2026-04-14 17:21:55 +05:30
Jake BarnbyandGitHub	76320d652a	Merge pull request #11887 from appwrite/fix/composer-audit-graphql-php Upgrade graphql-php to v15.31.5	2026-04-14 23:46:45 +12:00
Chirag Aggarwal	6d5968e2ea	ci: disable functional GraphQL e2e	2026-04-14 16:51:46 +05:30
shimon	70c380fa36	feat: add tracing support for execution events in log and worker classes	2026-04-14 13:36:29 +03:00
shimon	512a7ae2bd	feat: enhance function scheduling with tracing support	2026-04-14 13:36:19 +03:00
Chirag AggarwalandGitHub	49d3cd980f	Merge branch '1.9.x' into fix/composer-audit-graphql-php	2026-04-14 15:07:22 +05:30
Luke B. SilverandGitHub	39a396810a	Merge pull request #11881 from appwrite/feat/45-min-build-timeout feat: increase default build timeout to 45 minutes	2026-04-14 09:28:29 +01:00
Jake BarnbyandGitHub	1d307178bb	Merge pull request #11691 from appwrite/delete-project-shared-table-v1 Safe delete shared tables v1	2026-04-14 18:00:00 +12:00
fogelito	c3ed2ff6ce	Merge branch '1.9.x' of https://github.com/appwrite/appwrite into delete-project-shared-table-v1	2026-04-14 08:05:44 +03:00
Chirag Aggarwal	efadf17bfe	Fix GraphQL 15 static analysis	2026-04-14 10:26:59 +05:30
Chirag Aggarwal	bcfec8d5de	Align graphql version pinning style	2026-04-14 09:35:25 +05:30
Chirag Aggarwal	4b2e22d9da	Fix graphql-php audit vulnerability	2026-04-14 09:27:14 +05:30
ArnabChatterjee20k	45e22e2243	Merge remote-tracking branch 'origin/1.9.x' into docsdb-fixes	2026-04-13 22:44:07 +05:30
Matej BačoandGitHub	0a21f3b139	Merge pull request #11884 from appwrite/fix-webhook-api-security Fix: Webhook API secret rotation and security	2026-04-13 15:52:55 +02:00
Jake Barnby	cc8eb62c83	(chore): rename	2026-04-14 01:15:06 +12:00
Luke B. SilverandGitHub	b1ad6ea87c	Merge pull request #11883 from appwrite/fix/large-execution-payload fix: trim execution queue payload to project ID only	2026-04-13 14:13:43 +01:00
Jake Barnby	d52d6c0bf0	(fix): reset route to avoid clobbering otel	2026-04-14 01:13:32 +12:00
Matej Bačo	db406b0a27	Fix tests	2026-04-13 15:08:20 +02:00
Matej Bačo	2585518e33	Fix bugs	2026-04-13 15:08:13 +02:00
Matej Bačo	c9fceb870c	Fix folder structure	2026-04-13 14:57:24 +02:00
Matej Bačo	9f1ec356d1	Formatting fix	2026-04-13 14:53:25 +02:00
Matej Bačo	28d285d5c5	Improved tests for webhook edge cases	2026-04-13 14:53:06 +02:00
loks0nandClaude Sonnet 4.6	a941d8b855	fix: trim execution queue payload to project ID only The v1-executions queue was serialising the full project document (OAuth providers, webhooks, keys, auths config, permissions, etc.) into every message. The worker DI system already re-fetches the complete project from the platform database using only the project ID, so the full document was wasted bytes. Override trimPayload() in the Execution event class to include only $id in the project stub, reducing message size significantly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-13 13:52:09 +01:00
Matej Bačo	3263133e5f	Implement secure webhook interfaces	2026-04-13 14:50:06 +02:00
fogelito	a3ba66c90a	Merge branch '1.9.x' of https://github.com/appwrite/appwrite into delete-project-shared-table-v1 # Conflicts: # composer.lock	2026-04-13 13:29:03 +03:00
ArnabChatterjee20kandGitHub	c24d724000	Merge pull request #11749 from appwrite/db-workers-memory added reset in db worker for queue for realtime	2026-04-13 15:47:54 +05:30
Luke B. Silver GitHubgreptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>	df5ccc10ad	Apply suggestion from @greptile-apps[bot] Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>	2026-04-13 10:48:20 +01:00
loks0nandClaude Sonnet 4.6	2807d6cd9a	feat: increase default build timeout to 45 minutes Raises _APP_COMPUTE_BUILD_TIMEOUT default from 900s (15 min) to 2700s (45 min) to support longer-running builds. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-13 09:57:27 +01:00
ArnabChatterjee20kandGitHub	20e2f2284f	Merge branch '1.9.x' into db-workers-memory	2026-04-13 13:43:14 +05:30
ArnabChatterjee20k	0cce480592	typo	2026-04-10 17:23:43 +05:30
ArnabChatterjee20k	b622b092a8	updated	2026-04-10 17:22:22 +05:30
ArnabChatterjee20k	96fe989f6d	update composer dependencies and remove obsolete log classes	2026-04-10 17:15:31 +05:30
ArnabChatterjee20k	d13dbae0fe	added allowance of empty payload for documentsdb	2026-04-10 13:59:45 +05:30
fogelito	31728c9b72	Update lock	2026-04-06 09:29:58 +03:00
fogelito	9d0fc9e5b1	Merge branch '1.9.x' of https://github.com/appwrite/appwrite into delete-project-shared-table-v1	2026-04-06 09:19:38 +03:00
fogelito	a332eb5f32	Merge branch '1.9.x' of https://github.com/appwrite/appwrite into delete-project-shared-table-v1	2026-04-05 11:42:25 +03:00
fogelito	775d21e5ee	lock	2026-04-05 10:08:29 +03:00
ArnabChatterjee20k	cf99269bc5	Add reset method to Realtime class for clearing event state This new method resets the event state for long-lived worker processes by clearing subscribers, context, and user-related fields, ensuring no stale state affects subsequent triggers.	2026-04-01 18:08:45 +05:30
ArnabChatterjee20k	2a184288f4	removed throw	2026-04-01 18:05:56 +05:30
ArnabChatterjee20k	9237f387fc	added reset in db worker for queue for realtime	2026-04-01 17:59:28 +05:30
fogelito	e42a26fdad	comment	2026-03-31 19:20:13 +03:00
fogelito	2c4770d29b	Database 5.3.19	2026-03-31 19:18:32 +03:00
fogelito	2a9e423cb1	Temporary disabling deletes from internal collections	2026-03-31 12:54:33 +03:00
fogelito	14869cc6d6	Safe delete shared tables v1	2026-03-31 09:59:53 +03:00