Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Handlers/RequestTerminatedHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
namespace Overtrue\LaravelOpenTelemetry\Handlers;

use Laravel\Octane\Events\RequestTerminated;
use Overtrue\LaravelOpenTelemetry\Facades\Measure;
use Overtrue\LaravelOpenTelemetry\Facades\Metric;
use Overtrue\LaravelOpenTelemetry\Support\MeasureDataFlusher;

class RequestTerminatedHandler
{
Expand All @@ -16,7 +15,6 @@ class RequestTerminatedHandler
public function handle(RequestTerminated $event): void
{
// In Octane mode, we need to force flush the tracer provider.
Measure::flush();
Metric::flush();
MeasureDataFlusher::flush();
}
}
15 changes: 15 additions & 0 deletions src/Support/MeasureDataFlusher.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace Overtrue\LaravelOpenTelemetry\Support;

use Overtrue\LaravelOpenTelemetry\Facades\Measure;
use Overtrue\LaravelOpenTelemetry\Facades\Metric;

class MeasureDataFlusher
{
public static function flush(): void
{
Measure::flush();
Metric::flush();
}
}
5 changes: 5 additions & 0 deletions src/Watchers/QueueWatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Queue\Events\JobQueued;
use OpenTelemetry\SemConv\TraceAttributes;
use Overtrue\LaravelOpenTelemetry\Facades\Measure;
use Overtrue\LaravelOpenTelemetry\Support\MeasureDataFlusher;

/**
* Queue Watcher
Expand Down Expand Up @@ -76,6 +77,8 @@ public function recordJobProcessed(JobProcessed $event): void
'messaging.job.class' => $jobClass,
'messaging.job.status' => 'completed',
]);

MeasureDataFlusher::flush();
}

public function recordJobFailed(JobFailed $event): void
Expand All @@ -87,5 +90,7 @@ public function recordJobFailed(JobFailed $event): void
'messaging.job.class' => $jobClass,
'messaging.job.status' => 'failed',
]);

MeasureDataFlusher::flush();
}
}
7 changes: 7 additions & 0 deletions tests/Watchers/QueueWatcherTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Mockery;
use OpenTelemetry\SemConv\TraceAttributes;
use Overtrue\LaravelOpenTelemetry\Facades\Measure;
use Overtrue\LaravelOpenTelemetry\Support\MeasureDataFlusher;
use Overtrue\LaravelOpenTelemetry\Tests\TestCase;
use Overtrue\LaravelOpenTelemetry\Watchers\QueueWatcher;

Expand Down Expand Up @@ -118,6 +119,9 @@ public function test_records_job_processed_event()
'messaging.job.status' => 'completed',
]);

$flusher = Mockery::mock('alias:'.MeasureDataFlusher::class);
$flusher->shouldReceive('flush')->once();

$this->watcher->recordJobProcessed($event);
}

Expand All @@ -138,6 +142,9 @@ public function test_records_job_failed_event()
'messaging.job.status' => 'failed',
]);

$flusher = Mockery::mock('alias:'.MeasureDataFlusher::class);
$flusher->shouldReceive('flush')->once();

$this->watcher->recordJobFailed($event);
}

Expand Down