Skip to content

Commit 3212b3f

Browse files
committed
Merge branch 'master' into client-reports
2 parents f30739a + 5eea18c commit 3212b3f

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
shell: bash
6262

6363
- name: Cache Composer dependencies
64-
uses: actions/cache@v4
64+
uses: actions/cache@v5
6565
with:
6666
path: ${{ steps.composer-cache.outputs.directory }}
6767
key: ${{ runner.os }}-${{ matrix.php.version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/publish-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- name: Get auth token
2626
id: token
27-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
27+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
2828
with:
2929
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
3030
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

src/SentrySdk.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Sentry;
66

7+
use Sentry\Logs\Logs;
8+
use Sentry\Metrics\TraceMetrics;
79
use Sentry\State\Hub;
810
use Sentry\State\HubInterface;
911

@@ -61,4 +63,20 @@ public static function setCurrentHub(HubInterface $hub): HubInterface
6163

6264
return $hub;
6365
}
66+
67+
/**
68+
* Flushes all buffered telemetry data.
69+
*
70+
* This is a convenience facade that forwards the flush operation to all
71+
* internally managed components.
72+
*
73+
* Calling this method is equivalent to invoking `flush()` on each component
74+
* individually. It does not change flushing behavior, improve performance,
75+
* or reduce the number of network requests.
76+
*/
77+
public static function flush(): void
78+
{
79+
Logs::getInstance()->flush();
80+
TraceMetrics::getInstance()->flush();
81+
}
6482
}

src/functions.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,3 +396,18 @@ function addFeatureFlag(string $name, bool $result): void
396396
$scope->addFeatureFlag($name, $result);
397397
});
398398
}
399+
400+
/**
401+
* Flushes all buffered telemetry data.
402+
*
403+
* This is a convenience facade that forwards the flush operation to all
404+
* internally managed components.
405+
*
406+
* Calling this method is equivalent to invoking `flush()` on each component
407+
* individually. It does not change flushing behavior, improve performance,
408+
* or reduce the number of network requests.
409+
*/
410+
function flush(): void
411+
{
412+
SentrySdk::flush();
413+
}

0 commit comments

Comments
 (0)