Skip to content

Commit c60f098

Browse files
committed
tests(agent): Updates integration/frameworks tests to have log labels metric
1 parent 9cc7f57 commit c60f098

17 files changed

+91
-78
lines changed

tests/integration/frameworks/drupal/test_invoke_all_with.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5858
[{"name":"Custom/invoke_callback",
5959
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
60-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
60+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
61+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
6162
]
6263
]
6364
*/

tests/integration/frameworks/drupal/test_module_invoke_all.php

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,22 @@
3535
"?? timeframe start",
3636
"?? timeframe stop",
3737
[
38-
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},
39-
[1, "??", "??", "??", "??", "??"]],
40-
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"},
41-
[1, "??", "??", "??", "??", "??"]],
42-
[{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
43-
[{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
44-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
45-
[{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]],
46-
[{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]],
47-
[{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]],
48-
[{"name":"Framework/Drupal/Hook/h"}, [2, "??", "??", "??", "??", "??"]],
49-
[{"name":"Framework/Drupal/Module/module"}, [5, "??", "??", "??", "??", "??"]],
50-
[{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]],
51-
[{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
52-
[{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]],
53-
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
54-
[{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]]
38+
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[1, "??", "??", "??", "??", "??"]],
39+
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]],
40+
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
41+
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
42+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
43+
[{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]],
44+
[{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]],
46+
[{"name":"Framework/Drupal/Hook/h"}, [2, "??", "??", "??", "??", "??"]],
47+
[{"name":"Framework/Drupal/Module/module"}, [5, "??", "??", "??", "??", "??"]],
48+
[{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]],
49+
[{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
50+
[{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]],
51+
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
52+
[{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]],
53+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
5554
]
5655
]
5756
*/

tests/integration/frameworks/drupal/test_module_invoke_all.php8.php

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,21 @@
3636
"?? timeframe start",
3737
"?? timeframe stop",
3838
[
39-
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},
40-
[1, "??", "??", "??", "??", "??"]],
41-
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"},
42-
[1, "??", "??", "??", "??", "??"]],
43-
[{"name": "Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
44-
[{"name": "Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
45-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
46-
[{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]],
47-
[{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]],
48-
[{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]],
49-
[{"name":"Framework/Drupal/Module/module"}, [3, "??", "??", "??", "??", "??"]],
50-
[{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]],
51-
[{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
52-
[{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]],
53-
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
54-
[{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]]
39+
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/all"},[1, "??", "??", "??", "??", "??"]],
40+
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]],
41+
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
42+
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
43+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
44+
[{"name":"Framework/Drupal/Hook/hook_with_arg"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Framework/Drupal/Hook/f"}, [1, "??", "??", "??", "??", "??"]],
46+
[{"name":"Framework/Drupal/Hook/g"}, [1, "??", "??", "??", "??", "??"]],
47+
[{"name":"Framework/Drupal/Module/module"}, [3, "??", "??", "??", "??", "??"]],
48+
[{"name":"OtherTransaction/all"}, [1, "??", "??", "??", "??", "??"]],
49+
[{"name":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
50+
[{"name":"OtherTransactionTotalTime"}, [1, "??", "??", "??", "??", "??"]],
51+
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
52+
[{"name":"Supportability/framework/Drupal/forced"}, [1, 0, 0, 0, 0, 0]],
53+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
5554
]
5655
]
5756
*/

tests/integration/frameworks/laravel/test_artisan_name.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
[{"name":"Supportability/framework/Laravel/forced"}, [1, "??", "??", "??", "??", "??"]],
2929
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
3030
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
31-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
31+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
32+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
3233
]
3334
]
3435
*/

tests/integration/frameworks/laravel/test_artisan_name_logging_off.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
[{"name":"Supportability/framework/Laravel/forced"}, [1, "??", "??", "??", "??", "??"]],
3232
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
3333
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
34-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
34+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
35+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
3536
]
3637
]
3738
*/

tests/integration/frameworks/laravel/test_artisan_name_non_input.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
[{"name":"Supportability/framework/Laravel/forced"}, [1, "??", "??", "??", "??", "??"]],
2929
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
3030
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
31-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
31+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
32+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
3233
]
3334
]
3435
*/

tests/integration/frameworks/laravel/test_artisan_name_non_string.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
[{"name":"Supportability/framework/Laravel/forced"}, [1, "??", "??", "??", "??", "??"]],
2929
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
3030
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
31-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
31+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
32+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
3233
]
3334
]
3435
*/

tests/integration/frameworks/magento/test_temp_tables.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
[{"name":"Datastore/statement/SQLite/search_/create"}, [1, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/statement/SQLite/search_/drop"}, [1, "??", "??", "??", "??", "??"]],
4141
[{"name":"Datastore/statement/SQLite/search_/insert"}, [1, "??", "??", "??", "??", "??"]],
42-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]],
43-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]],
44-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]],
42+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]],
43+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]],
44+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]],
4545
[{"name":"Datastore/statement/SQLite/search_tmp_/create"}, [1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/statement/SQLite/search_tmp_/drop"}, [1, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/statement/SQLite/search_tmp_/insert"}, [1, "??", "??", "??", "??", "??"]],
@@ -70,7 +70,8 @@
7070
"scope":"OtherTransaction/Action/unknown"}, [1, "??", "??", "??", "??", "??"]],
7171
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
7272
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
73-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
73+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
74+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
7475
]
7576
]
7677
*/

tests/integration/frameworks/magento/test_temp_tables_logging_off.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
[{"name":"Datastore/statement/SQLite/search_/create"}, [1, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/statement/SQLite/search_/drop"}, [1, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/statement/SQLite/search_/insert"}, [1, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]],
46-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]],
47-
[{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/create"}, [2, "??", "??", "??", "??", "??"]],
46+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/drop"}, [2, "??", "??", "??", "??", "??"]],
47+
[{"name":"Datastore/statement/SQLite/search_tmp_*\/insert"}, [2, "??", "??", "??", "??", "??"]],
4848
[{"name":"Datastore/statement/SQLite/search_tmp_/create"}, [1, "??", "??", "??", "??", "??"]],
4949
[{"name":"Datastore/statement/SQLite/search_tmp_/drop"}, [1, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/statement/SQLite/search_tmp_/insert"}, [1, "??", "??", "??", "??", "??"]],
@@ -73,7 +73,8 @@
7373
"scope":"OtherTransaction/Action/unknown"}, [1, "??", "??", "??", "??", "??"]],
7474
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
7575
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
76-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
76+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
77+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
7778
]
7879
]
7980
*/

tests/integration/frameworks/silex/test_basic.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
[{"name":"Supportability/framework/Silex/detected"}, [1, 0, 0, 0, 0, 0]],
2929
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
3030
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
31-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
31+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
32+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
3233
]
3334
]
3435
*/

0 commit comments

Comments
 (0)