From 0e5dde7acfae36966cf134ef73d9d3d6028bba74 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Sun, 14 Nov 2021 11:39:47 +0800 Subject: [PATCH] Drop deprecated `span.{start,http}` fields --- .../data_stream/rum_traces/fields/fields.yml | 7 --- .../apm/data_stream/traces/fields/fields.yml | 7 --- apmpackage/apm/docs/README.md | 1 - ...TestPublishIntegrationEvents.approved.json | 15 ------ ...lishIntegrationMinimalEvents.approved.json | 3 -- .../TestPublishIntegrationSpans.approved.json | 25 --------- changelogs/head.asciidoc | 1 + model/apmevent.go | 23 -------- model/modeldecoder/rumv3/decoder.go | 4 -- model/modeldecoder/v2/decoder.go | 4 -- model/modeldecoder/v2/span_test.go | 1 - model/span.go | 9 ---- model/span_test.go | 13 +---- .../span_jaeger_http.approved.json | 7 --- ...span_jaeger_http_status_code.approved.json | 7 --- ...an_jaeger_https_default_port.approved.json | 1 - .../testIntakeIntegrationEvents.approved.json | 15 ------ ...ntakeIntegrationInvalidEvent.approved.json | 3 -- ...eIntegrationInvalidJSONEvent.approved.json | 3 -- ...tegrationOpenTelemetryBridge.approved.json | 6 --- ...ntegrationOptionalTimestamps.approved.json | 3 -- ...keIntegrationRumTransactions.approved.json | 4 -- .../testIntakeIntegrationSpans.approved.json | 25 --------- .../testIntakeRUMV3Events.approved.json | 53 ------------------- .../TestNoMatchingSourcemap.approved.json | 4 -- .../TestRUMRoutingIntegration.approved.json | 53 ------------------- .../TestRUMSpanSourcemapping.approved.json | 4 -- 27 files changed, 2 insertions(+), 299 deletions(-) diff --git a/apmpackage/apm/data_stream/rum_traces/fields/fields.yml b/apmpackage/apm/data_stream/rum_traces/fields/fields.yml index 48ba7eaa9c2..e7403cd313e 100644 --- a/apmpackage/apm/data_stream/rum_traces/fields/fields.yml +++ b/apmpackage/apm/data_stream/rum_traces/fields/fields.yml @@ -319,13 +319,6 @@ type: keyword description: | Generic designation of a span in the scope of a transaction. - - name: start - type: group - fields: - - name: us - type: long - description: | - Offset relative to the transaction's timestamp identifying the start of the span, in microseconds. - name: subtype type: keyword description: | diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml index 48ba7eaa9c2..e7403cd313e 100644 --- a/apmpackage/apm/data_stream/traces/fields/fields.yml +++ b/apmpackage/apm/data_stream/traces/fields/fields.yml @@ -319,13 +319,6 @@ type: keyword description: | Generic designation of a span in the scope of a transaction. - - name: start - type: group - fields: - - name: us - type: long - description: | - Offset relative to the transaction's timestamp identifying the start of the span, in microseconds. - name: subtype type: keyword description: | diff --git a/apmpackage/apm/docs/README.md b/apmpackage/apm/docs/README.md index 575b17d5279..87464b266fe 100644 --- a/apmpackage/apm/docs/README.md +++ b/apmpackage/apm/docs/README.md @@ -167,7 +167,6 @@ Traces are written to `traces-apm-*` data streams, except for RUM traces, which | span.message.age.ms | Age of a message in milliseconds. | long | | span.message.queue.name | Name of the message queue or topic where the message is published or received. | keyword | | span.name | Generic designation of a span in the scope of a transaction. | keyword | -| span.start.us | Offset relative to the transaction's timestamp identifying the start of the span, in microseconds. | long | | span.subtype | A further sub-division of the type (e.g. postgresql, elasticsearch) | keyword | | span.sync | Indicates whether the span was executed synchronously or asynchronously. | boolean | | span.type | Keyword of specific relevance in the service's domain (eg: 'db.postgresql.query', 'template.erb', 'cache', etc). | keyword | diff --git a/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json index 82b22fda0ff..db2550af2f4 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json @@ -397,21 +397,6 @@ "duration": { "us": 3781 }, - "http": { - "method": "GET", - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "status_code": 302, - "transfer_size": 300.12 - } - }, - "http.url.original": "http://localhost:8000", "id": "1234567890aaaade", "name": "GET users-authenticated", "stacktrace": [ diff --git a/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json index 89146479590..72ad9d20ac7 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json @@ -155,9 +155,6 @@ }, "id": "0123456a89012345", "name": "GET /api/types", - "start": { - "us": 1845 - }, "type": "request" }, "timestamp": { diff --git a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json index 42f7d61c50d..290f980ae59 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json @@ -243,9 +243,6 @@ }, "id": "1234abcdef567895", "name": "GET /api/types", - "start": { - "us": 22000 - }, "type": "request" }, "timestamp": { @@ -376,9 +373,6 @@ }, "id": "0123456a89012345", "name": "GET /api/types", - "start": { - "us": 1845 - }, "subtype": "http", "type": "request" }, @@ -508,9 +502,6 @@ }, "id": "abcde56a89012345", "name": "get /api/types", - "start": { - "us": 0 - }, "subtype": "http", "sync": false, "type": "request" @@ -670,16 +661,6 @@ "duration": { "us": 3781 }, - "http": { - "method": "GET", - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "status_code": 200, - "transfer_size": 300.12 - } - }, - "http.url.original": "http://localhost:8000", "id": "1234567890aaaade", "name": "SELECT FROM product_types", "stacktrace": [ @@ -731,9 +712,6 @@ } } ], - "start": { - "us": 2830 - }, "subtype": "postgresql", "sync": true, "type": "db" @@ -1013,9 +991,6 @@ }, "id": "abcdef01234567", "name": "SELECT FROM p_details", - "start": { - "us": 2830 - }, "subtype": "postgresql", "type": "db" }, diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index b92bbd0d6a8..081ec72fdd9 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -29,6 +29,7 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits] - Removed `apm-server.rum.{allowed_service,event_rate}` configuration option in favor of `apm-server.auth.anonymous.{allow_service,rate_limit}` {pull}6560[6560] - Removed `apm-server.{api_key,secret_token}` configuration options in favor of `apm-server.auth.{api_key,secret_token}` {pull}6560[6560] - Onboarding documents are no longer indexed {pull}6431[6431] +- Removed unused `span.start.us` field, and deprecated `span.http.*` fields {pull}6602[6602] [float] ==== Bug fixes diff --git a/model/apmevent.go b/model/apmevent.go index c292c4128d4..33987e431cf 100644 --- a/model/apmevent.go +++ b/model/apmevent.go @@ -146,28 +146,5 @@ func (e *APMEvent) BeatEvent(ctx context.Context) beat.Event { fields.maybeSetString("message", e.Message) fields.maybeSetMapStr("http", e.HTTP.fields()) fields.maybeSetMapStr("faas", e.FAAS.fields()) - if e.Processor == SpanProcessor { - // Deprecated: copy url.original and http.* to span.http.* for backwards compatibility. - // - // TODO(axw) remove this in 8.0: https://github.com/elastic/apm-server/issues/5995 - var spanHTTPFields mapStr - spanHTTPFields.maybeSetString("version", e.HTTP.Version) - if e.HTTP.Request != nil { - spanHTTPFields.maybeSetString("method", e.HTTP.Request.Method) - } - if e.HTTP.Response != nil { - spanHTTPFields.maybeSetMapStr("response", e.HTTP.Response.fields()) - } - if len(spanHTTPFields) != 0 || e.URL.Original != "" { - spanFieldsMap, ok := event.Fields["span"].(common.MapStr) - if !ok { - spanFieldsMap = make(common.MapStr) - event.Fields["span"] = spanFieldsMap - } - spanFields := mapStr(spanFieldsMap) - spanFields.maybeSetMapStr("http", common.MapStr(spanHTTPFields)) - spanFields.maybeSetString("http.url.original", e.URL.Original) - } - } return event } diff --git a/model/modeldecoder/rumv3/decoder.go b/model/modeldecoder/rumv3/decoder.go index 834b438b935..c732f7acc31 100644 --- a/model/modeldecoder/rumv3/decoder.go +++ b/model/modeldecoder/rumv3/decoder.go @@ -579,10 +579,6 @@ func mapToSpanModel(from *span, event *model.APMEvent) { out.Stacktrace = make(model.Stacktrace, len(from.Stacktrace)) mapToStracktraceModel(from.Stacktrace, out.Stacktrace) } - if from.Start.IsSet() { - val := from.Start.Val - out.Start = &val - } if from.Sync.IsSet() { val := from.Sync.Val out.Sync = &val diff --git a/model/modeldecoder/v2/decoder.go b/model/modeldecoder/v2/decoder.go index 2e84d484e72..49f2779cbae 100644 --- a/model/modeldecoder/v2/decoder.go +++ b/model/modeldecoder/v2/decoder.go @@ -993,10 +993,6 @@ func mapToSpanModel(from *span, event *model.APMEvent) { out.Stacktrace = make(model.Stacktrace, len(from.Stacktrace)) mapToStracktraceModel(from.Stacktrace, out.Stacktrace) } - if from.Start.IsSet() { - val := from.Start.Val - out.Start = &val - } if from.Sync.IsSet() { val := from.Sync.Val out.Sync = &val diff --git a/model/modeldecoder/v2/span_test.go b/model/modeldecoder/v2/span_test.go index 016b11563f6..0329166335a 100644 --- a/model/modeldecoder/v2/span_test.go +++ b/model/modeldecoder/v2/span_test.go @@ -177,7 +177,6 @@ func TestDecodeMapToSpanModel(t *testing.T) { modeldecodertest.SetStructValues(&input, defaultVal) input.Start.Reset() mapToSpanModel(&input, &out) - require.Nil(t, out.Span.Start) assert.Equal(t, reqTime, out.Timestamp) }) diff --git a/model/span.go b/model/span.go index 53510577abc..bae128f6acb 100644 --- a/model/span.go +++ b/model/span.go @@ -46,11 +46,6 @@ type Span struct { // Action holds the span action: "query", "execute", etc. Action string - // Start holds the span's offset from the transaction timestamp in milliseconds. - // - // TODO(axw) drop in 8.0. See https://github.com/elastic/apm-server/issues/6000) - Start *float64 - // SelfTime holds the aggregated span durations, for breakdown metrics. SelfTime AggregatedDuration @@ -147,10 +142,6 @@ func (e *Span) setFields(fields *mapStr, apmEvent *APMEvent) { span.maybeSetString("subtype", e.Subtype) span.maybeSetString("action", e.Action) span.maybeSetBool("sync", e.Sync) - if e.Start != nil { - start := time.Duration(*e.Start * float64(time.Millisecond)) - span.set("start", common.MapStr{"us": int(start.Microseconds())}) - } if apmEvent.Processor == SpanProcessor { // TODO(axw) set `event.duration` in 8.0, and remove this field. // See https://github.com/elastic/apm-server/issues/5999 diff --git a/model/span_test.go b/model/span_test.go index ffad750b74d..2a3cdd5d9dd 100644 --- a/model/span_test.go +++ b/model/span_test.go @@ -36,7 +36,6 @@ func TestSpanTransformEmpty(t *testing.T) { func TestSpanTransform(t *testing.T) { path := "test/path" - start := 0.65 hexID := "0147258369012345" subtype := "amqp" action := "publish" @@ -60,7 +59,6 @@ func TestSpanTransform(t *testing.T) { Kind: "CLIENT", Subtype: subtype, Action: action, - Start: &start, RepresentativeCount: 5, Stacktrace: Stacktrace{{AbsPath: path}}, DB: &DB{ @@ -85,7 +83,6 @@ func TestSpanTransform(t *testing.T) { "duration": common.MapStr{"us": int(duration.Microseconds())}, "name": "myspan", "kind": "CLIENT", - "start": common.MapStr{"us": 650}, "type": "myspantype", "subtype": subtype, "action": action, @@ -166,15 +163,7 @@ func TestSpanHTTPFields(t *testing.T) { "original": event.URL.Original, }, "span": common.MapStr{ - "duration": common.MapStr{"us": 0}, - "http.url.original": event.URL.Original, - "http": common.MapStr{ - "version": event.HTTP.Version, - "method": event.HTTP.Request.Method, - "response": common.MapStr{ - "status_code": event.HTTP.Response.StatusCode, - }, - }, + "duration": common.MapStr{"us": 0}, }, }, output.Fields) } diff --git a/processor/otel/test_approved/span_jaeger_http.approved.json b/processor/otel/test_approved/span_jaeger_http.approved.json index 84b845800ff..f33efad5ab3 100644 --- a/processor/otel/test_approved/span_jaeger_http.approved.json +++ b/processor/otel/test_approved/span_jaeger_http.approved.json @@ -55,13 +55,6 @@ "duration": { "us": 79000000 }, - "http": { - "method": "get", - "response": { - "status_code": 400 - } - }, - "http.url.original": "http://foo.bar.com?a=12", "id": "0000000041414646", "name": "HTTP GET", "subtype": "http", diff --git a/processor/otel/test_approved/span_jaeger_http_status_code.approved.json b/processor/otel/test_approved/span_jaeger_http_status_code.approved.json index 0c4efe5ab9d..7bcbb1406a4 100644 --- a/processor/otel/test_approved/span_jaeger_http_status_code.approved.json +++ b/processor/otel/test_approved/span_jaeger_http_status_code.approved.json @@ -48,13 +48,6 @@ "duration": { "us": 79000000 }, - "http": { - "method": "get", - "response": { - "status_code": 202 - } - }, - "http.url.original": "http://foo.bar.com?a=12", "id": "0000000041414646", "name": "HTTP GET", "subtype": "http", diff --git a/processor/otel/test_approved/span_jaeger_https_default_port.approved.json b/processor/otel/test_approved/span_jaeger_https_default_port.approved.json index cba479e9272..f5be2a7d35d 100644 --- a/processor/otel/test_approved/span_jaeger_https_default_port.approved.json +++ b/processor/otel/test_approved/span_jaeger_https_default_port.approved.json @@ -40,7 +40,6 @@ "duration": { "us": 79000000 }, - "http.url.original": "https://foo.bar.com:443?a=12", "id": "0000000041414646", "name": "HTTPS GET", "subtype": "http", diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json index 0996062b6b8..a96f0296fed 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json @@ -375,21 +375,6 @@ "duration": { "us": 3781 }, - "http": { - "method": "GET", - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "status_code": 302, - "transfer_size": 300.12 - } - }, - "http.url.original": "http://localhost:8000", "id": "1234567890aaaade", "name": "GET users-authenticated", "stacktrace": [ diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidEvent.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidEvent.approved.json index bb7538be513..87754803756 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidEvent.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidEvent.approved.json @@ -34,9 +34,6 @@ }, "id": "abcdef01234567", "name": "GET /api/types", - "start": { - "us": 0 - }, "type": "request" }, "timestamp": { diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidJSONEvent.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidJSONEvent.approved.json index bb7538be513..87754803756 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidJSONEvent.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationInvalidJSONEvent.approved.json @@ -34,9 +34,6 @@ }, "id": "abcdef01234567", "name": "GET /api/types", - "start": { - "us": 0 - }, "type": "request" }, "timestamp": { diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationOpenTelemetryBridge.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationOpenTelemetryBridge.approved.json index d94cb0b343d..55603cebc62 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationOpenTelemetryBridge.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationOpenTelemetryBridge.approved.json @@ -247,12 +247,6 @@ "duration": { "us": 32592 }, - "http": { - "method": "GET", - "response": { - "status_code": 200 - } - }, "id": "ddf109a4c4aa5f2b6e984548ca57774d", "kind": "CLIENT", "name": "span_name", diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationOptionalTimestamps.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationOptionalTimestamps.approved.json index 94fb271ace9..6eff00a6ad0 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationOptionalTimestamps.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationOptionalTimestamps.approved.json @@ -127,9 +127,6 @@ }, "id": "0147258369abcdef", "name": "sp1", - "start": { - "us": 10000 - }, "type": "db" }, "timestamp": { diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationRumTransactions.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationRumTransactions.approved.json index 57459e69096..df227a04e86 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationRumTransactions.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationRumTransactions.approved.json @@ -102,7 +102,6 @@ "duration": { "us": 643000 }, - "http.url.original": "http://localhost:8000/test/e2e/general-usecase/span", "id": "aaaaaaaaaaaaaaaa", "name": "transaction", "stacktrace": [ @@ -127,9 +126,6 @@ } } ], - "start": { - "us": 0 - }, "type": "transaction" }, "timestamp": { diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json index 1c4f8cc8523..b5e280abce2 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json @@ -215,9 +215,6 @@ }, "id": "1234abcdef567895", "name": "GET /api/types", - "start": { - "us": 22000 - }, "type": "request" }, "timestamp": { @@ -334,9 +331,6 @@ }, "id": "0123456a89012345", "name": "GET /api/types", - "start": { - "us": 1845 - }, "subtype": "http", "type": "request" }, @@ -452,9 +446,6 @@ }, "id": "abcde56a89012345", "name": "get /api/types", - "start": { - "us": 0 - }, "subtype": "http", "sync": false, "type": "request" @@ -600,16 +591,6 @@ "duration": { "us": 3781 }, - "http": { - "method": "GET", - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "status_code": 200, - "transfer_size": 300.12 - } - }, - "http.url.original": "http://localhost:8000", "id": "1234567890aaaade", "name": "SELECT FROM product_types", "stacktrace": [ @@ -661,9 +642,6 @@ } } ], - "start": { - "us": 2830 - }, "subtype": "postgresql", "sync": true, "type": "db" @@ -915,9 +893,6 @@ }, "id": "abcdef01234567", "name": "SELECT FROM p_details", - "start": { - "us": 2830 - }, "subtype": "postgresql", "type": "db" }, diff --git a/processor/stream/test_approved_es_documents/testIntakeRUMV3Events.approved.json b/processor/stream/test_approved_es_documents/testIntakeRUMV3Events.approved.json index 41ea119f69b..c728584016b 100644 --- a/processor/stream/test_approved_es_documents/testIntakeRUMV3Events.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeRUMV3Events.approved.json @@ -322,9 +322,6 @@ }, "id": "bbd8bcc3be14d814", "name": "Requesting and receiving the document", - "start": { - "us": 4000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, @@ -399,9 +396,6 @@ }, "id": "fc546e87a90a774f", "name": "Parsing the document, executing sy. scripts", - "start": { - "us": 14000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, @@ -492,19 +486,8 @@ "duration": { "us": 35060 }, - "http": { - "response": { - "decoded_body_size": 676864, - "encoded_body_size": 676864, - "transfer_size": 677175 - } - }, - "http.url.original": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED", "id": "fb8f717930697299", "name": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js", - "start": { - "us": 22534 - }, "subtype": "script", "type": "rc" }, @@ -582,9 +565,6 @@ }, "id": "9b80535c4403c9fb", "name": "OpenTracing y", - "start": { - "us": 96929 - }, "type": "cu" }, "timestamp": { @@ -675,18 +655,8 @@ "duration": { "us": 6724 }, - "http": { - "method": "GET", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8000/test/e2e/common/data.json?test=hamid", "id": "5ecb8ee030749715", "name": "GET /test/e2e/common/data.json", - "start": { - "us": 98940 - }, "subtype": "h", "sync": true, "type": "external" @@ -782,18 +752,8 @@ "duration": { "us": 11584 }, - "http": { - "method": "POST", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8003/data", "id": "27f45fd274f976d4", "name": "POST http://localhost:8003/data", - "start": { - "us": 106520 - }, "subtype": "h", "sync": true, "type": "external" @@ -890,18 +850,8 @@ "duration": { "us": 15949 }, - "http": { - "method": "POST", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8003/fetch", "id": "a3c043330bc2015e", "name": "POST http://localhost:8003/fetch", - "start": { - "us": 119935 - }, "subtype": "h", "sync": false, "type": "external" @@ -1002,9 +952,6 @@ } } ], - "start": { - "us": 120000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index da4c1788495..baea97eea34 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -46,7 +46,6 @@ "duration": { "us": 643000 }, - "http.url.original": "http://localhost:8000/test/e2e/general-usecase/span", "id": "aaaaaaaaaaaaaaaa", "name": "transaction", "stacktrace": [ @@ -72,9 +71,6 @@ } } ], - "start": { - "us": 0 - }, "type": "transaction" }, "timestamp": { diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index a7d2fc1af4a..ff4ecbb5c45 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -72,18 +72,8 @@ "duration": { "us": 11584 }, - "http": { - "method": "POST", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8003/data", "id": "27f45fd274f976d4", "name": "POST http://localhost:8003/data", - "start": { - "us": 106520 - }, "subtype": "h", "sync": true, "type": "external" @@ -173,18 +163,8 @@ "duration": { "us": 6724 }, - "http": { - "method": "GET", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8000/test/e2e/common/data.json?test=hamid", "id": "5ecb8ee030749715", "name": "GET /test/e2e/common/data.json", - "start": { - "us": 98940 - }, "subtype": "h", "sync": true, "type": "external" @@ -257,9 +237,6 @@ }, "id": "9b80535c4403c9fb", "name": "OpenTracing y", - "start": { - "us": 96929 - }, "type": "cu" }, "timestamp": { @@ -345,18 +322,8 @@ "duration": { "us": 15949 }, - "http": { - "method": "POST", - "response": { - "status_code": 200 - } - }, - "http.url.original": "http://localhost:8003/fetch", "id": "a3c043330bc2015e", "name": "POST http://localhost:8003/fetch", - "start": { - "us": 119935 - }, "subtype": "h", "sync": false, "type": "external" @@ -429,9 +396,6 @@ }, "id": "bbd8bcc3be14d814", "name": "Requesting and receiving the document", - "start": { - "us": 4000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, @@ -525,9 +489,6 @@ } } ], - "start": { - "us": 120000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, @@ -612,19 +573,8 @@ "duration": { "us": 35060 }, - "http": { - "response": { - "decoded_body_size": 676864, - "encoded_body_size": 676864, - "transfer_size": 677175 - } - }, - "http.url.original": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED", "id": "fb8f717930697299", "name": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js", - "start": { - "us": 22534 - }, "subtype": "script", "type": "rc" }, @@ -696,9 +646,6 @@ }, "id": "fc546e87a90a774f", "name": "Parsing the document, executing sy. scripts", - "start": { - "us": 14000 - }, "subtype": "browser-timing", "type": "hard-navigation" }, diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index 98dafc57ea3..0de0a9d261f 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -46,7 +46,6 @@ "duration": { "us": 643000 }, - "http.url.original": "http://localhost:8000/test/e2e/general-usecase/span", "id": "aaaaaaaaaaaaaaaa", "name": "transaction", "stacktrace": [ @@ -123,9 +122,6 @@ } } ], - "start": { - "us": 0 - }, "type": "transaction" }, "timestamp": {