From 46c09671ea1d23a34e869d7667480f20a725c648 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Tue, 28 Nov 2023 11:51:58 +0800 Subject: [PATCH 1/8] apmpackage: prepare for move to apm-data plugin (#12102) --- apmpackage/apm/changelog.yml | 7 +- .../data_stream/error_logs/fields/fields.yml | 34 +- .../apm_data_stream_migration.yml | 42 -- .../apm/data_stream/traces/fields/fields.yml | 71 +- changelogs/head.asciidoc | 4 +- ...tPipelineDataStreamMigration.approved.json | 699 ------------------ systemtest/ingest_test.go | 37 - 7 files changed, 109 insertions(+), 785 deletions(-) delete mode 100644 apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_data_stream_migration.yml delete mode 100644 systemtest/approvals/TestIngestPipelineDataStreamMigration.approved.json diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml index 6906aa2b13d..841afb1123d 100644 --- a/apmpackage/apm/changelog.yml +++ b/apmpackage/apm/changelog.yml @@ -1,8 +1,11 @@ - version: generated changes: - - description: Placeholder + - description: Add missing mappings for various fields type: enhancement - link: https://github.com/elastic/apm-server/pull/123 + link: https://github.com/elastic/apm-server/pull/12102 + - description: Remove unsupported 7.x data stream migration pipeline + type: enhancement + link: https://github.com/elastic/apm-server/pull/12102 - version: 8.11.0 changes: - description: Add geoip processing to add client.geo.* fields for app_logs diff --git a/apmpackage/apm/data_stream/error_logs/fields/fields.yml b/apmpackage/apm/data_stream/error_logs/fields/fields.yml index c24ddc4e677..7d09a162531 100644 --- a/apmpackage/apm/data_stream/error_logs/fields/fields.yml +++ b/apmpackage/apm/data_stream/error_logs/fields/fields.yml @@ -6,6 +6,12 @@ - name: error.culprit type: keyword description: Function call which was the primary perpetrator of this event. +- name: error.custom + type: flattened + description: Custom error context. +- name: error.exception.attributes + type: flattened + description: Arbitrary attributes associated with the exception. - name: error.exception.code type: keyword description: The error code set when the error happened, e.g. database error code. @@ -18,6 +24,10 @@ - name: error.exception.module type: keyword description: The module namespace of the original error. +- name: error.exception.stacktrace + type: flattened + description: | + Stacktrace identifying the instrumented source code corresponding to the error. - name: error.exception.type type: keyword description: The type of the original error, e.g. the Java exception class name. @@ -42,8 +52,24 @@ type: keyword description: | A parametrized message. E.g. 'Could not connect to %s'. The property message is still required, and should be equal to the param_message, but with placeholders replaced. In some situations the param_message is used to group errors together. +- name: error.log.stacktrace + type: flattened + description: | + Stacktrace identifying the instrumented source code corresponding to the error. +- name: http.request.body + type: flattened + description: | + The original body of the monitored HTTP request. +- name: http.request.env + type: flattened + description: | + The CGI-like environment variables of the monitored HTTP request. +- name: http.request.cookies + type: flattened + description: | + The cookies of the monitored HTTP request. - name: http.request.headers - type: object + type: flattened description: | The canonical headers of the monitored HTTP request. - name: http.response.finished @@ -51,9 +77,13 @@ description: | Used by the Node agent to indicate when in the response life cycle an error has occurred. - name: http.response.headers - type: object + type: flattened description: | The canonical headers of the monitored HTTP response. +- name: http.response.headers_sent + type: boolean + description: | + Used by the Node agent to indicate whether HTTP response headers were sent. - name: kubernetes.namespace type: keyword description: | diff --git a/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_data_stream_migration.yml b/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_data_stream_migration.yml deleted file mode 100644 index ce9480e5fbc..00000000000 --- a/apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/apm_data_stream_migration.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -description: | - Pipeline for migrating APM events from indices to data streams. - This pipeline is not used directly by apmserver; it is installed - for manually migrating legacy indices to data streams. -processors: - - pipeline: - name: observer_version - - pipeline: - name: observer_ids - - pipeline: - name: remove_ecs_version - - pipeline: - name: process_ppid - - script: - if: ctx.processor?.event == 'span' || ctx.processor?.event == 'transaction' - source: | - ctx.data_stream = ["type": "traces", "dataset": "apm", "namespace": "migrated"] - - script: - if: ctx.processor?.event == 'error' - source: | - ctx.data_stream = ["type": "logs", "dataset": "apm.error", "namespace": "migrated"] - - script: - if: ctx.processor?.event == 'metric' - source: | - String dataset; - if (ctx["metricset.name"] != "app") { - dataset = "apm.internal"; - } else { - String serviceName = ctx.service.name; - serviceName = serviceName.toLowerCase(); - serviceName = /[\\\/*?"<>| ,#:-]/.matcher(serviceName).replaceAll('_'); - dataset = "apm.app." + serviceName; - } - ctx.data_stream = ["type": "metrics", "dataset": dataset, "namespace": "migrated"]; - - set: - if: ctx.data_stream != null - field: _index - value: "{{data_stream.type}}-{{data_stream.dataset}}-{{data_stream.namespace}}" - - remove: - field: timeseries # remove timeseries.instance - ignore_missing: true diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml index 94ec29db330..01a2033c81d 100644 --- a/apmpackage/apm/data_stream/traces/fields/fields.yml +++ b/apmpackage/apm/data_stream/traces/fields/fields.yml @@ -56,8 +56,20 @@ type: keyword description: | The lambda function version. +- name: http.request.body + type: flattened + description: | + The original body of the monitored HTTP request. +- name: http.request.env + type: flattened + description: | + The CGI-like environment variables of the monitored HTTP request. +- name: http.request.cookies + type: flattened + description: | + The cookies of the monitored HTTP request. - name: http.request.headers - type: object + type: flattened description: | The canonical headers of the monitored HTTP request. - name: http.response.finished @@ -65,9 +77,14 @@ description: | Used by the Node agent to indicate when in the response life cycle an error has occurred. - name: http.response.headers - type: object + type: flattened description: | The canonical headers of the monitored HTTP response. +- name: http.response.headers_sent + type: boolean + index: false + description: | + Used by the Node agent to indicate whether HTTP response headers were sent. - name: http.response.transfer_size type: long unit: byte @@ -221,10 +238,26 @@ type: long description: | Sum of the durations of the compressed spans, in microseconds. +- name: span.db.instance + type: keyword + description: | + Database instance. - name: span.db.link type: keyword description: | Database link. +- name: span.db.type + type: keyword + description: | + Database type. +- name: span.db.user.name + type: keyword + description: | + Database username. +- name: span.db.statement + type: keyword + description: | + Database statement. - name: span.db.rows_affected type: long description: | @@ -245,6 +278,18 @@ type: long description: | Duration of the span, in microseconds. +- name: span.message.body + type: keyword + description: The message body + index: false +- name: span.message.routing_key + type: keyword + description: The message routing key + index: false +- name: span.message.headers + type: flattened + description: The message headers + index: false - name: span.message.age.ms type: long description: | @@ -257,6 +302,10 @@ type: keyword description: | Generic designation of a span in the scope of a transaction. +- name: span.stacktrace + type: flattened + description: | + Stacktrace identifying the instrumented source code corresponding to the span. - name: span.subtype type: keyword description: | @@ -279,6 +328,9 @@ type: long description: | Timestamp of the event in microseconds since Unix epoch. +- name: transaction.custom + type: flattened + description: Custom transaction context. - name: transaction.duration.us type: long description: | @@ -306,6 +358,18 @@ description: | A user-defined mapping of groups of marks in milliseconds. dynamic: true +- name: transaction.message.body + type: keyword + description: The message body + index: false +- name: transaction.message.routing_key + type: keyword + description: The message routing key + index: false +- name: transaction.message.headers + type: flattened + description: The message headers + index: false - name: transaction.message.age.ms type: long description: | @@ -332,6 +396,9 @@ - name: transaction.span_count.dropped type: long description: The total amount of dropped spans for this transaction. +- name: transaction.span_count.started + type: long + description: The total amount of started spans for this transaction. - name: transaction.type type: keyword description: | diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 5e6155333cf..286151c5251 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -5,6 +5,7 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] [float] ==== Breaking Changes +- The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102]. [float] ==== Bug fixes @@ -20,4 +21,5 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] ==== Added - Update container base image to Ubuntu 22.04 {pull}11778[11778] - Add support for returning partial success response in OTLP input {pull}11883[11883] -- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] \ No newline at end of file +- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935] +- Field mappings have been added for various formerly unindexed fields {pull}12102[12102] diff --git a/systemtest/approvals/TestIngestPipelineDataStreamMigration.approved.json b/systemtest/approvals/TestIngestPipelineDataStreamMigration.approved.json deleted file mode 100644 index 7b80f483495..00000000000 --- a/systemtest/approvals/TestIngestPipelineDataStreamMigration.approved.json +++ /dev/null @@ -1,699 +0,0 @@ -{ - "events": [ - { - "@timestamp": "2022-09-12T03:52:50.939Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "migrated", - "type": "logs" - }, - "error": { - "culprit": "once", - "exception": [ - { - "handled": false, - "message": "boom", - "module": "errors", - "stacktrace": [ - { - "abs_path": "/home/andrew/projects/apmload/main.go", - "exclude_from_grouping": false, - "filename": "main.go", - "function": "once", - "line": { - "number": 53 - }, - "module": "main" - }, - { - "abs_path": "/home/andrew/projects/apmload/main.go", - "exclude_from_grouping": false, - "filename": "main.go", - "function": "main", - "line": { - "number": 29 - }, - "module": "main" - }, - { - "abs_path": "/home/andrew/go/toolchain/1.18.1/src/runtime/proc.go", - "exclude_from_grouping": false, - "filename": "proc.go", - "function": "main", - "library_frame": true, - "line": { - "number": 250 - }, - "module": "runtime" - }, - { - "abs_path": "/home/andrew/go/toolchain/1.18.1/src/runtime/asm_amd64.s", - "exclude_from_grouping": false, - "filename": "asm_amd64.s", - "function": "goexit", - "library_frame": true, - "line": { - "number": 1571 - }, - "module": "runtime" - } - ], - "type": "errorString" - } - ], - "grouping_key": "d9bb6552d94deb040e83062f8fe1e449", - "grouping_name": "boom", - "id": "b2da5288b2c3d7e79c42a636ca2fd99f" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "architecture": "amd64", - "hostname": "corduroy", - "ip": "110.174.44.88", - "name": "corduroy", - "os": { - "platform": "linux" - } - }, - "message": "boom", - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7bd04bc3063f9930" - }, - "process": { - "args": [ - "/tmp/go-build1405913256/b001/exe/main" - ], - "parent": { - "pid": 4009763 - }, - "pid": 4009922, - "title": "main" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "language": { - "name": "go", - "version": "go1.18.1" - }, - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "runtime": { - "name": "gc", - "version": "go1.18.1" - } - }, - "timestamp": { - "us": 1662954770939878 - }, - "trace": { - "id": "5cfc595035477ea235a632fc3e2bb6b1" - }, - "transaction": { - "id": "5cfc595035477ea2", - "sampled": true, - "type": "type" - } - }, - { - "@timestamp": "2022-09-12T03:52:51.178Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm.app.main", - "namespace": "migrated", - "type": "metrics" - }, - "event": { - "ingested": "dynamic" - }, - "golang": { - "goroutines": 11, - "heap": { - "allocations": { - "active": 6160384, - "allocated": 4579688, - "frees": 39979, - "idle": 5701632, - "mallocs": 44520, - "objects": 4541, - "total": 8834120 - }, - "gc": { - "cpu_fraction": 0.0003175952, - "next_gc_limit": 8842488, - "total_count": 3, - "total_pause": { - "ns": 178493 - } - }, - "system": { - "obtained": 11862016, - "released": 3989504, - "stack": 720896, - "total": 20268040 - } - } - }, - "host": { - "architecture": "amd64", - "hostname": "corduroy", - "ip": "110.174.44.88", - "name": "corduroy", - "os": { - "platform": "linux" - } - }, - "metricset": { - "name": "app" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": "/tmp/go-build1405913256/b001/exe/main", - "parent": { - "pid": 4009763 - }, - "pid": 4009922, - "title": "main" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "go1.18.1" - }, - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "runtime": { - "name": "gc", - "version": "go1.18.1" - } - }, - "system": { - "cpu": { - "total": { - "norm": { - "pct": 0.02255639 - } - } - }, - "memory": { - "actual": { - "free": 33981653000 - }, - "total": 46108970000 - }, - "process": { - "cpu": { - "total": { - "norm": { - "pct": 0.0025062656 - } - } - }, - "memory": { - "rss": { - "bytes": 15187968 - }, - "size": 1485594600 - } - } - } - }, - { - "@timestamp": "2022-09-12T03:52:00.000Z", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "migrated", - "type": "metrics" - }, - "event": { - "ingested": "dynamic", - "outcome": "failure" - }, - "metricset": { - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "name": "main" - }, - "span": { - "destination": { - "service": { - "resource": "dest_resource", - "response_time": { - "count": 1, - "sum": { - "us": 10220 - } - } - } - } - } - }, - { - "@timestamp": "2022-09-12T03:52:00.000Z", - "_doc_count": 1, - "agent": { - "name": "go" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "migrated", - "type": "metrics" - }, - "event": { - "ingested": "dynamic", - "outcome": "failure" - }, - "host": { - "hostname": "corduroy", - "name": "corduroy" - }, - "metricset": { - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 1 - ], - "values": [ - 10239 - ] - } - }, - "name": "name", - "root": true, - "type": "type" - } - }, - { - "@timestamp": "2022-09-12T03:52:51.178Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "migrated", - "type": "metrics" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "architecture": "amd64", - "hostname": "corduroy", - "ip": "110.174.44.88", - "name": "corduroy", - "os": { - "platform": "linux" - } - }, - "metricset": { - "name": "span_breakdown" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": "/tmp/go-build1405913256/b001/exe/main", - "parent": { - "pid": 4009763 - }, - "pid": 4009922, - "title": "main" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "go1.18.1" - }, - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "runtime": { - "name": "gc", - "version": "go1.18.1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 15 - } - }, - "type": "app" - }, - "transaction": { - "name": "name", - "type": "type" - } - }, - { - "@timestamp": "2022-09-12T03:52:51.178Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "migrated", - "type": "metrics" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "architecture": "amd64", - "hostname": "corduroy", - "ip": "110.174.44.88", - "name": "corduroy", - "os": { - "platform": "linux" - } - }, - "metricset": { - "name": "span_breakdown" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": "/tmp/go-build1405913256/b001/exe/main", - "parent": { - "pid": 4009763 - }, - "pid": 4009922, - "title": "main" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "go1.18.1" - }, - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "runtime": { - "name": "gc", - "version": "go1.18.1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 10220 - } - }, - "type": "type" - }, - "transaction": { - "name": "name", - "type": "type" - } - }, - { - "@timestamp": "2022-09-12T03:52:50.929Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "migrated", - "type": "traces" - }, - "event": { - "outcome": "failure" - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "5cfc595035477ea2" - }, - "processor": { - "event": "span", - "name": "transaction" - }, - "service": { - "name": "main" - }, - "span": { - "destination": { - "service": { - "resource": "dest_resource", - "type": "type" - } - }, - "duration": { - "us": 10220 - }, - "id": "7bd04bc3063f9930", - "name": "name", - "stacktrace": [ - { - "abs_path": "/home/andrew/go/pkg/mod/go.elastic.co/apm/v2@v2.0.0/span.go", - "exclude_from_grouping": false, - "filename": "span.go", - "function": "(*Span).End", - "library_frame": true, - "line": { - "number": 368 - }, - "module": "go.elastic.co/apm/v2" - }, - { - "abs_path": "/home/andrew/projects/apmload/main.go", - "exclude_from_grouping": false, - "filename": "main.go", - "function": "once", - "line": { - "number": 56 - }, - "module": "main" - }, - { - "abs_path": "/home/andrew/projects/apmload/main.go", - "exclude_from_grouping": false, - "filename": "main.go", - "function": "main", - "line": { - "number": 29 - }, - "module": "main" - }, - { - "abs_path": "/home/andrew/go/toolchain/1.18.1/src/runtime/proc.go", - "exclude_from_grouping": false, - "filename": "proc.go", - "function": "main", - "library_frame": true, - "line": { - "number": 250 - }, - "module": "runtime" - }, - { - "abs_path": "/home/andrew/go/toolchain/1.18.1/src/runtime/asm_amd64.s", - "exclude_from_grouping": false, - "filename": "asm_amd64.s", - "function": "goexit", - "library_frame": true, - "line": { - "number": 1571 - }, - "module": "runtime" - } - ], - "type": "type" - }, - "timestamp": { - "us": 1662954770929706 - }, - "trace": { - "id": "5cfc595035477ea235a632fc3e2bb6b1" - }, - "transaction": { - "id": "5cfc595035477ea2" - } - }, - { - "@timestamp": "2022-09-12T03:52:50.929Z", - "agent": { - "name": "go", - "version": "2.0.0" - }, - "container": { - "id": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "migrated", - "type": "traces" - }, - "event": { - "ingested": "dynamic", - "outcome": "failure" - }, - "host": { - "architecture": "amd64", - "hostname": "corduroy", - "ip": "110.174.44.88", - "name": "corduroy", - "os": { - "platform": "linux" - } - }, - "observer": { - "hostname": "dynamic", - "name": "instance-0000000000", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "/tmp/go-build1405913256/b001/exe/main" - ], - "parent": { - "pid": 4009763 - }, - "pid": 4009922, - "title": "main" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "language": { - "name": "go", - "version": "go1.18.1" - }, - "name": "main", - "node": { - "name": "spawn-6cd7c2e1-43d5-4c89-8480-e178b3bc70d1" - }, - "runtime": { - "name": "gc", - "version": "go1.18.1" - } - }, - "timestamp": { - "us": 1662954770929705 - }, - "trace": { - "id": "5cfc595035477ea235a632fc3e2bb6b1" - }, - "transaction": { - "duration": { - "us": 10236 - }, - "id": "5cfc595035477ea2", - "name": "name", - "sampled": true, - "span_count": { - "dropped": 0, - "started": 1 - }, - "type": "type" - } - } - ] -} diff --git a/systemtest/ingest_test.go b/systemtest/ingest_test.go index d1b3337fc4a..c1bd709dd6e 100644 --- a/systemtest/ingest_test.go +++ b/systemtest/ingest_test.go @@ -18,14 +18,11 @@ package systemtest_test import ( - "bytes" "context" "encoding/json" - "fmt" "io" "net/http" "net/url" - "os" "strings" "testing" @@ -36,7 +33,6 @@ import ( "github.com/elastic/apm-server/systemtest" "github.com/elastic/apm-server/systemtest/apmservertest" "github.com/elastic/apm-server/systemtest/estest" - "github.com/elastic/apm-tools/pkg/approvaltest" "github.com/elastic/apm-tools/pkg/espoll" "github.com/elastic/go-elasticsearch/v8/esapi" ) @@ -181,39 +177,6 @@ func TestIngestPipelineEventDuration(t *testing.T) { } } -func TestIngestPipelineDataStreamMigration(t *testing.T) { - systemtest.CleanupElasticsearch(t) - - var testdata struct { - Hits struct { - Hits []struct { - Source json.RawMessage `json:"_source"` - } `json:"hits` - } `json:"hits` - } - - data, err := os.ReadFile("../testdata/ingest/7_17_docs.json") - require.NoError(t, err) - err = json.Unmarshal(data, &testdata) - require.NoError(t, err) - - // Index documents using the data stream migration ingest pipeline. - pipeline := fmt.Sprintf("traces-apm-%s-apm_data_stream_migration", systemtest.IntegrationPackage.Version) - for _, doc := range testdata.Hits.Hits { - _, err := systemtest.Elasticsearch.Do(context.Background(), esapi.IndexRequest{ - Index: "traces-apm-foo", // should not be created; ingest pipeline should take over - Pipeline: pipeline, - Body: bytes.NewReader(doc.Source), - }, nil) - require.NoError(t, err) - } - - result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, - len(testdata.Hits.Hits), "traces-apm*,logs-apm*,metrics-apm*", nil, - ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) -} - func TestIngestPipelineEventSuccessCount(t *testing.T) { type test struct { source string From 2e1d98f8bfd739937f0d9e6cd1b196470e7ebf5c Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Tue, 28 Nov 2023 20:35:10 +0800 Subject: [PATCH 2/8] systemtest: compare `fields` instead of `_source` in approvals (#12098) * go.mod: update apm-tools Update apm-tools to bring in the newer version of opentelemetry-go, which affects approvals. * Fix flaky test (Unrelated to other changes.) * Mechanically flatten approvals find -name '*.approved.json' -exec go run path/to/apm-tools/cmd/flatten-approvals -i {} \; * systemtest: approve fields instead of _source --- systemtest/agentconfig_test.go | 2 +- systemtest/aggregation_test.go | 30 +- .../approvals/TestAgentConfig.approved.json | 122 +- .../TestApprovedMetrics.approved.json | 912 ++-- .../data_streams_disabled.approved.json | 714 +-- .../TestCompressedSpans.approved.json | 438 +- .../approvals/TestDropUnsampled.approved.json | 339 +- .../approvals/TestErrorIngest.approved.json | 341 +- .../approvals/TestIntake/Errors.approved.json | 2047 +++++---- .../TestIntake/ErrorsTxID.approved.json | 660 +-- .../approvals/TestIntake/Events.approved.json | 1832 +++++--- .../TestIntake/Metricsets.approved.json | 912 ++-- .../TestIntake/MinimalEvents.approved.json | 704 +-- .../approvals/TestIntake/Spans.approved.json | 4003 ++++++++++------- .../TestIntake/Transactions.approved.json | 2132 +++++---- .../TransactionsHugeTraces.approved.json | 629 ++- .../TestIntake/UnknownSpanType.approved.json | 842 ++-- .../TestIntakeLog/with_faas.approved.json | 229 +- .../with_flat_ecs_fields.approved.json | 299 +- .../with_nested_ecs_fields.approved.json | 299 +- ...fields_overrides_flat_fields.approved.json | 299 +- .../with_timestamp.approved.json | 215 +- .../with_timestamp_as_str.approved.json | 215 +- .../without_timestamp.approved.json | 215 +- .../TestJaeger/batch_0.approved.json | 1005 +++-- .../TestJaeger/batch_1.approved.json | 2569 ++++++----- .../TestNoMatchingSourcemap.approved.json | 195 +- .../approvals/TestOTLPGRPCLogs.approved.json | 104 +- .../TestOTLPGRPCLogsClientIP.approved.json | 155 +- .../TestOTLPGRPCMetrics_counter.approved.json | 80 +- ...estOTLPGRPCMetrics_histogram.approved.json | 80 +- .../TestOTLPGRPCMetrics_summary.approved.json | 80 +- .../TestOTLPGRPCTraces.approved.json | 500 +- .../data_streams_disabled.approved.json | 146 +- .../standalone.approved.json | 620 +-- .../standalone.approved.json | 620 +-- .../TestRUMRoutingIntegration.approved.json | 1855 ++++---- .../TestRUMSpanSourcemapping.approved.json | 285 +- .../TestRUMXForwardedFor.approved.json | 356 +- .../data_streams_disabled.approved.json | 350 +- ...erviceDestinationAggregation.approved.json | 375 +- ...iceSummaryMetricsAggregation.approved.json | 216 +- ...ryMetricsAggregationOverflow.approved.json | 648 +-- ...ransactionMetricsAggregation.approved.json | 708 +-- ...adInvalidElasticsearchConfig.approved.json | 626 +-- .../TestTransactionAggregation.approved.json | 1749 ++++--- ...ansactionAggregationShutdown.approved.json | 501 ++- ...tionDroppedSpansStatsMetrics.approved.json | 636 +-- ...DroppedSpansStatsTransaction.approved.json | 196 +- systemtest/errors_test.go | 34 +- systemtest/go.mod | 48 +- systemtest/go.sum | 113 +- systemtest/huge_traces_test.go | 21 +- systemtest/intake_log_test.go | 2 +- systemtest/intake_test.go | 21 +- systemtest/jaeger_test.go | 2 +- systemtest/metrics_test.go | 2 +- systemtest/otlp_test.go | 12 +- systemtest/rum_test.go | 6 +- systemtest/sampling_test.go | 2 +- systemtest/sourcemap_test.go | 6 +- 61 files changed, 19347 insertions(+), 14007 deletions(-) diff --git a/systemtest/agentconfig_test.go b/systemtest/agentconfig_test.go index 62c8758a6cd..8cd2a8683a7 100644 --- a/systemtest/agentconfig_test.go +++ b/systemtest/agentconfig_test.go @@ -139,7 +139,7 @@ func TestAgentConfig(t *testing.T) { require.Len(t, result.Hits.Hits, 2) etag := gjson.GetBytes(result.Hits.Hits[0].RawSource, "labels.etag") assert.Equal(t, etag1, strconv.Quote(etag.String())) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp", "labels.etag") + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "@timestamp", "labels.etag") } func queryAgentConfig(t testing.TB, serverURL, serviceName, serviceEnvironment, etag string) (map[string]string, *http.Response, map[string]interface{}) { diff --git a/systemtest/aggregation_test.go b/systemtest/aggregation_test.go index 53e50f88f8c..58658ab22ef 100644 --- a/systemtest/aggregation_test.go +++ b/systemtest/aggregation_test.go @@ -78,7 +78,7 @@ func TestTransactionAggregation(t *testing.T) { result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 9, "metrics-apm.transaction*", espoll.ExistsQuery{Field: "transaction.duration.histogram"}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) // Make sure the _doc_count field is added such that aggregations return // the appropriate per-bucket doc_count values. @@ -140,7 +140,7 @@ func TestTransactionAggregationShutdown(t *testing.T) { result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 3, "metrics-apm.transaction*", espoll.ExistsQuery{Field: "transaction.duration.histogram"}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) } func TestServiceDestinationAggregation(t *testing.T) { @@ -176,7 +176,16 @@ func TestServiceDestinationAggregation(t *testing.T) { result := estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.service_destination*", espoll.ExistsQuery{Field: "span.destination.service.response_time.count"}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) + + // _doc_count is not returned in fields, it is only visible in _source and + // in the results of aggregations. + // + // TODO(axw) we should use an aggregation, and check the resturned doc_counts. + for _, hit := range result.Hits.Hits { + docCount := hit.Source["_doc_count"].(float64) + assert.Equal(t, 5.0, docCount) + } } func TestTransactionAggregationLabels(t *testing.T) { @@ -252,7 +261,16 @@ func TestServiceTransactionMetricsAggregation(t *testing.T) { result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 2, "metrics-apm.service_transaction*", espoll.TermQuery{Field: "metricset.name", Value: "service_transaction"}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) + + // _doc_count is not returned in fields, it is only visible in _source and + // in the results of aggregations. + // + // TODO(axw) we should use an aggregation, and check the resturned doc_counts. + for _, hit := range result.Hits.Hits { + docCount := hit.Source["_doc_count"].(float64) + assert.Equal(t, 2.0, docCount) + } } func TestServiceTransactionMetricsAggregationLabels(t *testing.T) { @@ -371,7 +389,7 @@ func TestServiceSummaryMetricsAggregation(t *testing.T) { result := estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.service_summary*", espoll.TermQuery{Field: "metricset.name", Value: "service_summary"}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) } func TestServiceSummaryMetricsAggregationOverflow(t *testing.T) { @@ -416,7 +434,7 @@ func TestServiceSummaryMetricsAggregationOverflow(t *testing.T) { espoll.TermQuery{Field: "metricset.name", Value: "service_summary"}, ) // Ignore timestamp because overflow bucket uses time.Now() - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp") + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "@timestamp") } func TestNonDefaultRollupIntervalHiddenDataStream(t *testing.T) { diff --git a/systemtest/approvals/TestAgentConfig.approved.json b/systemtest/approvals/TestAgentConfig.approved.json index 8fd3a40e23b..561791606c4 100644 --- a/systemtest/approvals/TestAgentConfig.approved.json +++ b/systemtest/approvals/TestAgentConfig.approved.json @@ -1,50 +1,72 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent_config_applied": 1, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "labels": { - "etag": "dynamic" - }, - "metricset": { - "name": "agent_config" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - } - }, - { - "@timestamp": "dynamic", - "agent_config_applied": 1, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "labels": { - "etag": "dynamic" - }, - "metricset": { - "name": "agent_config" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent_config_applied": [ + 1 + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "labels.etag": [ + "dynamic" + ], + "metricset.name": [ + "agent_config" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent_config_applied": [ + 1 + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "labels.etag": [ + "dynamic" + ], + "metricset.name": [ + "agent_config" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ] + } +] diff --git a/systemtest/approvals/TestApprovedMetrics.approved.json b/systemtest/approvals/TestApprovedMetrics.approved.json index 2ff6e6c5087..3ee806a691b 100644 --- a/systemtest/approvals/TestApprovedMetrics.approved.json +++ b/systemtest/approvals/TestApprovedMetrics.approved.json @@ -1,229 +1,280 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:41.364Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "go": { - "memstats": { - "heap": { - "sys": { - "bytes": 6520832 - } - } - } - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.366Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "process": { - "cgroup": { - "memory": { - "mem": { - "limit": { - "bytes": 2048 - }, - "usage": { - "bytes": 1024 - } - } - } - } - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.367Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "process": { - "cgroup": { - "cpu": { - "cfs": { - "period": { - "us": 1024 - }, - "quota": { - "us": 2048 - } - }, - "id": 2048, - "stats": { - "periods": 2048, - "throttled": { - "ns": 2048, - "periods": 2048 - } - } - }, - "cpuacct": { - "id": 2048, - "total": { - "ns": 2048 - } - } - } - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.368Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "latency_distribution": { +[ + { + "@timestamp": [ + "2017-05-30T18:53:41.364Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "go.memstats.heap.sys.bytes": [ + 6520832 + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.366Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.memory.mem.limit.bytes": [ + 2048 + ], + "system.process.cgroup.memory.mem.usage.bytes": [ + 1024 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.367Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.cpu.cfs.period.us": [ + 1024 + ], + "system.process.cgroup.cpu.cfs.quota.us": [ + 2048 + ], + "system.process.cgroup.cpu.id": [ + 2048 + ], + "system.process.cgroup.cpu.stats.periods": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.ns": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.periods": [ + 2048 + ], + "system.process.cgroup.cpuacct.id": [ + 2048 + ], + "system.process.cgroup.cpuacct.total.ns": [ + 2048 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.368Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "latency_distribution": [ + { "counts": [ 1, 2, @@ -234,172 +285,245 @@ 2.2, 3.3 ] - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.369Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "faas": { - "billed_duration": 183, - "coldstart": true, - "coldstart_duration": 422.97, - "duration": 182.43, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime", - "timeout": 5000 - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "memory": { - "actual": { - "free": 54525952 - }, - "total": 134217728 - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "some": "abc", - "success": "true", - "tag1": "one" - }, - "metricset": { - "name": "span_breakdown" - }, - "numeric_labels": { - "code": 200, - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 633 - } - }, - "subtype": "mysql", - "type": "db" - }, - "transaction": { - "name": "GET /", - "type": "request" - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" } - } - ] -} + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.369Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "faas.billed_duration": [ + 183 + ], + "faas.coldstart": [ + true + ], + "faas.coldstart_duration": [ + 422.97 + ], + "faas.duration": [ + 182.43 + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "faas.timeout": [ + 5000 + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.memory.actual.free": [ + 54525952 + ], + "system.memory.total": [ + 134217728 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.some": [ + "abc" + ], + "labels.success": [ + "true" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "span_breakdown" + ], + "numeric_labels.code": [ + 200 + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "mysql" + ], + "span.type": [ + "db" + ], + "transaction.name": [ + "GET /" + ], + "transaction.type": [ + "request" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + } +] diff --git a/systemtest/approvals/TestApprovedMetrics/data_streams_disabled.approved.json b/systemtest/approvals/TestApprovedMetrics/data_streams_disabled.approved.json index 4385674a77a..fec542b689b 100644 --- a/systemtest/approvals/TestApprovedMetrics/data_streams_disabled.approved.json +++ b/systemtest/approvals/TestApprovedMetrics/data_streams_disabled.approved.json @@ -1,287 +1,427 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:41.364Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "go.memstats.heap.sys.bytes": 6520832, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "metricset.name": "app", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.366Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "metricset.name": "app", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system.process.cgroup.memory.mem.limit.bytes": 2048, - "system.process.cgroup.memory.mem.usage.bytes": 1024, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.366Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "metricset.name": "app", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system.process.cgroup.cpu.cfs.period.us": 1024, - "system.process.cgroup.cpu.cfs.quota.us": 2048, - "system.process.cgroup.cpu.id": 2048, - "system.process.cgroup.cpu.stats.periods": 2048, - "system.process.cgroup.cpu.stats.throttled.ns": 2048, - "system.process.cgroup.cpu.stats.throttled.periods": 2048, - "system.process.cgroup.cpuacct.id": 2048, - "system.process.cgroup.cpuacct.total.ns": 2048, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.366Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one", - "tag2": 2 - }, - "latency_distribution": { - "counts": [ - 1, - 2, - 3 - ], - "values": [ - 1.1, - 2.2, - 3.3 - ] - }, - "metricset.name": "app", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "code": 200, - "some": "abc", - "success": true, - "tag1": "one", - "tag2": 2 - }, - "metricset.name": "span_breakdown", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum.us": 633 - }, - "subtype": "mysql", - "type": "db" - }, - "transaction": { - "name": "GET /", - "type": "request" - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - } - ] -} +[ + { + "@timestamp": [ + "2017-05-30T18:53:41.364Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "go.memstats.heap.sys.bytes": [ + 6520832 + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "labels.tag2": [ + 2 + ], + "metricset.name": [ + "app" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.366Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "labels.tag2": [ + 2 + ], + "metricset.name": [ + "app" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.memory.mem.limit.bytes": [ + 2048 + ], + "system.process.cgroup.memory.mem.usage.bytes": [ + 1024 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.366Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "labels.tag2": [ + 2 + ], + "metricset.name": [ + "app" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.cpu.cfs.period.us": [ + 1024 + ], + "system.process.cgroup.cpu.cfs.quota.us": [ + 2048 + ], + "system.process.cgroup.cpu.id": [ + 2048 + ], + "system.process.cgroup.cpu.stats.periods": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.ns": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.periods": [ + 2048 + ], + "system.process.cgroup.cpuacct.id": [ + 2048 + ], + "system.process.cgroup.cpuacct.total.ns": [ + 2048 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.366Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "labels.tag2": [ + 2 + ], + "latency_distribution.counts": [ + 1, + 2, + 3 + ], + "latency_distribution.values": [ + 1.1, + 2.2, + 3.3 + ], + "metricset.name": [ + "app" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:42.281Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.code": [ + 200 + ], + "labels.some": [ + "abc" + ], + "labels.success": [ + true + ], + "labels.tag1": [ + "one" + ], + "labels.tag2": [ + 2 + ], + "metricset.name": [ + "span_breakdown" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "mysql" + ], + "span.type": [ + "db" + ], + "transaction.name": [ + "GET /" + ], + "transaction.type": [ + "request" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ] + } +] diff --git a/systemtest/approvals/TestCompressedSpans.approved.json b/systemtest/approvals/TestCompressedSpans.approved.json index c2da0651e1f..cec7f4a25f1 100644 --- a/systemtest/approvals/TestCompressedSpans.approved.json +++ b/systemtest/approvals/TestCompressedSpans.approved.json @@ -1,183 +1,255 @@ -{ - "events": [ - { - "@timestamp": "1970-01-01T00:00:00.000Z", - "agent": { - "name": "go", - "version": "0.0.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "i386", - "hostname": "beowulf", - "ip": [ - "127.0.0.1" - ], - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "0000000000000001" - }, - "process": { - "pid": 1, - "title": "systemtest.test" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - }, - "target": { - "type": "redis" - } - }, - "span": { - "composite": { - "compression_strategy": "same_kind", - "count": 50, - "sum": { - "us": 50000 - } - }, - "destination": { - "service": { - "resource": "redis", - "type": "db" - } - }, - "duration": { - "us": 50000 - }, - "id": "0000000000000002", - "name": "Calls to redis", - "representative_count": 1, - "subtype": "redis", - "type": "db" - }, - "trace": { - "id": "01000000000000000000000000000000" - }, - "transaction": { - "id": "0000000000000001" - } - }, - { - "@timestamp": "1970-01-01T00:00:00.050Z", - "agent": { - "name": "go", - "version": "0.0.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "i386", - "hostname": "beowulf", - "ip": [ - "127.0.0.1" - ], - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "0000000000000001" - }, - "process": { - "pid": 1, - "title": "systemtest.test" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - }, - "target": { - "type": "elasticsearch" - } - }, - "span": { - "composite": { - "compression_strategy": "exact_match", - "count": 5, - "sum": { - "us": 20000 - } - }, - "destination": { - "service": { - "resource": "elasticsearch", - "type": "db" - } - }, - "duration": { - "us": 20000 - }, - "id": "0000000000000034", - "name": "_bulk", - "representative_count": 1, - "subtype": "elasticsearch", - "type": "db" - }, - "timestamp": { - "us": 50000 - }, - "trace": { - "id": "01000000000000000000000000000000" - }, - "transaction": { - "id": "0000000000000001" - } - } - ] -} +[ + { + "@timestamp": [ + "1970-01-01T00:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "agent.version": [ + "0.0.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "i386" + ], + "host.hostname": [ + "beowulf" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "0000000000000001" + ], + "process.pid": [ + 1 + ], + "process.title": [ + "systemtest.test" + ], + "process.title.text": [ + "systemtest.test" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "service.target.type": [ + "redis" + ], + "span.composite.compression_strategy": [ + "same_kind" + ], + "span.composite.count": [ + 50 + ], + "span.composite.sum.us": [ + 50000 + ], + "span.destination.service.resource": [ + "redis" + ], + "span.destination.service.type": [ + "db" + ], + "span.duration.us": [ + 50000 + ], + "span.id": [ + "0000000000000002" + ], + "span.name": [ + "Calls to redis" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "redis" + ], + "span.type": [ + "db" + ], + "trace.id": [ + "01000000000000000000000000000000" + ], + "transaction.id": [ + "0000000000000001" + ] + }, + { + "@timestamp": [ + "1970-01-01T00:00:00.050Z" + ], + "agent.name": [ + "go" + ], + "agent.version": [ + "0.0.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "i386" + ], + "host.hostname": [ + "beowulf" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "0000000000000001" + ], + "process.pid": [ + 1 + ], + "process.title": [ + "systemtest.test" + ], + "process.title.text": [ + "systemtest.test" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "service.target.type": [ + "elasticsearch" + ], + "span.composite.compression_strategy": [ + "exact_match" + ], + "span.composite.count": [ + 5 + ], + "span.composite.sum.us": [ + 20000 + ], + "span.destination.service.resource": [ + "elasticsearch" + ], + "span.destination.service.type": [ + "db" + ], + "span.duration.us": [ + 20000 + ], + "span.id": [ + "0000000000000034" + ], + "span.name": [ + "_bulk" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "elasticsearch" + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 50000 + ], + "trace.id": [ + "01000000000000000000000000000000" + ], + "transaction.id": [ + "0000000000000001" + ] + } +] diff --git a/systemtest/approvals/TestDropUnsampled.approved.json b/systemtest/approvals/TestDropUnsampled.approved.json index c0f29ac1f20..af28a6a95dd 100644 --- a/systemtest/approvals/TestDropUnsampled.approved.json +++ b/systemtest/approvals/TestDropUnsampled.approved.json @@ -1,138 +1,201 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "go", - "version": "0.0.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "i386", - "hostname": "beowulf", - "ip": [ - "127.0.0.1" - ], - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1, - "title": "systemtest.test" - }, - "processor": { - "event": "transaction" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "span": { - "id": "dynamic" - }, - "trace": { - "id": "dynamic" - }, - "transaction": { - "duration": { - "us": 1000000 - }, - "id": "dynamic", - "name": "sampled", - "representative_count": 1, - "sampled": true, - "span_count": { - "dropped": 0, - "started": 0 - }, - "type": "TestDropUnsampled" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "127.0.0.1" - }, - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction" - }, - "service": { - "name": "allowed" - }, - "source": { - "ip": "127.0.0.1", - "port": "dynamic" - }, - "span": { - "id": "dynamic" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "dynamic" - }, - "transaction": { - "duration": { - "us": 0 - }, - "id": "dynamic", - "representative_count": 1, - "span_count": { - "started": 1 - }, - "type": "TestDropUnsampled" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "agent.version": [ + "0.0.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "i386" + ], + "host.hostname": [ + "beowulf" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1 + ], + "process.title": [ + "systemtest.test" + ], + "process.title.text": [ + "systemtest.test" + ], + "processor.event": [ + "transaction" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "span.id": [ + "dynamic" + ], + "trace.id": [ + "dynamic" + ], + "transaction.duration.us": [ + 1000000 + ], + "transaction.id": [ + "dynamic" + ], + "transaction.name": [ + "sampled" + ], + "transaction.name.text": [ + "sampled" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 0 + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "TestDropUnsampled" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "127.0.0.1" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "service.name": [ + "allowed" + ], + "source.ip": [ + "127.0.0.1" + ], + "source.port": [ + "dynamic" + ], + "span.id": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "dynamic" + ], + "transaction.duration.us": [ + 0 + ], + "transaction.id": [ + "dynamic" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.span_count.started": [ + 1 + ], + "transaction.type": [ + "TestDropUnsampled" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestErrorIngest.approved.json b/systemtest/approvals/TestErrorIngest.approved.json index 10936af8b51..3d73033b329 100644 --- a/systemtest/approvals/TestErrorIngest.approved.json +++ b/systemtest/approvals/TestErrorIngest.approved.json @@ -1,135 +1,206 @@ -{ - "events": [ - { - "@timestamp": "2018-08-09T15:04:05.999Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "abcdef123", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb", - "grouping_name": "Cannot read property 'baz' of undefined", - "id": "abcdef0123456789", - "log": { - "level": "custom log level", - "message": "Cannot read property 'baz' of undefined" - } - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "message": "Cannot read property 'baz' of undefined", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "9632587410abcdef" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-abc" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "id": "1234567890987654" - }, - "timestamp": { - "us": 1533827045999000 - }, - "trace": { - "id": "0123456789abcdeffedcba0123456789" - }, - "transaction": { - "id": "1234567890987654", - "name": "mytx", - "sampled": true, - "type": "request" - }, - "user": { - "domain": "ldap://abc", - "email": "bar@example.com", - "id": "123", - "name": "bar" - } - } - ] -} +[ + { + "@timestamp": [ + "2018-08-09T15:04:05.999Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "abcdef123" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.grouping_key": [ + "d6b3f958dfea98dc9ed2b57d5f0c48bb" + ], + "error.grouping_name": [ + "Cannot read property 'baz' of undefined" + ], + "error.id": [ + "abcdef0123456789" + ], + "error.log.level": [ + "custom log level" + ], + "error.log.message": [ + "Cannot read property 'baz' of undefined" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "message": [ + "Cannot read property 'baz' of undefined" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "9632587410abcdef" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-abc" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.id": [ + "1234567890987654" + ], + "timestamp.us": [ + 1533827045999000 + ], + "trace.id": [ + "0123456789abcdeffedcba0123456789" + ], + "transaction.id": [ + "1234567890987654" + ], + "transaction.name": [ + "mytx" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "request" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "bar@example.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + } +] diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 3ffe4fc0074..990c967c8c5 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -1,860 +1,1233 @@ -{ - "events": [ - { - "@timestamp": "2017-05-09T15:04:05.999Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "abcdef123", - "name": "elastic-node", - "version": "3.14.0" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": "dynamic", - "lon": "dynamic" - } - }, - "ip": "12.53.12.1" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "culprit": "my.module.function_name", - "custom": { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - }, - "exception": [ - { - "attributes": { - "foo": "bar" - }, - "code": "42", - "handled": false, - "message": "The username root is unknown", - "module": "__builtins__", - "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" - } - } - ], - "type": "DbError" - }, - { - "message": "something wrong writing a file", - "type": "InternalDbError" - }, - { - "message": "disk spinning way too fast", - "type": "VeryInternalDbError" - }, - { - "message": "on top of it, internet doesn't work", - "parent": 1, - "type": "ConnectionError" - } - ], - "grouping_key": "d72b25a26fde3f3aaad1c86950acd070", - "grouping_name": "My service could not talk to the database named foobar", - "id": "0123456789012345", - "log": { - "level": "warning", - "logger_name": "my.logger.name", - "message": "My service could not talk to the database named foobar", - "param_message": "My service could not talk to the database named %s", - "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" - } - } +[ + { + "@timestamp": [ + "2017-05-09T15:04:05.999Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "abcdef123" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "client.geo.continent_name": [ + "North America" + ], + "client.geo.country_iso_code": [ + "US" + ], + "client.geo.country_name": [ + "United States" + ], + "client.geo.location": [ + "dynamic" + ], + "client.ip": [ + "12.53.12.1" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.culprit": [ + "my.module.function_name" + ], + "error.custom": [ + { + "and_objects": { + "foo": [ + "bar", + "baz" ] - } - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": "Hello World" - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "headers": { - "Array": [ - "foo", - "bar", - "baz" - ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] - }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "message": "My service could not talk to the database named foobar", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Node", - "version": "1" - }, - "language": { - "name": "ecmascript", - "version": "1.2" - }, - "name": "service1", - "node": { - "name": "node-xyz" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - } - }, - "source": { - "ip": "12.53.12.1" - }, - "timestamp": { - "us": 1494342245999999 - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "domain": "ldap://abc", - "id": "99", - "name": "foo" - }, - "user_agent": { - "device": { - "name": "Other" }, - "name": "Other", - "original": "Mozilla Chrome Edge" + "my_key": 1, + "some_other_value": "foo bar" } - }, - { - "@timestamp": "2018-08-09T14:59:05.999Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "abcdef123", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" + ], + "error.exception.attributes": [ + { + "foo": "bar" + } + ], + "error.exception.code": [ + "42" + ], + "error.exception.handled": [ + false + ], + "error.exception.message": [ + "The username root is unknown", + "something wrong writing a file", + "disk spinning way too fast", + "on top of it, internet doesn't work" + ], + "error.exception.module": [ + "__builtins__" + ], + "error.exception.stacktrace": [ + { + "classname": "BaseClass", + "exclude_from_grouping": false + }, + { + "abs_path": "/real/file/name.py", + "classname": "RName", + "context": { + "post": [ + "line4", + "line5" + ], + "pre": [ + "line1", + "line2" + ] }, - "project": { - "id": "project_id", - "name": "project_name" + "exclude_from_grouping": false, + "filename": "file/name.py", + "function": "foo", + "library_frame": true, + "line": { + "column": 4, + "context": "line3", + "number": 3 }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" + "module": "App::MyModule", + "vars": { + "key": "value" } }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "Cannot read property 'baz' no defined" - } - ], - "grouping_key": "ae0232fed4cb40e7ebc62a585a421d60", - "grouping_name": "Cannot read property 'baz' no defined", - "id": "cdefab0123456789" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "message": "Cannot read property 'baz' no defined", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-abc" + { + "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" + ] }, - "runtime": { - "name": "node", - "version": "8.0.0" + "exclude_from_grouping": false, + "filename": "lib/instrumentation/index.js", + "function": "instrumented", + "line": { + "context": " var result = original.apply(this, arguments)", + "number": 102 }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1533826745999000 - }, - "user": { - "domain": "ldap://abc", - "email": "bar@example.com", - "id": "123", - "name": "bar" + "vars": { + "key": "value" + } } - }, - { - "@timestamp": "2018-08-09T14:59:05.999Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "abcdef123", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" + ], + "error.exception.type": [ + "DbError", + "InternalDbError", + "VeryInternalDbError", + "ConnectionError" + ], + "error.grouping_key": [ + "d72b25a26fde3f3aaad1c86950acd070" + ], + "error.grouping_name": [ + "My service could not talk to the database named foobar" + ], + "error.id": [ + "0123456789012345" + ], + "error.log.level": [ + "warning" + ], + "error.log.logger_name": [ + "my.logger.name" + ], + "error.log.message": [ + "My service could not talk to the database named foobar" + ], + "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" + ] }, - "project": { - "id": "project_id", - "name": "project_name" + "exclude_from_grouping": false, + "filename": "/webpack/file/name.py", + "function": "foo", + "line": { + "column": 4, + "context": "line3", + "number": 3 }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" + "module": "App::MyModule", + "vars": { + "key": "value" } }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "grouping_key": "dc8dd667f7036ec5f0bae87bf2188243", - "grouping_name": "no user found", - "id": "xFoaabb123FFFFFF", - "log": { - "message": "no user found", - "stacktrace": [ - { - "classname": "User::Special", - "exclude_from_grouping": false - } + { + "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" ] - } - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "message": "no user found", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-abc" + "exclude_from_grouping": false, + "filename": "lib/instrumentation/index.js", + "function": "instrumented", + "line": { + "context": " var result = original.apply(this, arguments)", + "number": 102 }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "timestamp": { - "us": 1533826745999000 - }, - "user": { - "domain": "ldap://abc", - "email": "bar@example.com", - "id": "123", - "name": "bar" - } - }, - { - "@timestamp": "2019-01-09T21:40:53.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "justanid", - "name": "elastic-ruby", - "version": "2.1.3" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" + "vars": { + "key": "value" } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "type": "DbError" - } - ], - "grouping_key": "c3868d6704b923014eaffea034e70a3d", - "grouping_name": null, - "id": "cdefab0123456780" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" + } + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.body": [ + { + "original": "Hello World" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "9632587410abcdef" - }, - "process": { - "args": [ - "node", - "server.js" + "Content-Type": [ + "text/html" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "testing", - "framework": { - "name": "Rails", - "version": "5.0" - }, - "language": { - "name": "ruby", - "version": "2.5" - }, - "name": "service1", - "node": { - "name": "node-abc" - }, - "runtime": { - "name": "cruby", - "version": "2.5" - }, - "version": "2" - }, - "timestamp": { - "us": 1547070053000000 - }, - "trace": { - "id": "0123456789abcdeffedcba0123456789" - }, - "user": { - "domain": "ldap://abc", - "email": "bar@example.com", - "id": "123", - "name": "bar" - } - }, - { - "@timestamp": "2018-08-09T15:04:05.999Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "abcdef123", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb", - "grouping_name": "Cannot read property 'baz' of undefined", - "id": "abcdef0123456789", - "log": { - "level": "custom log level", - "message": "Cannot read property 'baz' of undefined" - } - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" + "Cookie": [ + "c1=v1,c2=v2" ], - "name": "prod.example", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "message": "Cannot read property 'baz' of undefined", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "9632587410abcdef" - }, - "process": { - "args": [ - "node", - "server.js" + "Some-Other-Header": [ + "foo" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-abc" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "id": "1234567890987654" - }, - "timestamp": { - "us": 1533827045999000 - }, - "trace": { - "id": "0123456789abcdeffedcba0123456789" - }, - "transaction": { - "id": "1234567890987654", - "name": "mytx", - "sampled": true, - "type": "request" - }, - "user": { - "domain": "ldap://abc", - "email": "bar@example.com", - "id": "123", - "name": "bar" + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } + ], + "http.request.method": [ + "POST" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "message": [ + "My service could not talk to the database named foobar" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Node" + ], + "service.framework.version": [ + "1" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "1.2" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "node-xyz" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "source.ip": [ + "12.53.12.1" + ], + "timestamp.us": [ + 1494342245999999 + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.domain": [ + "ldap://abc" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Other" + ], + "user_agent.original": [ + "Mozilla Chrome Edge" + ], + "user_agent.original.text": [ + "Mozilla Chrome Edge" + ] + }, + { + "@timestamp": [ + "2018-08-09T14:59:05.999Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "abcdef123" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "Cannot read property 'baz' no defined" + ], + "error.grouping_key": [ + "ae0232fed4cb40e7ebc62a585a421d60" + ], + "error.grouping_name": [ + "Cannot read property 'baz' no defined" + ], + "error.id": [ + "cdefab0123456789" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "message": [ + "Cannot read property 'baz' no defined" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-abc" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "timestamp.us": [ + 1533826745999000 + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "bar@example.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2018-08-09T14:59:05.999Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "abcdef123" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.grouping_key": [ + "dc8dd667f7036ec5f0bae87bf2188243" + ], + "error.grouping_name": [ + "no user found" + ], + "error.id": [ + "xFoaabb123FFFFFF" + ], + "error.log.message": [ + "no user found" + ], + "error.log.stacktrace": [ + { + "classname": "User::Special", + "exclude_from_grouping": false } - } - ] -} + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "message": [ + "no user found" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-abc" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "timestamp.us": [ + 1533826745999000 + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "bar@example.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2019-01-09T21:40:53.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "justanid" + ], + "agent.name": [ + "elastic-ruby" + ], + "agent.version": [ + "2.1.3" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.type": [ + "DbError" + ], + "error.grouping_key": [ + "c3868d6704b923014eaffea034e70a3d" + ], + "error.id": [ + "cdefab0123456780" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "9632587410abcdef" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "testing" + ], + "service.framework.name": [ + "Rails" + ], + "service.framework.version": [ + "5.0" + ], + "service.language.name": [ + "ruby" + ], + "service.language.version": [ + "2.5" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "node-abc" + ], + "service.runtime.name": [ + "cruby" + ], + "service.runtime.version": [ + "2.5" + ], + "service.version": [ + "2" + ], + "timestamp.us": [ + 1547070053000000 + ], + "trace.id": [ + "0123456789abcdeffedcba0123456789" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "bar@example.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2018-08-09T15:04:05.999Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "abcdef123" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.grouping_key": [ + "d6b3f958dfea98dc9ed2b57d5f0c48bb" + ], + "error.grouping_name": [ + "Cannot read property 'baz' of undefined" + ], + "error.id": [ + "abcdef0123456789" + ], + "error.log.level": [ + "custom log level" + ], + "error.log.message": [ + "Cannot read property 'baz' of undefined" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "prod.example" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "message": [ + "Cannot read property 'baz' of undefined" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "9632587410abcdef" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-abc" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.id": [ + "1234567890987654" + ], + "timestamp.us": [ + 1533827045999000 + ], + "trace.id": [ + "0123456789abcdeffedcba0123456789" + ], + "transaction.id": [ + "1234567890987654" + ], + "transaction.name": [ + "mytx" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "request" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "bar@example.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + } +] diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index 9a19f72807d..7651b446d30 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -1,295 +1,391 @@ -{ - "events": [ - { - "@timestamp": "2019-10-21T11:30:44.929Z", - "agent": { - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "client": { - "ip": "192.168.0.1" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)", - "custom": { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - }, - "exception": [ - { - "attributes": { - "foo": "bar" - }, - "code": "42", - "handled": false, - "message": "Theusernamerootisunknown", - "module": "org.springframework.http.client", - "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" - } - } - ], - "type": "java.net.UnknownHostException" - }, - { - "message": "something wrong writing a file", - "type": "InternalDbError" - }, - { - "message": "disk spinning way too fast", - "type": "VeryInternalDbError" - }, - { - "message": "on top of it,internet doesn't work", - "parent": 1, - "type": "ConnectionError" - } - ], - "grouping_key": "9a4054e958afe722b5877e8fac578ff3", - "grouping_name": "Request method 'POST' not supported", - "id": "9876543210abcdeffedcba0123456789", - "log": { - "level": "error", - "logger_name": "http404", - "message": "Request method 'POST' not supported", - "param_message": "Request method 'POST' /events/:event not supported", - "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" - } - } +[ + { + "@timestamp": [ + "2019-10-21T11:30:44.929Z" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "client.ip": [ + "192.168.0.1" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.culprit": [ + "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" + ], + "error.custom": [ + { + "and_objects": { + "foo": [ + "bar", + "baz" ] - } - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "http": { - "request": { - "body": { - "original": "HelloWorld" - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "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" - ] - }, - "method": "POST" }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 + "my_key": 1, + "some_other_value": "foobar" + } + ], + "error.exception.attributes": [ + { + "foo": "bar" + } + ], + "error.exception.code": [ + "42" + ], + "error.exception.handled": [ + false + ], + "error.exception.message": [ + "Theusernamerootisunknown", + "something wrong writing a file", + "disk spinning way too fast", + "on top of it,internet doesn't work" + ], + "error.exception.module": [ + "org.springframework.http.client" + ], + "error.exception.stacktrace": [ + { + "abs_path": "/tmp/AbstractPlainSocketImpl.java", + "context": { + "post": [ + "line4", + "line5" + ], + "pre": [ + "line1", + "line2" + ] }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" + "exclude_from_grouping": false, + "filename": "AbstractPlainSocketImpl.java", + "function": "connect", + "library_frame": true, + "line": { + "column": 4, + "context": "3", + "number": 3 }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + "module": "java.net", + "vars": { + "key": "value" } }, - "labels": { - "ab_testing": "true", - "group": "experimental", - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "message": "Request method 'POST' not supported", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "9632587410abcdef" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 + { + "exclude_from_grouping": false, + "filename": "AbstractClientHttpRequest.java", + "function": "execute", + "line": { + "number": 102 }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "Node", - "version": "1" - }, - "language": { - "name": "Java", - "version": "1.2" + "vars": { + "key": "value" + } + } + ], + "error.exception.type": [ + "java.net.UnknownHostException", + "InternalDbError", + "VeryInternalDbError", + "ConnectionError" + ], + "error.grouping_key": [ + "9a4054e958afe722b5877e8fac578ff3" + ], + "error.grouping_name": [ + "Request method 'POST' not supported" + ], + "error.id": [ + "9876543210abcdeffedcba0123456789" + ], + "error.log.level": [ + "error" + ], + "error.log.logger_name": [ + "http404" + ], + "error.log.message": [ + "Request method 'POST' not supported" + ], + "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" + ] }, - "name": "service1", - "node": { - "name": "node-xyz" + "exclude_from_grouping": false, + "filename": "Socket.java", + "function": "connect", + "library_frame": true, + "line": { + "column": 4, + "context": "line3", + "number": 3 }, - "runtime": { - "name": "Java", - "version": "10.0.2" + "module": "java.net", + "vars": { + "key": "value" } }, - "source": { - "ip": "192.168.0.1", - "nat": { - "ip": "12.53.12.1" + { + "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", + "exclude_from_grouping": false, + "filename": "SimpleBufferingClientHttpRequest.java", + "function": "executeInternal", + "line": { + "number": 102 + }, + "vars": { + "key": "value" } - }, - "span": { - "id": "1234567890987654" - }, - "timestamp": { - "us": 1571657444929001 - }, - "trace": { - "id": "0123456789abcdeffedcba0123456789" - }, - "transaction": { - "id": "1234567890987654" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "user@foo.mail", - "id": "99", - "name": "foo" } - } - ] -} + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "http.request.body": [ + { + "original": "HelloWorld" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "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" + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "message": [ + "Request method 'POST' not supported" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "9632587410abcdef" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "Node" + ], + "service.framework.version": [ + "1" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "1.2" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "node-xyz" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "source.ip": [ + "192.168.0.1" + ], + "source.nat.ip": [ + "12.53.12.1" + ], + "span.id": [ + "1234567890987654" + ], + "timestamp.us": [ + 1571657444929001 + ], + "trace.id": [ + "0123456789abcdeffedcba0123456789" + ], + "transaction.id": [ + "1234567890987654" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.email": [ + "user@foo.mail" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ] + } +] diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index 740283244e6..c4545d82582 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -1,774 +1,1110 @@ -{ - "events": [ - { - "@timestamp": "2019-10-21T11:30:44.929Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "client": { - "ip": "192.168.0.1" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)", - "custom": { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - }, - "exception": [ - { - "attributes": { - "foo": "bar" - }, - "code": "42", - "handled": false, - "message": "Theusernamerootisunknown", - "module": "org.springframework.http.client", - "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" - } - } - ], - "type": "java.net.UnknownHostException" - }, - { - "message": "something wrong writing a file", - "type": "InternalDbError" - }, - { - "message": "disk spinning way too fast", - "type": "VeryInternalDbError" - }, - { - "message": "on top of it,internet doesn't work", - "parent": 1, - "type": "ConnectionError" - } - ], - "grouping_key": "9a4054e958afe722b5877e8fac578ff3", - "grouping_name": "Request method 'POST' not supported", - "id": "9876543210abcdeffedcba0123456789", - "log": { - "level": "error", - "logger_name": "http404", - "message": "Request method 'POST' not supported", - "param_message": "Request method 'POST' /events/:event not supported", - "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" - } - } +[ + { + "@timestamp": [ + "2019-10-21T11:30:44.929Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "client.ip": [ + "192.168.0.1" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.culprit": [ + "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" + ], + "error.custom": [ + { + "and_objects": { + "foo": [ + "bar", + "baz" ] - } - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "http": { - "request": { - "body": { - "original": "HelloWorld" - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "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" - ] - }, - "method": "POST" }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 + "my_key": 1, + "some_other_value": "foobar" + } + ], + "error.exception.attributes": [ + { + "foo": "bar" + } + ], + "error.exception.code": [ + "42" + ], + "error.exception.handled": [ + false + ], + "error.exception.message": [ + "Theusernamerootisunknown", + "something wrong writing a file", + "disk spinning way too fast", + "on top of it,internet doesn't work" + ], + "error.exception.module": [ + "org.springframework.http.client" + ], + "error.exception.stacktrace": [ + { + "abs_path": "/tmp/AbstractPlainSocketImpl.java", + "context": { + "post": [ + "line4", + "line5" + ], + "pre": [ + "line1", + "line2" + ] }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" + "exclude_from_grouping": false, + "filename": "AbstractPlainSocketImpl.java", + "function": "connect", + "library_frame": true, + "line": { + "column": 4, + "context": "3", + "number": 3 }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + "module": "java.net", + "vars": { + "key": "value" } }, - "labels": { - "ab_testing": "true", - "group": "experimental", - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "message": "Request method 'POST' not supported", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "9632587410abcdef" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "Node", - "version": "1" - }, - "language": { - "name": "Java", - "version": "1.2" - }, - "name": "service1", - "node": { - "name": "node-xyz" + { + "exclude_from_grouping": false, + "filename": "AbstractClientHttpRequest.java", + "function": "execute", + "line": { + "number": 102 }, - "runtime": { - "name": "Java", - "version": "10.0.2" + "vars": { + "key": "value" } - }, - "source": { - "ip": "192.168.0.1", - "nat": { - "ip": "12.53.12.1" - } - }, - "span": { - "id": "1234567890987654" - }, - "timestamp": { - "us": 1571657444929001 - }, - "trace": { - "id": "0123456789abcdeffedcba0123456789" - }, - "transaction": { - "id": "1234567890987654", - "sampled": true, - "type": "request" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "user@foo.mail", - "id": "99", - "name": "foo" } - }, - { - "@timestamp": "2019-10-21T11:30:44.929Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": "127.0.0.1", - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "group": "experimental", - "success": "true" - }, - "metricset": { - "name": "span_breakdown" - }, - "numeric_labels": { - "code": 200, - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": "-v", - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "1234_service-12a3", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "4.3.0" - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 633 - } + ], + "error.exception.type": [ + "java.net.UnknownHostException", + "InternalDbError", + "VeryInternalDbError", + "ConnectionError" + ], + "error.grouping_key": [ + "9a4054e958afe722b5877e8fac578ff3" + ], + "error.grouping_name": [ + "Request method 'POST' not supported" + ], + "error.id": [ + "9876543210abcdeffedcba0123456789" + ], + "error.log.level": [ + "error" + ], + "error.log.logger_name": [ + "http404" + ], + "error.log.message": [ + "Request method 'POST' not supported" + ], + "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" + ] }, - "subtype": "mysql", - "type": "db" - }, - "transaction": { - "name": "GET/", - "type": "request" - } - }, - { - "@timestamp": "2019-10-21T11:30:44.929Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0-SNAPSHOT" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "http": { - "request": { - "method": "GET" + "exclude_from_grouping": false, + "filename": "Socket.java", + "function": "connect", + "library_frame": true, + "line": { + "column": 4, + "context": "line3", + "number": 3 }, - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "status_code": 302, - "transfer_size": 30012 + "module": "java.net", + "vars": { + "key": "value" } }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" + { + "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", + "exclude_from_grouping": false, + "filename": "SimpleBufferingClientHttpRequest.java", + "function": "executeInternal", + "line": { + "number": 102 }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + "vars": { + "key": "value" } - }, - "labels": { - "ab_testing": "true", - "group": "experimental" - }, - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "-v" + } + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "http.request.body": [ + { + "original": "HelloWorld" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Content-Length": [ + "0" ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "opbeans-java-1", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - } - }, - "span": { - "action": "connect", - "db": { - "instance": "customers", - "link": "other.db.com", - "statement": "SELECT * FROM product_types WHERE user_id = ?", - "type": "sql", - "user": { - "name": "postgres" - } - }, - "duration": { - "us": 3781 - }, - "id": "1234567890aaaade", - "name": "GET users-authenticated", - "representative_count": 1, - "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" - } - } + "Cookie": [ + "c1=v1", + "c2=v2" ], - "subtype": "http", - "sync": true, - "type": "external" - }, - "timestamp": { - "us": 1571657444929001 - }, - "trace": { - "id": "abcdef0123456789abcdef9876543210" - }, - "transaction": { - "id": "1234567890987654" - }, - "url": { - "original": "http://localhost:8000" - } - }, - { - "@timestamp": "2019-10-21T11:30:44.929Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0-SNAPSHOT" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": "dynamic", - "lon": "dynamic" - } - }, - "ip": "12.53.12.1" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" ], - "name": "host1", - "os": { - "platform": "Linux" + "Host": [ + "opbeans-java:3000" + ] + } + ], + "http.request.method": [ + "POST" + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "message": [ + "Request method 'POST' not supported" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "9632587410abcdef" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "processor.event": [ + "error" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "Node" + ], + "service.framework.version": [ + "1" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "1.2" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "node-xyz" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "source.ip": [ + "192.168.0.1" + ], + "source.nat.ip": [ + "12.53.12.1" + ], + "span.id": [ + "1234567890987654" + ], + "timestamp.us": [ + 1571657444929001 + ], + "trace.id": [ + "0123456789abcdeffedcba0123456789" + ], + "transaction.id": [ + "1234567890987654" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "request" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.email": [ + "user@foo.mail" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ] + }, + { + "@timestamp": [ + "2019-10-21T11:30:44.929Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.success": [ + "true" + ], + "metricset.name": [ + "span_breakdown" + ], + "numeric_labels.code": [ + 200 + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "4.3.0" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "mysql" + ], + "span.type": [ + "db" + ], + "transaction.name": [ + "GET/" + ], + "transaction.type": [ + "request" + ] + }, + { + "@timestamp": [ + "2019-10-21T11:30:44.929Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0-SNAPSHOT" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "http.request.method": [ + "GET" + ], + "http.response.decoded_body_size": [ + 401 + ], + "http.response.encoded_body_size": [ + 356 + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.status_code": [ + 302 + ], + "http.response.transfer_size": [ + 30012 + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "opbeans-java-1" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "span.action": [ + "connect" + ], + "span.db.instance": [ + "customers" + ], + "span.db.link": [ + "other.db.com" + ], + "span.db.statement": [ + "SELECT * FROM product_types WHERE user_id = ?" + ], + "span.db.type": [ + "sql" + ], + "span.db.user.name": [ + "postgres" + ], + "span.duration.us": [ + 3781 + ], + "span.id": [ + "1234567890aaaade" + ], + "span.name": [ + "GET users-authenticated" + ], + "span.representative_count": [ + 1 + ], + "span.stacktrace": [ + { + "exclude_from_grouping": false, + "filename": "DispatcherServlet.java", + "line": { + "number": 547 } }, - "http": { - "request": { - "body": { - "original": { - "additional": { - "bar": 123, - "req": "additionalinformation" - }, - "string": "helloworld" - } - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "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" - ] - }, - "method": "POST" + { + "abs_path": "/tmp/AbstractView.java", + "exclude_from_grouping": false, + "filename": "AbstractView.java", + "function": "render", + "library_frame": true, + "line": { + "column": 4, + "context": "line3", + "number": 547 }, - "response": { - "decoded_body_size": 40190, - "encoded_body_size": 35690, - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] + "module": "org.springframework.web.servlet.view", + "vars": { + "key": "value" + } + } + ], + "span.subtype": [ + "http" + ], + "span.sync": [ + true + ], + "span.type": [ + "external" + ], + "timestamp.us": [ + 1571657444929001 + ], + "trace.id": [ + "abcdef0123456789abcdef9876543210" + ], + "transaction.id": [ + "1234567890987654" + ], + "url.original": [ + "http://localhost:8000" + ], + "url.original.text": [ + "http://localhost:8000" + ] + }, + { + "@timestamp": [ + "2019-10-21T11:30:44.929Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0-SNAPSHOT" + ], + "client.geo.continent_name": [ + "North America" + ], + "client.geo.country_iso_code": [ + "US" + ], + "client.geo.country_name": [ + "United States" + ], + "client.geo.location": [ + "dynamic" + ], + "client.ip": [ + "12.53.12.1" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "http.request.body": [ + { + "original": { + "additional": { + "bar": 123, + "req": "additionalinformation" }, - "headers_sent": true, - "status_code": 200, - "transfer_size": 300 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + "string": "helloworld" } - }, - "labels": { - "ab_testing": "true", - "group": "experimental", - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdefabcdef01234567" - }, - "process": { - "args": [ - "-v" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Content-Type": [ + "text/html" ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "experimental-java", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - } - }, - "source": { - "ip": "12.53.12.1", - "port": 8080 - }, - "span": { - "id": "4340a8e0df1906ecbfa9" - }, - "timestamp": { - "us": 1571657444929001 - }, - "trace": { - "id": "0acd456789abcdef0123456789abcdef" - }, - "transaction": { - "custom": { - "(": "notavalidregexandthatisfine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - }, - "duration": { - "us": 32592 - }, - "id": "4340a8e0df1906ecbfa9", - "name": "ResourceHttpRequestHandler", - "representative_count": 1, - "result": "HTTP2xx", - "sampled": true, - "span_count": { - "dropped": 0, - "started": 17 - }, - "type": "http" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "foo@mail.com", - "id": "99", - "name": "foo" - }, - "user_agent": { - "device": { - "name": "Other" + "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" + ], + "http.response.decoded_body_size": [ + 40190 + ], + "http.response.encoded_body_size": [ + 35690 + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 300 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdefabcdef01234567" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "experimental-java" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "source.ip": [ + "12.53.12.1" + ], + "source.port": [ + 8080 + ], + "span.id": [ + "4340a8e0df1906ecbfa9" + ], + "timestamp.us": [ + 1571657444929001 + ], + "trace.id": [ + "0acd456789abcdef0123456789abcdef" + ], + "transaction.custom": [ + { + "(": "notavalidregexandthatisfine", + "and_objects": { + "foo": [ + "bar", + "baz" + ] }, - "name": "Chrome", - "original": "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36, MozillaChromeEdge", - "version": "51.0.2704.103" + "my_key": 1, + "some_other_value": "foobar" } - } - ] -} + ], + "transaction.duration.us": [ + 32592 + ], + "transaction.id": [ + "4340a8e0df1906ecbfa9" + ], + "transaction.name": [ + "ResourceHttpRequestHandler" + ], + "transaction.name.text": [ + "ResourceHttpRequestHandler" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.result": [ + "HTTP2xx" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 0 + ], + "transaction.span_count.started": [ + 17 + ], + "transaction.type": [ + "http" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.email": [ + "foo@mail.com" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Chrome" + ], + "user_agent.original": [ + "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36, MozillaChromeEdge" + ], + "user_agent.original.text": [ + "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36, MozillaChromeEdge" + ], + "user_agent.version": [ + "51.0.2704.103" + ] + } +] diff --git a/systemtest/approvals/TestIntake/Metricsets.approved.json b/systemtest/approvals/TestIntake/Metricsets.approved.json index 2ff6e6c5087..3ee806a691b 100644 --- a/systemtest/approvals/TestIntake/Metricsets.approved.json +++ b/systemtest/approvals/TestIntake/Metricsets.approved.json @@ -1,229 +1,280 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:41.364Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "go": { - "memstats": { - "heap": { - "sys": { - "bytes": 6520832 - } - } - } - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.366Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "process": { - "cgroup": { - "memory": { - "mem": { - "limit": { - "bytes": 2048 - }, - "usage": { - "bytes": 1024 - } - } - } - } - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.367Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "process": { - "cgroup": { - "cpu": { - "cfs": { - "period": { - "us": 1024 - }, - "quota": { - "us": 2048 - } - }, - "id": 2048, - "stats": { - "periods": 2048, - "throttled": { - "ns": 2048, - "periods": 2048 - } - } - }, - "cpuacct": { - "id": 2048, - "total": { - "ns": 2048 - } - } - } - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.368Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "latency_distribution": { +[ + { + "@timestamp": [ + "2017-05-30T18:53:41.364Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "go.memstats.heap.sys.bytes": [ + 6520832 + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.366Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.memory.mem.limit.bytes": [ + 2048 + ], + "system.process.cgroup.memory.mem.usage.bytes": [ + 1024 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.367Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.process.cgroup.cpu.cfs.period.us": [ + 1024 + ], + "system.process.cgroup.cpu.cfs.quota.us": [ + 2048 + ], + "system.process.cgroup.cpu.id": [ + 2048 + ], + "system.process.cgroup.cpu.stats.periods": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.ns": [ + 2048 + ], + "system.process.cgroup.cpu.stats.throttled.periods": [ + 2048 + ], + "system.process.cgroup.cpuacct.id": [ + 2048 + ], + "system.process.cgroup.cpuacct.total.ns": [ + 2048 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.368Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "latency_distribution": [ + { "counts": [ 1, 2, @@ -234,172 +285,245 @@ 2.2, 3.3 ] - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:41.369Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "faas": { - "billed_duration": 183, - "coldstart": true, - "coldstart_duration": 422.97, - "duration": 182.43, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime", - "timeout": 5000 - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "name": "app" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "system": { - "memory": { - "actual": { - "free": 54525952 - }, - "total": 134217728 - } - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" - } - }, - { - "@timestamp": "2017-05-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "labels": { - "some": "abc", - "success": "true", - "tag1": "one" - }, - "metricset": { - "name": "span_breakdown" - }, - "numeric_labels": { - "code": 200, - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1234 - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "ecmascript" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 633 - } - }, - "subtype": "mysql", - "type": "db" - }, - "transaction": { - "name": "GET /", - "type": "request" - }, - "user": { - "email": "user@mail.com", - "id": "axb123hg", - "name": "logged-in-user" } - } - ] -} + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:41.369Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "faas.billed_duration": [ + 183 + ], + "faas.coldstart": [ + true + ], + "faas.coldstart_duration": [ + 422.97 + ], + "faas.duration": [ + 182.43 + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "faas.timeout": [ + 5000 + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "app" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "system.memory.actual.free": [ + 54525952 + ], + "system.memory.total": [ + 134217728 + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "labels.some": [ + "abc" + ], + "labels.success": [ + "true" + ], + "labels.tag1": [ + "one" + ], + "metricset.name": [ + "span_breakdown" + ], + "numeric_labels.code": [ + 200 + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1234 + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "ecmascript" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-1" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "mysql" + ], + "span.type": [ + "db" + ], + "transaction.name": [ + "GET /" + ], + "transaction.type": [ + "request" + ], + "user.email": [ + "user@mail.com" + ], + "user.id": [ + "axb123hg" + ], + "user.name": [ + "logged-in-user" + ], + "user.name.text": [ + "logged-in-user" + ] + } +] diff --git a/systemtest/approvals/TestIntake/MinimalEvents.approved.json b/systemtest/approvals/TestIntake/MinimalEvents.approved.json index 477637d8caa..0fde9e28423 100644 --- a/systemtest/approvals/TestIntake/MinimalEvents.approved.json +++ b/systemtest/approvals/TestIntake/MinimalEvents.approved.json @@ -1,298 +1,406 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "grouping_key": "0b9cba09845a097a271c6beb4c6207f3", - "grouping_name": "error log message", - "id": "abcdef0123456789", - "log": { - "message": "error log message" - } - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "message": "error log message", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "name": "1234_service-12a3" - }, - "timestamp": { - "us": "dynamic" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "error exception message" - } - ], - "grouping_key": "3a1fb5609458fbb132b44d8fc7cde104", - "grouping_name": "error exception message", - "id": "abcdef0123456790" - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "message": "error exception message", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "name": "1234_service-12a3" - }, - "timestamp": { - "us": "dynamic" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "type": "error exception type" - } - ], - "grouping_key": "fa405fa2bd848dab17207e7b544d9ad4", - "grouping_name": null, - "id": "abcdef0123456791" - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "name": "1234_service-12a3" - }, - "timestamp": { - "us": "dynamic" - } - }, - { - "@timestamp": "dynamic", - "a": 3.2, - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "metrics" - }, - "host": { - "ip": "127.0.0.1" - }, - "metricset": { - "name": "app" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "name": "1234_service-12a3" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ab23456a89012345" - }, - "processor": { - "event": "span" - }, - "service": { - "name": "1234_service-12a3" - }, - "span": { - "duration": { - "us": 3564 - }, - "id": "0123456a89012345", - "name": "GET /api/types", - "representative_count": 1, - "type": "request" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "0123456789abcdef0123456789abcdef" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ab23456a89012345" - }, - "processor": { - "event": "span" - }, - "service": { - "name": "1234_service-12a3" - }, - "span": { - "duration": { - "us": 3564 - }, - "id": "0123456a89012345", - "name": "GET /api/types", - "representative_count": 1, - "type": "request" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "0123456789abcdef0123456789abcdef" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "ip": [ - "127.0.0.1" - ] - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction" - }, - "service": { - "name": "1234_service-12a3" - }, - "span": { - "id": "abcdef1478523690" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "01234567890123456789abcdefabcdef" - }, - "transaction": { - "duration": { - "us": 32592 - }, - "id": "abcdef1478523690", - "representative_count": 1, - "sampled": true, - "span_count": { - "started": 0 - }, - "type": "request" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.grouping_key": [ + "0b9cba09845a097a271c6beb4c6207f3" + ], + "error.grouping_name": [ + "error log message" + ], + "error.id": [ + "abcdef0123456789" + ], + "error.log.message": [ + "error log message" + ], + "host.ip": [ + "127.0.0.1" + ], + "message": [ + "error log message" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "service.name": [ + "1234_service-12a3" + ], + "timestamp.us": [ + "dynamic" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "error exception message" + ], + "error.grouping_key": [ + "3a1fb5609458fbb132b44d8fc7cde104" + ], + "error.grouping_name": [ + "error exception message" + ], + "error.id": [ + "abcdef0123456790" + ], + "host.ip": [ + "127.0.0.1" + ], + "message": [ + "error exception message" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "service.name": [ + "1234_service-12a3" + ], + "timestamp.us": [ + "dynamic" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.type": [ + "error exception type" + ], + "error.grouping_key": [ + "fa405fa2bd848dab17207e7b544d9ad4" + ], + "error.id": [ + "abcdef0123456791" + ], + "host.ip": [ + "127.0.0.1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "service.name": [ + "1234_service-12a3" + ], + "timestamp.us": [ + "dynamic" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "a": [ + 3.2 + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "host.ip": [ + "127.0.0.1" + ], + "metricset.name": [ + "app" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.name": [ + "1234_service-12a3" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.ip": [ + "127.0.0.1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ab23456a89012345" + ], + "processor.event": [ + "span" + ], + "service.name": [ + "1234_service-12a3" + ], + "span.duration.us": [ + 3564 + ], + "span.id": [ + "0123456a89012345" + ], + "span.name": [ + "GET /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "request" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "0123456789abcdef0123456789abcdef" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.ip": [ + "127.0.0.1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ab23456a89012345" + ], + "processor.event": [ + "span" + ], + "service.name": [ + "1234_service-12a3" + ], + "span.duration.us": [ + 3564 + ], + "span.id": [ + "0123456a89012345" + ], + "span.name": [ + "GET /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "request" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "0123456789abcdef0123456789abcdef" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.ip": [ + "127.0.0.1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "service.name": [ + "1234_service-12a3" + ], + "span.id": [ + "abcdef1478523690" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "01234567890123456789abcdefabcdef" + ], + "transaction.duration.us": [ + 32592 + ], + "transaction.id": [ + "abcdef1478523690" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "request" + ] + } +] diff --git a/systemtest/approvals/TestIntake/Spans.approved.json b/systemtest/approvals/TestIntake/Spans.approved.json index 2e326ebba4f..368417a5185 100644 --- a/systemtest/approvals/TestIntake/Spans.approved.json +++ b/systemtest/approvals/TestIntake/Spans.approved.json @@ -1,1652 +1,2387 @@ -{ - "events": [ - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "justanid", - "name": "elastic-ruby", - "version": "2.2" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1", - "port": 5432 - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "method": "GET" - }, - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "status_code": 200, - "transfer_size": 30012 - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "service1", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "target": { - "name": "testdb", - "type": "postgres" - } - }, - "span": { - "action": "query", - "db": { - "instance": "customers", - "link": "other.db.com", - "rows_affected": 2, - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "destination": { - "service": { - "name": "postgresql", - "resource": "postgres/testdb", - "type": "db" - } - }, - "duration": { - "us": 3781 - }, - "id": "1234567890aaaade", - "name": "SELECT FROM product_types", - "representative_count": 1, - "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" - } - } - ], - "subtype": "postgresql", - "sync": true, - "type": "db" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "abcdef0123456789abcdef9876543210" - }, - "url": { - "original": "http://localhost:8000" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ababcdcdefefabde" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "action": "call", - "duration": { - "us": 13980 - }, - "id": "abcde56a89012345", - "name": "get /api/types", - "representative_count": 1, - "subtype": "http", - "sync": false, - "type": "request" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "abcdef0123456789abcdef9876543210" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "value1", - "tag4": "true" - }, - "numeric_labels": { - "tag2": 123, - "tag3": 12.34 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdefabcdef7890" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "duration": { - "us": 3564 - }, - "id": "0123456a89012345", - "name": "GET /api/types", - "representative_count": 1, - "subtype": "http", - "type": "request" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "abcdef0123456789abcdef9876543210" - }, - "transaction": { - "id": "ab23456a89012345" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "0000000011111111" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "duration": { - "us": 32592 - }, - "id": "1234abcdef567895", - "name": "GET /api/types", - "representative_count": 1, - "type": "request" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "abcdef0123456789abcdef9876543210" - }, - "transaction": { - "id": "ab45781d265894fe" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2021-07-06T11:58:05.682Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "action": "query", - "composite": { - "compression_strategy": "exact_match", - "count": 10, - "sum": { - "us": 359298 - } - }, - "duration": { - "us": 378191 - }, - "id": "abcdef01234567", - "name": "SELECT FROM p_details", - "representative_count": 1, - "subtype": "postgresql", - "type": "db" - }, - "timestamp": { - "us": 1625572685682272 - }, - "trace": { - "id": "edcbaf0123456789abcdef9876543210" - }, - "transaction": { - "id": "01af25874dec69dd" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "justanid", - "name": "elastic-ruby", - "version": "2.2" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" +[ + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "justanid" + ], + "agent.name": [ + "elastic-ruby" + ], + "agent.version": [ + "2.2" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "0:0::0:1" + ], + "destination.ip": [ + "::1" + ], + "destination.port": [ + 5432 + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.method": [ + "GET" + ], + "http.response.decoded_body_size": [ + 401 + ], + "http.response.encoded_body_size": [ + 356 + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 30012 + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.target.name": [ + "testdb" + ], + "service.target.type": [ + "postgres" + ], + "span.action": [ + "query" + ], + "span.db.instance": [ + "customers" + ], + "span.db.link": [ + "other.db.com" + ], + "span.db.rows_affected": [ + 2 + ], + "span.db.statement": [ + "SELECT * FROM product_types WHERE user_id=?" + ], + "span.db.type": [ + "sql" + ], + "span.db.user.name": [ + "readonly_user" + ], + "span.destination.service.name": [ + "postgresql" + ], + "span.destination.service.resource": [ + "postgres/testdb" + ], + "span.destination.service.type": [ + "db" + ], + "span.duration.us": [ + 3781 + ], + "span.id": [ + "1234567890aaaade" + ], + "span.name": [ + "SELECT FROM product_types" + ], + "span.representative_count": [ + 1 + ], + "span.stacktrace": [ + { + "classname": "Core.js", + "exclude_from_grouping": false, + "filename": "net.js", + "line": { + "number": 547 } }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1", - "port": 5432 - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "method": "GET" - }, - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "status_code": 200, - "transfer_size": 30012 - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" + { + "context": { + "post": [ + " ins.currentTransaction = prev", + "}" + ] + }, + "exclude_from_grouping": false, + "filename": "file2.js", + "line": { + "number": 12 } }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "service1", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "target": { - "name": "testdb", - "type": "postgres" + { + "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": { - "action": "query", - "db": { - "instance": "customers", - "link": "other.db.com", - "rows_affected": 2, - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "destination": { - "service": { - "name": "postgresql", - "resource": "postgresql", - "type": "db" - } - }, - "duration": { - "us": 3781 - }, - "id": "fdc4567890aaaade", - "name": "SELECT FROM product_types", - "representative_count": 1, - "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" - } - } - ], - "subtype": "postgresql", - "sync": true, - "type": "db" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "fdceas0123456789abcdef9876543210" - }, - "url": { - "original": "http://localhost:8000" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" + ], + "span.subtype": [ + "postgresql" + ], + "span.sync": [ + true + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "abcdef0123456789abcdef9876543210" + ], + "url.original": [ + "http://localhost:8000" + ], + "url.original.text": [ + "http://localhost:8000" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ababcdcdefefabde" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.action": [ + "call" + ], + "span.duration.us": [ + 13980 + ], + "span.id": [ + "abcde56a89012345" + ], + "span.name": [ + "get /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "http" + ], + "span.sync": [ + false + ], + "span.type": [ + "request" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "abcdef0123456789abcdef9876543210" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "value1" + ], + "labels.tag4": [ + "true" + ], + "numeric_labels.tag2": [ + 123 + ], + "numeric_labels.tag3": [ + 12.34 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdefabcdef7890" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.duration.us": [ + 3564 + ], + "span.id": [ + "0123456a89012345" + ], + "span.name": [ + "GET /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "http" + ], + "span.type": [ + "request" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "abcdef0123456789abcdef9876543210" + ], + "transaction.id": [ + "ab23456a89012345" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "0000000011111111" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.duration.us": [ + 32592 + ], + "span.id": [ + "1234abcdef567895" + ], + "span.name": [ + "GET /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "request" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "abcdef0123456789abcdef9876543210" + ], + "transaction.id": [ + "ab45781d265894fe" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2021-07-06T11:58:05.682Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.action": [ + "query" + ], + "span.composite.compression_strategy": [ + "exact_match" + ], + "span.composite.count": [ + 10 + ], + "span.composite.sum.us": [ + 359298 + ], + "span.duration.us": [ + 378191 + ], + "span.id": [ + "abcdef01234567" + ], + "span.name": [ + "SELECT FROM p_details" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "postgresql" + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 1625572685682272 + ], + "trace.id": [ + "edcbaf0123456789abcdef9876543210" + ], + "transaction.id": [ + "01af25874dec69dd" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "justanid" + ], + "agent.name": [ + "elastic-ruby" + ], + "agent.version": [ + "2.2" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "0:0::0:1" + ], + "destination.ip": [ + "::1" + ], + "destination.port": [ + 5432 + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.method": [ + "GET" + ], + "http.response.decoded_body_size": [ + 401 + ], + "http.response.encoded_body_size": [ + 356 + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 30012 + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.target.name": [ + "testdb" + ], + "service.target.type": [ + "postgres" + ], + "span.action": [ + "query" + ], + "span.db.instance": [ + "customers" + ], + "span.db.link": [ + "other.db.com" + ], + "span.db.rows_affected": [ + 2 + ], + "span.db.statement": [ + "SELECT * FROM product_types WHERE user_id=?" + ], + "span.db.type": [ + "sql" + ], + "span.db.user.name": [ + "readonly_user" + ], + "span.destination.service.name": [ + "postgresql" + ], + "span.destination.service.resource": [ + "postgresql" + ], + "span.destination.service.type": [ + "db" + ], + "span.duration.us": [ + 3781 + ], + "span.id": [ + "fdc4567890aaaade" + ], + "span.name": [ + "SELECT FROM product_types" + ], + "span.representative_count": [ + 1 + ], + "span.stacktrace": [ + { + "classname": "Core.js", + "exclude_from_grouping": false, + "filename": "net.js", + "line": { + "number": 547 } }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" + { + "context": { + "post": [ + " ins.currentTransaction = prev", + "}" + ] + }, + "exclude_from_grouping": false, + "filename": "file2.js", + "line": { + "number": 12 } }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" + { + "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" } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "action": "receive", - "duration": { - "us": 141581 - }, - "id": "00xxx12312312312", - "message": { - "age": { - "ms": 1577958057123 - }, - "queue": { - "name": "new_users" - }, - "routing_key": "user-created-span" - }, - "name": "Rabbitmq receive", - "representative_count": 1, - "subtype": "JMS", - "type": "messaging" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "fdedef0123456789abcdef9876543210" - }, - "transaction": { - "id": "01af25874dec69dd" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "child": { - "id": [ - "51234abcdef56789" - ] - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" + ], + "span.subtype": [ + "postgresql" + ], + "span.sync": [ + true + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "fdceas0123456789abcdef9876543210" + ], + "url.original": [ + "http://localhost:8000" + ], + "url.original.text": [ + "http://localhost:8000" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "0:0::0:1" + ], + "destination.ip": [ + "::1" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.action": [ + "receive" + ], + "span.duration.us": [ + 141581 + ], + "span.id": [ + "00xxx12312312312" + ], + "span.message.age.ms": [ + 1577958057123 + ], + "span.message.queue.name": [ + "new_users" + ], + "span.message.routing_key": [ + "user-created-span" + ], + "span.name": [ + "Rabbitmq receive" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "JMS" + ], + "span.type": [ + "messaging" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "fdedef0123456789abcdef9876543210" + ], + "transaction.id": [ + "01af25874dec69dd" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "child.id": [ + "51234abcdef56789" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.action": [ + "query.custom" + ], + "span.duration.us": [ + 141581 + ], + "span.id": [ + "abcdef01234567" + ], + "span.name": [ + "GET /api/types" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "postgresql" + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "fdedef0123456789abcdef9876543210" + ], + "transaction.id": [ + "01af25874dec69dd" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:33:03.584Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "0:0::0:1" + ], + "destination.ip": [ + "::1" + ], + "destination.port": [ + 8080 + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "backendspans" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.target.name": [ + "localhost:8080" + ], + "service.target.type": [ + "" + ], + "service.version": [ + "5.1.3" + ], + "span.action": [ + "request" + ], + "span.destination.service.name": [ + "external" + ], + "span.destination.service.resource": [ + "localhost:8080" + ], + "span.destination.service.type": [ + "http" + ], + "span.duration.us": [ + 988 + ], + "span.id": [ + "ljf4567890aaaade" + ], + "span.name": [ + "Request" + ], + "span.representative_count": [ + 1 + ], + "span.subtype": [ + "http" + ], + "span.type": [ + "external" + ], + "timestamp.us": [ + 1532975583584217 + ], + "trace.id": [ + "ljfjev0123456789abcdef9876543210" + ], + "transaction.id": [ + "01af25874dec69dd" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "justanid" + ], + "agent.name": [ + "elastic-ruby" + ], + "agent.version": [ + "2.2" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "0:0::0:1" + ], + "destination.ip": [ + "::1" + ], + "destination.port": [ + 5432 + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.id": [ + "some-request-id" + ], + "http.request.method": [ + "GET" + ], + "http.response.decoded_body_size": [ + 401 + ], + "http.response.encoded_body_size": [ + 356 + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 30012 + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "label1" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdef0123456789" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.target.type": [ + "postgresql" + ], + "span.action": [ + "query" + ], + "span.db.instance": [ + "customers" + ], + "span.db.link": [ + "other.db.com" + ], + "span.db.rows_affected": [ + 2 + ], + "span.db.statement": [ + "SELECT * FROM product_types WHERE user_id=?" + ], + "span.db.type": [ + "sql" + ], + "span.db.user.name": [ + "readonly_user" + ], + "span.destination.service.name": [ + "postgresql" + ], + "span.destination.service.resource": [ + "postgresql" + ], + "span.destination.service.type": [ + "db" + ], + "span.duration.us": [ + 3781 + ], + "span.id": [ + "ute4567890aaaade" + ], + "span.name": [ + "SELECT FROM product_types" + ], + "span.representative_count": [ + 1 + ], + "span.stacktrace": [ + { + "classname": "Core.js", + "exclude_from_grouping": false, + "filename": "net.js", + "line": { + "number": 547 } }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" + { + "context": { + "post": [ + " ins.currentTransaction = prev", + "}" + ] + }, + "exclude_from_grouping": false, + "filename": "file2.js", + "line": { + "number": 12 } }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" + { + "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" } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "action": "query.custom", - "duration": { - "us": 141581 - }, - "id": "abcdef01234567", - "name": "GET /api/types", - "representative_count": 1, - "subtype": "postgresql", - "type": "db" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "fdedef0123456789abcdef9876543210" - }, - "transaction": { - "id": "01af25874dec69dd" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:33:03.584Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1", - "port": 8080 - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "backendspans", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "target": { - "name": "localhost:8080", - "type": "" - }, - "version": "5.1.3" - }, - "span": { - "action": "request", - "destination": { - "service": { - "name": "external", - "resource": "localhost:8080", - "type": "http" - } - }, - "duration": { - "us": 988 - }, - "id": "ljf4567890aaaade", - "name": "Request", - "representative_count": 1, - "subtype": "http", - "type": "external" - }, - "timestamp": { - "us": 1532975583584217 - }, - "trace": { - "id": "ljfjev0123456789abcdef9876543210" - }, - "transaction": { - "id": "01af25874dec69dd" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" - } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "justanid", - "name": "elastic-ruby", - "version": "2.2" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "0:0::0:1", - "ip": "0:0::0:1", - "port": 5432 - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "id": "some-request-id", - "method": "GET" - }, - "response": { - "decoded_body_size": 401, - "encoded_body_size": 356, - "status_code": 200, - "transfer_size": 30012 - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "label1" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdef0123456789" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "service1", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "target": { - "type": "postgresql" - } - }, - "span": { - "action": "query", - "db": { - "instance": "customers", - "link": "other.db.com", - "rows_affected": 2, - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "destination": { - "service": { - "name": "postgresql", - "resource": "postgresql", - "type": "db" - } - }, - "duration": { - "us": 3781 - }, - "id": "ute4567890aaaade", - "name": "SELECT FROM product_types", - "representative_count": 1, - "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" - } - } - ], - "subtype": "postgresql", - "sync": true, - "type": "db" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "utedif0123456789abcdef9876543210" - }, - "url": { - "original": "http://localhost:8000" - }, - "user": { - "domain": "ldap://abc", - "email": "s@test.com", - "id": "123", - "name": "john" } - } - ] -} + ], + "span.subtype": [ + "postgresql" + ], + "span.sync": [ + true + ], + "span.type": [ + "db" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "utedif0123456789abcdef9876543210" + ], + "url.original": [ + "http://localhost:8000" + ], + "url.original.text": [ + "http://localhost:8000" + ], + "user.domain": [ + "ldap://abc" + ], + "user.email": [ + "s@test.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "john" + ], + "user.name.text": [ + "john" + ] + } +] diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index 77e6ad2ccf6..1b75080858b 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -1,871 +1,1281 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdefabcdef01234567" - }, - "process": { - "args": [ - "node", - "server.js" +[ + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "one" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdefabcdef01234567" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "session.id": [ + "sunday" + ], + "session.sequence": [ + 123 + ], + "span.id": [ + "00xxxxFFaaaa1234" + ], + "timestamp.us": [ + 1496170407154000 + ], + "trace.id": [ + "0123456789abcdef0123456789abcdef" + ], + "transaction.duration.us": [ + 3000 + ], + "transaction.id": [ + "00xxxxFFaaaa1234" + ], + "transaction.message.age.ms": [ + 1577958057123 + ], + "transaction.message.body": [ + "user created" + ], + "transaction.message.headers": [ + { + "Involved_services": [ + "user", + "auth" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "session": { - "id": "sunday", - "sequence": 123 - }, - "span": { - "id": "00xxxxFFaaaa1234" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "0123456789abcdef0123456789abcdef" - }, - "transaction": { - "duration": { - "us": 3000 - }, - "id": "00xxxxFFaaaa1234", - "message": { - "age": { - "ms": 1577958057123 - }, - "body": "user created", - "headers": { - "Involved_services": [ - "user", - "auth" - ], - "User_id": [ - "1ax3" - ] - }, - "queue": { - "name": "new_users" - }, - "routing_key": "user-created-transaction" - }, - "name": "amqp receive", - "representative_count": 1, - "sampled": true, - "span_count": { - "started": 1 - }, - "type": "messaging" - }, - "user": { - "email": "bar@user.com", - "id": "123user", - "name": "bar" + "User_id": [ + "1ax3" + ] } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "abcdefabcdef01234567" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "id": "945254c567a5417e" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "0123456789abcdef0123456789abcdef" - }, - "transaction": { - "duration": { - "us": 32592 - }, - "id": "945254c567a5417e", - "representative_count": 1, - "sampled": true, - "span_count": { - "started": 43 - }, - "type": "request" - }, - "user": { - "email": "bar@user.com", - "id": "123user", - "name": "bar" - } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": "dynamic", - "lon": "dynamic" - } - }, - "ip": "12.53.12.1" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - }, - "cookies": { - "c1": "v1", - "c2": "v2" - }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "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" - ] + ], + "transaction.message.queue.name": [ + "new_users" + ], + "transaction.message.routing_key": [ + "user-created-transaction" + ], + "transaction.name": [ + "amqp receive" + ], + "transaction.name.text": [ + "amqp receive" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 1 + ], + "transaction.type": [ + "messaging" + ], + "user.email": [ + "bar@user.com" + ], + "user.id": [ + "123user" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "one" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "abcdefabcdef01234567" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.id": [ + "945254c567a5417e" + ], + "timestamp.us": [ + 1496170407154000 + ], + "trace.id": [ + "0123456789abcdef0123456789abcdef" + ], + "transaction.duration.us": [ + 32592 + ], + "transaction.id": [ + "945254c567a5417e" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 43 + ], + "transaction.type": [ + "request" + ], + "user.email": [ + "bar@user.com" + ], + "user.id": [ + "123user" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "client.geo.continent_name": [ + "North America" + ], + "client.geo.country_iso_code": [ + "US" + ], + "client.geo.country_name": [ + "United States" + ], + "client.geo.location": [ + "dynamic" + ], + "client.ip": [ + "12.53.12.1" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.body": [ + { + "original": { + "additional": { + "bar": 123, + "req": "additional information" }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "decoded_body_size": 2990, - "encoded_body_size": 2690, - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200, - "transfer_size": 258 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" + "str": "hello world" } - }, - "labels": { - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8", - "tag1": "one", - "tag4": "false" - }, - "numeric_labels": { - "tag2": 12, - "tag3": 12.45 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "7.0" - }, - "version": "5.1.3" - }, - "source": { - "ip": "12.53.12.1" - }, - "span": { - "id": "4340a8e0df1906ecbfa9" - }, - "timestamp": { - "us": 1496170407154000 - }, - "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" - }, - "duration": { - "us": 32592 - }, - "id": "4340a8e0df1906ecbfa9", - "name": "GET /api/types", - "representative_count": 1, - "result": "success", - "sampled": true, - "span_count": { - "started": 17 - }, - "type": "request" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "domain": "ldap://abc", - "id": "99", - "name": "foo" - }, - "user_agent": { - "device": { - "name": "Mac" - }, - "name": "Chrome", - "original": "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", - "os": { - "full": "Mac OS X 10.10.5", - "name": "Mac OS X", - "version": "10.10.5" - }, - "version": "51.0.2704.103" } - }, - { - "@timestamp": "2018-07-30T18:53:42.281Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "justanid", - "name": "elastic-ruby", - "version": "2.2" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "method": "POST" - }, - "response": {} - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" + "Content-Type": [ + "text/html" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "testing", - "framework": { - "name": "Rails", - "version": "5.0" - }, - "language": { - "name": "ruby", - "version": "2.5" - }, - "name": "service1", - "node": { - "name": "node-ABC" - }, - "runtime": { - "name": "cruby", - "version": "2.5" - }, - "version": "2" - }, - "span": { - "id": "cdef4340a8e0df19" - }, - "timestamp": { - "us": 1532976822281000 - }, - "trace": { - "id": "0acd456789abcdef0123456789abcdef" - }, - "transaction": { - "duration": { - "us": 13980 - }, - "experience": { - "cls": 1, - "fid": 2, - "longtask": { - "count": 3, - "max": 1, - "sum": 2.5 - }, - "tbt": 3.4 - }, - "id": "cdef4340a8e0df19", - "marks": { - "another_mark": { - "some_float": 10, - "some_long": 10 - }, - "navigationTiming": { - "appBeforeBootstrap": 608.9300000000001, - "navigationStart": -21 - } - }, - "representative_count": 1, - "sampled": true, - "span_count": { - "dropped": 55, - "started": 436 - }, - "type": "request" - }, - "user": { - "email": "bar@user.com", - "id": "123user", - "name": "bar" - } - }, - { - "@timestamp": "2021-09-15T20:11:06.365Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "origin": { - "account": { - "id": "abc123" - }, - "provider": "aws", - "region": "us-east-1", - "service": { - "name": "serviceName" - } - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "faas": { - "coldstart": false, - "execution": "2e13b309-23e1-417f-8bf7-074fc96bc683", - "name": "faasName", - "trigger": { - "request_id": "FuH2Cir_vHcEMUA=", - "type": "http" - }, - "version": "1.0.0" - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" + "Cookie": [ + "c1=v1, c2=v2" ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" - } - }, - "labels": { - "tag1": "one" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" + "Some-Other-Header": [ + "foo" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "origin": { - "id": "abc123", - "name": "service-name", - "version": "1.0" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "id": "142e61450efb8574" - }, - "timestamp": { - "us": 1631736666365048 - }, - "trace": { - "id": "eb56529a1f461c5e7e2f66ecb075e983" - }, - "transaction": { - "duration": { - "us": 38853 - }, - "id": "142e61450efb8574", - "name": "july-2021-delete-after-july-31", - "representative_count": 1, - "result": "success", - "sampled": true, - "span_count": { - "started": 0 - }, - "type": "lambda" - }, - "user": { - "email": "bar@user.com", - "id": "123user", - "name": "bar" + "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" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "http.response.decoded_body_size": [ + 2990 + ], + "http.response.encoded_body_size": [ + 2690 + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 258 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "labels.tag1": [ + "one" + ], + "labels.tag4": [ + "false" + ], + "numeric_labels.tag2": [ + 12 + ], + "numeric_labels.tag3": [ + 12.45 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "7.0" + ], + "service.version": [ + "5.1.3" + ], + "source.ip": [ + "12.53.12.1" + ], + "span.id": [ + "4340a8e0df1906ecbfa9" + ], + "timestamp.us": [ + 1496170407154000 + ], + "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 + ], + "transaction.id": [ + "4340a8e0df1906ecbfa9" + ], + "transaction.name": [ + "GET /api/types" + ], + "transaction.name.text": [ + "GET /api/types" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.result": [ + "success" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 17 + ], + "transaction.type": [ + "request" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.domain": [ + "ldap://abc" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ], + "user_agent.device.name": [ + "Mac" + ], + "user_agent.name": [ + "Chrome" + ], + "user_agent.original": [ + "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" + ], + "user_agent.original.text": [ + "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" + ], + "user_agent.os.full": [ + "Mac OS X 10.10.5" + ], + "user_agent.os.full.text": [ + "Mac OS X 10.10.5" + ], + "user_agent.os.name": [ + "Mac OS X" + ], + "user_agent.os.name.text": [ + "Mac OS X" + ], + "user_agent.os.version": [ + "10.10.5" + ], + "user_agent.version": [ + "51.0.2704.103" + ] + }, + { + "@timestamp": [ + "2018-07-30T18:53:42.281Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "justanid" + ], + "agent.name": [ + "elastic-ruby" + ], + "agent.version": [ + "2.2" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.method": [ + "POST" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "one" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "testing" + ], + "service.framework.name": [ + "Rails" + ], + "service.framework.version": [ + "5.0" + ], + "service.language.name": [ + "ruby" + ], + "service.language.version": [ + "2.5" + ], + "service.name": [ + "service1" + ], + "service.node.name": [ + "node-ABC" + ], + "service.runtime.name": [ + "cruby" + ], + "service.runtime.version": [ + "2.5" + ], + "service.version": [ + "2" + ], + "span.id": [ + "cdef4340a8e0df19" + ], + "timestamp.us": [ + 1532976822281000 + ], + "trace.id": [ + "0acd456789abcdef0123456789abcdef" + ], + "transaction.duration.us": [ + 13980 + ], + "transaction.experience.cls": [ + 1 + ], + "transaction.experience.fid": [ + 2 + ], + "transaction.experience.longtask.count": [ + 3 + ], + "transaction.experience.longtask.max": [ + 1 + ], + "transaction.experience.longtask.sum": [ + 2.5 + ], + "transaction.experience.tbt": [ + 3.4 + ], + "transaction.id": [ + "cdef4340a8e0df19" + ], + "transaction.marks.another_mark.some_float": [ + 10 + ], + "transaction.marks.another_mark.some_long": [ + 10 + ], + "transaction.marks.navigationTiming.appBeforeBootstrap": [ + 608.93 + ], + "transaction.marks.navigationTiming.navigationStart": [ + -21 + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 55 + ], + "transaction.span_count.started": [ + 436 + ], + "transaction.type": [ + "request" + ], + "user.email": [ + "bar@user.com" + ], + "user.id": [ + "123user" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + }, + { + "@timestamp": [ + "2021-09-15T20:11:06.365Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.origin.account.id": [ + "abc123" + ], + "cloud.origin.provider": [ + "aws" + ], + "cloud.origin.region": [ + "us-east-1" + ], + "cloud.origin.service.name": [ + "serviceName" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "faas.coldstart": [ + false + ], + "faas.execution": [ + "2e13b309-23e1-417f-8bf7-074fc96bc683" + ], + "faas.name": [ + "faasName" + ], + "faas.trigger.request_id": [ + "FuH2Cir_vHcEMUA=" + ], + "faas.trigger.type": [ + "http" + ], + "faas.version": [ + "1.0.0" + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.tag1": [ + "one" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.origin.id": [ + "abc123" + ], + "service.origin.name": [ + "service-name" + ], + "service.origin.version": [ + "1.0" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.id": [ + "142e61450efb8574" + ], + "timestamp.us": [ + 1631736666365048 + ], + "trace.id": [ + "eb56529a1f461c5e7e2f66ecb075e983" + ], + "transaction.duration.us": [ + 38853 + ], + "transaction.id": [ + "142e61450efb8574" + ], + "transaction.name": [ + "july-2021-delete-after-july-31" + ], + "transaction.name.text": [ + "july-2021-delete-after-july-31" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.result": [ + "success" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "lambda" + ], + "user.email": [ + "bar@user.com" + ], + "user.id": [ + "123user" + ], + "user.name": [ + "bar" + ], + "user.name.text": [ + "bar" + ] + } +] diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index 53aeea4b608..28d9ca972a2 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -1,251 +1,388 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "activation_method": "some_activation_method", - "name": "elastic-node", - "version": "3.14.0" - }, - "client": { - "geo": { - "continent_name": "North America", - "country_iso_code": "US", - "country_name": "United States", - "location": { - "lat": "dynamic", - "lon": "dynamic" - } - }, - "ip": "12.53.12.1" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "instance": { - "id": "instance_id", - "name": "instance_name" - }, - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - }, - "cookies": { - "c1": "v1", - "c2": "v2" +[ + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "client.geo.continent_name": [ + "North America" + ], + "client.geo.country_iso_code": [ + "US" + ], + "client.geo.country_name": [ + "United States" + ], + "client.geo.location": [ + "dynamic" + ], + "client.ip": [ + "12.53.12.1" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.instance.id": [ + "instance_id" + ], + "cloud.instance.name": [ + "instance_name" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.body": [ + { + "original": { + "additional": { + "bar": 123, + "req": "additional information" }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "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" - ] - }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "decoded_body_size": 2990, - "encoded_body_size": 2690, - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200, - "transfer_size": 258 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "node": { - "name": "node-name" - }, - "pod": { - "name": "pod-name", - "uid": "pod-uid" + "str": "hello world" } - }, - "labels": { - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8", - "tag1": "one", - "tag4": "false" - }, - "numeric_labels": { - "tag2": 12, - "tag3": 12.45 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "chatty-service", - "node": { - "name": "chatty-node" - }, - "runtime": { - "name": "node", - "version": "7.0" - }, - "version": "5.1.3" - }, - "source": { - "ip": "12.53.12.1" - }, - "span": { - "id": "ddf109a4c4aa5f2b6e984548ca57774c" - }, - "timestamp": { - "us": 1496170407154000 - }, - "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" - }, - "duration": { - "us": 32592 - }, - "id": "ddf109a4c4aa5f2b6e984548ca57774c", - "name": "GET /api/types", - "representative_count": 1, - "result": "success", - "sampled": true, - "span_count": { - "dropped": 3, - "started": 20 - }, - "type": "request" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "domain": "ldap://abc", - "id": "99", - "name": "foo" - }, - "user_agent": { - "device": { - "name": "Mac" - }, - "name": "Chrome", - "original": "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", - "os": { - "full": "Mac OS X 10.10.5", - "name": "Mac OS X", - "version": "10.10.5" + "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" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "http.response.decoded_body_size": [ + 2990 + ], + "http.response.encoded_body_size": [ + 2690 + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 258 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "labels.tag1": [ + "one" + ], + "labels.tag4": [ + "false" + ], + "numeric_labels.tag2": [ + 12 + ], + "numeric_labels.tag3": [ + 12.45 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "chatty-service" + ], + "service.node.name": [ + "chatty-node" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "7.0" + ], + "service.version": [ + "5.1.3" + ], + "source.ip": [ + "12.53.12.1" + ], + "span.id": [ + "ddf109a4c4aa5f2b6e984548ca57774c" + ], + "timestamp.us": [ + 1496170407154000 + ], + "trace.id": [ + "646df3b8b5279e982cc12a2f1ac004f3" + ], + "transaction.custom": [ + { + "(": "not a valid regex and that is fine", + "and_objects": { + "foo": [ + "bar", + "baz" + ] }, - "version": "51.0.2704.103" + "my_key": 1, + "some_other_value": "foo bar" } - } - ] -} + ], + "transaction.duration.us": [ + 32592 + ], + "transaction.id": [ + "ddf109a4c4aa5f2b6e984548ca57774c" + ], + "transaction.name": [ + "GET /api/types" + ], + "transaction.name.text": [ + "GET /api/types" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.result": [ + "success" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 3 + ], + "transaction.span_count.started": [ + 20 + ], + "transaction.type": [ + "request" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.domain": [ + "ldap://abc" + ], + "user.id": [ + "99" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ], + "user_agent.device.name": [ + "Mac" + ], + "user_agent.name": [ + "Chrome" + ], + "user_agent.original": [ + "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" + ], + "user_agent.original.text": [ + "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" + ], + "user_agent.os.full": [ + "Mac OS X 10.10.5" + ], + "user_agent.os.full.text": [ + "Mac OS X 10.10.5" + ], + "user_agent.os.name": [ + "Mac OS X" + ], + "user_agent.os.name.text": [ + "Mac OS X" + ], + "user_agent.os.version": [ + "10.10.5" + ], + "user_agent.version": [ + "51.0.2704.103" + ] + } +] diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index ff809e1d9ee..dfa4b1b56f6 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -1,361 +1,501 @@ -{ - "events": [ - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "elastic-node", - "version": "3.14.0" - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "x64", - "ip": [ - "127.0.0.1" - ], - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "method": "GET" +[ + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.name": [ + "elastic-node" + ], + "agent.version": [ + "3.14.0" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "x64" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.method": [ + "GET" + ], + "http.response.status_code": [ + 200 + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.span_tag": [ + "something" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "945254c567a5417e" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "container-id" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "span.db.instance": [ + "customers" + ], + "span.db.statement": [ + "SELECT * FROM product_types WHERE user_id=?" + ], + "span.db.type": [ + "sql" + ], + "span.db.user.name": [ + "readonly_user" + ], + "span.duration.us": [ + 3781 + ], + "span.id": [ + "0aaaaaaaaaaaaaaa" + ], + "span.name": [ + "SELECT FROM product_types" + ], + "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 }, - "response": { - "status_code": 200 + "module": "some module", + "vars": { + "key": "value" } }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" + { + "exclude_from_grouping": false, + "filename": "my2file.js", + "line": { + "number": 10 } - }, - "labels": { - "span_tag": "something" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "945254c567a5417e" - }, - "process": { - "args": [ - "node", - "server.js" - ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "container-id" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "span": { - "db": { - "instance": "customers", - "statement": "SELECT * FROM product_types WHERE user_id=?", - "type": "sql", - "user": { - "name": "readonly_user" - } - }, - "duration": { - "us": 3781 - }, - "id": "0aaaaaaaaaaaaaaa", - "name": "SELECT FROM product_types", - "representative_count": 1, - "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 - } - } - ], - "sync": false, - "type": "unknown" - }, - "timestamp": { - "us": 1496170407154000 - }, - "trace": { - "id": "945254c567a5417eaaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "945254c567a5417e" - }, - "url": { - "original": "http://localhost:8000" - }, - "user": { - "email": "foo@bar.com", - "id": "123user", - "name": "foo" } - }, - { - "@timestamp": "2017-05-30T18:53:27.154Z", - "agent": { - "name": "js-base", - "version": "1.3" - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success" - }, - "host": { - "architecture": "x64", - "ip": [ - "127.0.0.1" - ], - "os": { - "platform": "darwin" - } - }, - "http": { - "request": { - "body": { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - }, - "cookies": { - "c1": "v1", - "c2": "v2" + ], + "span.sync": [ + false + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1496170407154000 + ], + "trace.id": [ + "945254c567a5417eaaaaaaaaaaaaaaaa" + ], + "transaction.id": [ + "945254c567a5417e" + ], + "url.original": [ + "http://localhost:8000" + ], + "url.original.text": [ + "http://localhost:8000" + ], + "user.email": [ + "foo@bar.com" + ], + "user.id": [ + "123user" + ], + "user.name": [ + "foo" + ], + "user.name.text": [ + "foo" + ] + }, + { + "@timestamp": [ + "2017-05-30T18:53:27.154Z" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "1.3" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "host.architecture": [ + "x64" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.os.platform": [ + "darwin" + ], + "http.request.body": [ + { + "original": { + "additional": { + "bar": 123, + "req": "additional information" }, - "env": { - "GATEWAY_INTERFACE": "CGI/1.1", - "SERVER_SOFTWARE": "nginx" - }, - "headers": { - "Array": [ - "foo", - "bar", - "baz" - ], - "Content-Type": [ - "text/html" - ], - "Cookie": [ - "c1=v1,c2=v2" - ], - "Some-Other-Header": [ - "foo" - ], - "User-Agent": [ - "Mozilla Chrome Edge" - ] - }, - "method": "POST", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "finished": true, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "headers_sent": true, - "status_code": 200 - }, - "version": "1.1" - }, - "kubernetes": { - "namespace": "namespace1", - "pod": { - "name": "pod-name", - "uid": "pod-uid" + "str": "hello world" } - }, - "labels": { - "bool_error": "false", - "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" - }, - "numeric_labels": { - "number_code": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "node", - "server.js" + } + ], + "http.request.cookies": [ + { + "c1": "v1", + "c2": "v2" + } + ], + "http.request.env": [ + { + "GATEWAY_INTERFACE": "CGI/1.1", + "SERVER_SOFTWARE": "nginx" + } + ], + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" ], - "parent": { - "pid": 6789 - }, - "pid": 1234, - "title": "node" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "staging", - "framework": { - "name": "Express", - "version": "1.2.3" - }, - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "serviceabc", - "node": { - "name": "special-name" - }, - "runtime": { - "name": "javascript", - "version": "8.0.0" - } - }, - "span": { - "id": "945254c567a5417e" - }, - "timestamp": { - "us": 1496170407154000 - }, - "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" - }, - "duration": { - "us": 32592 - }, - "id": "945254c567a5417e", - "marks": { - "another_mark": { - "some_float": 10, - "some_long": 10 - }, - "navigationTiming": { - "appBeforeBootstrap": 608.9300000000001, - "navigationStart": -21 - } - }, - "name": "GET /api/types", - "representative_count": 1, - "result": "success", - "sampled": true, - "span_count": { - "dropped": 2, - "started": 4 - }, - "type": "unknown" - }, - "url": { - "domain": "www.example.com", - "fragment": "#hash", - "full": "https://www.example.com/p/a/t/h?query=string#hash", - "original": "/p/a/t/h?query=string#hash", - "path": "/p/a/t/h", - "port": 8080, - "query": "?query=string", - "scheme": "https" - }, - "user": { - "email": "foo@example.com", - "id": "99" - }, - "user_agent": { - "device": { - "name": "Other" + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } + ], + "http.request.method": [ + "POST" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "http.response.finished": [ + true + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } + ], + "http.response.headers_sent": [ + true + ], + "http.response.status_code": [ + 200 + ], + "http.version": [ + "1.1" + ], + "kubernetes.namespace": [ + "namespace1" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "kubernetes.pod.uid": [ + "pod-uid" + ], + "labels.bool_error": [ + "false" + ], + "labels.organization_uuid": [ + "9f0e9d64-c185-4d21-a6f4-4673ed561ec8" + ], + "numeric_labels.number_code": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "node", + "server.js" + ], + "process.parent.pid": [ + 6789 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "node" + ], + "process.title.text": [ + "node" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "staging" + ], + "service.framework.name": [ + "Express" + ], + "service.framework.version": [ + "1.2.3" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "serviceabc" + ], + "service.node.name": [ + "special-name" + ], + "service.runtime.name": [ + "javascript" + ], + "service.runtime.version": [ + "8.0.0" + ], + "span.id": [ + "945254c567a5417e" + ], + "timestamp.us": [ + 1496170407154000 + ], + "trace.id": [ + "945254c567a5417eaaaaaaaaaaaaaaaa" + ], + "transaction.custom": [ + { + "(": "not a valid regex and that is fine", + "and_objects": { + "foo": [ + "bar", + "baz" + ] }, - "name": "Other", - "original": "Mozilla Chrome Edge" + "my_key": 1, + "some_other_value": "foo bar" } - } - ] -} + ], + "transaction.duration.us": [ + 32592 + ], + "transaction.id": [ + "945254c567a5417e" + ], + "transaction.marks.another_mark.some_float": [ + 10 + ], + "transaction.marks.another_mark.some_long": [ + 10 + ], + "transaction.marks.navigationTiming.appBeforeBootstrap": [ + 608.93 + ], + "transaction.marks.navigationTiming.navigationStart": [ + -21 + ], + "transaction.name": [ + "GET /api/types" + ], + "transaction.name.text": [ + "GET /api/types" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.result": [ + "success" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 2 + ], + "transaction.span_count.started": [ + 4 + ], + "transaction.type": [ + "unknown" + ], + "url.domain": [ + "www.example.com" + ], + "url.fragment": [ + "#hash" + ], + "url.full": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.full.text": [ + "https://www.example.com/p/a/t/h?query=string#hash" + ], + "url.original": [ + "/p/a/t/h?query=string#hash" + ], + "url.original.text": [ + "/p/a/t/h?query=string#hash" + ], + "url.path": [ + "/p/a/t/h" + ], + "url.port": [ + 8080 + ], + "url.query": [ + "?query=string" + ], + "url.scheme": [ + "https" + ], + "user.email": [ + "foo@example.com" + ], + "user.id": [ + "99" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Other" + ], + "user_agent.original": [ + "Mozilla Chrome Edge" + ], + "user_agent.original.text": [ + "Mozilla Chrome Edge" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_faas.approved.json b/systemtest/approvals/TestIntakeLog/with_faas.approved.json index 9887a676b38..f4027880df6 100644 --- a/systemtest/approvals/TestIntakeLog/with_faas.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_faas.approved.json @@ -1,93 +1,136 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T05:47:29.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "faas": { - "coldstart": true, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "group": "experimental" - }, - "message": "test log message with faas", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "1234_service-12a3", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "4.3.0" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T05:47:29.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "faas.coldstart": [ + true + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "message": [ + "test log message with faas" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "4.3.0" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json index 640b1bf778f..b7af03e4488 100644 --- a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json @@ -1,121 +1,178 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T05:47:29.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.testsvc", - "namespace": "default", - "type": "logs" - }, - "event": { - "dataset": "accesslog", - "kind": "event" - }, - "faas": { - "coldstart": true, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "bool": "true", - "group": "experimental", - "str": "str" - }, - "log": { - "level": "warn", - "logger": "testLogger", - "origin": { - "file": { - "line": 10, - "name": "testFile" - }, - "function": "testFunc" - } - }, - "message": "test log message with ecs fields", - "numeric_labels": { - "float": 1.1, - "int": 1, - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "thread": { - "name": "testThread" - }, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "prod", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "testSvc", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "v1.0.0" - }, - "span": { - "id": "txn-id" - }, - "trace": { - "id": "trace-id" - }, - "transaction": { - "id": "txn-id" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T05:47:29.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.testsvc" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.dataset": [ + "accesslog" + ], + "event.kind": [ + "event" + ], + "faas.coldstart": [ + true + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.bool": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.str": [ + "str" + ], + "log.level": [ + "warn" + ], + "log.logger": [ + "testLogger" + ], + "log.origin.file.line": [ + 10 + ], + "log.origin.file.name": [ + "testFile" + ], + "log.origin.function": [ + "testFunc" + ], + "message": [ + "test log message with ecs fields" + ], + "numeric_labels.float": [ + 1.1 + ], + "numeric_labels.int": [ + 1 + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.thread.name": [ + "testThread" + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "testSvc" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "v1.0.0" + ], + "span.id": [ + "txn-id" + ], + "trace.id": [ + "trace-id" + ], + "transaction.id": [ + "txn-id" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json index ee229a305be..58e95a53a41 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json @@ -1,121 +1,178 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T05:47:29.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.testsvc", - "namespace": "default", - "type": "logs" - }, - "event": { - "dataset": "accesslog", - "kind": "event" - }, - "faas": { - "coldstart": true, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "bool": "true", - "group": "experimental", - "str": "str" - }, - "log": { - "level": "warn", - "logger": "testLogger", - "origin": { - "file": { - "line": 10, - "name": "testFile" - }, - "function": "testFunc" - } - }, - "message": "test log message with nested ecs fields", - "numeric_labels": { - "float": 1.1, - "int": 1, - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "thread": { - "name": "testThread" - }, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "prod", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "testSvc", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "v1.0.0" - }, - "span": { - "id": "txn-id" - }, - "trace": { - "id": "trace-id" - }, - "transaction": { - "id": "txn-id" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T05:47:29.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.testsvc" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.dataset": [ + "accesslog" + ], + "event.kind": [ + "event" + ], + "faas.coldstart": [ + true + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.bool": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.str": [ + "str" + ], + "log.level": [ + "warn" + ], + "log.logger": [ + "testLogger" + ], + "log.origin.file.line": [ + 10 + ], + "log.origin.file.name": [ + "testFile" + ], + "log.origin.function": [ + "testFunc" + ], + "message": [ + "test log message with nested ecs fields" + ], + "numeric_labels.float": [ + 1.1 + ], + "numeric_labels.int": [ + 1 + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.thread.name": [ + "testThread" + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "testSvc" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "v1.0.0" + ], + "span.id": [ + "txn-id" + ], + "trace.id": [ + "trace-id" + ], + "transaction.id": [ + "txn-id" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json index 53cea0bad7e..14f97043e1e 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields_overrides_flat_fields.approved.json @@ -1,121 +1,178 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T05:47:29.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.testsvc", - "namespace": "default", - "type": "logs" - }, - "event": { - "dataset": "accesslog", - "kind": "event" - }, - "faas": { - "coldstart": true, - "execution": "6f7f0961f83442118a7af6fe80b88d56", - "id": "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "bool": "true", - "group": "experimental", - "str": "str" - }, - "log": { - "level": "warn", - "logger": "testLogger", - "origin": { - "file": { - "line": 10, - "name": "testFile" - }, - "function": "testFunc" - } - }, - "message": "test log message with override of flat ecs fields by nested ecs fields", - "numeric_labels": { - "float": 1.1, - "int": 1, - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "thread": { - "name": "testThread" - }, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "prod", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "testSvc", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "v1.0.0" - }, - "span": { - "id": "txn-id" - }, - "trace": { - "id": "trace-id" - }, - "transaction": { - "id": "txn-id" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T05:47:29.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.testsvc" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.dataset": [ + "accesslog" + ], + "event.kind": [ + "event" + ], + "faas.coldstart": [ + true + ], + "faas.execution": [ + "6f7f0961f83442118a7af6fe80b88d56" + ], + "faas.id": [ + "arn:aws:lambda:us-east-2:123456789012:function:custom-runtime" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.bool": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "labels.str": [ + "str" + ], + "log.level": [ + "warn" + ], + "log.logger": [ + "testLogger" + ], + "log.origin.file.line": [ + 10 + ], + "log.origin.file.name": [ + "testFile" + ], + "log.origin.function": [ + "testFunc" + ], + "message": [ + "test log message with override of flat ecs fields by nested ecs fields" + ], + "numeric_labels.float": [ + 1.1 + ], + "numeric_labels.int": [ + 1 + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.thread.name": [ + "testThread" + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "testSvc" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "v1.0.0" + ], + "span.id": [ + "txn-id" + ], + "trace.id": [ + "trace-id" + ], + "transaction.id": [ + "txn-id" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json index cab2f99b616..39869bafc29 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json @@ -1,88 +1,127 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T05:47:29.000Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "group": "experimental" - }, - "message": "test log message with timestamp", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "1234_service-12a3", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "4.3.0" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T05:47:29.000Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "message": [ + "test log message with timestamp" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "4.3.0" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json index 78906cc28be..bc0c05fa3e6 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json @@ -1,88 +1,127 @@ -{ - "events": [ - { - "@timestamp": "2022-09-08T21:47:29.111Z", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "group": "experimental" - }, - "message": "test log message with string timestamp", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "1234_service-12a3", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "4.3.0" - } - } - ] -} +[ + { + "@timestamp": [ + "2022-09-08T21:47:29.111Z" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "message": [ + "test log message with string timestamp" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "4.3.0" + ] + } +] diff --git a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json index 46e41c21104..8620e852b9b 100644 --- a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json @@ -1,88 +1,127 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "activation_method": "some_activation_method", - "ephemeral_id": "e71be9ac-93b0-44b9-a997-5638f6ccfc36", - "name": "java", - "version": "1.10.0" - }, - "container": { - "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "data_stream": { - "dataset": "apm.app.1234_service_12a3", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "architecture": "amd64", - "hostname": "node-name", - "ip": [ - "127.0.0.1" - ], - "name": "host1", - "os": { - "platform": "Linux" - } - }, - "kubernetes": { - "namespace": "default", - "node": { - "name": "node-name" - }, - "pod": { - "name": "instrumented-java-service", - "uid": "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" - } - }, - "labels": { - "ab_testing": "true", - "group": "experimental" - }, - "message": "test log message without timestamp", - "numeric_labels": { - "segment": 5 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "args": [ - "-v" - ], - "parent": { - "pid": 1 - }, - "pid": 1234, - "title": "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" - }, - "service": { - "environment": "production", - "framework": { - "name": "spring", - "version": "5.0.0" - }, - "language": { - "name": "Java", - "version": "10.0.2" - }, - "name": "1234_service-12a3", - "node": { - "name": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" - }, - "runtime": { - "name": "Java", - "version": "10.0.2" - }, - "version": "4.3.0" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.activation_method": [ + "some_activation_method" + ], + "agent.ephemeral_id": [ + "e71be9ac-93b0-44b9-a997-5638f6ccfc36" + ], + "agent.name": [ + "java" + ], + "agent.version": [ + "1.10.0" + ], + "container.id": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "data_stream.dataset": [ + "apm.app.1234_service_12a3" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.architecture": [ + "amd64" + ], + "host.hostname": [ + "node-name" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "host1" + ], + "host.os.platform": [ + "Linux" + ], + "kubernetes.namespace": [ + "default" + ], + "kubernetes.node.name": [ + "node-name" + ], + "kubernetes.pod.name": [ + "instrumented-java-service" + ], + "kubernetes.pod.uid": [ + "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" + ], + "labels.ab_testing": [ + "true" + ], + "labels.group": [ + "experimental" + ], + "message": [ + "test log message without timestamp" + ], + "numeric_labels.segment": [ + 5 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.args": [ + "-v" + ], + "process.parent.pid": [ + 1 + ], + "process.pid": [ + 1234 + ], + "process.title": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "process.title.text": [ + "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" + ], + "service.environment": [ + "production" + ], + "service.framework.name": [ + "spring" + ], + "service.framework.version": [ + "5.0.0" + ], + "service.language.name": [ + "Java" + ], + "service.language.version": [ + "10.0.2" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], + "service.runtime.name": [ + "Java" + ], + "service.runtime.version": [ + "10.0.2" + ], + "service.version": [ + "4.3.0" + ] + } +] diff --git a/systemtest/approvals/TestJaeger/batch_0.approved.json b/systemtest/approvals/TestJaeger/batch_0.approved.json index 4051d7bd2f1..6d2e8adb656 100644 --- a/systemtest/approvals/TestJaeger/batch_0.approved.json +++ b/systemtest/approvals/TestJaeger/batch_0.approved.json @@ -1,422 +1,583 @@ -{ - "events": [ - { - "@timestamp": "2019-12-20T07:41:45.007Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "Retrying GetDriver after error", - "log": { - "message": "Retrying GetDriver after error" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "message": "Retrying GetDriver after error", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "timestamp": { - "us": 1576827705007552 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3", - "sampled": true, - "type": "unknown" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.089Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "Retrying GetDriver after error", - "log": { - "message": "Retrying GetDriver after error" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "message": "Retrying GetDriver after error", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "timestamp": { - "us": 1576827705089431 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3", - "sampled": true, - "type": "unknown" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.172Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "Retrying GetDriver after error", - "log": { - "message": "Retrying GetDriver after error" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "message": "Retrying GetDriver after error", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "timestamp": { - "us": 1576827705172530 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3", - "sampled": true, - "type": "unknown" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.197Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.app.driver", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "level": "info" - }, - "message": "Search successful", - "numeric_labels": { - "num_drivers": 10 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.954Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.app.driver", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "level": "info", - "location": "728,326" - }, - "message": "Searching for nearby drivers", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.954Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.app.driver", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "key": "customer", - "value": "Japanese Desserts" - }, - "message": "baggage", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "id": "7be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.953Z", - "agent": { - "ephemeral_id": "624386e9c81d2980", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "as": "thrift", - "peer_service": "driver-client", - "sampler_param": "true", - "sampler_type": "const" - }, - "numeric_labels": { - "peer_ipv4": 2130706433, - "peer_port": 50535 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "driver", - "node": { - "name": "host01" - } - }, - "span": { - "id": "7be2fd98d0973be3" - }, - "timestamp": { - "us": 1576827704953864 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - }, - "transaction": { - "duration": { - "us": 243417 - }, - "id": "7be2fd98d0973be3", - "name": "Driver::findNearest", - "sampled": true, - "type": "unknown" - } - } - ] -} +[ + { + "@timestamp": [ + "2019-12-20T07:41:45.007Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "Retrying GetDriver after error" + ], + "error.log.message": [ + "Retrying GetDriver after error" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "message": [ + "Retrying GetDriver after error" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "timestamp.us": [ + 1576827705007552 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.089Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "Retrying GetDriver after error" + ], + "error.log.message": [ + "Retrying GetDriver after error" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "message": [ + "Retrying GetDriver after error" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "timestamp.us": [ + 1576827705089431 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.172Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "Retrying GetDriver after error" + ], + "error.log.message": [ + "Retrying GetDriver after error" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "message": [ + "Retrying GetDriver after error" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "timestamp.us": [ + 1576827705172530 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.197Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.app.driver" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.level": [ + "info" + ], + "message": [ + "Search successful" + ], + "numeric_labels.num_drivers": [ + 10 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.954Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.app.driver" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.level": [ + "info" + ], + "labels.location": [ + "728,326" + ], + "message": [ + "Searching for nearby drivers" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.954Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.app.driver" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.key": [ + "customer" + ], + "labels.value": [ + "Japanese Desserts" + ], + "message": [ + "baggage" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.id": [ + "7be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.953Z" + ], + "agent.ephemeral_id": [ + "624386e9c81d2980" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.as": [ + "thrift" + ], + "labels.peer_service": [ + "driver-client" + ], + "labels.sampler_param": [ + "true" + ], + "labels.sampler_type": [ + "const" + ], + "numeric_labels.peer_ipv4": [ + 2130706433 + ], + "numeric_labels.peer_port": [ + 50535 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "driver" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "7be2fd98d0973be3" + ], + "timestamp.us": [ + 1576827704953864 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ], + "transaction.duration.us": [ + 243417 + ], + "transaction.id": [ + "7be2fd98d0973be3" + ], + "transaction.name": [ + "Driver::findNearest" + ], + "transaction.name.text": [ + "Driver::findNearest" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + } +] diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index ced4f97992c..d765ad08e9d 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -1,1091 +1,1478 @@ -{ - "events": [ - { - "@timestamp": "2019-12-20T07:41:45.006Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "redis timeout", - "log": { - "message": "redis timeout" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "driver_id": "T762465C" - }, - "message": "redis timeout", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "333295bfb438ea03" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "timestamp": { - "us": 1576827705006847 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.089Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "redis timeout", - "log": { - "message": "redis timeout" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "driver_id": "T781861C" - }, - "message": "redis timeout", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "614811d6c498bfb0" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "timestamp": { - "us": 1576827705089372 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.172Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "message": "redis timeout" - } - ], - "grouping_key": "dd09a7d0d9dde0adfcd694967c5a88de", - "grouping_name": "redis timeout", - "log": { - "message": "redis timeout" - } - }, - "event": {}, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "driver_id": "T752547C" - }, - "message": "redis timeout", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "0242ee3774d9eab1" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "timestamp": { - "us": 1576827705172347 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.973Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm.app.redis", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "level": "info" - }, - "message": "Found drivers", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "id": "6e09e8bcefd6b828" - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.132Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "failure", - "success_count": 0 - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T752547C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 39602 - }, - "id": "0242ee3774d9eab1", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705132896 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.089Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T781861C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 11802 - }, - "id": "231604559da84d61", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705089459 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.186Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T757338C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 10431 - }, - "id": "2b4c28f02b272f17", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705186670 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.113Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T708771C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 11986 - }, - "id": "2ef335bad24accc2", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705113531 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.973Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "failure", - "success_count": 0 - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T762465C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 33732 - }, - "id": "333295bfb438ea03", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827704973809 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.125Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T710624C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 7311 - }, - "id": "38ec645e7201224d", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705125567 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.054Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "failure", - "success_count": 0 - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T781861C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 35375 - }, - "id": "614811d6c498bfb0", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705054046 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.101Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T705860C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 12236 - }, - "id": "61f7ecf24d13c36a", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705101278 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.007Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T762465C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 9240 - }, - "id": "627c37a97e475c2f", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705007578 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.172Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T752547C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 14029 - }, - "id": "6a63d1e81cfc7d95", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705172618 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.029Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T752110C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 10630 - }, - "id": "6b4051dd2a5e2366", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705029415 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.040Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T757670C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 13946 - }, - "id": "6df97a86b9b3451b", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705040082 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:44.954Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_location": "728,326" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 19711 - }, - "id": "6e09e8bcefd6b828", - "name": "FindDriverIDs", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827704954062 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - }, - { - "@timestamp": "2019-12-20T07:41:45.016Z", - "agent": { - "ephemeral_id": "2e3f8db3eb77fae0", - "name": "Jaeger/Go", - "version": "2.20.1" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "host": { - "hostname": "host01", - "ip": [ - "10.0.0.13" - ], - "name": "host01" - }, - "labels": { - "param_driverID": "T712515C" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "7be2fd98d0973be3" - }, - "processor": { - "event": "span" - }, - "service": { - "language": { - "name": "Go" - }, - "name": "redis", - "node": { - "name": "host01" - } - }, - "span": { - "duration": { - "us": 12561 - }, - "id": "7bd7663d39c5a847", - "name": "GetDriver", - "representative_count": 1, - "type": "unknown" - }, - "timestamp": { - "us": 1576827705016845 - }, - "trace": { - "id": "00000000000000007be2fd98d0973be3" - } - } - ] -} +[ + { + "@timestamp": [ + "2019-12-20T07:41:45.006Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "redis timeout" + ], + "error.log.message": [ + "redis timeout" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.driver_id": [ + "T762465C" + ], + "message": [ + "redis timeout" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "333295bfb438ea03" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "timestamp.us": [ + 1576827705006847 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.089Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "redis timeout" + ], + "error.log.message": [ + "redis timeout" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.driver_id": [ + "T781861C" + ], + "message": [ + "redis timeout" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "614811d6c498bfb0" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "timestamp.us": [ + 1576827705089372 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.172Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.message": [ + "redis timeout" + ], + "error.grouping_key": [ + "dd09a7d0d9dde0adfcd694967c5a88de" + ], + "error.grouping_name": [ + "redis timeout" + ], + "error.log.message": [ + "redis timeout" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.driver_id": [ + "T752547C" + ], + "message": [ + "redis timeout" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "0242ee3774d9eab1" + ], + "processor.event": [ + "error" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "timestamp.us": [ + 1576827705172347 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.973Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm.app.redis" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.level": [ + "info" + ], + "message": [ + "Found drivers" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.id": [ + "6e09e8bcefd6b828" + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.132Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "failure" + ], + "event.success_count": [ + 0 + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T752547C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 39602 + ], + "span.id": [ + "0242ee3774d9eab1" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705132896 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.089Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T781861C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 11802 + ], + "span.id": [ + "231604559da84d61" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705089459 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.186Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T757338C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 10431 + ], + "span.id": [ + "2b4c28f02b272f17" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705186670 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.113Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T708771C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 11986 + ], + "span.id": [ + "2ef335bad24accc2" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705113531 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.973Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "failure" + ], + "event.success_count": [ + 0 + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T762465C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 33732 + ], + "span.id": [ + "333295bfb438ea03" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827704973809 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.125Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T710624C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 7311 + ], + "span.id": [ + "38ec645e7201224d" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705125567 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.054Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "failure" + ], + "event.success_count": [ + 0 + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T781861C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 35375 + ], + "span.id": [ + "614811d6c498bfb0" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705054046 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.101Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T705860C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 12236 + ], + "span.id": [ + "61f7ecf24d13c36a" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705101278 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.007Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T762465C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 9240 + ], + "span.id": [ + "627c37a97e475c2f" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705007578 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.172Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T752547C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 14029 + ], + "span.id": [ + "6a63d1e81cfc7d95" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705172618 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.029Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T752110C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 10630 + ], + "span.id": [ + "6b4051dd2a5e2366" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705029415 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.040Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T757670C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 13946 + ], + "span.id": [ + "6df97a86b9b3451b" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705040082 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:44.954Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_location": [ + "728,326" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 19711 + ], + "span.id": [ + "6e09e8bcefd6b828" + ], + "span.name": [ + "FindDriverIDs" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827704954062 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + }, + { + "@timestamp": [ + "2019-12-20T07:41:45.016Z" + ], + "agent.ephemeral_id": [ + "2e3f8db3eb77fae0" + ], + "agent.name": [ + "Jaeger/Go" + ], + "agent.version": [ + "2.20.1" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "host.hostname": [ + "host01" + ], + "host.ip": [ + "10.0.0.13" + ], + "host.name": [ + "host01" + ], + "labels.param_driverID": [ + "T712515C" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "7be2fd98d0973be3" + ], + "processor.event": [ + "span" + ], + "service.language.name": [ + "Go" + ], + "service.name": [ + "redis" + ], + "service.node.name": [ + "host01" + ], + "span.duration.us": [ + 12561 + ], + "span.id": [ + "7bd7663d39c5a847" + ], + "span.name": [ + "GetDriver" + ], + "span.representative_count": [ + 1 + ], + "span.type": [ + "unknown" + ], + "timestamp.us": [ + 1576827705016845 + ], + "trace.id": [ + "00000000000000007be2fd98d0973be3" + ] + } +] diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index a636db9b175..0c0caf5703f 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -1,90 +1,111 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "127.0.0.1" - }, - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "611f4fa950f04631" - }, - "processor": { - "event": "span" - }, - "service": { - "name": "apm-agent-js" - }, - "source": { - "ip": "127.0.0.1", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 643000 +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "127.0.0.1" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "611f4fa950f04631" + ], + "processor.event": [ + "span" + ], + "service.name": [ + "apm-agent-js" + ], + "source.ip": [ + "127.0.0.1" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 643000 + ], + "span.id": [ + "aaaaaaaaaaaaaaaa" + ], + "span.name": [ + "transaction" + ], + "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 }, - "id": "aaaaaaaaaaaaaaaa", - "name": "transaction", - "representative_count": 1, - "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" - } - } - ], - "type": "transaction" - }, - "timestamp": { - "us": "dynamic" + "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" + } }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "611f4fa950f04631" - }, - "url": { - "original": "http://localhost:8000/test/e2e/general-usecase/span" + { + "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" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "611f4fa950f04631aaaaaaaaaaaaaaaa" + ], + "transaction.id": [ + "611f4fa950f04631" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/span" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/span" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCLogs.approved.json b/systemtest/approvals/TestOTLPGRPCLogs.approved.json index 0eea8aa83e0..c3abed08e21 100644 --- a/systemtest/approvals/TestOTLPGRPCLogs.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogs.approved.json @@ -1,46 +1,58 @@ -{ - "events": [ - { - "@timestamp": "1970-01-01T00:00:01.000Z", - "agent": { - "name": "otlp/go", - "version": "unknown" - }, - "data_stream": { - "dataset": "apm.app.unknown", - "namespace": "default", - "type": "logs" - }, - "event": { - "severity": 9 - }, - "labels": { - "key": "value" - }, - "log": { - "level": "Info" - }, - "message": "a log message", - "numeric_labels": { - "numeric_key": 1234 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "language": { - "name": "go" - }, - "name": "unknown" - }, - "span": { - "id": "0200000000000000" - }, - "trace": { - "id": "01000000000000000000000000000000" - } - } - ] -} +[ + { + "@timestamp": [ + "1970-01-01T00:00:01.000Z" + ], + "agent.name": [ + "otlp/go" + ], + "agent.version": [ + "unknown" + ], + "data_stream.dataset": [ + "apm.app.unknown" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.severity": [ + 9 + ], + "labels.key": [ + "value" + ], + "log.level": [ + "Info" + ], + "message": [ + "a log message" + ], + "numeric_labels.numeric_key": [ + 1234 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown" + ], + "span.id": [ + "0200000000000000" + ], + "trace.id": [ + "01000000000000000000000000000000" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index b358fe48642..b8aab6b00e8 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -1,67 +1,88 @@ -{ - "events": [ - { - "@timestamp": "1970-01-01T00:00:01.000Z", - "agent": { - "name": "android/java", - "version": "unknown" - }, - "client": { - "geo": { - "city_name": "Berlin", - "continent_name": "Europe", - "country_iso_code": "DE", - "country_name": "Germany", - "location": { - "lat": "dynamic", - "lon": "dynamic" - }, - "region_iso_code": "DE-BE", - "region_name": "Land Berlin" - }, - "ip": "178.162.206.244" - }, - "data_stream": { - "dataset": "apm.app.unknown", - "namespace": "default", - "type": "logs" - }, - "event": { - "severity": 9 - }, - "labels": { - "key": "value" - }, - "log": { - "level": "Info" - }, - "message": "a log message", - "numeric_labels": { - "numeric_key": 1234 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "language": { - "name": "java" - }, - "name": "unknown" - }, - "source": { - "ip": "178.162.206.244", - "nat": { - "ip": "127.0.0.1" - } - }, - "span": { - "id": "0200000000000000" - }, - "trace": { - "id": "01000000000000000000000000000000" - } - } - ] -} +[ + { + "@timestamp": [ + "1970-01-01T00:00:01.000Z" + ], + "agent.name": [ + "android/java" + ], + "agent.version": [ + "unknown" + ], + "client.geo.city_name": [ + "Berlin" + ], + "client.geo.continent_name": [ + "Europe" + ], + "client.geo.country_iso_code": [ + "DE" + ], + "client.geo.country_name": [ + "Germany" + ], + "client.geo.location": [ + "dynamic" + ], + "client.geo.region_iso_code": [ + "DE-BE" + ], + "client.geo.region_name": [ + "Land Berlin" + ], + "client.ip": [ + "178.162.206.244" + ], + "data_stream.dataset": [ + "apm.app.unknown" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.severity": [ + 9 + ], + "labels.key": [ + "value" + ], + "log.level": [ + "Info" + ], + "message": [ + "a log message" + ], + "numeric_labels.numeric_key": [ + 1234 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.language.name": [ + "java" + ], + "service.name": [ + "unknown" + ], + "source.ip": [ + "178.162.206.244" + ], + "source.nat.ip": [ + "127.0.0.1" + ], + "span.id": [ + "0200000000000000" + ], + "trace.id": [ + "01000000000000000000000000000000" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json index d4b52539d92..0a439456ec9 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json @@ -1,34 +1,46 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "opentelemetry/go", - "version": "1.17.0" - }, - "counter": 1, - "data_stream": { - "dataset": "apm.app.unknown_service_systemtest_test", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "name": "app" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.19.0" + ], + "counter": [ + 1 + ], + "data_stream.dataset": [ + "apm.app.unknown_service_systemtest_test" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.name": [ + "app" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json index 8b26929890c..ff53d2e172b 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json @@ -1,17 +1,25 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "opentelemetry/go", - "version": "1.17.0" - }, - "data_stream": { - "dataset": "apm.app.unknown_service_systemtest_test", - "namespace": "default", - "type": "metrics" - }, - "histogram": { +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.19.0" + ], + "data_stream.dataset": [ + "apm.app.unknown_service_systemtest_test" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "histogram": [ + { "counts": [ 1, 1, @@ -24,24 +32,28 @@ 5500, 10000 ] - }, - "metricset": { - "name": "app" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" } - } - ] -} + ], + "metricset.name": [ + "app" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json index 49104d36c74..4ad1b9142cd 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json @@ -1,37 +1,49 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "otlp", - "version": "unknown" - }, - "data_stream": { - "dataset": "apm.app.unknown", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "name": "app" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "unknown" - }, - "name": "unknown" - }, - "summary": { +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "otlp" + ], + "agent.version": [ + "unknown" + ], + "data_stream.dataset": [ + "apm.app.unknown" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.name": [ + "app" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "unknown" + ], + "service.name": [ + "unknown" + ], + "summary": [ + { "sum": 123.456, "value_count": 10 } - } - ] -} + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCTraces.approved.json b/systemtest/approvals/TestOTLPGRPCTraces.approved.json index c5c4efd3b47..dee4990f459 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces.approved.json @@ -1,214 +1,286 @@ -{ - "events": [ - { - "@timestamp": "1970-01-01T00:02:03.002Z", - "agent": { - "name": "opentelemetry/go", - "version": "1.17.0" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "exception": [ - { - "handled": true, - "message": "kablamo", - "type": "*errors.errorString" - } - ], - "grouping_key": "14f4d08792a45fce53a46c93851e36e1", - "grouping_name": "kablamo", - "id": "dynamic", - "stack_trace": "not an actual real stack trace" - }, - "event": {}, - "labels": { - "resource_attribute_array": [ - "a", - "b" - ], - "resource_attribute_bool": "true", - "resource_attribute_bool_array": [ - "true", - "false" - ] - }, - "message": "kablamo", - "numeric_labels": { - "resource_attribute_float": 123456.789, - "resource_attribute_float_array": [ - 123456.789, - 987654321.1234568 - ], - "resource_attribute_int": 123456 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "b3ee9be3b687a611" - }, - "service": { - "framework": { - "name": "systemtest" - }, - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" - }, - "span": { - "id": "b3ee9be3b687a611" - }, - "timestamp": { - "us": 123002000 - }, - "trace": { - "id": "d2acbef8b37655e48548fd9d61ad6114" - }, - "transaction": { - "id": "b3ee9be3b687a611", - "sampled": true, - "type": "unknown" - } - }, - { - "@timestamp": "1970-01-01T00:02:03.001Z", - "agent": { - "name": "opentelemetry/go", - "version": "1.17.0" - }, - "data_stream": { - "dataset": "apm.app.unknown_service_systemtest_test", - "namespace": "default", - "type": "logs" - }, - "event": { - "kind": "event" - }, - "labels": { - "resource_attribute_array": [ - "a", - "b" - ], - "resource_attribute_bool": "true", - "resource_attribute_bool_array": [ - "true", - "false" - ] - }, - "message": "a_span_event", - "numeric_labels": { - "resource_attribute_float": 123456.789, - "resource_attribute_float_array": [ - 123456.789, - 987654321.1234568 - ], - "resource_attribute_int": 123456 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "framework": { - "name": "systemtest" - }, - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" - }, - "span": { - "id": "b3ee9be3b687a611" - }, - "trace": { - "id": "d2acbef8b37655e48548fd9d61ad6114" - }, - "transaction": { - "id": "b3ee9be3b687a611" - } - }, - { - "@timestamp": "1970-01-01T00:02:03.000Z", - "agent": { - "name": "opentelemetry/go", - "version": "1.17.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "labels": { - "resource_attribute_array": [ - "a", - "b" - ], - "resource_attribute_bool": "true", - "resource_attribute_bool_array": [ - "true", - "false" - ], - "span_attribute_array": [ - "a", - "b", - "c" - ] - }, - "numeric_labels": { - "resource_attribute_float": 123456.789, - "resource_attribute_float_array": [ - 123456.789, - 987654321.1234568 - ], - "resource_attribute_int": 123456 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction" - }, - "service": { - "framework": { - "name": "systemtest" - }, - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" - }, - "span": { - "id": "b3ee9be3b687a611" - }, - "timestamp": { - "us": 123000000 - }, - "trace": { - "id": "d2acbef8b37655e48548fd9d61ad6114" - }, - "transaction": { - "duration": { - "us": 31536000000000 - }, - "id": "b3ee9be3b687a611", - "name": "operation_name", - "representative_count": 1, - "sampled": true, - "type": "unknown" - } - } - ] -} +[ + { + "@timestamp": [ + "1970-01-01T00:02:03.002Z" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.19.0" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.exception.handled": [ + true + ], + "error.exception.message": [ + "kablamo" + ], + "error.exception.type": [ + "*errors.errorString" + ], + "error.grouping_key": [ + "14f4d08792a45fce53a46c93851e36e1" + ], + "error.grouping_name": [ + "kablamo" + ], + "error.id": [ + "dynamic" + ], + "error.stack_trace": [ + "not an actual real stack trace" + ], + "error.stack_trace.text": [ + "not an actual real stack trace" + ], + "labels.resource_attribute_array": [ + "a", + "b" + ], + "labels.resource_attribute_bool": [ + "true" + ], + "labels.resource_attribute_bool_array": [ + "true", + "false" + ], + "message": [ + "kablamo" + ], + "numeric_labels.resource_attribute_float": [ + 123456.789 + ], + "numeric_labels.resource_attribute_float_array": [ + 123456.789, + 987654321.123457 + ], + "numeric_labels.resource_attribute_int": [ + 123456 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "b3ee9be3b687a611" + ], + "processor.event": [ + "error" + ], + "service.framework.name": [ + "systemtest" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ], + "span.id": [ + "b3ee9be3b687a611" + ], + "timestamp.us": [ + 123002000 + ], + "trace.id": [ + "d2acbef8b37655e48548fd9d61ad6114" + ], + "transaction.id": [ + "b3ee9be3b687a611" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + }, + { + "@timestamp": [ + "1970-01-01T00:02:03.001Z" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.19.0" + ], + "data_stream.dataset": [ + "apm.app.unknown_service_systemtest_test" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "event.kind": [ + "event" + ], + "labels.resource_attribute_array": [ + "a", + "b" + ], + "labels.resource_attribute_bool": [ + "true" + ], + "labels.resource_attribute_bool_array": [ + "true", + "false" + ], + "message": [ + "a_span_event" + ], + "numeric_labels.resource_attribute_float": [ + 123456.789 + ], + "numeric_labels.resource_attribute_float_array": [ + 123456.789, + 987654321.123457 + ], + "numeric_labels.resource_attribute_int": [ + 123456 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "service.framework.name": [ + "systemtest" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ], + "span.id": [ + "b3ee9be3b687a611" + ], + "trace.id": [ + "d2acbef8b37655e48548fd9d61ad6114" + ], + "transaction.id": [ + "b3ee9be3b687a611" + ] + }, + { + "@timestamp": [ + "1970-01-01T00:02:03.000Z" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.19.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "labels.resource_attribute_array": [ + "a", + "b" + ], + "labels.resource_attribute_bool": [ + "true" + ], + "labels.resource_attribute_bool_array": [ + "true", + "false" + ], + "labels.span_attribute_array": [ + "a", + "b", + "c" + ], + "numeric_labels.resource_attribute_float": [ + 123456.789 + ], + "numeric_labels.resource_attribute_float_array": [ + 123456.789, + 987654321.123457 + ], + "numeric_labels.resource_attribute_int": [ + 123456 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "service.framework.name": [ + "systemtest" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ], + "span.id": [ + "b3ee9be3b687a611" + ], + "timestamp.us": [ + 123000000 + ], + "trace.id": [ + "d2acbef8b37655e48548fd9d61ad6114" + ], + "transaction.duration.us": [ + 31536000000000 + ], + "transaction.id": [ + "b3ee9be3b687a611" + ], + "transaction.name": [ + "operation_name" + ], + "transaction.name.text": [ + "operation_name" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "unknown" + ] + } +] diff --git a/systemtest/approvals/TestOTLPGRPCTraces/data_streams_disabled.approved.json b/systemtest/approvals/TestOTLPGRPCTraces/data_streams_disabled.approved.json index e96dc079675..5bf920bc281 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces/data_streams_disabled.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces/data_streams_disabled.approved.json @@ -1,64 +1,82 @@ -{ - "events": [ - { - "@timestamp": "1970-01-01T00:02:03.000Z", - "agent": { - "name": "opentelemetry/go", - "version": "1.0.0" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic", - "outcome": "unknown" - }, - "labels": { - "resource_attribute_array": [ - "a", - "b" - ], - "span_attribute_array": [ - "a", - "b", - "c" - ] - }, - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "framework": { - "name": "systemtest" - }, - "language": { - "name": "go" - }, - "name": "unknown_service_systemtest_test" - }, - "timestamp": { - "us": 123000000 - }, - "trace": { - "id": "d2acbef8b37655e48548fd9d61ad6114" - }, - "transaction": { - "duration": { - "us": 1000000 - }, - "id": "b3ee9be3b687a611", - "name": "operation_name", - "sampled": true, - "type": "custom" - } - } - ] -} +[ + { + "@timestamp": [ + "1970-01-01T00:02:03.000Z" + ], + "agent.name": [ + "opentelemetry/go" + ], + "agent.version": [ + "1.0.0" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "event.outcome": [ + "unknown" + ], + "labels.resource_attribute_array": [ + "a", + "b" + ], + "labels.span_attribute_array": [ + "a", + "b", + "c" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "processor.name": [ + "transaction" + ], + "service.framework.name": [ + "systemtest" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "unknown_service_systemtest_test" + ], + "timestamp.us": [ + 123000000 + ], + "trace.id": [ + "d2acbef8b37655e48548fd9d61ad6114" + ], + "transaction.duration.us": [ + 1000000 + ], + "transaction.id": [ + "b3ee9be3b687a611" + ], + "transaction.name": [ + "operation_name" + ], + "transaction.sampled": [ + true + ], + "transaction.type": [ + "custom" + ] + } +] diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json index 3a1b196bd09..45f2b2242f9 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json @@ -1,296 +1,342 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "dynamic" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "culprit": "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e", - "exception": [ - { - "message": "Uncaught Error: timeout test error", - "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 - } - } - ], - "type": "Error" - } - ], - "grouping_key": "89e23da755c2dd759d2d529e37c92b8f", - "grouping_name": "Uncaught Error: log timeout test error", - "id": "aba2688e033848ce9c4e4005f1caa534", - "log": { - "message": "Uncaught Error: log timeout test error", - "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 - } - } +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.culprit": [ + "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e" + ], + "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 } }, - "http": { - "request": { - "referrer": "http://localhost:8000/test/e2e/" + { + "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 } }, - "message": "Uncaught Error: log timeout test error", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "name": "apm-agent-js", - "version": "1.0.1" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "timestamp": { - "us": "dynamic" + { + "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 + } }, - "url": { - "domain": "localhost", - "full": "http://localhost:8000/test/e2e/general-usecase/", - "original": "http://localhost:8000/test/e2e/general-usecase/", - "path": "/test/e2e/general-usecase/", - "port": 8000, - "scheme": "http" + { + "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 + } }, - "user_agent": { - "device": { - "name": "Other" + { + "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 }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" + "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" + ], + "error.grouping_key": [ + "89e23da755c2dd759d2d529e37c92b8f" + ], + "error.grouping_name": [ + "Uncaught Error: log timeout test error" + ], + "error.id": [ + "aba2688e033848ce9c4e4005f1caa534" + ], + "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/" + ], + "message": [ + "Uncaught Error: log timeout test error" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "service.name": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.1" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "url.domain": [ + "localhost" + ], + "url.full": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.full.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.path": [ + "/test/e2e/general-usecase/" + ], + "url.port": [ + 8000 + ], + "url.scheme": [ + "http" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json index 3a1b196bd09..45f2b2242f9 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json @@ -1,296 +1,342 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "dynamic" - }, - "data_stream": { - "dataset": "apm.error", - "namespace": "default", - "type": "logs" - }, - "error": { - "culprit": "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e", - "exception": [ - { - "message": "Uncaught Error: timeout test error", - "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 - } - } - ], - "type": "Error" - } - ], - "grouping_key": "89e23da755c2dd759d2d529e37c92b8f", - "grouping_name": "Uncaught Error: log timeout test error", - "id": "aba2688e033848ce9c4e4005f1caa534", - "log": { - "message": "Uncaught Error: log timeout test error", - "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 - } - } +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.error" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "logs" + ], + "error.culprit": [ + "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e" + ], + "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 } }, - "http": { - "request": { - "referrer": "http://localhost:8000/test/e2e/" + { + "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 } }, - "message": "Uncaught Error: log timeout test error", - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "service": { - "name": "apm-agent-js", - "version": "1.0.1" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "timestamp": { - "us": "dynamic" + { + "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 + } }, - "url": { - "domain": "localhost", - "full": "http://localhost:8000/test/e2e/general-usecase/", - "original": "http://localhost:8000/test/e2e/general-usecase/", - "path": "/test/e2e/general-usecase/", - "port": 8000, - "scheme": "http" + { + "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 + } }, - "user_agent": { - "device": { - "name": "Other" + { + "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 }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" + "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" + ], + "error.grouping_key": [ + "89e23da755c2dd759d2d529e37c92b8f" + ], + "error.grouping_name": [ + "Uncaught Error: log timeout test error" + ], + "error.id": [ + "aba2688e033848ce9c4e4005f1caa534" + ], + "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/" + ], + "message": [ + "Uncaught Error: log timeout test error" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "service.name": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.1" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "url.domain": [ + "localhost" + ], + "url.full": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.full.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.path": [ + "/test/e2e/general-usecase/" + ], + "url.port": [ + 8000 + ], + "url.scheme": [ + "http" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index 5296974eda3..a7c1345c3e0 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -1,771 +1,1102 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "localhost", - "port": 8003 - }, - "event": { - "outcome": "success" - }, - "http": { - "request": { - "method": "POST" +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "localhost" + ], + "destination.port": [ + 8003 + ], + "event.outcome": [ + "success" + ], + "http.request.method": [ + "POST" + ], + "http.response.status_code": [ + 200 + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.destination.service.name": [ + "http://localhost:8003" + ], + "span.destination.service.resource": [ + "localhost:8003" + ], + "span.destination.service.type": [ + "external" + ], + "span.duration.us": [ + 11584 + ], + "span.id": [ + "27f45fd274f976d4" + ], + "span.name": [ + "POST http://localhost:8003/data" + ], + "span.subtype": [ + "h" + ], + "span.sync": [ + true + ], + "span.type": [ + "external" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ], + "url.original": [ + "http://localhost:8003/data" + ], + "url.original.text": [ + "http://localhost:8003/data" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "localhost" + ], + "destination.port": [ + 8000 + ], + "event.outcome": [ + "success" + ], + "http.request.method": [ + "GET" + ], + "http.response.status_code": [ + 200 + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.destination.service.name": [ + "http://localhost:8000" + ], + "span.destination.service.resource": [ + "localhost:8000" + ], + "span.destination.service.type": [ + "external" + ], + "span.duration.us": [ + 6724 + ], + "span.id": [ + "5ecb8ee030749715" + ], + "span.name": [ + "GET /test/e2e/common/data.json" + ], + "span.subtype": [ + "h" + ], + "span.sync": [ + true + ], + "span.type": [ + "external" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ], + "url.original": [ + "http://localhost:8000/test/e2e/common/data.json?test=hamid" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/common/data.json?test=hamid" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 198070 + ], + "span.id": [ + "9b80535c4403c9fb" + ], + "span.name": [ + "OpenTracing y" + ], + "span.type": [ + "cu" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "localhost" + ], + "destination.port": [ + 8003 + ], + "event.outcome": [ + "success" + ], + "http.request.method": [ + "POST" + ], + "http.response.status_code": [ + 200 + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "bbd8bcc3be14d814" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.action": [ + "action" + ], + "span.destination.service.name": [ + "http://localhost:8003" + ], + "span.destination.service.resource": [ + "localhost:8003" + ], + "span.destination.service.type": [ + "external" + ], + "span.duration.us": [ + 15949 + ], + "span.id": [ + "a3c043330bc2015e" + ], + "span.name": [ + "POST http://localhost:8003/fetch" + ], + "span.subtype": [ + "h" + ], + "span.sync": [ + false + ], + "span.type": [ + "external" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ], + "url.original": [ + "http://localhost:8003/fetch" + ], + "url.original.text": [ + "http://localhost:8003/fetch" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 2000 + ], + "span.id": [ + "bbd8bcc3be14d814" + ], + "span.name": [ + "Requesting and receiving the document" + ], + "span.subtype": [ + "browser-timing" + ], + "span.type": [ + "hard-navigation" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 2000 + ], + "span.id": [ + "bc7665dc25629379" + ], + "span.name": [ + "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 }, - "response": { - "status_code": 200 + "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" } }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "destination": { - "service": { - "name": "http://localhost:8003", - "resource": "localhost:8003", - "type": "external" - } - }, - "duration": { - "us": 11584 + { + "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 }, - "id": "27f45fd274f976d4", - "name": "POST http://localhost:8003/data", - "subtype": "h", - "sync": true, - "type": "external" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - }, - "url": { - "original": "http://localhost:8003/data" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "localhost", - "port": 8000 - }, - "event": { - "outcome": "success" - }, - "http": { - "request": { - "method": "GET" - }, - "response": { - "status_code": 200 - } - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" + "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" } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "destination": { - "service": { - "name": "http://localhost:8000", - "resource": "localhost:8000", - "type": "external" - } - }, - "duration": { - "us": 6724 - }, - "id": "5ecb8ee030749715", - "name": "GET /test/e2e/common/data.json", - "subtype": "h", - "sync": true, - "type": "external" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - }, - "url": { - "original": "http://localhost:8000/test/e2e/common/data.json?test=hamid" } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 198070 - }, - "id": "9b80535c4403c9fb", - "name": "OpenTracing y", - "type": "cu" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" + ], + "span.subtype": [ + "browser-timing" + ], + "span.type": [ + "hard-navigation" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "destination.address": [ + "localhost" + ], + "destination.port": [ + 8000 + ], + "event.outcome": [ + "unknown" + ], + "http.response.decoded_body_size": [ + 676864 + ], + "http.response.encoded_body_size": [ + 676864 + ], + "http.response.transfer_size": [ + 677175 + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.destination.service.name": [ + "http://localhost:8000" + ], + "span.destination.service.resource": [ + "localhost:8000" + ], + "span.destination.service.type": [ + "rc" + ], + "span.duration.us": [ + 35060 + ], + "span.id": [ + "fb8f717930697299" + ], + "span.name": [ + "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" + ], + "span.subtype": [ + "script" + ], + "span.type": [ + "rc" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "service.environment": [ + "prod" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 106000 + ], + "span.id": [ + "fc546e87a90a774f" + ], + "span.name": [ + "Parsing the document, executing sy. scripts" + ], + "span.subtype": [ + "browser-timing" + ], + "span.type": [ + "hard-navigation" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.id": [ + "ec2e280be8345240" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "js-base" + ], + "agent.version": [ + "4.8.1" + ], + "client.ip": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "http.request.headers": [ + { + "Accept": [ + "application/json" + ] } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "localhost", - "port": 8003 - }, - "event": { - "outcome": "success" - }, - "http": { - "request": { - "method": "POST" - }, - "response": { - "status_code": 200 - } - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "bbd8bcc3be14d814" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "action": "action", - "destination": { - "service": { - "name": "http://localhost:8003", - "resource": "localhost:8003", - "type": "external" - } - }, - "duration": { - "us": 15949 - }, - "id": "a3c043330bc2015e", - "name": "POST http://localhost:8003/fetch", - "subtype": "h", - "sync": false, - "type": "external" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - }, - "url": { - "original": "http://localhost:8003/fetch" + ], + "http.request.method": [ + "GET" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "http.response.decoded_body_size": [ + 690 + ], + "http.response.encoded_body_size": [ + 690 + ], + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 2000 - }, - "id": "bbd8bcc3be14d814", - "name": "Requesting and receiving the document", - "subtype": "browser-timing", - "type": "hard-navigation" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success" - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 2000 - }, - "id": "bc7665dc25629379", - "name": "Fire \"DOMContentLoaded\" event", - "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" - } - } - ], - "subtype": "browser-timing", - "type": "hard-navigation" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "destination": { - "address": "localhost", - "port": 8000 - }, - "event": { - "outcome": "unknown" - }, - "http": { - "response": { - "decoded_body_size": 676864, - "encoded_body_size": 676864, - "transfer_size": 677175 - } - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "destination": { - "service": { - "name": "http://localhost:8000", - "resource": "localhost:8000", - "type": "rc" - } - }, - "duration": { - "us": 35060 - }, - "id": "fb8f717930697299", - "name": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js", - "subtype": "script", - "type": "rc" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - }, - "url": { - "original": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "ec2e280be8345240" - }, - "processor": { - "event": "span" - }, - "service": { - "environment": "prod", - "name": "apm-a-rum-test-e2e-general-usecase" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 106000 - }, - "id": "fc546e87a90a774f", - "name": "Parsing the document, executing sy. scripts", - "subtype": "browser-timing", - "type": "hard-navigation" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "id": "ec2e280be8345240" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "js-base", - "version": "4.8.1" - }, - "client": "dynamic", - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success" - }, - "http": { - "request": { - "headers": { - "Accept": [ - "application/json" - ] - }, - "method": "GET", - "referrer": "http://localhost:8000/test/e2e/" - }, - "response": { - "decoded_body_size": 690, - "encoded_body_size": 690, - "headers": { - "Content-Type": [ - "application/json" - ] - }, - "status_code": 200, - "transfer_size": 983 - }, - "version": "1.1" - }, - "labels": { - "testTagKey": "testTagValue" - }, - "network": { - "connection": { - "type": "5G" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "1ef08ac234fca23b455d9e27c660f1ab" - }, - "processor": { - "event": "transaction" - }, - "service": { - "environment": "prod", - "framework": { - "name": "angular", - "version": "2" - }, - "language": { - "name": "javascript", - "version": "6" - }, - "name": "apm-a-rum-test-e2e-general-usecase", - "runtime": { - "name": "v8", - "version": "8.0" - }, - "version": "0.0.1" - }, - "source": { - "ip": "dynamic", - "port": "dynamic" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "286ac3ad697892c406528f13c82e0ce1" - }, - "transaction": { - "custom": { - "testContext": "testContext" - }, - "duration": { - "us": 295000 - }, - "experience": { - "cls": 1, - "fid": 2, - "longtask": { - "count": 3, - "max": 1, - "sum": 2.5 - }, - "tbt": 3.4 - }, - "id": "ec2e280be8345240", - "marks": { - "agent": { - "domComplete": 138, - "domContentLoadedEventEnd": 110, - "domContentLoadedEventStart": 100, - "domInteractive": 120, - "firstContentfulPaint": 70.82500003930181, - "largestContentfulPaint": 131.03000004775822, - "timeToFirstByte": 5 - }, - "navigationTiming": { - "connectEnd": 0, - "connectStart": 0, - "domComplete": 138, - "domContentLoadedEventEnd": 122, - "domContentLoadedEventStart": 120, - "domInteractive": 120, - "domLoading": 14, - "domainLookupEnd": 0, - "domainLookupStart": 0, - "fetchStart": 0, - "loadEventEnd": 138, - "loadEventStart": 138, - "requestStart": 4, - "responseEnd": 6, - "responseStart": 5 - } - }, - "name": "general-usecase-initial-p-load", - "representative_count": 1, - "sampled": true, - "span_count": { - "dropped": 1, - "started": 8 - }, - "type": "p-load" - }, - "url": { - "domain": "localhost", - "full": "http://localhost:8000/test/e2e/general-usecase/", - "original": "http://localhost:8000/test/e2e/general-usecase/", - "path": "/test/e2e/general-usecase/", - "port": 8000, - "scheme": "http" - }, - "user": { - "email": "em", - "id": "uId", - "name": "un" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" + ], + "http.response.status_code": [ + 200 + ], + "http.response.transfer_size": [ + 983 + ], + "http.version": [ + "1.1" + ], + "labels.testTagKey": [ + "testTagValue" + ], + "network.connection.type": [ + "5G" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "1ef08ac234fca23b455d9e27c660f1ab" + ], + "processor.event": [ + "transaction" + ], + "service.environment": [ + "prod" + ], + "service.framework.name": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.version": [ + "6" + ], + "service.name": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], + "source.ip": [ + "dynamic" + ], + "source.port": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "286ac3ad697892c406528f13c82e0ce1" + ], + "transaction.custom": [ + { + "testContext": "testContext" } - } - ] -} + ], + "transaction.duration.us": [ + 295000 + ], + "transaction.experience.cls": [ + 1 + ], + "transaction.experience.fid": [ + 2 + ], + "transaction.experience.longtask.count": [ + 3 + ], + "transaction.experience.longtask.max": [ + 1 + ], + "transaction.experience.longtask.sum": [ + 2.5 + ], + "transaction.experience.tbt": [ + 3.4 + ], + "transaction.id": [ + "ec2e280be8345240" + ], + "transaction.marks.agent.domComplete": [ + 138 + ], + "transaction.marks.agent.domContentLoadedEventEnd": [ + 110 + ], + "transaction.marks.agent.domContentLoadedEventStart": [ + 100 + ], + "transaction.marks.agent.domInteractive": [ + 120 + ], + "transaction.marks.agent.firstContentfulPaint": [ + 70.825 + ], + "transaction.marks.agent.largestContentfulPaint": [ + 131.03 + ], + "transaction.marks.agent.timeToFirstByte": [ + 5 + ], + "transaction.marks.navigationTiming.connectEnd": [ + 0 + ], + "transaction.marks.navigationTiming.connectStart": [ + 0 + ], + "transaction.marks.navigationTiming.domComplete": [ + 138 + ], + "transaction.marks.navigationTiming.domContentLoadedEventEnd": [ + 122 + ], + "transaction.marks.navigationTiming.domContentLoadedEventStart": [ + 120 + ], + "transaction.marks.navigationTiming.domInteractive": [ + 120 + ], + "transaction.marks.navigationTiming.domLoading": [ + 14 + ], + "transaction.marks.navigationTiming.domainLookupEnd": [ + 0 + ], + "transaction.marks.navigationTiming.domainLookupStart": [ + 0 + ], + "transaction.marks.navigationTiming.fetchStart": [ + 0 + ], + "transaction.marks.navigationTiming.loadEventEnd": [ + 138 + ], + "transaction.marks.navigationTiming.loadEventStart": [ + 138 + ], + "transaction.marks.navigationTiming.requestStart": [ + 4 + ], + "transaction.marks.navigationTiming.responseEnd": [ + 6 + ], + "transaction.marks.navigationTiming.responseStart": [ + 5 + ], + "transaction.name": [ + "general-usecase-initial-p-load" + ], + "transaction.name.text": [ + "general-usecase-initial-p-load" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 1 + ], + "transaction.span_count.started": [ + 8 + ], + "transaction.type": [ + "p-load" + ], + "url.domain": [ + "localhost" + ], + "url.full": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.full.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.path": [ + "/test/e2e/general-usecase/" + ], + "url.port": [ + 8000 + ], + "url.scheme": [ + "http" + ], + "user.email": [ + "em" + ], + "user.id": [ + "uId" + ], + "user.name": [ + "un" + ], + "user.name.text": [ + "un" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index 6a5638173e6..d24f9c48dd5 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -1,135 +1,156 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "127.0.0.1" - }, - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "parent": { - "id": "611f4fa950f04631" - }, - "processor": { - "event": "span" - }, - "service": { - "name": "apm-agent-js" - }, - "source": { - "ip": "127.0.0.1", - "port": "dynamic" - }, - "span": { - "duration": { - "us": 643000 +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "127.0.0.1" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "611f4fa950f04631" + ], + "processor.event": [ + "span" + ], + "service.name": [ + "apm-agent-js" + ], + "source.ip": [ + "127.0.0.1" + ], + "source.port": [ + "dynamic" + ], + "span.duration.us": [ + 643000 + ], + "span.id": [ + "aaaaaaaaaaaaaaaa" + ], + "span.name": [ + "transaction" + ], + "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" + ] }, - "id": "aaaaaaaaaaaaaaaa", - "name": "transaction", - "representative_count": 1, - "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 - } - } - ], - "type": "transaction" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "id": "611f4fa950f04631" + "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 + } }, - "url": { - "original": "http://localhost:8000/test/e2e/general-usecase/span" + { + "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" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "611f4fa950f04631aaaaaaaaaaaaaaaa" + ], + "transaction.id": [ + "611f4fa950f04631" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/span" + ], + "url.original.text": [ + "http://localhost:8000/test/e2e/general-usecase/span" + ] + } +] diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json index 8f8d26e4f97..3ed284fcf21 100644 --- a/systemtest/approvals/TestRUMXForwardedFor.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json @@ -1,143 +1,213 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "5.5.0" - }, - "client": { - "geo": { - "city_name": "Perth", - "continent_name": "Oceania", - "country_iso_code": "AU", - "country_name": "Australia", - "location": "dynamic", - "region_iso_code": "AU-WA", - "region_name": "Western Australia" - }, - "ip": "220.244.41.16" - }, - "data_stream": { - "dataset": "apm.internal", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "name": "span_breakdown" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "name": "rum-js-test" - }, - "source": { - "ip": "220.244.41.16", - "nat": { - "ip": "127.0.0.1" - } - }, - "span": { - "self_time": { - "count": 1, - "sum": { - "us": 633 - } - }, - "subtype": "http", - "type": "external" - }, - "transaction": { - "name": "GET /", - "type": "request" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "5.5.0" - }, - "client": { - "geo": { - "city_name": "Perth", - "continent_name": "Oceania", - "country_iso_code": "AU", - "country_name": "Australia", - "location": "dynamic", - "region_iso_code": "AU-WA", - "region_name": "Western Australia" - }, - "ip": "220.244.41.16" - }, - "data_stream": { - "dataset": "apm.rum", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "unknown" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction" - }, - "service": { - "name": "rum-js-test" - }, - "source": { - "ip": "220.244.41.16", - "nat": { - "ip": "127.0.0.1" - } - }, - "span": { - "id": "611f4fa950f04631" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "duration": { - "us": 643000 - }, - "id": "611f4fa950f04631", - "representative_count": 1, - "sampled": true, - "span_count": { - "started": 0 - }, - "type": "page-load" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "5.5.0" + ], + "client.geo.city_name": [ + "Perth" + ], + "client.geo.continent_name": [ + "Oceania" + ], + "client.geo.country_iso_code": [ + "AU" + ], + "client.geo.country_name": [ + "Australia" + ], + "client.geo.location": [ + "dynamic" + ], + "client.geo.region_iso_code": [ + "AU-WA" + ], + "client.geo.region_name": [ + "Western Australia" + ], + "client.ip": [ + "220.244.41.16" + ], + "data_stream.dataset": [ + "apm.internal" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.name": [ + "span_breakdown" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.name": [ + "rum-js-test" + ], + "source.ip": [ + "220.244.41.16" + ], + "source.nat.ip": [ + "127.0.0.1" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "http" + ], + "span.type": [ + "external" + ], + "transaction.name": [ + "GET /" + ], + "transaction.type": [ + "request" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "5.5.0" + ], + "client.geo.city_name": [ + "Perth" + ], + "client.geo.continent_name": [ + "Oceania" + ], + "client.geo.country_iso_code": [ + "AU" + ], + "client.geo.country_name": [ + "Australia" + ], + "client.geo.location": [ + "dynamic" + ], + "client.geo.region_iso_code": [ + "AU-WA" + ], + "client.geo.region_name": [ + "Western Australia" + ], + "client.ip": [ + "220.244.41.16" + ], + "data_stream.dataset": [ + "apm.rum" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "unknown" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "service.name": [ + "rum-js-test" + ], + "source.ip": [ + "220.244.41.16" + ], + "source.nat.ip": [ + "127.0.0.1" + ], + "span.id": [ + "611f4fa950f04631" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "611f4fa950f04631aaaaaaaaaaaaaaaa" + ], + "transaction.duration.us": [ + 643000 + ], + "transaction.id": [ + "611f4fa950f04631" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "page-load" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.original.text": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json b/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json index b91f784eeb1..271042a432c 100644 --- a/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json @@ -1,137 +1,213 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "5.5.0" - }, - "client": { - "geo": { - "city_name": "Perth", - "continent_name": "Oceania", - "country_iso_code": "AU", - "country_name": "Australia", - "location": "dynamic", - "region_iso_code": "AU-WA", - "region_name": "Western Australia" - }, - "ip": "220.244.41.16" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic" - }, - "metricset.name": "span_breakdown", - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric", - "name": "metric" - }, - "service": { - "name": "rum-js-test" - }, - "source": { - "ip": "127.0.0.1", - "port": "dynamic" - }, - "span": { - "self_time": { - "count": 1, - "sum.us": 633 - }, - "subtype": "http", - "type": "external" - }, - "transaction": { - "name": "GET /", - "type": "request" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "5.5.0" - }, - "client": { - "geo": { - "city_name": "Perth", - "continent_name": "Oceania", - "country_iso_code": "AU", - "country_name": "Australia", - "location": "dynamic", - "region_iso_code": "AU-WA", - "region_name": "Western Australia" - }, - "ip": "220.244.41.16" - }, - "ecs": { - "version": "dynamic" - }, - "event": { - "ingested": "dynamic", - "outcome": "unknown" - }, - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "transaction", - "name": "transaction" - }, - "service": { - "name": "rum-js-test" - }, - "source": { - "ip": "127.0.0.1", - "port": "dynamic" - }, - "timestamp": { - "us": "dynamic" - }, - "trace": { - "id": "611f4fa950f04631aaaaaaaaaaaaaaaa" - }, - "transaction": { - "duration": { - "us": 643000 - }, - "id": "611f4fa950f04631", - "sampled": true, - "span_count": { - "started": 0 - }, - "type": "page-load" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "5.5.0" + ], + "client.geo.city_name": [ + "Perth" + ], + "client.geo.continent_name": [ + "Oceania" + ], + "client.geo.country_iso_code": [ + "AU" + ], + "client.geo.country_name": [ + "Australia" + ], + "client.geo.location": [ + "dynamic" + ], + "client.geo.region_iso_code": [ + "AU-WA" + ], + "client.geo.region_name": [ + "Western Australia" + ], + "client.ip": [ + "220.244.41.16" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "metricset.name": [ + "span_breakdown" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "processor.name": [ + "metric" + ], + "service.name": [ + "rum-js-test" + ], + "source.ip": [ + "127.0.0.1" + ], + "source.port": [ + "dynamic" + ], + "span.self_time.count": [ + 1 + ], + "span.self_time.sum.us": [ + 633 + ], + "span.subtype": [ + "http" + ], + "span.type": [ + "external" + ], + "transaction.name": [ + "GET /" + ], + "transaction.type": [ + "request" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "5.5.0" + ], + "client.geo.city_name": [ + "Perth" + ], + "client.geo.continent_name": [ + "Oceania" + ], + "client.geo.country_iso_code": [ + "AU" + ], + "client.geo.country_name": [ + "Australia" + ], + "client.geo.location": [ + "dynamic" + ], + "client.geo.region_iso_code": [ + "AU-WA" + ], + "client.geo.region_name": [ + "Western Australia" + ], + "client.ip": [ + "220.244.41.16" + ], + "ecs.version": [ + "dynamic" + ], + "event.ingested": [ + "dynamic" + ], + "event.outcome": [ + "unknown" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "transaction" + ], + "processor.name": [ + "transaction" + ], + "service.name": [ + "rum-js-test" + ], + "source.ip": [ + "127.0.0.1" + ], + "source.port": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "611f4fa950f04631aaaaaaaaaaaaaaaa" + ], + "transaction.duration.us": [ + 643000 + ], + "transaction.id": [ + "611f4fa950f04631" + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "page-load" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestServiceDestinationAggregation.approved.json b/systemtest/approvals/TestServiceDestinationAggregation.approved.json index 758d7179adc..1ba70139ede 100644 --- a/systemtest/approvals/TestServiceDestinationAggregation.approved.json +++ b/systemtest/approvals/TestServiceDestinationAggregation.approved.json @@ -1,169 +1,206 @@ -{ - "events": [ - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "labels": { - "company": "elastic", - "department_name": "apm", - "organization": "observability" - }, - "metricset": { - "interval": "10m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "resource" - } - }, - "span": { - "destination": { - "service": { - "resource": "resource", - "response_time": { - "count": 5, - "sum": { - "us": 5000000 - } - } - } - }, - "name": "name" - } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "labels": { - "company": "elastic", - "department_name": "apm", - "organization": "observability" - }, - "metricset": { - "interval": "1m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "resource" - } - }, - "span": { - "destination": { - "service": { - "resource": "resource", - "response_time": { - "count": 5, - "sum": { - "us": 5000000 - } - } - } - }, - "name": "name" - } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "labels": { - "company": "elastic", - "department_name": "apm", - "organization": "observability" - }, - "metricset": { - "interval": "60m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "resource" - } - }, - "span": { - "destination": { - "service": { - "resource": "resource", - "response_time": { - "count": 5, - "sum": { - "us": 5000000 - } - } - } - }, - "name": "name" - } - } - ] -} +[ + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "labels.company": [ + "elastic" + ], + "labels.department_name": [ + "apm" + ], + "labels.organization": [ + "observability" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "resource" + ], + "span.destination.service.resource": [ + "resource" + ], + "span.destination.service.response_time.count": [ + 5 + ], + "span.destination.service.response_time.sum.us": [ + 5000000 + ], + "span.name": [ + "name" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "labels.company": [ + "elastic" + ], + "labels.department_name": [ + "apm" + ], + "labels.organization": [ + "observability" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "resource" + ], + "span.destination.service.resource": [ + "resource" + ], + "span.destination.service.response_time.count": [ + 5 + ], + "span.destination.service.response_time.sum.us": [ + 5000000 + ], + "span.name": [ + "name" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "labels.company": [ + "elastic" + ], + "labels.department_name": [ + "apm" + ], + "labels.organization": [ + "observability" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "resource" + ], + "span.destination.service.resource": [ + "resource" + ], + "span.destination.service.response_time.count": [ + 5 + ], + "span.destination.service.response_time.sum.us": [ + 5000000 + ], + "span.name": [ + "name" + ] + } +] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json index b8f7e2c94c9..c937596cd3a 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json @@ -1,91 +1,125 @@ -{ - "events": [ - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.10m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "10m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.1m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "1m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.60m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "60m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - } - } - ] -} +[ + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + } +] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json index d08dc9d47b8..242e01cd566 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json @@ -1,268 +1,380 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "data_stream": { - "dataset": "apm.service_summary.10m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "10m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "name": "_other" - }, - "service_summary": { - "aggregation": { - "overflow_count": 2 - } - } - }, - { - "@timestamp": "dynamic", - "data_stream": { - "dataset": "apm.service_summary.1m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "1m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "name": "_other" - }, - "service_summary": { - "aggregation": { - "overflow_count": 2 - } - } - }, - { - "@timestamp": "dynamic", - "data_stream": { - "dataset": "apm.service_summary.60m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "60m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "name": "_other" - }, - "service_summary": { - "aggregation": { - "overflow_count": 2 - } - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.10m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "10m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "prod", - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.1m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "1m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "prod", - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.60m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "60m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "prod", - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.10m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "10m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "test", - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.1m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "1m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "test", - "language": { - "name": "go" - }, - "name": "systemtest" - } - }, - { - "@timestamp": "dynamic", - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_summary.60m", - "namespace": "default", - "type": "metrics" - }, - "metricset": { - "interval": "60m", - "name": "service_summary" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "test", - "language": { - "name": "go" - }, - "name": "systemtest" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.service_summary.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.name": [ + "_other" + ], + "service_summary.aggregation.overflow_count": [ + 2 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.service_summary.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.name": [ + "_other" + ], + "service_summary.aggregation.overflow_count": [ + 2 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "data_stream.dataset": [ + "apm.service_summary.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.name": [ + "_other" + ], + "service_summary.aggregation.overflow_count": [ + 2 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "prod" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "prod" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "prod" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "test" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "test" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_summary.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_summary" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "test" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ] + } +] diff --git a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json index 850ac19386b..70c5980a6c8 100644 --- a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json @@ -1,322 +1,398 @@ -{ - "events": [ - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "10m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type1" +[ + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "1m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type1" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "60m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type1" + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "10m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type2" + ], + "transaction.type": [ + "type1" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "1m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type2" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 2, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "success_count": { - "sum": 2, - "value_count": 2 - } - }, - "metricset": { - "interval": "60m", - "name": "service_transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 2007038, - "value_count": 2 - } - }, - "type": "type2" + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 } - } - ] -} + ], + "transaction.type": [ + "type1" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 + } + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 + } + ], + "transaction.type": [ + "type1" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 + } + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 + } + ], + "transaction.type": [ + "type2" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 + } + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 + } + ], + "transaction.type": [ + "type2" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.success_count": [ + { + "sum": 2, + "value_count": 2 + } + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 2007038, + "value_count": 2 + } + ], + "transaction.type": [ + "type2" + ] + } +] diff --git a/systemtest/approvals/TestSourcemapUploadInvalidElasticsearchConfig.approved.json b/systemtest/approvals/TestSourcemapUploadInvalidElasticsearchConfig.approved.json index f30fb5e5e1a..7e1b5d09db1 100644 --- a/systemtest/approvals/TestSourcemapUploadInvalidElasticsearchConfig.approved.json +++ b/systemtest/approvals/TestSourcemapUploadInvalidElasticsearchConfig.approved.json @@ -1,308 +1,318 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "rum-js", - "version": "0.0.0" - }, - "client": { - "ip": "127.0.0.1" - }, - "ecs": { - "version": "dynamic" - }, - "error": { - "culprit": "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e", - "exception": [ - { - "message": "Uncaught Error: timeout test error", - "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__", - "library_frame": false, - "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", - "library_frame": false, - "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", - "library_frame": false, - "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", - "library_frame": false, - "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", - "library_frame": false, - "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", - "library_frame": false, - "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 - } - } - ], - "type": "Error" - } - ], - "grouping_key": "89e23da755c2dd759d2d529e37c92b8f", - "grouping_name": "Uncaught Error: log timeout test error", - "id": "aba2688e033848ce9c4e4005f1caa534", - "log": { - "message": "Uncaught Error: log timeout test error", - "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", - "library_frame": false, - "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 - } - } - ] - } - }, - "event": { - "ingested": "dynamic" - }, - "http": { - "request": { - "referrer": "http://localhost:8000/test/e2e/" - } - }, - "observer": { - "ephemeral_id": "dynamic", - "hostname": "dynamic", - "id": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "error", - "name": "error" - }, - "service": { - "name": "apm-agent-js", - "version": "1.0.1" - }, - "source": { - "ip": "127.0.0.1" - }, - "timestamp": { - "us": "dynamic" - }, - "url": { - "domain": "localhost", - "full": "http://localhost:8000/test/e2e/general-usecase/", - "original": "http://localhost:8000/test/e2e/general-usecase/", - "path": "/test/e2e/general-usecase/", - "port": 8000, - "scheme": "http" - }, - "user_agent": { - "device": { - "name": "Other" - }, - "name": "Go-http-client", - "original": "Go-http-client/1.1", - "version": "1.1" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "rum-js" + ], + "agent.version": [ + "0.0.0" + ], + "client.ip": [ + "127.0.0.1" + ], + "ecs.version": [ + "dynamic" + ], + "error.culprit": [ + "webpack:///webpack/bootstrap 6002740481c9666b0d38 in \u003canonymous\u003e" + ], + "error.exception.message": [ + "Uncaught Error: timeout test error" + ], + "error.exception.stacktrace.abs_path": [ + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map" + ], + "error.exception.stacktrace.context.post": [ + "", + " \t\t// Check if module is in cache", + " \t\tif(installedModules[moduleId])", + " \t\t\treturn installedModules[moduleId].exports;", + "", + "", + " \t// __webpack_public_path__", + " \t__webpack_require__.p = \"\";", + "", + " \t// Load entry module and return exports", + "", + " \t\t// Check if module is in cache", + " \t\tif(installedModules[moduleId])", + " \t\t\treturn installedModules[moduleId].exports;", + "", + "", + "", + "", + "/** WEBPACK FOOTER **", + " ** webpack/bootstrap 6002740481c9666b0d38", + " \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: {}," + ], + "error.exception.stacktrace.context.pre": [ + " \t// The module cache", + " \tvar installedModules = {};", + "", + " \t// The require function", + "", + " \t// expose the modules object (__webpack_modules__)", + " \t__webpack_require__.m = modules;", + "", + " \t// expose the module cache", + " \t// The module cache", + " \tvar installedModules = {};", + "", + " \t// The require function", + "", + " \t// __webpack_public_path__", + " \t__webpack_require__.p = \"\";", + "", + " \t// Load entry module and return exports", + "", + " \t// The require function", + " \tfunction __webpack_require__(moduleId) {", + "", + " \t\t// Check if module is in cache" + ], + "error.exception.stacktrace.exclude_from_grouping": [ + false, + false, + false, + false, + false + ], + "error.exception.stacktrace.filename": [ + "webpack:///webpack/bootstrap 6002740481c9666b0d38", + "webpack:///webpack/bootstrap 6002740481c9666b0d38", + "webpack:///webpack/bootstrap 6002740481c9666b0d38", + "webpack:///webpack/bootstrap 6002740481c9666b0d38", + "webpack:///webpack/bootstrap 6002740481c9666b0d38" + ], + "error.exception.stacktrace.function": [ + "__webpack_require__", + "\u003cunknown\u003e", + "\u003cunknown\u003e", + "moduleId", + "\u003canonymous\u003e" + ], + "error.exception.stacktrace.library_frame": [ + false, + false, + false, + false, + false + ], + "error.exception.stacktrace.line.column": [ + 0, + 0, + 0, + 0, + 0 + ], + "error.exception.stacktrace.line.context": [ + " \tfunction __webpack_require__(moduleId) {", + " \t__webpack_require__.c = installedModules;", + " \tfunction __webpack_require__(moduleId) {", + " \treturn __webpack_require__(0);", + " \t\tif(installedModules[moduleId])" + ], + "error.exception.stacktrace.line.number": [ + 5, + 33, + 5, + 39, + 8 + ], + "error.exception.stacktrace.original.abs_path": [ + "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map" + ], + "error.exception.stacktrace.original.colno": [ + 18, + 181, + 15, + 199, + 33 + ], + "error.exception.stacktrace.original.filename": [ + "test/e2e/general-usecase/bundle.js.map", + "~/test/e2e/general-usecase/bundle.js.map", + "~/test/e2e/general-usecase/bundle.js.map", + "~/test/e2e/general-usecase/bundle.js.map", + "~/test/e2e/general-usecase/bundle.js.map" + ], + "error.exception.stacktrace.original.function": [ + "\u003canonymous\u003e", + "invokeTask", + "runTask", + "invoke", + "timer" + ], + "error.exception.stacktrace.original.library_frame": [ + true, + false + ], + "error.exception.stacktrace.original.lineno": [ + 1, + 1, + 1, + 1, + 1 + ], + "error.exception.stacktrace.sourcemap.updated": [ + true, + true, + true, + true, + true + ], + "error.exception.type": [ + "Error" + ], + "error.grouping_key": [ + "89e23da755c2dd759d2d529e37c92b8f" + ], + "error.grouping_name": [ + "Uncaught Error: log timeout test error" + ], + "error.id": [ + "aba2688e033848ce9c4e4005f1caa534" + ], + "error.log.message": [ + "Uncaught Error: log timeout test error" + ], + "error.log.stacktrace.abs_path": [ + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map" + ], + "error.log.stacktrace.context.post": [ + "", + " \t\t// Check if module is in cache", + " \t\tif(installedModules[moduleId])", + " \t\t\treturn installedModules[moduleId].exports;", + "" + ], + "error.log.stacktrace.context.pre": [ + " \t// The module cache", + " \tvar installedModules = {};", + "", + " \t// The require function" + ], + "error.log.stacktrace.exclude_from_grouping": [ + false + ], + "error.log.stacktrace.filename": [ + "webpack:///webpack/bootstrap 6002740481c9666b0d38" + ], + "error.log.stacktrace.function": [ + "\u003canonymous\u003e" + ], + "error.log.stacktrace.library_frame": [ + false + ], + "error.log.stacktrace.line.column": [ + 0 + ], + "error.log.stacktrace.line.context": [ + " \tfunction __webpack_require__(moduleId) {" + ], + "error.log.stacktrace.line.number": [ + 5 + ], + "error.log.stacktrace.original.abs_path": [ + "http://localhost:8000/test/e2e/general-usecase/bundle.js.map" + ], + "error.log.stacktrace.original.colno": [ + 18 + ], + "error.log.stacktrace.original.filename": [ + "~/test/e2e/general-usecase/bundle.js.map" + ], + "error.log.stacktrace.original.function": [ + "\u003canonymous\u003e" + ], + "error.log.stacktrace.original.lineno": [ + 1 + ], + "error.log.stacktrace.sourcemap.updated": [ + true + ], + "event.ingested": [ + "dynamic" + ], + "http.request.referrer": [ + "http://localhost:8000/test/e2e/" + ], + "observer.ephemeral_id": [ + "dynamic" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.id": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "error" + ], + "processor.name": [ + "error" + ], + "service.name": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.1" + ], + "source.ip": [ + "127.0.0.1" + ], + "timestamp.us": [ + "dynamic" + ], + "url.domain": [ + "localhost" + ], + "url.full": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.original": [ + "http://localhost:8000/test/e2e/general-usecase/" + ], + "url.path": [ + "/test/e2e/general-usecase/" + ], + "url.port": [ + 8000 + ], + "url.scheme": [ + "http" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.original": [ + "Go-http-client/1.1" + ], + "user_agent.version": [ + "1.1" + ] + } +] diff --git a/systemtest/approvals/TestTransactionAggregation.approved.json b/systemtest/approvals/TestTransactionAggregation.approved.json index 34cf299ab4b..1f1c147f6f8 100644 --- a/systemtest/approvals/TestTransactionAggregation.approved.json +++ b/systemtest/approvals/TestTransactionAggregation.approved.json @@ -1,757 +1,1010 @@ -{ - "events": [ - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 5, - "value_count": 5 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "10m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 5 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 5017595, - "value_count": 5 - } - }, - "name": "abc", - "root": true, - "type": "backend" +[ + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 5, + "value_count": 5 } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 5, - "value_count": 5 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "1m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 5 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 5017595, - "value_count": 5 - } - }, - "name": "abc", - "root": true, - "type": "backend" + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 5 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 5, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 5, - "value_count": 5 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "60m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 5 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 5017595, - "value_count": 5 - } - }, - "name": "abc", - "root": true, - "type": "backend" + ], + "transaction.duration.summary": [ + { + "sum": 5017595, + "value_count": 5 } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 10, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 10, - "value_count": 10 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "10m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 10 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 10035190, - "value_count": 10 - } - }, - "name": "def", - "root": true, - "type": "backend" + ], + "transaction.name": [ + "abc" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 5, + "value_count": 5 } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 10, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 10, - "value_count": 10 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "1m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 10 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 10035190, - "value_count": 10 - } - }, - "name": "def", - "root": true, - "type": "backend" + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 5 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 10, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 10, - "value_count": 10 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "60m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 10 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 10035190, - "value_count": 10 - } - }, - "name": "def", - "root": true, - "type": "backend" + ], + "transaction.duration.summary": [ + { + "sum": 5017595, + "value_count": 5 } - }, - { - "@timestamp": "2021-09-15T20:10:00.000Z", - "_doc_count": 2, - "agent": { - "name": "elastic-node" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "unknown" - }, - "faas": { - "coldstart": false, - "trigger": { - "type": "http" - } - }, - "host": { - "hostname": "node-name", - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "pod": { - "name": "pod-name" - } - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "interval": "10m", - "name": "transaction" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "staging", - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 38911 - ] - }, - "summary": { - "sum": 77822, - "value_count": 2 - } - }, - "name": "faas", - "result": "success", - "root": true, - "type": "lambda" + ], + "transaction.name": [ + "abc" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 5, + "value_count": 5 } - }, - { - "@timestamp": "2021-09-15T20:11:00.000Z", - "_doc_count": 2, - "agent": { - "name": "elastic-node" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "unknown" - }, - "faas": { - "coldstart": false, - "trigger": { - "type": "http" - } - }, - "host": { - "hostname": "node-name", - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "pod": { - "name": "pod-name" - } - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "interval": "1m", - "name": "transaction" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "staging", - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 38911 - ] - }, - "summary": { - "sum": 77822, - "value_count": 2 - } - }, - "name": "faas", - "result": "success", - "root": true, - "type": "lambda" + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 5 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2021-09-15T20:00:00.000Z", - "_doc_count": 2, - "agent": { - "name": "elastic-node" - }, - "cloud": { - "account": { - "id": "account_id", - "name": "account_name" - }, - "availability_zone": "cloud_availability_zone", - "machine": { - "type": "machine_type" - }, - "project": { - "id": "project_id", - "name": "project_name" - }, - "provider": "cloud_provider", - "region": "cloud_region", - "service": { - "name": "lambda" - } - }, - "container": { - "id": "container-id" - }, - "data_stream": { - "dataset": "apm.transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "unknown" - }, - "faas": { - "coldstart": false, - "trigger": { - "type": "http" - } - }, - "host": { - "hostname": "node-name", - "name": "node-name", - "os": { - "platform": "darwin" - } - }, - "kubernetes": { - "pod": { - "name": "pod-name" - } - }, - "labels": { - "tag1": "one" - }, - "metricset": { - "interval": "60m", - "name": "transaction" - }, - "numeric_labels": { - "tag2": 2 - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "environment": "staging", - "language": { - "name": "ecmascript", - "version": "8" - }, - "name": "1234_service-12a3", - "node": { - "name": "node-123" - }, - "runtime": { - "name": "node", - "version": "8.0.0" - }, - "version": "5.1.3" - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 2 - ], - "values": [ - 38911 - ] - }, - "summary": { - "sum": 77822, - "value_count": 2 - } - }, - "name": "faas", - "result": "success", - "root": true, - "type": "lambda" + ], + "transaction.duration.summary": [ + { + "sum": 5017595, + "value_count": 5 } - } - ] -} + ], + "transaction.name": [ + "abc" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 10, + "value_count": 10 + } + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 10 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 10035190, + "value_count": 10 + } + ], + "transaction.name": [ + "def" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 10, + "value_count": 10 + } + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 10 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 10035190, + "value_count": 10 + } + ], + "transaction.name": [ + "def" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 10, + "value_count": 10 + } + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 10 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 10035190, + "value_count": 10 + } + ], + "transaction.name": [ + "def" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "backend" + ] + }, + { + "@timestamp": [ + "2021-09-15T20:10:00.000Z" + ], + "agent.name": [ + "elastic-node" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "unknown" + ], + "faas.coldstart": [ + false + ], + "faas.trigger.type": [ + "http" + ], + "host.hostname": [ + "node-name" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "labels.tag1": [ + "one" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "transaction" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "staging" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 38911 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 77822, + "value_count": 2 + } + ], + "transaction.name": [ + "faas" + ], + "transaction.result": [ + "success" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "lambda" + ] + }, + { + "@timestamp": [ + "2021-09-15T20:11:00.000Z" + ], + "agent.name": [ + "elastic-node" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "unknown" + ], + "faas.coldstart": [ + false + ], + "faas.trigger.type": [ + "http" + ], + "host.hostname": [ + "node-name" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "labels.tag1": [ + "one" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "transaction" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "staging" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 38911 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 77822, + "value_count": 2 + } + ], + "transaction.name": [ + "faas" + ], + "transaction.result": [ + "success" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "lambda" + ] + }, + { + "@timestamp": [ + "2021-09-15T20:00:00.000Z" + ], + "agent.name": [ + "elastic-node" + ], + "cloud.account.id": [ + "account_id" + ], + "cloud.account.name": [ + "account_name" + ], + "cloud.availability_zone": [ + "cloud_availability_zone" + ], + "cloud.machine.type": [ + "machine_type" + ], + "cloud.project.id": [ + "project_id" + ], + "cloud.project.name": [ + "project_name" + ], + "cloud.provider": [ + "cloud_provider" + ], + "cloud.region": [ + "cloud_region" + ], + "cloud.service.name": [ + "lambda" + ], + "container.id": [ + "container-id" + ], + "data_stream.dataset": [ + "apm.transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "unknown" + ], + "faas.coldstart": [ + false + ], + "faas.trigger.type": [ + "http" + ], + "host.hostname": [ + "node-name" + ], + "host.name": [ + "node-name" + ], + "host.os.platform": [ + "darwin" + ], + "kubernetes.pod.name": [ + "pod-name" + ], + "labels.tag1": [ + "one" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "transaction" + ], + "numeric_labels.tag2": [ + 2 + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.environment": [ + "staging" + ], + "service.language.name": [ + "ecmascript" + ], + "service.language.version": [ + "8" + ], + "service.name": [ + "1234_service-12a3" + ], + "service.node.name": [ + "node-123" + ], + "service.runtime.name": [ + "node" + ], + "service.runtime.version": [ + "8.0.0" + ], + "service.version": [ + "5.1.3" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 2 + ], + "values": [ + 38911 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 77822, + "value_count": 2 + } + ], + "transaction.name": [ + "faas" + ], + "transaction.result": [ + "success" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "lambda" + ] + } +] diff --git a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json index afc6ac793bd..667edb05506 100644 --- a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json +++ b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json @@ -1,217 +1,290 @@ -{ - "events": [ - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 1, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 1, - "value_count": 1 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "10m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 1 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 1003519, - "value_count": 1 - } - }, - "name": "name", - "root": true, - "type": "type" +[ + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 1, + "value_count": 1 } - }, - { - "@timestamp": "2006-01-02T15:04:00.000Z", - "_doc_count": 1, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 1, - "value_count": 1 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "1m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 1 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 1003519, - "value_count": 1 - } - }, - "name": "name", - "root": true, - "type": "type" + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 1 + ], + "values": [ + 1003519 + ] } - }, - { - "@timestamp": "2006-01-02T15:00:00.000Z", - "_doc_count": 1, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.transaction.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success", - "success_count": { - "sum": 1, - "value_count": 1 - } - }, - "host": { - "hostname": "beowulf", - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "metricset": { - "interval": "60m", - "name": "transaction" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "transaction": { - "duration": { - "histogram": { - "counts": [ - 1 - ], - "values": [ - 1003519 - ] - }, - "summary": { - "sum": 1003519, - "value_count": 1 - } - }, - "name": "name", - "root": true, - "type": "type" + ], + "transaction.duration.summary": [ + { + "sum": 1003519, + "value_count": 1 } - } - ] -} + ], + "transaction.name": [ + "name" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "type" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:04:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 1, + "value_count": 1 + } + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 1 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 1003519, + "value_count": 1 + } + ], + "transaction.name": [ + "name" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "type" + ] + }, + { + "@timestamp": [ + "2006-01-02T15:00:00.000Z" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.transaction.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + { + "sum": 1, + "value_count": 1 + } + ], + "host.hostname": [ + "beowulf" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "transaction" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "transaction.duration.histogram": [ + { + "counts": [ + 1 + ], + "values": [ + 1003519 + ] + } + ], + "transaction.duration.summary": [ + { + "sum": 1003519, + "value_count": 1 + } + ], + "transaction.name": [ + "name" + ], + "transaction.root": [ + true + ], + "transaction.type": [ + "type" + ] + } +] diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json index 387a875923a..95e8c64c6d3 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json @@ -1,298 +1,338 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "_doc_count": 4, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "10m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "elasticsearch" - } - }, - "span": { - "destination": { - "service": { - "resource": "elasticsearch", - "response_time": { - "count": 4, - "sum": { - "us": 3600 - } - } - } - } - } - }, - { - "@timestamp": "dynamic", - "_doc_count": 4, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "1m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "elasticsearch" - } - }, - "span": { - "destination": { - "service": { - "resource": "elasticsearch", - "response_time": { - "count": 4, - "sum": { - "us": 3600 - } - } - } - } - } - }, - { - "@timestamp": "dynamic", - "_doc_count": 4, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "60m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "elasticsearch" - } - }, - "span": { - "destination": { - "service": { - "resource": "elasticsearch", - "response_time": { - "count": 4, - "sum": { - "us": 3600 - } - } - } - } - } - }, - { - "@timestamp": "dynamic", - "_doc_count": 50, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.10m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "10m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "redis" - } - }, - "span": { - "destination": { - "service": { - "resource": "redis", - "response_time": { - "count": 50, - "sum": { - "us": 5000 - } - } - } - } - } - }, - { - "@timestamp": "dynamic", - "_doc_count": 50, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.1m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "1m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "redis" - } - }, - "span": { - "destination": { - "service": { - "resource": "redis", - "response_time": { - "count": 50, - "sum": { - "us": 5000 - } - } - } - } - } - }, - { - "@timestamp": "dynamic", - "_doc_count": 50, - "agent": { - "name": "go" - }, - "data_stream": { - "dataset": "apm.service_destination.60m", - "namespace": "default", - "type": "metrics" - }, - "event": { - "outcome": "success" - }, - "metricset": { - "interval": "60m", - "name": "service_destination" - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "processor": { - "event": "metric" - }, - "service": { - "language": { - "name": "go" - }, - "name": "systemtest", - "target": { - "type": "redis" - } - }, - "span": { - "destination": { - "service": { - "resource": "redis", - "response_time": { - "count": 50, - "sum": { - "us": 5000 - } - } - } - } - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "elasticsearch" + ], + "span.destination.service.resource": [ + "elasticsearch" + ], + "span.destination.service.response_time.count": [ + 4 + ], + "span.destination.service.response_time.sum.us": [ + 3600 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "elasticsearch" + ], + "span.destination.service.resource": [ + "elasticsearch" + ], + "span.destination.service.response_time.count": [ + 4 + ], + "span.destination.service.response_time.sum.us": [ + 3600 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "elasticsearch" + ], + "span.destination.service.resource": [ + "elasticsearch" + ], + "span.destination.service.response_time.count": [ + 4 + ], + "span.destination.service.response_time.sum.us": [ + 3600 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.10m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "10m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "redis" + ], + "span.destination.service.resource": [ + "redis" + ], + "span.destination.service.response_time.count": [ + 50 + ], + "span.destination.service.response_time.sum.us": [ + 5000 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.1m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "1m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "redis" + ], + "span.destination.service.resource": [ + "redis" + ], + "span.destination.service.response_time.count": [ + 50 + ], + "span.destination.service.response_time.sum.us": [ + 5000 + ] + }, + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "data_stream.dataset": [ + "apm.service_destination.60m" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "metrics" + ], + "event.outcome": [ + "success" + ], + "metricset.interval": [ + "60m" + ], + "metricset.name": [ + "service_destination" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "processor.event": [ + "metric" + ], + "service.language.name": [ + "go" + ], + "service.name": [ + "systemtest" + ], + "service.target.type": [ + "redis" + ], + "span.destination.service.resource": [ + "redis" + ], + "span.destination.service.response_time.count": [ + 50 + ], + "span.destination.service.response_time.sum.us": [ + 5000 + ] + } +] diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json index bc9aee4e497..951a0cb2591 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json @@ -1,78 +1,118 @@ -{ - "events": [ - { - "@timestamp": "dynamic", - "agent": { - "name": "go", - "version": "0.0.0" - }, - "data_stream": { - "dataset": "apm", - "namespace": "default", - "type": "traces" - }, - "event": { - "outcome": "success", - "success_count": 1 - }, - "host": { - "architecture": "i386", - "hostname": "beowulf", - "ip": [ - "127.0.0.1" - ], - "name": "beowulf", - "os": { - "platform": "minix" - } - }, - "observer": { - "hostname": "dynamic", - "type": "apm-server", - "version": "dynamic" - }, - "process": { - "pid": 1, - "title": "systemtest.test" - }, - "processor": { - "event": "transaction" - }, - "service": { - "language": { - "name": "go", - "version": "2.0" - }, - "name": "systemtest", - "node": { - "name": "beowulf" - }, - "runtime": { - "name": "gc", - "version": "2.0" - } - }, - "span": { - "id": "dynamic" - }, - "timestamp": "dynamic", - "trace": { - "id": "dynamic" - }, - "transaction": { - "duration": { - "us": 30000 - }, - "id": "dynamic", - "name": "huge-traces", - "representative_count": 1, - "sampled": true, - "span_count": { - "dropped": 54, - "started": 0 - }, - "type": "type" - } - } - ] -} +[ + { + "@timestamp": [ + "dynamic" + ], + "agent.name": [ + "go" + ], + "agent.version": [ + "0.0.0" + ], + "data_stream.dataset": [ + "apm" + ], + "data_stream.namespace": [ + "default" + ], + "data_stream.type": [ + "traces" + ], + "event.outcome": [ + "success" + ], + "event.success_count": [ + 1 + ], + "host.architecture": [ + "i386" + ], + "host.hostname": [ + "beowulf" + ], + "host.ip": [ + "127.0.0.1" + ], + "host.name": [ + "beowulf" + ], + "host.os.platform": [ + "minix" + ], + "observer.hostname": [ + "dynamic" + ], + "observer.type": [ + "apm-server" + ], + "observer.version": [ + "dynamic" + ], + "process.pid": [ + 1 + ], + "process.title": [ + "systemtest.test" + ], + "process.title.text": [ + "systemtest.test" + ], + "processor.event": [ + "transaction" + ], + "service.language.name": [ + "go" + ], + "service.language.version": [ + "2.0" + ], + "service.name": [ + "systemtest" + ], + "service.node.name": [ + "beowulf" + ], + "service.runtime.name": [ + "gc" + ], + "service.runtime.version": [ + "2.0" + ], + "span.id": [ + "dynamic" + ], + "timestamp.us": [ + "dynamic" + ], + "trace.id": [ + "dynamic" + ], + "transaction.duration.us": [ + 30000 + ], + "transaction.id": [ + "dynamic" + ], + "transaction.name": [ + "huge-traces" + ], + "transaction.name.text": [ + "huge-traces" + ], + "transaction.representative_count": [ + 1 + ], + "transaction.sampled": [ + true + ], + "transaction.span_count.dropped": [ + 54 + ], + "transaction.span_count.started": [ + 0 + ], + "transaction.type": [ + "type" + ] + } +] diff --git a/systemtest/errors_test.go b/systemtest/errors_test.go index 71069ce9688..53aafb8d7ca 100644 --- a/systemtest/errors_test.go +++ b/systemtest/errors_test.go @@ -19,6 +19,8 @@ package systemtest_test import ( "bytes" + "errors" + "fmt" "net/http" "os" "testing" @@ -51,5 +53,35 @@ func TestErrorIngest(t *testing.T) { result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm.error*", espoll.ExistsQuery{ Field: "transaction.name", }) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) +} + +// TestErrorExceptionCause tests hierarchical exception causes, +// which must be obtained from _source due to how the exception +// tree is structured as an array of objects. +func TestErrorExceptionCause(t *testing.T) { + systemtest.CleanupElasticsearch(t) + srv := apmservertest.NewServerTB(t) + + tracer := srv.Tracer() + tracer.NewError(fmt.Errorf( + "parent: %w %w", + fmt.Errorf("child1: %w", errors.New("grandchild")), + errors.New("child2"), + )).Send() + tracer.Flush(nil) + + result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm.error*", nil) + errorObj := result.Hits.Hits[0].Source["error"].(map[string]any) + exceptions := errorObj["exception"].([]any) + + require.Len(t, exceptions, 4) + assert.Equal(t, "parent: child1: grandchild child2", exceptions[0].(map[string]any)["message"]) + assert.Equal(t, "child1: grandchild", exceptions[1].(map[string]any)["message"]) + assert.Equal(t, "grandchild", exceptions[2].(map[string]any)["message"]) + assert.Equal(t, "child2", exceptions[3].(map[string]any)["message"]) + assert.NotContains(t, exceptions[0], "parent") + assert.NotContains(t, exceptions[1], "parent") + assert.NotContains(t, exceptions[2], "parent") + assert.Equal(t, float64(0), exceptions[3].(map[string]any)["parent"]) } diff --git a/systemtest/go.mod b/systemtest/go.mod index b6f3b601b56..657bd68596a 100644 --- a/systemtest/go.mod +++ b/systemtest/go.mod @@ -8,8 +8,8 @@ require ( github.com/docker/docker v24.0.7+incompatible github.com/docker/go-connections v0.4.0 github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6 - github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b - github.com/elastic/go-elasticsearch/v8 v8.8.1 + github.com/elastic/apm-tools v0.0.0-20231123072934-d85ff07a8390 + github.com/elastic/go-elasticsearch/v8 v8.10.1 github.com/elastic/go-lumber v0.1.1 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 github.com/hashicorp/go-multierror v1.1.1 @@ -17,26 +17,26 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.18.0 - github.com/tidwall/gjson v1.14.4 - go.elastic.co/apm/v2 v2.4.4 - go.elastic.co/fastjson v1.1.0 + github.com/tidwall/gjson v1.17.0 + go.elastic.co/apm/v2 v2.4.5 + go.elastic.co/fastjson v1.3.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 go.opentelemetry.io/collector/semconv v0.81.0 - go.opentelemetry.io/otel v1.17.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 - go.opentelemetry.io/otel/metric v1.17.0 - go.opentelemetry.io/otel/sdk v1.17.0 - go.opentelemetry.io/otel/sdk/metric v0.40.0 - go.opentelemetry.io/otel/trace v1.17.0 + go.opentelemetry.io/otel v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 + go.opentelemetry.io/otel/metric v1.19.0 + go.opentelemetry.io/otel/sdk v1.19.0 + go.opentelemetry.io/otel/sdk/metric v1.19.0 + go.opentelemetry.io/otel/trace v1.19.0 go.uber.org/zap v1.24.0 golang.org/x/sync v0.3.0 golang.org/x/sys v0.13.0 golang.org/x/time v0.3.0 - google.golang.org/grpc v1.57.1 + google.golang.org/grpc v1.58.3 gopkg.in/yaml.v3 v3.0.1 ) @@ -44,7 +44,7 @@ require ( github.com/containerd/containerd v1.7.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect @@ -59,12 +59,12 @@ require ( github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/go-units v0.5.0 // indirect github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect - github.com/elastic/go-sysinfo v1.7.1 // indirect + github.com/elastic/go-sysinfo v1.11.1 // indirect github.com/elastic/go-windows v1.0.1 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -82,15 +82,15 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/tidwall/match v1.1.1 // indirect - github.com/tidwall/pretty v1.2.0 // indirect + github.com/tidwall/pretty v1.2.1 // indirect github.com/tidwall/sjson v1.2.5 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -98,8 +98,8 @@ require ( golang.org/x/net v0.17.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/protobuf v1.31.0 // indirect howett.net/plist v1.0.0 // indirect ) diff --git a/systemtest/go.sum b/systemtest/go.sum index 458810ac7ca..aebcb86f848 100644 --- a/systemtest/go.sum +++ b/systemtest/go.sum @@ -43,17 +43,16 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6 h1:xT0z9yPjU0Csoq9B3BZls8CCtEeU3HMFhuSK8vu9YAo= github.com/elastic/apm-perf v0.0.0-20230608162138-29920c01cfd6/go.mod h1:zK9WN3ehaqmWNgGCDtLpJ3ensSTsZ+N+T4TD11fQPx0= -github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b h1:47VFNMVQQt7WTHF7NdS37Qkk4fMx4uGhM5WWf5lUqio= -github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b/go.mod h1:IUMdGldUOSqfeXSj+zIjYaBX6WFM7M95WU2VdmZ5ZyE= +github.com/elastic/apm-tools v0.0.0-20231123072934-d85ff07a8390 h1:UZ2g+AJibFB+fX68DbozgJVKGUZAOqLtiCdwQ9cIk2Q= +github.com/elastic/apm-tools v0.0.0-20231123072934-d85ff07a8390/go.mod h1:QrCraAInc4Adxm0XBtjHFAMrdF/vfXt2D6D1LoudCPo= github.com/elastic/elastic-transport-go/v8 v8.3.0 h1:DJGxovyQLXGr62e9nDMPSxRyWION0Bh6d9eCFBriiHo= github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= -github.com/elastic/go-elasticsearch/v8 v8.8.1 h1:/OiP5Yex40q5eWpzFVQIS8jRE7SaEZrFkG9JbE6TXtY= -github.com/elastic/go-elasticsearch/v8 v8.8.1/go.mod h1:GU1BJHO7WeamP7UhuElYwzzHtvf9SDmeVpSSy9+o6Qg= +github.com/elastic/go-elasticsearch/v8 v8.10.1 h1:JJ3i2DimYTsJcUoEGbg6tNB0eehTNdid9c5kTR1TGuI= +github.com/elastic/go-elasticsearch/v8 v8.10.1/go.mod h1:GU1BJHO7WeamP7UhuElYwzzHtvf9SDmeVpSSy9+o6Qg= github.com/elastic/go-lumber v0.1.1 h1:aae5rSBnwBvdB0aShJ7AbOYPyvP1/wS/JIOC1A4D1DM= github.com/elastic/go-lumber v0.1.1/go.mod h1:DMVoFv7YM71enE9X5vWJWWv7wvQNtzXh7bPeKukDccY= -github.com/elastic/go-sysinfo v1.7.1 h1:Wx4DSARcKLllpKT2TnFVdSUJOsybqMYCNQZq1/wO+s0= -github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= -github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= +github.com/elastic/go-sysinfo v1.11.1 h1:g9mwl05njS4r69TisC+vwHWTSKywZFYYUu3so3T/Lao= +github.com/elastic/go-sysinfo v1.11.1/go.mod h1:6KQb31j0QeWBDF88jIdWSxE8cwoOB9tO4Y4osN7Q70E= github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0= github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= @@ -75,15 +74,15 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -104,7 +103,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -139,15 +137,13 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -173,12 +169,13 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/testcontainers/testcontainers-go v0.18.0 h1:8RXrcIQv5xX/uBOSmZd297gzvA7F0yuRA37/918o7Yg= github.com/testcontainers/testcontainers-go v0.18.0/go.mod h1:rLC7hR2SWRjJZZNrUYiTKvUXCziNxzZiYtz9icTWYNQ= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= -github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= +github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= +github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= @@ -190,36 +187,36 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.elastic.co/apm/v2 v2.4.4 h1:KGbmUEtLNQ6sCFGpqTMhfRjqDOKP8IliO+efErKY5lU= -go.elastic.co/apm/v2 v2.4.4/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= -go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= -go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= +go.elastic.co/apm/v2 v2.4.5 h1:+01xPucS6YazBMYxbTSwNEsV9sgznFC0WW7x5dzxyPg= +go.elastic.co/apm/v2 v2.4.5/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so= +go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= +go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 h1:4sONXE9hAX+4Di8m0bQ/KaoH3Mi+OPt04cXkZ7A8W3k= go.opentelemetry.io/collector/pdata v1.0.0-rcv0013/go.mod h1:x09G/4KjEcDKNuWCjC5ZtnuDE0XEqiRwI+yrHSVjIy8= go.opentelemetry.io/collector/semconv v0.81.0 h1:lCYNNo3powDvFIaTPP2jDKIrBiV1T92NK4QgL/aHYXw= go.opentelemetry.io/collector/semconv v0.81.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= -go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= -go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 h1:SZaSbubADNhH2Gxm+1GaZ/cFsGiYefZoodMMX79AOd4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0/go.mod h1:N65FzQDfQH7NY7umgb0U+7ypGKVYKwwE24L6KXT4OA8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4= -go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= -go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= -go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= -go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= -go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= -go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= -go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= -go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= +go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -244,7 +241,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -254,7 +250,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -277,7 +272,6 @@ golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= @@ -286,31 +280,28 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e h1:Ao9GzfUMPH3zjVfzXG5rlWlk+Q8MXWKwWpwVQE1MXfw= -google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= -google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= +gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= diff --git a/systemtest/huge_traces_test.go b/systemtest/huge_traces_test.go index 771784b208e..b618c6b1dff 100644 --- a/systemtest/huge_traces_test.go +++ b/systemtest/huge_traces_test.go @@ -76,13 +76,26 @@ func TestTransactionDroppedSpansStats(t *testing.T) { metricsResult := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 6, "metrics-apm.service_destination*", espoll.TermQuery{Field: "metricset.name", Value: "service_destination"}, ) - approvaltest.ApproveEvents(t, t.Name()+"Metrics", metricsResult.Hits.Hits, "@timestamp") + approvaltest.ApproveFields(t, t.Name()+"Metrics", metricsResult.Hits.Hits, "@timestamp") + + // _doc_count is not returned in fields, it is only visible in _source and + // in the results of aggregations. + // + // TODO(axw) we should use a terms aggregation on `service.target.type`, + // and check that the returned doc_counts are expected. This would require + // more changes to apm-tools to specify aggregations in Expect(Min)Docs. + docCounts := make(map[string]float64) + for _, hit := range metricsResult.Hits.Hits { + serviceTargetType := hit.Fields["service.target.type"][0].(string) + docCounts[serviceTargetType] = hit.Source["_doc_count"].(float64) + } + assert.Equal(t, map[string]float64{"elasticsearch": 4, "redis": 50}, docCounts) txResult := estest.ExpectDocs(t, systemtest.Elasticsearch, "traces-apm-*", espoll.TermQuery{Field: "transaction.id", Value: tx.TraceContext().Span.String()}, ) - approvaltest.ApproveEvents(t, t.Name()+"Transaction", txResult.Hits.Hits, - "@timestamp", "timestamp", "trace.id", "transaction.id", "span.id", + approvaltest.ApproveFields(t, t.Name()+"Transaction", txResult.Hits.Hits, + "@timestamp", "timestamp.us", "trace.id", "transaction.id", "span.id", ) } @@ -150,5 +163,5 @@ func TestCompressedSpans(t *testing.T) { spanResults := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 2, "traces-apm-*", espoll.TermQuery{Field: "span.type", Value: "db"}, ) - approvaltest.ApproveEvents(t, t.Name(), spanResults.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), spanResults.Hits.Hits) } diff --git a/systemtest/intake_log_test.go b/systemtest/intake_log_test.go index 53e29ad8c3e..a597f1ef03b 100644 --- a/systemtest/intake_log_test.go +++ b/systemtest/intake_log_test.go @@ -91,7 +91,7 @@ func TestIntakeLog(t *testing.T) { fmt.Sprintf("logs-apm.app.%s-*", test.ServiceName), espoll.MatchPhraseQuery{Field: "message", Value: test.Message}, ) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, test.DynamicFields...) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, test.DynamicFields...) }) } } diff --git a/systemtest/intake_test.go b/systemtest/intake_test.go index 2d068227ff2..8f271800688 100644 --- a/systemtest/intake_test.go +++ b/systemtest/intake_test.go @@ -24,6 +24,7 @@ import ( "github.com/elastic/apm-server/systemtest/apmservertest" "github.com/elastic/apm-server/systemtest/estest" "github.com/elastic/apm-tools/pkg/approvaltest" + "github.com/elastic/apm-tools/pkg/espoll" ) func TestIntake(t *testing.T) { @@ -51,13 +52,23 @@ func TestIntake(t *testing.T) { srv := apmservertest.NewServerTB(t) systemtest.CleanupElasticsearch(t) response := systemtest.SendBackendEventsPayload(t, srv.URL, "../testdata/intake-v2/"+tc.filename) - // Since we are just waiting for traces/metrics/logs and that they should go through almost immediately, - // there shouldn't be any aggregated metrics. result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, - response.Accepted, "traces-apm*,metrics-apm*,logs-apm*", nil, + response.Accepted, "traces-apm*,metrics-apm*,logs-apm*", + // Exclude aggregated transaction/service_destination metrics. + // Aggregations are flushed on 1m/10m/60m boundaries, so even + // if the test is fast there's a possibility of aggregated + // metrics being returned. + espoll.BoolQuery{ + MustNot: []any{espoll.ExistsQuery{Field: "metricset.interval"}}, + }, ) - tc.dynamicFields = append(tc.dynamicFields, "client.geo.city_name", "client.geo.location.lat", "client.geo.location.lon", "client.geo.region_iso_code", "client.geo.region_name") - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, tc.dynamicFields...) + tc.dynamicFields = append(tc.dynamicFields, + "client.geo.city_name", + "client.geo.location", + "client.geo.region_iso_code", + "client.geo.region_name", + ) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, tc.dynamicFields...) }) } diff --git a/systemtest/jaeger_test.go b/systemtest/jaeger_test.go index 94d4d6616a9..059fd3ccdfe 100644 --- a/systemtest/jaeger_test.go +++ b/systemtest/jaeger_test.go @@ -52,7 +52,7 @@ func TestJaeger(t *testing.T) { t.Run(name, func(t *testing.T) { systemtest.CleanupElasticsearch(t) hits := sendJaegerBatch(t, srv, "../testdata/jaeger/"+name+".json", grpc.WithInsecure()) - approvaltest.ApproveEvents(t, t.Name(), hits) + approvaltest.ApproveFields(t, t.Name(), hits) }) } diff --git a/systemtest/metrics_test.go b/systemtest/metrics_test.go index d67acb685c9..67b466e747b 100644 --- a/systemtest/metrics_test.go +++ b/systemtest/metrics_test.go @@ -68,7 +68,7 @@ func TestApprovedMetrics(t *testing.T) { espoll.TermQuery{Field: "metricset.name", Value: "transaction"}, }, }) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) // Check dynamic mapping of histograms. mappings := getFieldMappings(t, indices, []string{"latency_distribution"}) diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go index 6a692eba1ed..71033c7c802 100644 --- a/systemtest/otlp_test.go +++ b/systemtest/otlp_test.go @@ -114,7 +114,7 @@ func TestOTLPGRPCTraces(t *testing.T) { indices := "traces-apm*,logs-apm*" result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 3, indices, nil) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "error.id") + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "error.id") } func TestOTLPGRPCTraceSpanLinks(t *testing.T) { @@ -212,13 +212,13 @@ func TestOTLPGRPCMetrics(t *testing.T) { metricsClient.Export(context.Background(), pmetricotlp.NewExportRequestFromMetrics(metrics)) result := estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.app.*", espoll.ExistsQuery{Field: "counter"}) - approvaltest.ApproveEvents(t, t.Name()+"_counter", result.Hits.Hits, "@timestamp") + approvaltest.ApproveFields(t, t.Name()+"_counter", result.Hits.Hits, "@timestamp") result = estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.app.*", espoll.ExistsQuery{Field: "summary"}) - approvaltest.ApproveEvents(t, t.Name()+"_summary", result.Hits.Hits, "@timestamp") + approvaltest.ApproveFields(t, t.Name()+"_summary", result.Hits.Hits, "@timestamp") result = estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.app.*", espoll.ExistsQuery{Field: "histogram"}) - approvaltest.ApproveEvents(t, t.Name()+"_histogram", result.Hits.Hits, "@timestamp") + approvaltest.ApproveFields(t, t.Name()+"_histogram", result.Hits.Hits, "@timestamp") // Make sure we report monitoring for the metrics consumer. Metric values are unit tested. doc := getBeatsMonitoringStats(t, srv, nil) @@ -242,7 +242,7 @@ func TestOTLPGRPCLogs(t *testing.T) { require.NoError(t, err) result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm*", nil) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits) + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits) } func TestOTLPGRPCAuth(t *testing.T) { @@ -478,7 +478,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) { require.NoError(t, err) result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm*", nil) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.location.lat", "client.geo.location.lon") + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "client.geo.location") } func newMobileLogs(body interface{}) plog.Logs { diff --git a/systemtest/rum_test.go b/systemtest/rum_test.go index 3e0a4633c49..d082d0b12b2 100644 --- a/systemtest/rum_test.go +++ b/systemtest/rum_test.go @@ -70,7 +70,7 @@ func TestRUMXForwardedFor(t *testing.T) { Field: "processor.event", Values: []interface{}{"transaction", "metric"}, }) - approvaltest.ApproveEvents( + approvaltest.ApproveFields( t, t.Name(), result.Hits.Hits, // RUM timestamps are set by the server based on the time the payload is received. "@timestamp", "timestamp.us", @@ -218,8 +218,8 @@ func TestRUMRoutingIntegration(t *testing.T) { defer resp.Body.Close() } result := estest.ExpectSourcemapError(t, systemtest.Elasticsearch, "traces-apm.rum*", retry, nil, false) - approvaltest.ApproveEvents( + approvaltest.ApproveFields( t, t.Name(), result.Hits.Hits, "@timestamp", "timestamp.us", - "source.port", "source.ip", "client", + "source.port", "source.ip", "client.ip", ) } diff --git a/systemtest/sampling_test.go b/systemtest/sampling_test.go index 6ac2521d8a3..f7cd9d37dde 100644 --- a/systemtest/sampling_test.go +++ b/systemtest/sampling_test.go @@ -74,7 +74,7 @@ func TestDropUnsampled(t *testing.T) { Value: "TestDropUnsampled", }) assert.Len(t, result.Hits.Hits, 2) - approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, + approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, // RUM timestamps are set by the server based on the time the payload is received. "@timestamp", "timestamp.us", // RUM events have the source port recorded, and in the tests it will be dynamic diff --git a/systemtest/sourcemap_test.go b/systemtest/sourcemap_test.go index 5de283be3bd..27194b45e32 100644 --- a/systemtest/sourcemap_test.go +++ b/systemtest/sourcemap_test.go @@ -44,7 +44,7 @@ func TestRUMErrorSourcemapping(t *testing.T) { systemtest.SendRUMEventsPayload(t, serverURL, "../testdata/intake-v2/errors_rum.ndjson") } result := estest.ExpectSourcemapError(t, systemtest.Elasticsearch, "logs-apm.error-*", retry, nil, true) - approvaltest.ApproveEvents( + approvaltest.ApproveFields( t, t.Name(), result.Hits.Hits, // RUM timestamps are set by the server based on the time the payload is received. "@timestamp", "timestamp.us", @@ -96,7 +96,7 @@ func TestRUMSpanSourcemapping(t *testing.T) { Value: "span", }, true) - approvaltest.ApproveEvents( + approvaltest.ApproveFields( t, t.Name(), result.Hits.Hits, // RUM timestamps are set by the server based on the time the payload is received. "@timestamp", "timestamp.us", @@ -129,7 +129,7 @@ func TestNoMatchingSourcemap(t *testing.T) { Value: "span", }, false) - approvaltest.ApproveEvents( + approvaltest.ApproveFields( t, t.Name(), result.Hits.Hits, // RUM timestamps are set by the server based on the time the payload is received. "@timestamp", "timestamp.us", From 29f93a03314e2047c49f87c0acbf8f4f27ee5ba4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:18:07 -0500 Subject: [PATCH 3/8] [updatecli] Update to elastic/beats@284683dcc123 (#12093) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@cc39376a5d4c Made with ❤️️ by updatecli * chore: Update to elastic/beats@0b2287168503 Made with ❤️️ by updatecli * chore: Update to elastic/beats@07f6d5a22c4b Made with ❤️️ by updatecli * chore: Update to elastic/beats@296183ca0d11 Made with ❤️️ by updatecli * chore: Update to elastic/beats@284683dcc123 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index e4ed62b5f71..820c1ff9b00 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20231121082709-886d078ba1f0 +Version: v7.0.0-alpha2.0.20231128050735-284683dcc123 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231121082709-886d078ba1f0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231128050735-284683dcc123/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -1040,11 +1040,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.8.1 +Version: v0.8.2 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.8.1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.8.2/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 27b519300e7..9779be14c70 100644 --- a/go.mod +++ b/go.mod @@ -10,10 +10,10 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 - github.com/elastic/elastic-agent-system-metrics v0.8.1 + github.com/elastic/elastic-agent-system-metrics v0.8.2 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v0.2.1-0.20230829163624-c69a1cf8ce35 github.com/elastic/go-elasticsearch/v8 v8.10.0 diff --git a/go.sum b/go.sum index aefe06004c2..291df6bc2ee 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0 h1:ZVQuk/GSUNf/QvlC1bnI5EqXhBTpgrisbvQPT1S7p3w= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231121082709-886d078ba1f0/go.mod h1:eIy7raRUU0xxzyz5Kz6CWyeed8l7L0TYdHxXwsJKzT8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123 h1:AQDBme+9nT+RrNqZcoRfqPUQE/gSzV1oML104+6fms8= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123/go.mod h1:E8InL/F98oNrwxO5Fu2ZgtCLkMGshVYNrXyvIyxJWko= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= @@ -144,8 +144,8 @@ github.com/elastic/elastic-agent-libs v0.6.2 h1:tE5pFK4y7xm1FtXm+r+63G7STjJAaWh3 github.com/elastic/elastic-agent-libs v0.6.2/go.mod h1:o+EySawBZGeYu49shJxerg2wRCimS1dhrD4As0MS700= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= -github.com/elastic/elastic-agent-system-metrics v0.8.1 h1:eg6actuLeGJlIJFotHRdlAsz/3WhX2G8E0qI301IKBA= -github.com/elastic/elastic-agent-system-metrics v0.8.1/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= +github.com/elastic/elastic-agent-system-metrics v0.8.2 h1:99H1o+WTD/g6jcQr1hUOZ+dsZkZF0SfNePmjGg7TnhU= +github.com/elastic/elastic-agent-system-metrics v0.8.2/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= github.com/elastic/elastic-transport-go/v8 v8.0.0-20230329154755-1a3c63de0db6/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.3.0 h1:DJGxovyQLXGr62e9nDMPSxRyWION0Bh6d9eCFBriiHo= github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= From 84c49e7d1f3eb270870a344b8bb0c50c43a1446a Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:34:52 -0500 Subject: [PATCH 4/8] [updatecli] Bump elastic stack version to 8.12.0-d6c4164b (#12117) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 851f2b786e9..ca6bd4300fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-7521d760-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-d6c4164b-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-7521d760-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-d6c4164b-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-7521d760-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-d6c4164b-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 25d61694ea0..6137cd034fa 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.12.0-7521d760-SNAPSHOT + version: 8.12.0-d6c4164b-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index a9bbf2cee2c..e113e1812f8 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.12.0-7521d760-SNAPSHOT + version: 8.12.0-d6c4164b-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 054b634c1a4..f3ca0fee011 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.12.0-7521d760-SNAPSHOT + version: 8.12.0-d6c4164b-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 667d5fc77727eeff117c8540a3df70af4d89ef40 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 29 Nov 2023 00:57:00 -0600 Subject: [PATCH 5/8] docs: Add "Known issues" page (#11608) --- docs/integrations-index.asciidoc | 2 ++ docs/known-issues.asciidoc | 48 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 docs/known-issues.asciidoc diff --git a/docs/integrations-index.asciidoc b/docs/integrations-index.asciidoc index b375bf1c621..9a5596a8ea7 100644 --- a/docs/integrations-index.asciidoc +++ b/docs/integrations-index.asciidoc @@ -86,4 +86,6 @@ include::upgrading.asciidoc[] include::release-notes.asciidoc[leveloffset=+1] +include::known-issues.asciidoc[leveloffset=+1] + include::{docdir}/redirects.asciidoc[] diff --git a/docs/known-issues.asciidoc b/docs/known-issues.asciidoc new file mode 100644 index 00000000000..15e798763ac --- /dev/null +++ b/docs/known-issues.asciidoc @@ -0,0 +1,48 @@ +[[known-issues]] += Known issues + +APM has the following known issues: + +*Ingesting new JVM metrics in 8.9 and 8.10 breaks upgrade to 8.11 and stops ingestion* + +_APM Server versions: 8.11.0, 8.11.1_ + +_Elastic APM Java Agent versions: 1.39.0+_ + +// Describe the conditions in which this issue occurs +If you're using the Elastic APM Java Agent v1.39.0+ to send new JVM metrics to APM Server v8.9.x and v8.10.x, +// Describe the behavior of the issue +upgrading to 8.11.0 or 8.11.1 will silently fail and stop ingesting APM metrics. +// Describe why it happens +// This happens because... + +// Include exact error messages linked to this issue +// so users searching for the error message end up here. +After upgrading, you will see the following errors: + +* APM Server error logs: ++ +[source,txt] +---- +failed to index document in 'metrics-apm.internal-default' (fail_processor_exception): Document produced by APM Server v8.11.1, which is newer than the installed APM integration (v8.10.3-preview-1695284222). The APM integration must be upgraded. +---- + +* Fleet error on integration package upgrade: ++ +[source,txt] +---- +Failed installing package [apm] due to error: [ResponseError: mapper_parsing_exception + Root causes: + mapper_parsing_exception: Field [jvm.memory.non_heap.pool.committed] attempted to shadow a time_series_metric] +---- + +// Link to fix? +A fix for this issue is in progress: https://github.com/elastic/kibana/pull/171712[elastic/kibana#171712]. + + +// TEMPLATE + +//// +*Brief description* + +_Versions: XX.XX.XX, YY.YY.YY, ZZ.ZZ.ZZ_ + +Detailed description. +//// From 3a1bd90f9b5d64218c99ea77bfa2eac7508f8aff Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:20:02 -0500 Subject: [PATCH 6/8] [updatecli] Bump elastic stack version to 8.12.0-ec4853e4 (#12125) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ca6bd4300fa..433c6b16e68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-d6c4164b-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0-ec4853e4-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.12.0-d6c4164b-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.12.0-ec4853e4-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.12.0-d6c4164b-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.12.0-ec4853e4-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 6137cd034fa..470c08595e9 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.12.0-d6c4164b-SNAPSHOT + version: 8.12.0-ec4853e4-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index e113e1812f8..e1029eb56e0 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.12.0-d6c4164b-SNAPSHOT + version: 8.12.0-ec4853e4-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index f3ca0fee011..43bcba5c0d7 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.12.0-d6c4164b-SNAPSHOT + version: 8.12.0-ec4853e4-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From a15a69b569d50381fc25c08e46b12290c7294a0d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:37:36 -0500 Subject: [PATCH 7/8] chore: Update to elastic/beats@6f32513e5037 (#12126) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 820c1ff9b00..ae9142f3cd7 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20231128050735-284683dcc123 +Version: v7.0.0-alpha2.0.20231129135154-6f32513e5037 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231128050735-284683dcc123/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20231129135154-6f32513e5037/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/go.mod b/go.mod index 9779be14c70..867e5ce0419 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231129135154-6f32513e5037 github.com/elastic/elastic-agent-client/v7 v7.4.0 github.com/elastic/elastic-agent-libs v0.6.2 github.com/elastic/elastic-agent-system-metrics v0.8.2 diff --git a/go.sum b/go.sum index 291df6bc2ee..493787b7c3c 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5 h1:URlDi0TZetSAo8KAIbaMZQhM5EG8+SDgs0jTen7WvMg= github.com/elastic/apm-data v0.1.1-0.20231019120308-82201b991ae5/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123 h1:AQDBme+9nT+RrNqZcoRfqPUQE/gSzV1oML104+6fms8= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231128050735-284683dcc123/go.mod h1:E8InL/F98oNrwxO5Fu2ZgtCLkMGshVYNrXyvIyxJWko= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231129135154-6f32513e5037 h1:usCqCyW5dboEFPh60YruGWbK4ECNACYgsGcfJQYx50U= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231129135154-6f32513e5037/go.mod h1:E8InL/F98oNrwxO5Fu2ZgtCLkMGshVYNrXyvIyxJWko= github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA= github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M= github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo= From f88c08321a702bbc22c231c959055cc3d11e8d86 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Wed, 29 Nov 2023 10:15:31 -0600 Subject: [PATCH 8/8] docs: Update performance guide (#11969) * first draft * address initial feedback * address more feedback --- docs/processing-performance.asciidoc | 86 +++++++++++++++++++++------- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/docs/processing-performance.asciidoc b/docs/processing-performance.asciidoc index 8ab84d60f38..27e66e3afc6 100644 --- a/docs/processing-performance.asciidoc +++ b/docs/processing-performance.asciidoc @@ -5,40 +5,82 @@ APM Server performance depends on a number of factors: memory and CPU available, network latency, transaction sizes, workload patterns, agent and server settings, versions, and protocol. -Let's look at a simple example that makes the following assumptions: +We tested several scenarios to help you understand how to size the APM Server so that it can keep up with the load that your Elastic APM agents are sending: -* The load is generated in the same region as where APM Server and {es} are deployed. -* We're using the default settings in cloud. -* A small number of agents are reporting. - -This leaves us with relevant variables like payload and instance sizes. -See the table below for approximations. -As a reminder, events are +* Using the default hardware template on AWS, GCP and Azure on {ecloud}. +* For each hardware template, testing with several sizes: 1 GB, 4 GB, 8 GB, and 32 GB. +* For each size, using a fixed number of APM agents: 10 agents for 1 GB, 30 agents for 4 GB, 60 agents for 8 GB, and 240 agents for 32 GB. +* In all scenarios, using medium sized events. Events include <> and <>. +NOTE: You will also need to scale up {es} accordingly, potentially with an increased number of shards configured. +For more details on scaling {es}, refer to the {ref}/scalability.html[{es} documentation]. + +The results below include numbers for a synthetic workload. You can use the results of our tests to guide +your sizing decisions, however, *performance will vary based on factors unique to your use case* like your +specific setup, the size of APM event data, and the exact number of agents. + +:hardbreaks-option: + [options="header"] -|======================================================================= -|Transaction/Instance |512 MB Instance |2 GB Instance |8 GB Instance -|Small transactions +|==== +| Profile / Cloud | AWS | Azure | GCP -_5 spans with 5 stack frames each_ |600 events/second |1200 events/second |4800 events/second -|Medium transactions +| *1 GB* +(10 agents) +| 9,000 +events/second +| 6,000 +events/second +| 9,000 +events/second -_15 spans with 15 stack frames each_ |300 events/second |600 events/second |2400 events/second -|Large transactions +| *4 GB* +(30 agents) +| 25,000 +events/second +| 18,000 +events/second +| 17,000 +events/second -_30 spans with 30 stack frames each_ |150 events/second |300 events/second |1400 events/second -|======================================================================= +| *8 GB* +(60 agents) +| 40,000 +events/second +| 26,000 +events/second +| 25,000 +events/second -In other words, a 512 MB instance can process \~3 MB per second, -while an 8 GB instance can process ~20 MB per second. +| *16 GB* +(120 agents) +| 72,000 +events/second +| 51,000 +events/second +| 45,000 +events/second -APM Server is CPU bound, so it scales better from 2 GB to 8 GB than it does from 512 MB to 2 GB. -This is because larger instance types in {ecloud} come with much more computing power. +| *32 GB* +(240 agents) +| 135,000 +events/second +| 95,000 +events/second +| 95,000 +events/second + +|==== + +:!hardbreaks-option: Don't forget that the APM Server is stateless. Several instances running do not need to know about each other. This means that with a properly sized {es} instance, APM Server scales out linearly. -NOTE: RUM deserves special consideration. The RUM agent runs in browsers, and there can be many thousands reporting to an APM Server with very variable network latency. \ No newline at end of file +NOTE: RUM deserves special consideration. The RUM agent runs in browsers, and there can be many thousands reporting to an APM Server with very variable network latency. + +Alternatively or in addition to scaling the APM Server, consider +decreasing the ingestion volume. Read more in <>.