Skip to content

Commit 5937631

Browse files
authored
Merge pull request #172 from rollbar/fixed/issue-171-log-context-passed-directly-to-telemetry-body
Fixed #171 Log context passed directly to telemetry body.
2 parents f430c09 + 1c7e87e commit 5937631

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/TelemetryListener.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ protected function logMessageHandler(MessageLogged $message): void
105105
EventType::Log,
106106
// Telemetry does not support all PSR-3 or RFC-5424 levels, so we need to convert them.
107107
Telemeter::getLevelFromPsrLevel($message->level),
108-
array_merge(
109-
$message->context,
110-
['message' => $message->message],
111-
),
108+
[
109+
'message' => $message->message,
110+
'context' => $message->context,
111+
],
112112
);
113113
}
114114

tests/TelemetryListenerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testTelemetryCapturesLaravelLogs(): void
4949

5050
self::assertSame(EventLevel::Debug, $lastItem->level);
5151
self::assertSame('telemetry test message', $lastItem->body->message);
52-
self::assertSame(['foo' => 'bar'], $lastItem->body->extra);
52+
self::assertSame(['context' => ['foo' => 'bar']], $lastItem->body->extra);
5353
}
5454

5555
public function testTelemetryDoesNotCaptureLaravelLogsWhenDisabled(): void

0 commit comments

Comments
 (0)