remove clm from version/framework specific tests

bduranleau-nr · bduranleau-nr · commit acc592464067 · 2025-04-16T16:27:52.000-05:00
diff --git a/tests/integration/external/drupal6/test_span_externals.php b/tests/integration/external/drupal6/test_span_externals.php
@@ -62,11 +62,7 @@
         "timestamp": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "??",
-        "code.function": "drupal_http_request"
-      }
+      {}
     ],
     [
       {
diff --git a/tests/integration/external/drupal6/test_spans_post.php b/tests/integration/external/drupal6/test_spans_post.php
@@ -62,11 +62,7 @@
         "parentId": "??"
        },
        {},
-       {
-        "code.lineno": "??",
-        "code.filepath": "??",
-        "code.function": "drupal_http_request"
-       }
+       {}
     ],
     [
       {
diff --git a/tests/integration/external/drupal7/test_spans_post.php b/tests/integration/external/drupal7/test_spans_post.php
@@ -15,10 +15,6 @@
 /*SKIPIF
 <?php
 require("skipif.inc");
-
-if (version_compare(PHP_VERSION, "7.0", "<")) {
-  die("skip: CLM for PHP 5 not supported\n");
-}
 */
 
 /*EXPECT_SPAN_EVENTS
@@ -62,11 +58,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "??",
-        "code.function": "drupal_http_request"
-      }
+      {}
     ],
     [
       {
diff --git a/tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php b/tests/integration/external/drupal7/test_spans_sets_external_span_correctly.php
@@ -15,10 +15,6 @@
 /*SKIPIF
 <?php
 require("skipif.inc");
-
-if (version_compare(PHP_VERSION, "7.0", "<")) {
-  die("skip: CLM for PHP 5 not supported\n");
-}
 */
 
 /*EXPECT_SPAN_EVENTS
@@ -62,11 +58,7 @@
         "timestamp": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "??",
-        "code.function": "drupal_http_request"
-      }
+      {}
     ],
     [
       {
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_caught_error.php84.php
@@ -138,10 +138,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_WARNING"
       }
     ],
     [
@@ -159,11 +156,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_error.php84.php
@@ -105,10 +105,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_ERROR",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_ERROR"
       }
     ]
   ]
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception.php84.php
@@ -141,10 +141,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -162,11 +159,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure:__FILE__:??}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/function/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php
@@ -151,10 +151,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -172,11 +169,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_caught_error.php84.php
@@ -137,10 +137,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_WARNING"
       }
     ],
     [
@@ -158,11 +155,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_error.php84.php
@@ -105,10 +105,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_WARNING"
       }
     ]
   ]
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception.php84.php
@@ -138,10 +138,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -159,11 +156,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure:__FILE__:??}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php b/tests/integration/jit/tracing/test_span_events_are_created_upon_uncaught_handled_exception_invalid_handler.php
@@ -146,10 +146,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -167,11 +164,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_caught_error.php84.php
@@ -134,10 +134,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_WARNING"
       }
     ],
     [
@@ -155,11 +152,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_error.php84.php
@@ -101,10 +101,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "??"
+        "error.class": "E_USER_WARNING"
       }
     ]
   ]
diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php7.php
@@ -107,10 +107,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -128,11 +125,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/opcache/disabled/test_span_events_are_created_upon_uncaught_handled_exception.php84.php
@@ -137,10 +137,7 @@
       {},
       {
         "error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",
-        "error.class": "RuntimeException",
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "RuntimeException"
       }
     ],
     [
@@ -158,11 +155,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno": "??",
-        "code.filepath": "__FILE__",
-        "code.function": "{closure:__FILE__:??}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_caught_error.php84.php
@@ -92,10 +92,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": 137,
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "E_USER_WARNING"
       }
     ],
     [
@@ -113,11 +110,7 @@
         "parentId": "??"
       },
       {},
-      {
-        "code.lineno":  131,
-        "code.filepath": "__FILE__",
-        "code.function": "{closure:__FILE__:??}"
-      }
+      {}
     ]
   ]
 ]
diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_error.php84.php
@@ -92,10 +92,7 @@
       {},
       {
         "error.message": "foo",
-        "error.class": "E_USER_WARNING",
-        "code.lineno": 109,
-        "code.filepath": "__FILE__",
-        "code.function": "a"
+        "error.class": "E_USER_WARNING"
       }
     ]
   ]
diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php7.php
diff --git a/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php b/tests/integration/span_events/test_span_events_are_created_upon_uncaught_handled_exception.php84.php
diff --git a/tests/integration/span_events/test_span_events_root_parent.php b/tests/integration/span_events/test_span_events_root_parent.php

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,7 @@`
`62`	`62`	`"timestamp": "??"`
`63`	`63`	`},`
`64`	`64`	`{},`
`65`		`- {`
`66`		`- "code.lineno": "??",`
`67`		`- "code.filepath": "??",`
`68`		`- "code.function": "drupal_http_request"`
`69`		`- }`
	`65`	`+ {}`
`70`	`66`	`],`
`71`	`67`	`[`
`72`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,7 @@`
`138`	`138`	`{},`
`139`	`139`	`{`
`140`	`140`	`"error.message": "foo",`
`141`		`- "error.class": "E_USER_WARNING",`
`142`		`- "code.lineno": "??",`
`143`		`- "code.filepath": "__FILE__",`
`144`		`- "code.function": "??"`
	`141`	`+ "error.class": "E_USER_WARNING"`
`145`	`142`	`}`
`146`	`143`	`],`
`147`	`144`	`[`
`@@ -159,11 +156,7 @@`
`159`	`156`	`"parentId": "??"`
`160`	`157`	`},`
`161`	`158`	`{},`
`162`		`- {`
`163`		`- "code.lineno": "??",`
`164`		`- "code.filepath": "__FILE__",`
`165`		`- "code.function": "??"`
`166`		`- }`
	`159`	`+ {}`
`167`	`160`	`]`
`168`	`161`	`]`
`169`	`162`	`]`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,7 @@`
`105`	`105`	`{},`
`106`	`106`	`{`
`107`	`107`	`"error.message": "foo",`
`108`		`- "error.class": "E_USER_ERROR",`
`109`		`- "code.lineno": "??",`
`110`		`- "code.filepath": "__FILE__",`
`111`		`- "code.function": "??"`
	`108`	`+ "error.class": "E_USER_ERROR"`
`112`	`109`	`}`
`113`	`110`	`]`
`114`	`111`	`]`
Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,7 @@`
`141`	`141`	`{},`
`142`	`142`	`{`
`143`	`143`	`"error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",`
`144`		`- "error.class": "RuntimeException",`
`145`		`- "code.lineno": "??",`
`146`		`- "code.filepath": "__FILE__",`
`147`		`- "code.function": "a"`
	`144`	`+ "error.class": "RuntimeException"`
`148`	`145`	`}`
`149`	`146`	`],`
`150`	`147`	`[`
`@@ -162,11 +159,7 @@`
`162`	`159`	`"parentId": "??"`
`163`	`160`	`},`
`164`	`161`	`{},`
`165`		`- {`
`166`		`- "code.lineno": "??",`
`167`		`- "code.filepath": "__FILE__",`
`168`		`- "code.function": "{closure:__FILE__:??}"`
`169`		`- }`
	`162`	`+ {}`
`170`	`163`	`]`
`171`	`164`	`]`
`172`	`165`	`]`
Original file line number	Diff line number	Diff line change
`@@ -151,10 +151,7 @@`
`151`	`151`	`{},`
`152`	`152`	`{`
`153`	`153`	`"error.message": "Uncaught exception 'RuntimeException' with message 'oops' in __FILE__:??",`
`154`		`- "error.class": "RuntimeException",`
`155`		`- "code.lineno": "??",`
`156`		`- "code.filepath": "__FILE__",`
`157`		`- "code.function": "a"`
	`154`	`+ "error.class": "RuntimeException"`
`158`	`155`	`}`
`159`	`156`	`],`
`160`	`157`	`[`
`@@ -172,11 +169,7 @@`
`172`	`169`	`"parentId": "??"`
`173`	`170`	`},`
`174`	`171`	`{},`
`175`		`- {`
`176`		`- "code.lineno": "??",`
`177`		`- "code.filepath": "__FILE__",`
`178`		`- "code.function": "{closure}"`
`179`		`- }`
	`172`	`+ {}`
`180`	`173`	`]`
`181`	`174`	`]`
`182`	`175`	`]`
Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,7 @@`
`137`	`137`	`{},`
`138`	`138`	`{`
`139`	`139`	`"error.message": "foo",`
`140`		`- "error.class": "E_USER_WARNING",`
`141`		`- "code.lineno": "??",`
`142`		`- "code.filepath": "__FILE__",`
`143`		`- "code.function": "??"`
	`140`	`+ "error.class": "E_USER_WARNING"`
`144`	`141`	`}`
`145`	`142`	`],`
`146`	`143`	`[`
`@@ -158,11 +155,7 @@`
`158`	`155`	`"parentId": "??"`
`159`	`156`	`},`
`160`	`157`	`{},`
`161`		`- {`
`162`		`- "code.lineno": "??",`
`163`		`- "code.filepath": "__FILE__",`
`164`		`- "code.function": "??"`
`165`		`- }`
	`158`	`+ {}`
`166`	`159`	`]`
`167`	`160`	`]`
`168`	`161`	`]`