Skip to content

Commit 2ca2e2e

Browse files
committed
Fix test
1 parent df91329 commit 2ca2e2e

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

tests/data/expected_context.yaml

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
segmentItems:
1717
- serviceName: skywalking-agent-test-1
18-
segmentSize: 19
18+
segmentSize: 20
1919
segments:
2020
- segmentId: "not null"
2121
spans:
@@ -1437,6 +1437,23 @@ segmentItems:
14371437
- { key: url, value: "http://127.0.0.1:9011/memcache.php" }
14381438
- { key: http.method, value: GET }
14391439
- { key: http.status_code, value: "200" }
1440+
- segmentId: 'not null'
1441+
spans:
1442+
- operationName: GET:/monolog.php
1443+
parentSpanId: -1
1444+
spanId: 0
1445+
spanLayer: Http
1446+
startTime: gt 0
1447+
endTime: gt 0
1448+
componentId: 8001
1449+
isError: false
1450+
spanType: Entry
1451+
peer: ''
1452+
skipAnalysis: false
1453+
tags:
1454+
- {key: url, value: 'http://127.0.0.1:9011/monolog.php'}
1455+
- {key: http.method, value: GET}
1456+
- {key: http.status_code, value: '200'}
14401457
- serviceName: skywalking-agent-test-2
14411458
segmentSize: 1
14421459
segments:
@@ -2012,3 +2029,33 @@ segmentItems:
20122029
- { key: url, value: "http://127.0.0.1:9502/memcache" }
20132030
- { key: http.method, value: GET }
20142031
- { key: http.status_code, value: "200" }
2032+
2033+
logItems:
2034+
- serviceName: skywalking-agent-test-1
2035+
logSize: 2
2036+
logs:
2037+
- timestamp: gt 0
2038+
endpoint: GET:/monolog.php
2039+
body:
2040+
type: ''
2041+
content: {text: This is a WARNING level log.}
2042+
traceContext: {traceId: "not null", traceSegmentId: "not null", spanId: 0}
2043+
tags:
2044+
data:
2045+
- {key: level, value: WARNING}
2046+
- {key: logger, value: Monolog\Logger}
2047+
layer: ''
2048+
- timestamp: gt 0
2049+
endpoint: GET:/monolog.php
2050+
body:
2051+
type: ''
2052+
content: {text: This is a ERROR level log.}
2053+
traceContext: {traceId: "not null", traceSegmentId: "not null", spanId: 0}
2054+
tags:
2055+
data:
2056+
- {key: level, value: ERROR}
2057+
- {key: logger, value: Monolog\Logger}
2058+
- {key: foo, value: '123'}
2059+
- {key: bar, value: 'false'}
2060+
- {key: baz, value: test}
2061+
layer: ''

tests/php/fpm/monolog.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
"foo" => 123, "bar" => false, "baz" => new MyString("test"),
2929
]);
3030

31+
echo "ok";
32+
3133
class MyString {
3234
private $str;
3335

0 commit comments

Comments
 (0)