diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index e2373ea7aa0..f34d403c731 100644 --- 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" ], diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index 1d52e43a4b6..dc21fa8e33a 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -33,23 +33,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -68,45 +51,6 @@ "error.exception.parent": [ 1 ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "error.exception.type": [ "java.net.UnknownHostException", "InternalDbError", @@ -134,47 +78,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -193,38 +96,31 @@ "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "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.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -232,8 +128,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index e33e153f0b1..e1d4848c822 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -36,23 +36,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -71,45 +54,6 @@ "error.exception.parent": [ 1 ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "error.exception.type": [ "java.net.UnknownHostException", "InternalDbError", @@ -137,47 +81,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -196,38 +99,31 @@ "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "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.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -235,8 +131,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -665,8 +565,12 @@ "http.response.encoded_body_size": [ 356 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 302 @@ -809,31 +713,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "exclude_from_grouping": false, - "filename": "DispatcherServlet.java", - "line": { - "number": 547 - } - }, - { - "abs_path": "/tmp/AbstractView.java", - "exclude_from_grouping": false, - "filename": "AbstractView.java", - "function": "render", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "org.springframework.web.servlet.view", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "http" ], @@ -929,41 +808,28 @@ "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additionalinformation" - }, - "string": "helloworld" - } - } - ], - "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.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", - "MozillaChromeEdge" + "http.request.headers": [ + { + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" + ], + "User-Agent": [ + "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", + "MozillaChromeEdge" + ] + } ], "http.request.method": [ "POST" @@ -977,8 +843,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -1109,19 +979,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "notavalidregexandthatisfine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], "transaction.duration.us": [ 32592 ], diff --git a/systemtest/approvals/TestIntake/Spans.approved.json b/systemtest/approvals/TestIntake/Spans.approved.json index de98d97fcec..8de4e79fb7e 100644 --- a/systemtest/approvals/TestIntake/Spans.approved.json +++ b/systemtest/approvals/TestIntake/Spans.approved.json @@ -277,55 +277,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -1613,55 +1564,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -2751,55 +2653,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index 56b02e3e646..d7603216333 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -627,46 +627,33 @@ "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "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/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "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/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -683,8 +670,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -816,19 +807,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index 1e7dd5e1253..e37a5126355 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -111,46 +111,33 @@ "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "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/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "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/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -167,8 +154,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -300,19 +291,6 @@ "trace.id": [ "646df3b8b5279e982cc12a2f1ac004f3" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index 17a98c6f26b..78b5df3636e 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -166,42 +166,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "my2file.js", - "line": { - "number": 10 - } - } - ], "span.sync": [ false ], @@ -276,45 +240,32 @@ "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "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" @@ -325,8 +276,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -437,19 +392,6 @@ "trace.id": [ "945254c567a5417eaaaaaaaaaaaaaaaa" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index a5f16c16613..ccc49861cc5 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -1745,7 +1745,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index 1da04f9c1fc..deab65b210c 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -72,35 +72,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - } - ], "span.type": [ "transaction" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json index 7b920becc77..1652cdaada6 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json @@ -30,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -231,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json index 7b920becc77..1652cdaada6 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json @@ -30,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -231,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index 8d146ad17ef..4f3e5090cb7 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -991,34 +991,6 @@ "span.name.text": [ "Fire \"DOMContentLoaded\" event" ], - "span.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "generateError", - "line": { - "column": 9, - "number": 7662 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "\u003canonymous\u003e", - "line": { - "column": 3, - "number": 7666 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - } - ], "span.subtype": [ "browser-timing" ], @@ -1442,8 +1414,12 @@ "event.success_count": [ 1 ], - "http.request.headers.Accept": [ - "application/json" + "http.request.headers": [ + { + "Accept": [ + "application/json" + ] + } ], "http.request.method": [ "GET" @@ -1457,8 +1433,12 @@ "http.response.encoded_body_size": [ 690 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 200 @@ -1541,11 +1521,6 @@ "trace.id": [ "286ac3ad697892c406528f13c82e0ce1" ], - "transaction.custom": [ - { - "testContext": "testContext" - } - ], "transaction.duration.us": [ 295000 ], diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index 5815ce3894b..deab65b210c 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -72,80 +72,6 @@ "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "span.type": [ "transaction" ],