Skip to content

Commit c624111

Browse files
committed
refactor: Replace direct metric flushing with Integration::flushEvents() across various listeners.
1 parent 3816be4 commit c624111

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

src/sentry/src/Metrics/Listener/OnBeforeHandle.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use FriendsOfHyperf\Sentry\Constants;
1515
use FriendsOfHyperf\Sentry\Feature;
16+
use FriendsOfHyperf\Sentry\Integration;
1617
use FriendsOfHyperf\Sentry\Metrics\Event\MetricFactoryReady;
1718
use FriendsOfHyperf\Sentry\Metrics\Traits\MetricSetter;
1819
use FriendsOfHyperf\Sentry\SentryContext;
@@ -114,7 +115,8 @@ function () use ($metrics) {
114115
Unit::megabyte()
115116
);
116117

117-
metrics()->flush();
118+
// metrics()->flush();
119+
Integration::flushEvents();
118120
}
119121
);
120122
}

src/sentry/src/Metrics/Listener/OnCoroutineServerStart.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace FriendsOfHyperf\Sentry\Metrics\Listener;
1313

1414
use FriendsOfHyperf\Sentry\Feature;
15+
use FriendsOfHyperf\Sentry\Integration;
1516
use FriendsOfHyperf\Sentry\Metrics\Event\MetricFactoryReady;
1617
use FriendsOfHyperf\Sentry\Metrics\Traits\MetricSetter;
1718
use Hyperf\Coordinator\Timer;
@@ -112,7 +113,8 @@ function () use ($metrics) {
112113
Unit::megabyte()
113114
);
114115

115-
metrics()->flush();
116+
// metrics()->flush();
117+
Integration::flushEvents();
116118
}
117119
);
118120
}

src/sentry/src/Metrics/Listener/OnMetricFactoryReady.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use FriendsOfHyperf\Sentry\Constants as SentryConstants;
1515
use FriendsOfHyperf\Sentry\Feature;
16+
use FriendsOfHyperf\Sentry\Integration;
1617
use FriendsOfHyperf\Sentry\Metrics\CoroutineServerStats;
1718
use FriendsOfHyperf\Sentry\Metrics\Event\MetricFactoryReady;
1819
use FriendsOfHyperf\Sentry\Metrics\Traits\MetricSetter;
@@ -129,7 +130,8 @@ function () use ($metrics, $serverStatsFactory, $workerId) {
129130
Unit::megabyte()
130131
);
131132

132-
metrics()->flush();
133+
// metrics()->flush();
134+
Integration::flushEvents();
133135
}
134136
);
135137
}

src/sentry/src/Metrics/Listener/OnWorkerStart.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace FriendsOfHyperf\Sentry\Metrics\Listener;
1313

1414
use FriendsOfHyperf\Sentry\Feature;
15+
use FriendsOfHyperf\Sentry\Integration;
1516
use FriendsOfHyperf\Sentry\Metrics\Event\MetricFactoryReady;
1617
use FriendsOfHyperf\Sentry\Metrics\Traits\MetricSetter;
1718
use Hyperf\Coordinator\Timer;
@@ -119,7 +120,8 @@ function () use ($metrics, $event) {
119120
Unit::megabyte()
120121
);
121122

122-
metrics()->flush();
123+
// metrics()->flush();
124+
Integration::flushEvents();
123125
}
124126
);
125127
}

src/sentry/src/Metrics/Listener/PoolWatcher.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace FriendsOfHyperf\Sentry\Metrics\Listener;
1313

1414
use FriendsOfHyperf\Sentry\Feature;
15+
use FriendsOfHyperf\Sentry\Integration;
1516
use Hyperf\Coordinator\Timer;
1617
use Hyperf\Event\Contract\ListenerInterface;
1718
use Hyperf\Framework\Event\BeforeWorkerStart;
@@ -89,7 +90,8 @@ function () use ($pool, $workerId, $poolName) {
8990
]
9091
);
9192

92-
metrics()->flush();
93+
// metrics()->flush();
94+
Integration::flushEvents();
9395
}
9496
);
9597
}

src/sentry/src/Metrics/Listener/QueueWatcher.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace FriendsOfHyperf\Sentry\Metrics\Listener;
1313

1414
use FriendsOfHyperf\Sentry\Feature;
15+
use FriendsOfHyperf\Sentry\Integration;
1516
use FriendsOfHyperf\Sentry\Metrics\Event\MetricFactoryReady;
1617
use Hyperf\AsyncQueue\Driver\DriverFactory;
1718
use Hyperf\Contract\ConfigInterface;
@@ -83,7 +84,8 @@ function () {
8384
);
8485
}
8586

86-
metrics()->flush();
87+
// metrics()->flush();
88+
Integration::flushEvents();
8789
}
8890
);
8991
}

0 commit comments

Comments
 (0)