Skip to content

Commit a973fad

Browse files
mfulbmfulb
committed
tests(agent): Updates integration/api tests to have log labels metric
- skipped PHP5 specific tests
1 parent 704a5d7 commit a973fad

File tree

78 files changed

+237
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+237
-159
lines changed

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_disabled.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
9090
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
9191
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
92-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
92+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
93+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
9394
]
9495
]
9596
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"string": "span str"
115115
},
116116
{
117-
"code.lineno": 157,
117+
"code.lineno": 158,
118118
"code.filepath": "__FILE__",
119119
"code.function": "a"
120120
}
@@ -143,7 +143,8 @@
143143
[{"name":"Supportability/api/add_custom_parameter"}, [5, 0, 0, 0, 0, 0]],
144144
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
145145
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
146-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
146+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
147+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
147148
]
148149
]
149150
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_duplicate_te_off.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"string": "span str"
8989
},
9090
{
91-
"code.lineno": 131,
91+
"code.lineno": 132,
9292
"code.filepath": "__FILE__",
9393
"code.function": "a"
9494
}
@@ -117,7 +117,8 @@
117117
[{"name":"Supportability/api/add_custom_parameter"}, [4, 0, 0, 0, 0, 0]],
118118
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
119119
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
120-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
120+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
121+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
121122
]
122123
]
123124
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"double": 1.50000
7777
},
7878
{
79-
"code.lineno": 118,
79+
"code.lineno": 119,
8080
"code.filepath": "__FILE__",
8181
"code.function": "a"
8282
}
@@ -104,7 +104,8 @@
104104
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
105105
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
106106
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
107-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
107+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
108+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
108109
]
109110
]
110111
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_filter_logging_off.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"double": 1.50000
8080
},
8181
{
82-
"code.lineno": 121,
82+
"code.lineno": 122,
8383
"code.filepath": "__FILE__",
8484
"code.function": "a"
8585
}
@@ -105,9 +105,10 @@
105105
[{"name":"DurationByCaller/Unknown/Unknown/Unknown/Unknown/allOther"}, [1, "??", "??", "??", "??", "??"]],
106106
[{"name":"Supportability/api/add_custom_tracer"}, [1, 0, 0, 0, 0, 0]],
107107
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
108-
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
109-
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
110-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
108+
[{"name":"Supportability/Logging/Forwarding/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
109+
[{"name":"Supportability/Logging/Metrics/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]],
110+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
111+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
111112
]
112113
]
113114
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"int": 7
7777
},
7878
{
79-
"code.lineno": 118,
79+
"code.lineno": 119,
8080
"code.filepath": "__FILE__",
8181
"code.function": "a"
8282
}
@@ -104,7 +104,8 @@
104104
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
105105
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
106106
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
107-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
107+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
108+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
108109
]
109110
]
110111
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_key_te_off.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"int": 7
8282
},
8383
{
84-
"code.lineno": 123,
84+
"code.lineno": 124,
8585
"code.filepath": "__FILE__",
8686
"code.function": "a"
8787
}
@@ -109,7 +109,8 @@
109109
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
110110
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
111111
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
112-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
112+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
113+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
113114
]
114115
]
115116
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_parameters.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"1": 1
199199
},
200200
{
201-
"code.lineno": 240,
201+
"code.lineno": 241,
202202
"code.filepath": "__FILE__",
203203
"code.function": "a"
204204
}
@@ -226,7 +226,8 @@
226226
[{"name":"Supportability/api/add_custom_span_parameter"}, [64, 0, 0, 0, 0, 0]],
227227
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
228228
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
229-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
229+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
230+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
230231
]
231232
]
232233
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"string": "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234"
7777
},
7878
{
79-
"code.lineno": 118,
79+
"code.lineno": 119,
8080
"code.filepath": "__FILE__",
8181
"code.function": "a"
8282
}
@@ -104,7 +104,8 @@
104104
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
105105
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
106106
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
107-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
107+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
108+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
108109
]
109110
]
110111
*/

‎tests/integration/api/add_custom_span_parameter/test_span_event_parameter_max_value_te_off.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"string": "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234"
8787
},
8888
{
89-
"code.lineno": 128,
89+
"code.lineno": 129,
9090
"code.filepath": "__FILE__",
9191
"code.function": "a"
9292
}
@@ -114,7 +114,8 @@
114114
[{"name":"Supportability/api/add_custom_span_parameter"}, [4, 0, 0, 0, 0, 0]],
115115
[{"name":"Supportability/Logging/Forwarding/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
116116
[{"name":"Supportability/Logging/Metrics/PHP/enabled"}, [1, "??", "??", "??", "??", "??"]],
117-
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]]
117+
[{"name":"Supportability/Logging/LocalDecorating/PHP/disabled"},[1, "??", "??", "??", "??", "??"]],
118+
[{"name":"Supportability/Logging/Labels/PHP/disabled"}, [1, "??", "??", "??", "??", "??"]]
118119
]
119120
]
120121
*/

0 commit comments

Comments
 (0)