Fix approvals after flattened/dynamic changes

axw · May 20, 2024 · 360eb97 · 360eb97
1 parent 903763a
commit 360eb97
Show file tree

Hide file tree

Showing 13 changed files with 200 additions and 1,422 deletions.
diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json
@@ -93,23 +93,6 @@
  "error.culprit": [
  "my.module.function_name"
  ],
- "error.custom": [
- {
- "and_objects": {
- "foo": [
- "bar",
- "baz"
- ]
- },
- "my_key": 1,
- "some_other_value": "foo bar"
- }
- ],
- "error.exception.attributes": [
- {
- "foo": "bar"
- }
- ],
  "error.exception.code": [
  "42"
  ],
@@ -128,72 +111,6 @@
  "error.exception.parent": [
  1
  ],
- "error.exception.stacktrace": [
- {
- "classname": "BaseClass",
- "exclude_from_grouping": false
- },
- {
- "abs_path": "/real/file/name.py",
- "classname": "RName",
- "context": {
- "post": [
- "line4",
- "line5"
- ],
- "pre": [
- "line1",
- "line2"
- ]
- },
- "exclude_from_grouping": false,
- "filename": "file/name.py",
- "function": "foo",
- "library_frame": true,
- "line": {
- "column": 4,
- "context": "line3",
- "number": 3
- },
- "module": "App::MyModule",
- "vars": {
- "key": "value"
- }
- },
- {
- "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js",
- "context": {
- "post": [
- " ins.currentTransaction = prev",
- " return result",
- "}",
- "}",
- "",
- "Instrumentation.prototype._recoverTransaction = function (trans) {",
- " if (this.currentTransaction === trans) return"
- ],
- "pre": [
- " var trans = this.currentTransaction",
- "",
- " return instrumented",
- "",
- " function instrumented () {",
- " var prev = ins.currentTransaction",
- " ins.currentTransaction = trans"
- ]
- },
- "exclude_from_grouping": false,
- "filename": "lib/instrumentation/index.js",
- "function": "instrumented",
- "line": {
- "context": " var result = original.apply(this, arguments)",
- "number": 102
- },
- "vars": {
- "key": "value"
- }
- }
- ],
  "error.exception.type": [
  "DbError",
  "InternalDbError",
@@ -221,71 +138,6 @@
  "error.log.param_message": [
  "My service could not talk to the database named %s"
  ],
- "error.log.stacktrace": [
- {
- "classname": "User::Common",
- "exclude_from_grouping": false
- },
- {
- "abs_path": "/real/file/name.py",
- "classname": "Webpack::File::Name",
- "context": {
- "post": [
- "line4",
- "line5"
- ],
- "pre": [
- "line1",
- "line2"
- ]
- },
- "exclude_from_grouping": false,
- "filename": "/webpack/file/name.py",
- "function": "foo",
- "line": {
- "column": 4,
- "context": "line3",
- "number": 3
- },
- "module": "App::MyModule",
- "vars": {
- "key": "value"
- }
- },
- {
- "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js",
- "context": {
- "post": [
- " ins.currentTransaction = prev",
- " return result",
- "}",
- "}",
- "",
- "Instrumentation.prototype._recoverTransaction = function (trans) {",
- " if (this.currentTransaction === trans) return"
- ],
- "pre": [
- " var trans = this.currentTransaction",
- "",
- " return instrumented",
- "",
- " function instrumented () {",
- " var prev = ins.currentTransaction",
- " ins.currentTransaction = trans"
- ]
- },
- "exclude_from_grouping": false,
- "filename": "lib/instrumentation/index.js",
- "function": "instrumented",
- "line": {
- "context": " var result = original.apply(this, arguments)",
- "number": 102
- },
- "vars": {
- "key": "value"
- }
- }
- ],
  "host.architecture": [
  "x64"
  ],
@@ -304,39 +156,32 @@
  "host.os.platform": [
  "darwin"
  ],
- "http.request.body": [
- {
- "original": "Hello World"
- }
- ],
- "http.request.cookies.c1": [
- "v1"
- ],
- "http.request.cookies.c2": [
- "v2"
- ],
  "http.request.env.GATEWAY_INTERFACE": [
  "CGI/1.1"
  ],
  "http.request.env.SERVER_SOFTWARE": [
  "nginx"
  ],
- "http.request.headers.Array": [
- "foo",
- "bar",
- "baz"
- ],
- "http.request.headers.Content-Type": [
- "text/html"
- ],
- "http.request.headers.Cookie": [
- "c1=v1,c2=v2"
- ],
- "http.request.headers.Some-Other-Header": [
- "foo"
- ],
- "http.request.headers.User-Agent": [
- "Mozilla Chrome Edge"
+ "http.request.headers": [
+ {
+ "Array": [
+ "foo",
+ "bar",
+ "baz"
+ ],
+ "Content-Type": [
+ "text/html"
+ ],
+ "Cookie": [
+ "c1=v1,c2=v2"
+ ],
+ "Some-Other-Header": [
+ "foo"
+ ],
+ "User-Agent": [
+ "Mozilla Chrome Edge"
+ ]
+ }
  ],
  "http.request.method": [
  "POST"
@@ -347,8 +192,12 @@
  "http.response.finished": [
  true
  ],
- "http.response.headers.Content-Type": [
- "application/json"
+ "http.response.headers": [
+ {
+ "Content-Type": [
+ "application/json"
+ ]
+ }
  ],
  "http.response.headers_sent": [
  true
@@ -827,12 +676,6 @@
  "error.log.message": [
  "no user found"
  ],
- "error.log.stacktrace": [
- {
- "classname": "User::Special",
- "exclude_from_grouping": false
- }
- ],
  "host.architecture": [
  "x64"
  ],