diff --git a/systemtest/approvals/TestAgentConfig.approved.json b/systemtest/approvals/TestAgentConfig.approved.json index 561791606c4..7594040f587 100644 --- a/systemtest/approvals/TestAgentConfig.approved.json +++ b/systemtest/approvals/TestAgentConfig.approved.json @@ -21,6 +21,9 @@ "metricset.name": [ "agent_config" ], + "metricset.name.text": [ + "agent_config" + ], "observer.hostname": [ "dynamic" ], @@ -56,6 +59,9 @@ "metricset.name": [ "agent_config" ], + "metricset.name.text": [ + "agent_config" + ], "observer.hostname": [ "dynamic" ], diff --git a/systemtest/approvals/TestApprovedMetrics.approved.json b/systemtest/approvals/TestApprovedMetrics.approved.json index 3ee806a691b..e2e0622a7dd 100644 --- a/systemtest/approvals/TestApprovedMetrics.approved.json +++ b/systemtest/approvals/TestApprovedMetrics.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -54,12 +60,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -83,6 +98,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -104,6 +122,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -125,12 +146,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.memory.mem.limit.bytes": [ 2048 ], @@ -160,6 +190,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -181,6 +214,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -202,12 +238,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.cpu.cfs.period.us": [ 1024 ], @@ -255,6 +300,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -290,6 +338,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -311,12 +362,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -340,6 +400,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -359,10 +422,10 @@ true ], "faas.coldstart_duration": [ - 422.97 + 422.9700012207031 ], "faas.duration": [ - 182.43 + 182.42999267578125 ], "faas.execution": [ "6f7f0961f83442118a7af6fe80b88d56" @@ -382,6 +445,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -403,12 +469,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.memory.actual.free": [ 54525952 ], @@ -438,6 +513,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -465,6 +543,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -489,12 +570,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "span.self_time.count": [ 1 ], @@ -510,6 +600,9 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], diff --git a/systemtest/approvals/TestCompressedSpans.approved.json b/systemtest/approvals/TestCompressedSpans.approved.json index cec7f4a25f1..9dfdea38e64 100644 --- a/systemtest/approvals/TestCompressedSpans.approved.json +++ b/systemtest/approvals/TestCompressedSpans.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -66,18 +72,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -108,6 +126,9 @@ "span.name": [ "Calls to redis" ], + "span.name.text": [ + "Calls to redis" + ], "span.representative_count": [ 1 ], @@ -131,6 +152,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -161,6 +185,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -191,18 +218,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -233,6 +272,9 @@ "span.name": [ "_bulk" ], + "span.name.text": [ + "_bulk" + ], "span.representative_count": [ 1 ], diff --git a/systemtest/approvals/TestDropUnsampled.approved.json b/systemtest/approvals/TestDropUnsampled.approved.json index af28a6a95dd..2b5fd5f2544 100644 --- a/systemtest/approvals/TestDropUnsampled.approved.json +++ b/systemtest/approvals/TestDropUnsampled.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -63,18 +69,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -119,6 +137,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -152,6 +173,9 @@ "service.name": [ "allowed" ], + "service.name.text": [ + "allowed" + ], "source.ip": [ "127.0.0.1" ], @@ -185,9 +209,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestErrorIngest.approved.json b/systemtest/approvals/TestErrorIngest.approved.json index 3d73033b329..c542da40e12 100644 --- a/systemtest/approvals/TestErrorIngest.approved.json +++ b/systemtest/approvals/TestErrorIngest.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -21,6 +24,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -30,6 +36,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -39,6 +48,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -48,6 +60,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -87,6 +102,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -96,9 +114,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -142,24 +166,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -181,6 +220,9 @@ "transaction.name": [ "mytx" ], + "transaction.name.text": [ + "mytx" + ], "transaction.sampled": [ true ], diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 466be37c138..e2373ea7aa0 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -36,6 +39,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -45,6 +51,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -54,6 +63,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -63,6 +75,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -110,6 +125,9 @@ "error.exception.module": [ "__builtins__" ], + "error.exception.parent": [ + 1 + ], "error.exception.stacktrace": [ { "classname": "BaseClass", @@ -280,6 +298,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -344,9 +365,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -390,24 +417,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -462,9 +504,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Other" ], + "user_agent.name.text": [ + "Other" + ], "user_agent.original": [ "Mozilla Chrome Edge" ], @@ -485,6 +533,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -494,6 +545,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -503,6 +557,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -512,6 +569,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -521,6 +581,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -557,6 +620,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -566,9 +632,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -609,24 +681,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -665,6 +752,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -674,6 +764,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -683,6 +776,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -692,6 +788,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -701,6 +800,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -743,6 +845,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -752,9 +857,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -795,24 +906,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -851,6 +977,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.1.3" ], @@ -860,6 +989,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -869,6 +1001,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -878,6 +1013,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -887,6 +1025,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -920,6 +1061,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -929,9 +1073,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -972,24 +1122,39 @@ "service.framework.name": [ "Rails" ], + "service.framework.name.text": [ + "Rails" + ], "service.framework.version": [ "5.0" ], "service.language.name": [ "ruby" ], + "service.language.name.text": [ + "ruby" + ], "service.language.version": [ "2.5" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "cruby" ], + "service.runtime.name.text": [ + "cruby" + ], "service.runtime.version": [ "2.5" ], @@ -1031,6 +1196,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1040,6 +1208,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1049,6 +1220,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1058,6 +1232,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1067,6 +1244,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1106,6 +1286,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -1115,9 +1298,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1161,24 +1350,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-abc" ], + "service.node.name.text": [ + "node-abc" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1200,6 +1404,9 @@ "transaction.name": [ "mytx" ], + "transaction.name.text": [ + "mytx" + ], "transaction.sampled": [ true ], diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json index fbd00d97448..1d52e43a4b6 100644 --- a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json +++ b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -62,6 +65,9 @@ "error.exception.module": [ "org.springframework.http.client" ], + "error.exception.parent": [ + 1 + ], "error.exception.stacktrace": [ { "abs_path": "/tmp/AbstractPlainSocketImpl.java", @@ -181,6 +187,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -241,9 +250,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -298,24 +313,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index e03a5c1f8ea..e33e153f0b1 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -65,6 +68,9 @@ "error.exception.module": [ "org.springframework.http.client" ], + "error.exception.parent": [ + 1 + ], "error.exception.stacktrace": [ { "abs_path": "/tmp/AbstractPlainSocketImpl.java", @@ -184,6 +190,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -244,9 +253,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -301,24 +316,39 @@ "service.framework.name": [ "Node" ], + "service.framework.name.text": [ + "Node" + ], "service.framework.version": [ "1" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "1.2" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-xyz" ], + "service.node.name.text": [ + "node-xyz" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -402,6 +432,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -429,6 +462,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -438,9 +474,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -456,6 +498,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -495,24 +540,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -534,6 +594,9 @@ "transaction.name": [ "GET/" ], + "transaction.name.text": [ + "GET/" + ], "transaction.type": [ "request" ] @@ -551,6 +614,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -584,6 +650,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -611,9 +680,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -662,24 +737,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "opbeans-java-1" ], + "service.name.text": [ + "opbeans-java-1" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -701,6 +791,9 @@ "span.db.user.name": [ "postgres" ], + "span.db.user.name.text": [ + "postgres" + ], "span.duration.us": [ 3781 ], @@ -710,6 +803,9 @@ "span.name": [ "GET users-authenticated" ], + "span.name.text": [ + "GET users-authenticated" + ], "span.representative_count": [ 1 ], @@ -776,6 +872,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -824,6 +923,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -896,9 +998,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -950,24 +1058,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "experimental-java" ], + "service.name.text": [ + "experimental-java" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], @@ -1074,9 +1197,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "Chrome" + ], "user_agent.original": [ "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36, MozillaChromeEdge" ], diff --git a/systemtest/approvals/TestIntake/Metricsets.approved.json b/systemtest/approvals/TestIntake/Metricsets.approved.json index 3ee806a691b..e2e0622a7dd 100644 --- a/systemtest/approvals/TestIntake/Metricsets.approved.json +++ b/systemtest/approvals/TestIntake/Metricsets.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -54,12 +60,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -83,6 +98,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -104,6 +122,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -125,12 +146,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.memory.mem.limit.bytes": [ 2048 ], @@ -160,6 +190,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -181,6 +214,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -202,12 +238,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.process.cgroup.cpu.cfs.period.us": [ 1024 ], @@ -255,6 +300,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -290,6 +338,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -311,12 +362,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "user.email": [ "user@mail.com" ], @@ -340,6 +400,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -359,10 +422,10 @@ true ], "faas.coldstart_duration": [ - 422.97 + 422.9700012207031 ], "faas.duration": [ - 182.43 + 182.42999267578125 ], "faas.execution": [ "6f7f0961f83442118a7af6fe80b88d56" @@ -382,6 +445,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "numeric_labels.tag2": [ 2 ], @@ -403,12 +469,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "system.memory.actual.free": [ 54525952 ], @@ -438,6 +513,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -465,6 +543,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -489,12 +570,21 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-1" ], + "service.node.name.text": [ + "node-1" + ], "span.self_time.count": [ 1 ], @@ -510,6 +600,9 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], diff --git a/systemtest/approvals/TestIntake/MinimalEvents.approved.json b/systemtest/approvals/TestIntake/MinimalEvents.approved.json index 0fde9e28423..2913f24e4cb 100644 --- a/systemtest/approvals/TestIntake/MinimalEvents.approved.json +++ b/systemtest/approvals/TestIntake/MinimalEvents.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -51,6 +54,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -62,6 +68,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -107,6 +116,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -118,6 +130,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -157,6 +172,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "timestamp.us": [ "dynamic" ] @@ -171,6 +189,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -189,6 +210,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -203,6 +227,9 @@ ], "service.name": [ "1234_service-12a3" + ], + "service.name.text": [ + "1234_service-12a3" ] }, { @@ -212,6 +239,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -248,6 +278,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.duration.us": [ 3564 ], @@ -257,6 +290,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -277,6 +313,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -313,6 +352,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.duration.us": [ 3564 ], @@ -322,6 +364,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -342,6 +387,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -375,6 +423,9 @@ "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "span.id": [ "abcdef1478523690" ], diff --git a/systemtest/approvals/TestIntake/Spans.approved.json b/systemtest/approvals/TestIntake/Spans.approved.json index 368417a5185..de98d97fcec 100644 --- a/systemtest/approvals/TestIntake/Spans.approved.json +++ b/systemtest/approvals/TestIntake/Spans.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -21,6 +24,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -30,6 +36,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -39,6 +48,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -48,6 +60,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -87,6 +102,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -111,9 +129,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -157,30 +181,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "testdb" ], + "service.target.name.text": [ + "testdb" + ], "service.target.type": [ "postgres" ], @@ -205,9 +247,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgres/testdb" ], @@ -223,6 +271,9 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], @@ -322,6 +373,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -331,6 +385,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -340,6 +397,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -349,6 +409,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -358,6 +421,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -385,6 +451,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -394,9 +463,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -440,24 +515,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -476,6 +566,9 @@ "span.name": [ "get /api/types" ], + "span.name.text": [ + "get /api/types" + ], "span.representative_count": [ 1 ], @@ -520,6 +613,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -529,6 +625,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -538,6 +637,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -547,6 +649,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -556,6 +661,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -583,6 +691,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -592,9 +703,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -647,24 +764,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -680,6 +812,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -724,6 +859,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -733,6 +871,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -742,6 +883,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -751,6 +895,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -760,6 +907,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -787,6 +937,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -796,9 +949,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -842,24 +1001,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -875,6 +1049,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -916,6 +1093,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -925,6 +1105,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -934,6 +1117,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -943,6 +1129,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -952,6 +1141,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -982,6 +1174,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -991,9 +1186,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1037,24 +1238,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1082,6 +1298,9 @@ "span.name": [ "SELECT FROM p_details" ], + "span.name.text": [ + "SELECT FROM p_details" + ], "span.representative_count": [ 1 ], @@ -1129,6 +1348,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -1138,6 +1360,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1147,6 +1372,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1156,6 +1384,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1165,6 +1396,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1204,6 +1438,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1228,9 +1465,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1274,30 +1517,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "testdb" ], + "service.target.name.text": [ + "testdb" + ], "service.target.type": [ "postgres" ], @@ -1322,9 +1583,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgresql" ], @@ -1340,6 +1607,9 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], @@ -1439,6 +1709,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1448,6 +1721,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1457,6 +1733,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1466,6 +1745,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1475,6 +1757,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1508,6 +1793,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1517,9 +1805,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1563,24 +1857,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1602,12 +1911,18 @@ "span.message.queue.name": [ "new_users" ], + "span.message.queue.name.text": [ + "new_users" + ], "span.message.routing_key": [ "user-created-span" ], "span.name": [ "Rabbitmq receive" ], + "span.name.text": [ + "Rabbitmq receive" + ], "span.representative_count": [ 1 ], @@ -1652,6 +1967,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1664,6 +1982,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1673,6 +1994,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1682,6 +2006,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1691,6 +2018,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1721,6 +2051,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1730,9 +2063,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1776,24 +2115,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -1812,6 +2166,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -1856,6 +2213,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1865,6 +2225,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1874,6 +2237,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1883,6 +2249,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1892,6 +2261,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1931,6 +2303,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1940,9 +2315,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1986,30 +2367,48 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "backendspans" ], + "service.name.text": [ + "backendspans" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], "service.target.name": [ "localhost:8080" ], + "service.target.name.text": [ + "localhost:8080" + ], "service.target.type": [ "" ], @@ -2022,6 +2421,9 @@ "span.destination.service.name": [ "external" ], + "span.destination.service.name.text": [ + "external" + ], "span.destination.service.resource": [ "localhost:8080" ], @@ -2037,6 +2439,9 @@ "span.name": [ "Request" ], + "span.name.text": [ + "Request" + ], "span.representative_count": [ 1 ], @@ -2084,6 +2489,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -2093,6 +2501,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -2102,6 +2513,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -2111,6 +2525,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -2120,6 +2537,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -2159,6 +2579,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -2186,9 +2609,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -2232,24 +2661,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -2277,9 +2721,15 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.destination.service.name": [ "postgresql" ], + "span.destination.service.name.text": [ + "postgresql" + ], "span.destination.service.resource": [ "postgresql" ], @@ -2295,6 +2745,9 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index a3df939ae5d..6da49ae9e21 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -18,6 +21,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -27,6 +33,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -36,6 +45,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -45,6 +57,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -72,6 +87,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -81,9 +99,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -130,24 +154,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -191,6 +230,9 @@ "transaction.message.queue.name": [ "new_users" ], + "transaction.message.queue.name.text": [ + "new_users" + ], "transaction.message.routing_key": [ "user-created-transaction" ], @@ -235,6 +277,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -244,6 +289,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -253,6 +301,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -262,6 +313,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -271,6 +325,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -298,6 +355,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -307,9 +367,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -356,24 +422,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -430,6 +511,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -454,6 +538,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -463,6 +550,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -472,6 +562,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -481,6 +574,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -511,6 +607,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -591,9 +690,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -646,24 +751,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "7.0" ], @@ -767,9 +887,15 @@ "user_agent.device.name": [ "Mac" ], + "user_agent.device.name.text": [ + "Mac" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "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" ], @@ -808,6 +934,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -817,6 +946,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -826,6 +958,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -835,6 +970,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -844,6 +982,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -871,6 +1012,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -883,9 +1027,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -929,24 +1079,39 @@ "service.framework.name": [ "Rails" ], + "service.framework.name.text": [ + "Rails" + ], "service.framework.version": [ "5.0" ], "service.language.name": [ "ruby" ], + "service.language.name.text": [ + "ruby" + ], "service.language.version": [ "2.5" ], "service.name": [ "service1" ], + "service.name.text": [ + "service1" + ], "service.node.name": [ "node-ABC" ], + "service.node.name.text": [ + "node-ABC" + ], "service.runtime.name": [ "cruby" ], + "service.runtime.name.text": [ + "cruby" + ], "service.runtime.version": [ "2.5" ], @@ -1036,6 +1201,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1045,6 +1213,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1054,6 +1225,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1069,12 +1243,18 @@ "cloud.origin.service.name": [ "serviceName" ], + "cloud.origin.service.name.text": [ + "serviceName" + ], "cloud.project.id": [ "project_id" ], "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1084,6 +1264,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1108,6 +1291,9 @@ "faas.name": [ "faasName" ], + "faas.name.text": [ + "faasName" + ], "faas.trigger.request_id": [ "FuH2Cir_vHcEMUA=" ], @@ -1129,6 +1315,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1138,9 +1327,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -1184,33 +1379,51 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.origin.id": [ "abc123" ], "service.origin.name": [ "service-name" ], + "service.origin.name.text": [ + "service-name" + ], "service.origin.version": [ "1.0" ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index c3b48460971..1e7dd5e1253 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -33,6 +36,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -42,6 +48,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -51,6 +60,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -60,6 +72,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -90,6 +105,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -170,9 +188,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -225,24 +249,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "chatty-service" ], + "service.name.text": [ + "chatty-service" + ], "service.node.name": [ "chatty-node" ], + "service.node.name.text": [ + "chatty-node" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "7.0" ], @@ -349,9 +388,15 @@ "user_agent.device.name": [ "Mac" ], + "user_agent.device.name.text": [ + "Mac" + ], "user_agent.name": [ "Chrome" ], + "user_agent.name.text": [ + "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" ], diff --git a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json index 578ef307e0b..17a98c6f26b 100644 --- a/systemtest/approvals/TestIntake/UnknownSpanType.approved.json +++ b/systemtest/approvals/TestIntake/UnknownSpanType.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -48,6 +51,9 @@ "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -91,24 +97,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "container-id" ], + "service.node.name.text": [ + "container-id" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -127,6 +148,9 @@ "span.db.user.name": [ "readonly_user" ], + "span.db.user.name.text": [ + "readonly_user" + ], "span.duration.us": [ 3781 ], @@ -136,6 +160,9 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], @@ -216,6 +243,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "1.3" ], @@ -234,6 +264,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "host.architecture": [ "x64" ], @@ -310,6 +343,9 @@ "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -356,24 +392,39 @@ "service.framework.name": [ "Express" ], + "service.framework.name.text": [ + "Express" + ], "service.framework.version": [ "1.2.3" ], "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "serviceabc" ], + "service.name.text": [ + "serviceabc" + ], "service.node.name": [ "special-name" ], + "service.node.name.text": [ + "special-name" + ], "service.runtime.name": [ "javascript" ], + "service.runtime.name.text": [ + "javascript" + ], "service.runtime.version": [ "8.0.0" ], @@ -480,9 +531,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Other" ], + "user_agent.name.text": [ + "Other" + ], "user_agent.original": [ "Mozilla Chrome Edge" ], diff --git a/systemtest/approvals/TestIntakeLog/with_faas.approved.json b/systemtest/approvals/TestIntakeLog/with_faas.approved.json index f4027880df6..0ad648c5e2e 100644 --- a/systemtest/approvals/TestIntakeLog/with_faas.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_faas.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -51,6 +54,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -60,9 +66,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -108,24 +120,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json index b7af03e4488..6b64465c20e 100644 --- a/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_flat_ecs_fields.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json index 58e95a53a41..2371bb723f8 100644 --- a/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_nested_ecs_fields.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], 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 14f97043e1e..d75e63da7a7 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 @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -54,6 +57,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -63,9 +69,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -93,6 +105,9 @@ "log.origin.file.name": [ "testFile" ], + "log.origin.file.name.text": [ + "testFile" + ], "log.origin.function": [ "testFunc" ], @@ -129,6 +144,9 @@ "process.thread.name": [ "testThread" ], + "process.thread.name.text": [ + "testThread" + ], "process.title": [ "/usr/lib/jvm/java-10-openjdk-amd64/bin/java" ], @@ -141,24 +159,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "testSvc" ], + "service.name.text": [ + "testSvc" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json index 39869bafc29..be07910b78b 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json index bc0c05fa3e6..18871753bdb 100644 --- a/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json +++ b/systemtest/approvals/TestIntakeLog/with_timestamp_as_str.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json index 8620e852b9b..24f22e3a21c 100644 --- a/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json +++ b/systemtest/approvals/TestIntakeLog/without_timestamp.approved.json @@ -12,6 +12,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -42,6 +45,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -51,9 +57,15 @@ "kubernetes.node.name": [ "node-name" ], + "kubernetes.node.name.text": [ + "node-name" + ], "kubernetes.pod.name": [ "instrumented-java-service" ], + "kubernetes.pod.name.text": [ + "instrumented-java-service" + ], "kubernetes.pod.uid": [ "b17f231da0ad128dc6c6c0b2e82f6f303d3893e3" ], @@ -99,24 +111,39 @@ "service.framework.name": [ "spring" ], + "service.framework.name.text": [ + "spring" + ], "service.framework.version": [ "5.0.0" ], "service.language.name": [ "Java" ], + "service.language.name.text": [ + "Java" + ], "service.language.version": [ "10.0.2" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" ], + "service.node.name.text": [ + "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4" + ], "service.runtime.name": [ "Java" ], + "service.runtime.name.text": [ + "Java" + ], "service.runtime.version": [ "10.0.2" ], diff --git a/systemtest/approvals/TestJaeger/batch_0.approved.json b/systemtest/approvals/TestJaeger/batch_0.approved.json index 6d2e8adb656..bc8e88eb58d 100644 --- a/systemtest/approvals/TestJaeger/batch_0.approved.json +++ b/systemtest/approvals/TestJaeger/batch_0.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -42,6 +45,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -63,12 +69,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -98,6 +113,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -131,6 +149,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -152,12 +173,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -187,6 +217,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -220,6 +253,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "message": [ "Retrying GetDriver after error" ], @@ -241,12 +277,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -276,6 +321,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -300,6 +348,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -321,12 +372,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -347,6 +407,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -371,6 +434,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -392,12 +458,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -418,6 +493,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -442,6 +520,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.key": [ "customer" ], @@ -463,12 +544,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], @@ -489,6 +579,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -513,6 +606,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.as": [ "thrift" ], @@ -546,12 +642,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "driver" ], + "service.name.text": [ + "driver" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "7be2fd98d0973be3" ], diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index d765ad08e9d..edb65820106 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -9,6 +9,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -42,6 +45,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T762465C" ], @@ -66,12 +72,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705006847 ], @@ -89,6 +104,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -122,6 +140,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T781861C" ], @@ -146,12 +167,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705089372 ], @@ -169,6 +199,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -202,6 +235,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.driver_id": [ "T752547C" ], @@ -226,12 +262,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "timestamp.us": [ 1576827705172347 ], @@ -249,6 +294,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -273,6 +321,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.level": [ "info" ], @@ -288,15 +339,27 @@ "observer.version": [ "dynamic" ], + "parent.id": [ + "7be2fd98d0973be3" + ], "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.id": [ "6e09e8bcefd6b828" ], @@ -314,6 +377,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -341,6 +407,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752547C" ], @@ -362,12 +431,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 39602 ], @@ -377,6 +455,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -400,6 +481,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -424,6 +508,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -445,12 +532,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 11802 ], @@ -460,6 +556,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -483,6 +582,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -507,6 +609,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757338C" ], @@ -528,12 +633,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 10431 ], @@ -543,6 +657,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -566,6 +683,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -590,6 +710,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T708771C" ], @@ -611,12 +734,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 11986 ], @@ -626,6 +758,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -649,6 +784,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -676,6 +814,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -697,12 +838,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 33732 ], @@ -712,6 +862,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -735,6 +888,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -759,6 +915,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T710624C" ], @@ -780,12 +939,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 7311 ], @@ -795,6 +963,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -818,6 +989,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -845,6 +1019,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -866,12 +1043,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 35375 ], @@ -881,6 +1067,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -904,6 +1093,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -928,6 +1120,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T705860C" ], @@ -949,12 +1144,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 12236 ], @@ -964,6 +1168,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -987,6 +1194,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1011,6 +1221,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -1032,12 +1245,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 9240 ], @@ -1047,6 +1269,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1070,6 +1295,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1094,6 +1322,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752547C" ], @@ -1115,12 +1346,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 14029 ], @@ -1130,6 +1370,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1153,6 +1396,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1177,6 +1423,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752110C" ], @@ -1198,12 +1447,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 10630 ], @@ -1213,6 +1471,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1236,6 +1497,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1260,6 +1524,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757670C" ], @@ -1281,12 +1548,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 13946 ], @@ -1296,6 +1572,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1319,6 +1598,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1343,6 +1625,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_location": [ "728,326" ], @@ -1364,12 +1649,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 19711 ], @@ -1379,6 +1673,9 @@ "span.name": [ "FindDriverIDs" ], + "span.name.text": [ + "FindDriverIDs" + ], "span.representative_count": [ 1 ], @@ -1402,6 +1699,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1426,6 +1726,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T712515C" ], @@ -1447,12 +1750,21 @@ "service.language.name": [ "Go" ], + "service.language.name.text": [ + "Go" + ], "service.name": [ "redis" ], + "service.name.text": [ + "redis" + ], "service.node.name": [ "host01" ], + "service.node.name.text": [ + "host01" + ], "span.duration.us": [ 12561 ], @@ -1462,6 +1774,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], diff --git a/systemtest/approvals/TestNoMatchingSourcemap.approved.json b/systemtest/approvals/TestNoMatchingSourcemap.approved.json index 0c0caf5703f..1da04f9c1fc 100644 --- a/systemtest/approvals/TestNoMatchingSourcemap.approved.json +++ b/systemtest/approvals/TestNoMatchingSourcemap.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -42,6 +45,12 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.0" + ], "source.ip": [ "127.0.0.1" ], @@ -57,6 +66,9 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], @@ -106,6 +118,27 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/span" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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/TestOTLPGRPCLogs.approved.json b/systemtest/approvals/TestOTLPGRPCLogs.approved.json index c3abed08e21..13ca1da74f9 100644 --- a/systemtest/approvals/TestOTLPGRPCLogs.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogs.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "otlp/go" ], + "agent.name.text": [ + "otlp/go" + ], "agent.version": [ "unknown" ], @@ -45,9 +48,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "span.id": [ "0200000000000000" ], diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index b8aab6b00e8..837ba5afc7a 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "android/java" ], + "agent.name.text": [ + "android/java" + ], "agent.version": [ "unknown" ], @@ -69,9 +72,15 @@ "service.language.name": [ "java" ], + "service.language.name.text": [ + "java" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "source.ip": [ "178.162.206.244" ], diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json index 0a439456ec9..3febad1344c 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_counter.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -24,6 +27,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -39,8 +45,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" + ], + "service.name.text": [ + "unknown_service_systemtest_test" ] } ] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json index ff53d2e172b..be3589de9d4 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_histogram.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -37,6 +40,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -52,8 +58,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" + ], + "service.name.text": [ + "unknown_service_systemtest_test" ] } ] diff --git a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json index 4ad1b9142cd..74331909ff3 100644 --- a/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json +++ b/systemtest/approvals/TestOTLPGRPCMetrics_summary.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "otlp" ], + "agent.name.text": [ + "otlp" + ], "agent.version": [ "unknown" ], @@ -21,6 +24,9 @@ "metricset.name": [ "app" ], + "metricset.name.text": [ + "app" + ], "observer.hostname": [ "dynamic" ], @@ -36,9 +42,15 @@ "service.language.name": [ "unknown" ], + "service.language.name.text": [ + "unknown" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "summary": [ { "sum": 123.456, diff --git a/systemtest/approvals/TestOTLPGRPCTraces.approved.json b/systemtest/approvals/TestOTLPGRPCTraces.approved.json index dee4990f459..76bd2a686df 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -84,12 +87,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], @@ -116,6 +128,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -167,12 +182,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], @@ -190,6 +214,9 @@ "agent.name": [ "opentelemetry/go" ], + "agent.name.text": [ + "opentelemetry/go" + ], "agent.version": [ "1.19.0" ], @@ -246,12 +273,21 @@ "service.framework.name": [ "systemtest" ], + "service.framework.name.text": [ + "systemtest" + ], "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "unknown_service_systemtest_test" ], + "service.name.text": [ + "unknown_service_systemtest_test" + ], "span.id": [ "b3ee9be3b687a611" ], diff --git a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json index 45f2b2242f9..7b920becc77 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -287,6 +290,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +332,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/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 45f2b2242f9..7b920becc77 100644 --- a/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json +++ b/systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -287,6 +290,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +332,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestRUMRoutingIntegration.approved.json b/systemtest/approvals/TestRUMRoutingIntegration.approved.json index 9e00f3a44a8..8d146ad17ef 100644 --- a/systemtest/approvals/TestRUMRoutingIntegration.approved.json +++ b/systemtest/approvals/TestRUMRoutingIntegration.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -30,6 +33,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "POST" ], @@ -60,9 +66,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -72,6 +111,9 @@ "span.destination.service.name": [ "http://localhost:8003" ], + "span.destination.service.name.text": [ + "http://localhost:8003" + ], "span.destination.service.resource": [ "localhost:8003" ], @@ -87,6 +129,9 @@ "span.name": [ "POST http://localhost:8003/data" ], + "span.name.text": [ + "POST http://localhost:8003/data" + ], "span.subtype": [ "h" ], @@ -110,6 +155,39 @@ ], "url.original.text": [ "http://localhost:8003/data" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -119,6 +197,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -143,6 +224,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "GET" ], @@ -173,9 +257,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -185,6 +302,9 @@ "span.destination.service.name": [ "http://localhost:8000" ], + "span.destination.service.name.text": [ + "http://localhost:8000" + ], "span.destination.service.resource": [ "localhost:8000" ], @@ -200,6 +320,9 @@ "span.name": [ "GET /test/e2e/common/data.json" ], + "span.name.text": [ + "GET /test/e2e/common/data.json" + ], "span.subtype": [ "h" ], @@ -223,6 +346,39 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/common/data.json?test=hamid" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -232,6 +388,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -274,9 +433,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -292,6 +484,9 @@ "span.name": [ "OpenTracing y" ], + "span.name.text": [ + "OpenTracing y" + ], "span.type": [ "cu" ], @@ -303,6 +498,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -312,6 +540,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -336,6 +567,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.method": [ "POST" ], @@ -366,9 +600,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -381,6 +648,9 @@ "span.destination.service.name": [ "http://localhost:8003" ], + "span.destination.service.name.text": [ + "http://localhost:8003" + ], "span.destination.service.resource": [ "localhost:8003" ], @@ -396,6 +666,9 @@ "span.name": [ "POST http://localhost:8003/fetch" ], + "span.name.text": [ + "POST http://localhost:8003/fetch" + ], "span.subtype": [ "h" ], @@ -419,6 +692,39 @@ ], "url.original.text": [ "http://localhost:8003/fetch" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -428,6 +734,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -470,9 +779,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -488,6 +830,9 @@ "span.name": [ "Requesting and receiving the document" ], + "span.name.text": [ + "Requesting and receiving the document" + ], "span.subtype": [ "browser-timing" ], @@ -502,6 +847,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -511,6 +889,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -529,6 +910,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "labels.testTagKey": [ "testTagValue" ], @@ -553,9 +937,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -571,6 +988,9 @@ "span.name": [ "Fire \"DOMContentLoaded\" event" ], + "span.name.text": [ + "Fire \"DOMContentLoaded\" event" + ], "span.stacktrace": [ { "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", @@ -613,6 +1033,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -622,6 +1075,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -679,9 +1135,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -691,6 +1180,9 @@ "span.destination.service.name": [ "http://localhost:8000" ], + "span.destination.service.name.text": [ + "http://localhost:8000" + ], "span.destination.service.resource": [ "localhost:8000" ], @@ -706,6 +1198,9 @@ "span.name": [ "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" ], + "span.name.text": [ + "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" + ], "span.subtype": [ "script" ], @@ -726,6 +1221,39 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=REDACTED" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -735,6 +1263,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -777,9 +1308,42 @@ "service.environment": [ "prod" ], + "service.framework.name": [ + "angular" + ], + "service.framework.name.text": [ + "angular" + ], + "service.framework.version": [ + "2" + ], + "service.language.name": [ + "javascript" + ], + "service.language.name.text": [ + "javascript" + ], + "service.language.version": [ + "6" + ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], + "service.runtime.name": [ + "v8" + ], + "service.runtime.name.text": [ + "v8" + ], + "service.runtime.version": [ + "8.0" + ], + "service.version": [ + "0.0.1" + ], "source.ip": [ "dynamic" ], @@ -795,6 +1359,9 @@ "span.name": [ "Parsing the document, executing sy. scripts" ], + "span.name.text": [ + "Parsing the document, executing sy. scripts" + ], "span.subtype": [ "browser-timing" ], @@ -809,6 +1376,39 @@ ], "transaction.id": [ "ec2e280be8345240" + ], + "user.email": [ + "user@email.com" + ], + "user.id": [ + "123" + ], + "user.name": [ + "John Doe" + ], + "user.name.text": [ + "John Doe" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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" ] }, { @@ -818,6 +1418,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -836,6 +1439,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "http.request.headers.Accept": [ "application/json" ], @@ -890,21 +1496,33 @@ "service.framework.name": [ "angular" ], + "service.framework.name.text": [ + "angular" + ], "service.framework.version": [ "2" ], "service.language.name": [ "javascript" ], + "service.language.name.text": [ + "javascript" + ], "service.language.version": [ "6" ], "service.name": [ "apm-a-rum-test-e2e-general-usecase" ], + "service.name.text": [ + "apm-a-rum-test-e2e-general-usecase" + ], "service.runtime.name": [ "v8" ], + "service.runtime.name.text": [ + "v8" + ], "service.runtime.version": [ "8.0" ], @@ -1078,9 +1696,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json index d24f9c48dd5..5815ce3894b 100644 --- a/systemtest/approvals/TestRUMSpanSourcemapping.approved.json +++ b/systemtest/approvals/TestRUMSpanSourcemapping.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "0.0.0" ], @@ -42,6 +45,12 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], + "service.version": [ + "1.0.0" + ], "source.ip": [ "127.0.0.1" ], @@ -57,6 +66,9 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], @@ -151,6 +163,27 @@ ], "url.original.text": [ "http://localhost:8000/test/e2e/general-usecase/span" + ], + "user_agent.device.name": [ + "Other" + ], + "user_agent.device.name.text": [ + "Other" + ], + "user_agent.name": [ + "Go-http-client" + ], + "user_agent.name.text": [ + "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.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json index 3ed284fcf21..89d28519fa6 100644 --- a/systemtest/approvals/TestRUMXForwardedFor.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "5.5.0" ], @@ -45,6 +48,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "observer.hostname": [ "dynamic" ], @@ -60,6 +66,9 @@ "service.name": [ "rum-js-test" ], + "service.name.text": [ + "rum-js-test" + ], "source.ip": [ "220.244.41.16" ], @@ -81,15 +90,24 @@ "transaction.name": [ "GET /" ], + "transaction.name.text": [ + "GET /" + ], "transaction.type": [ "request" ], "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], @@ -107,6 +125,9 @@ "agent.name": [ "rum-js" ], + "agent.name.text": [ + "rum-js" + ], "agent.version": [ "5.5.0" ], @@ -161,6 +182,9 @@ "service.name": [ "rum-js-test" ], + "service.name.text": [ + "rum-js-test" + ], "source.ip": [ "220.244.41.16" ], @@ -197,9 +221,15 @@ "user_agent.device.name": [ "Other" ], + "user_agent.device.name.text": [ + "Other" + ], "user_agent.name": [ "Go-http-client" ], + "user_agent.name.text": [ + "Go-http-client" + ], "user_agent.original": [ "Go-http-client/1.1" ], diff --git a/systemtest/approvals/TestServiceDestinationAggregation.approved.json b/systemtest/approvals/TestServiceDestinationAggregation.approved.json index 1ba70139ede..3f8b3010a31 100644 --- a/systemtest/approvals/TestServiceDestinationAggregation.approved.json +++ b/systemtest/approvals/TestServiceDestinationAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -48,9 +51,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -65,6 +74,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] }, { @@ -74,6 +86,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -116,9 +131,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -133,6 +154,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] }, { @@ -142,6 +166,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -184,9 +211,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "resource" ], @@ -201,6 +234,9 @@ ], "span.name": [ "name" + ], + "span.name.text": [ + "name" ] } ] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json index c937596cd3a..c9997c600af 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -36,8 +39,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -47,6 +56,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -77,8 +89,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -88,6 +106,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -118,8 +139,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] } ] diff --git a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json index 242e01cd566..90e3d2be8ab 100644 --- a/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json +++ b/systemtest/approvals/TestServiceSummaryMetricsAggregationOverflow.approved.json @@ -33,6 +33,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -71,6 +74,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -109,6 +115,9 @@ "service.name": [ "_other" ], + "service.name.text": [ + "_other" + ], "service_summary.aggregation.overflow_count": [ 2 ] @@ -120,6 +129,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -153,8 +165,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -164,6 +182,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -197,8 +218,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -208,6 +235,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -241,8 +271,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -252,6 +288,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.10m" ], @@ -285,8 +324,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -296,6 +341,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.1m" ], @@ -329,8 +377,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] }, { @@ -340,6 +394,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_summary.60m" ], @@ -373,8 +430,14 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" + ], + "service.name.text": [ + "systemtest" ] } ] diff --git a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json index 70c5980a6c8..c09b5be6abb 100644 --- a/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json +++ b/systemtest/approvals/TestServiceTransactionMetricsAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.10m" ], @@ -42,9 +45,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -72,6 +81,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.1m" ], @@ -108,9 +120,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -138,6 +156,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.60m" ], @@ -174,9 +195,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -204,6 +231,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.10m" ], @@ -240,9 +270,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -270,6 +306,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.1m" ], @@ -306,9 +345,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ @@ -336,6 +381,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_transaction.60m" ], @@ -372,9 +420,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "transaction.duration.histogram": [ { "counts": [ diff --git a/systemtest/approvals/TestTransactionAggregation.approved.json b/systemtest/approvals/TestTransactionAggregation.approved.json index 1f1c147f6f8..1c9107c47ae 100644 --- a/systemtest/approvals/TestTransactionAggregation.approved.json +++ b/systemtest/approvals/TestTransactionAggregation.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -30,6 +33,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -54,18 +60,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -88,6 +106,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -102,6 +123,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -126,6 +150,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -150,18 +177,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -184,6 +223,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -198,6 +240,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -222,6 +267,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -246,18 +294,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -280,6 +340,9 @@ "transaction.name": [ "abc" ], + "transaction.name.text": [ + "abc" + ], "transaction.root": [ true ], @@ -294,6 +357,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -318,6 +384,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -342,18 +411,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -376,6 +457,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -390,6 +474,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -414,6 +501,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -438,18 +528,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -472,6 +574,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -486,6 +591,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -510,6 +618,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -534,18 +645,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -568,6 +691,9 @@ "transaction.name": [ "def" ], + "transaction.name.text": [ + "def" + ], "transaction.root": [ true ], @@ -582,12 +708,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -600,6 +732,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -609,6 +744,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -636,12 +774,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -672,18 +816,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -709,6 +865,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], @@ -726,12 +885,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -744,6 +909,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -753,6 +921,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -780,12 +951,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -816,18 +993,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -853,6 +1042,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], @@ -870,12 +1062,18 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "cloud.account.id": [ "account_id" ], "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -888,6 +1086,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -897,6 +1098,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -924,12 +1128,18 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "labels.tag1": [ "one" ], @@ -960,18 +1170,30 @@ "service.language.name": [ "ecmascript" ], + "service.language.name.text": [ + "ecmascript" + ], "service.language.version": [ "8" ], "service.name": [ "1234_service-12a3" ], + "service.name.text": [ + "1234_service-12a3" + ], "service.node.name": [ "node-123" ], + "service.node.name.text": [ + "node-123" + ], "service.runtime.name": [ "node" ], + "service.runtime.name.text": [ + "node" + ], "service.runtime.version": [ "8.0.0" ], @@ -997,6 +1219,9 @@ "transaction.name": [ "faas" ], + "transaction.name.text": [ + "faas" + ], "transaction.result": [ "success" ], diff --git a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json index 667edb05506..163880e72bc 100644 --- a/systemtest/approvals/TestTransactionAggregationShutdown.approved.json +++ b/systemtest/approvals/TestTransactionAggregationShutdown.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.10m" ], @@ -30,6 +33,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -54,18 +60,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -88,6 +106,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], @@ -102,6 +123,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.1m" ], @@ -126,6 +150,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -150,18 +177,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -184,6 +223,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], @@ -198,6 +240,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.transaction.60m" ], @@ -222,6 +267,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -246,18 +294,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], @@ -280,6 +340,9 @@ "transaction.name": [ "name" ], + "transaction.name.text": [ + "name" + ], "transaction.root": [ true ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json index 95e8c64c6d3..33382beded6 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -39,9 +42,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -62,6 +71,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -95,9 +107,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -118,6 +136,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -151,9 +172,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "elasticsearch" ], @@ -174,6 +201,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.10m" ], @@ -207,9 +237,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], @@ -230,6 +266,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.1m" ], @@ -263,9 +302,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], @@ -286,6 +331,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "data_stream.dataset": [ "apm.service_destination.60m" ], @@ -319,9 +367,15 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.target.type": [ "redis" ], diff --git a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json index 951a0cb2591..84bb0883fa6 100644 --- a/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json +++ b/systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json @@ -6,6 +6,9 @@ "agent.name": [ "go" ], + "agent.name.text": [ + "go" + ], "agent.version": [ "0.0.0" ], @@ -36,6 +39,9 @@ "host.name": [ "beowulf" ], + "host.name.text": [ + "beowulf" + ], "host.os.platform": [ "minix" ], @@ -63,18 +69,30 @@ "service.language.name": [ "go" ], + "service.language.name.text": [ + "go" + ], "service.language.version": [ "2.0" ], "service.name": [ "systemtest" ], + "service.name.text": [ + "systemtest" + ], "service.node.name": [ "beowulf" ], + "service.node.name.text": [ + "beowulf" + ], "service.runtime.name": [ "gc" ], + "service.runtime.name.text": [ + "gc" + ], "service.runtime.version": [ "2.0" ], diff --git a/systemtest/ingest_test.go b/systemtest/ingest_test.go index c1bd709dd6e..4b6ff344694 100644 --- a/systemtest/ingest_test.go +++ b/systemtest/ingest_test.go @@ -20,7 +20,6 @@ package systemtest_test import ( "context" "encoding/json" - "io" "net/http" "net/url" "strings" @@ -83,34 +82,6 @@ func TestIngestPipeline(t *testing.T) { assert.False(t, destinationIP.Exists()) // destination.address is not an IP } -func TestIngestPipelineVersionEnforcement(t *testing.T) { - source := `{"observer": {"version": "100.200.300"}}` // apm-server version is too new - dataStreams := []string{ - "traces-apm-default", - "traces-apm.rum-default", - "metrics-apm.internal-default", - "metrics-apm.app.service_name-default", - "logs-apm.error-default", - } - - for _, dataStream := range dataStreams { - body := strings.NewReader(source) - resp, err := systemtest.Elasticsearch.Index(dataStream, body) - require.NoError(t, err) - - respBody, err := io.ReadAll(resp.Body) - require.NoError(t, err) - resp.Body.Close() - - if !assert.Equal(t, http.StatusInternalServerError, resp.StatusCode, "%s: %s", dataStream, respBody) { - continue - } - assert.Contains(t, string(respBody), - `Document produced by APM Server v100.200.300, which is newer than the installed APM integration`, - ) - } -} - func TestIngestPipelineEventDuration(t *testing.T) { type test struct { source string diff --git a/systemtest/logstash_test.go b/systemtest/logstash_test.go index 114a1b26377..299333a494d 100644 --- a/systemtest/logstash_test.go +++ b/systemtest/logstash_test.go @@ -38,11 +38,13 @@ func TestLogstashOutput(t *testing.T) { require.NoError(t, err) t.Cleanup(func() { assert.NoError(t, ls.Close()) }) + waitForIntegration := false srv := apmservertest.NewUnstartedServerTB(t, "-E", "queue.mem.events=20000", "-E", "queue.mem.flush.min_events=10000", "-E", "queue.mem.flush.timeout=60s", ) + srv.Config.WaitForIntegration = &waitForIntegration srv.Config.Output = apmservertest.OutputConfig{ Logstash: &apmservertest.LogstashOutputConfig{ Enabled: true, diff --git a/systemtest/main_test.go b/systemtest/main_test.go index 8d04d978ab7..68b98704b6d 100644 --- a/systemtest/main_test.go +++ b/systemtest/main_test.go @@ -19,6 +19,7 @@ package systemtest import ( "errors" + "flag" "fmt" "log" "os" @@ -30,7 +31,11 @@ import ( "golang.org/x/sync/errgroup" ) +var installPackage = flag.Bool("apmpackage", true, "Install the APM integration package") + func TestMain(m *testing.M) { + flag.Parse() + var errg errgroup.Group errg.Go(func() error { @@ -41,14 +46,15 @@ func TestMain(m *testing.M) { return nil }) - errg.Go(func() error { - log.Println("INFO: building the integration package...") - if err := buildIntegrationPackage(); err != nil { - return fmt.Errorf("failed to build the integration package: %w", err) - } - - return nil - }) + if *installPackage { + errg.Go(func() error { + log.Println("INFO: building the integration package...") + if err := buildIntegrationPackage(); err != nil { + return fmt.Errorf("failed to build the integration package: %w", err) + } + return nil + }) + } if err := errg.Wait(); err != nil { log.Fatal(err) @@ -63,14 +69,15 @@ func TestMain(m *testing.M) { return nil }) - errg.Go(func() error { - log.Println("INFO: setting up fleet...") - if err := InitFleet(); err != nil { - return fmt.Errorf("failed to setup fleet: %w", err) - } - - return nil - }) + if *installPackage { + errg.Go(func() error { + log.Println("INFO: installing integration package...") + if err := InitFleet(); err != nil { + return fmt.Errorf("failed to installing integration package: %w", err) + } + return nil + }) + } if err := errg.Wait(); err != nil { log.Fatal(err)