Skip to content

Commit 9d28f37

Browse files
mfulbmfulb
committed
tests(agent): Updates integration/memcached tests to have log labels metric
1 parent bc2e2dd commit 9d28f37

12 files changed

+34
-22
lines changed

‎tests/integration/memcached/test_basic.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]],
4848
[{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]],
49-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
49+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5151
[{"name":"Datastore/operation/Memcached/add",
5252
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],
@@ -74,7 +74,8 @@
7474
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
7575
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
7676
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
77-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
77+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
78+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
7879
]
7980
]
8081
*/

‎tests/integration/memcached/test_basic_logging_off.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
[{"name":"Datastore/allOther"}, [15, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/Memcached/all"}, [15, "??", "??", "??", "??", "??"]],
5151
[{"name":"Datastore/Memcached/allOther"}, [15, "??", "??", "??", "??", "??"]],
52-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
52+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
5353
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5454
[{"name":"Datastore/operation/Memcached/add",
5555
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],
@@ -77,7 +77,8 @@
7777
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
7878
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
7979
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
80-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
80+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
81+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
8182
]
8283
]
8384
*/

‎tests/integration/memcached/test_by_key.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
[{"name":"Datastore/allOther"}, [11, "??", "??", "??", "??", "??"]],
4949
[{"name":"Datastore/Memcached/all"}, [11, "??", "??", "??", "??", "??"]],
5050
[{"name":"Datastore/Memcached/allOther"}, [11, "??", "??", "??", "??", "??"]],
51-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
51+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
5252
[{"name":"Datastore/operation/Memcached/add"}, [2, "??", "??", "??", "??", "??"]],
5353
[{"name":"Datastore/operation/Memcached/add",
5454
"scope":"OtherTransaction/php__FILE__"}, [2, "??", "??", "??", "??", "??"]],
@@ -70,7 +70,8 @@
7070
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [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/memcached/test_cas.php5.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5959
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
6060
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
61-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
61+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
62+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
6263
]
6364
]
6465
*/

‎tests/integration/memcached/test_cas.php7.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/delete",
4848
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
@@ -61,7 +61,8 @@
6161
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
6262
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
6363
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
64-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
64+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
65+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
6566
]
6667
]
6768
*/

‎tests/integration/memcached/test_cas_by_key.php5.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5959
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
6060
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
61-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
61+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
62+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
6263
]
6364
]
6465
*/

‎tests/integration/memcached/test_cas_by_key.php7.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4444
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
45-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
45+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
4646
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4747
[{"name":"Datastore/operation/Memcached/delete",
4848
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
@@ -61,7 +61,8 @@
6161
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
6262
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
6363
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
64-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
64+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
65+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
6566
]
6667
]
6768
*/

‎tests/integration/memcached/test_concat.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3636
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
3737
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
38-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
38+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/operation/Memcached/delete",
4141
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
@@ -54,7 +54,8 @@
5454
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5555
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
5656
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
57-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
57+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
58+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
5859
]
5960
]
6061
*/

‎tests/integration/memcached/test_concat_by_key.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3636
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
3737
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
38-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
38+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/operation/Memcached/delete",
4141
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
@@ -54,7 +54,8 @@
5454
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5555
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
5656
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
57-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
57+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
58+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
5859
]
5960
]
6061
*/

‎tests/integration/memcached/test_concat_by_key_logging_off.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
[{"name":"Datastore/allOther"}, [5, "??", "??", "??", "??", "??"]],
3939
[{"name":"Datastore/Memcached/all"}, [5, "??", "??", "??", "??", "??"]],
4040
[{"name":"Datastore/Memcached/allOther"}, [5, "??", "??", "??", "??", "??"]],
41-
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"}, [1, "??", "??", "??", "??", "??"]],
41+
[{"name":"Datastore/instance/Memcached/ENV[MEMCACHE_HOST]/11211"},[1, "??", "??", "??", "??", "??"]],
4242
[{"name":"Datastore/operation/Memcached/delete"}, [1, "??", "??", "??", "??", "??"]],
4343
[{"name":"Datastore/operation/Memcached/delete",
4444
"scope":"OtherTransaction/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
@@ -57,7 +57,8 @@
5757
[{"name":"OtherTransactionTotalTime/php__FILE__"}, [1, "??", "??", "??", "??", "??"]],
5858
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
5959
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [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
*/

0 commit comments

Comments
 (0)