diff --git a/_meta/fields.common.yml b/_meta/fields.common.yml index 537cfbd0ee2..be5d8160696 100644 --- a/_meta/fields.common.yml +++ b/_meta/fields.common.yml @@ -685,3 +685,64 @@ dynamic: true description: Additional experimental data sent by the agents. + - name: cloud + title: Cloud + group: 2 + type: group + fields: + - name: account + type: group + dynamic: false + fields: + - name: id + level: extended + type: keyword + ignore_above: 1024 + - name: name + level: extended + type: keyword + ignore_above: 1024 + - name: availability_zone + level: extended + type: keyword + ignore_above: 1024 + - name: instance + type: group + dynamic: false + fields: + - name: id + level: extended + type: keyword + ignore_above: 1024 + - name: name + level: extended + type: keyword + ignore_above: 1024 + - name: machine + type: group + dynamic: false + fields: + - name: type + level: extended + type: keyword + ignore_above: 1024 + - name: project + type: group + dynamic: false + fields: + - name: id + level: extended + type: keyword + ignore_above: 1024 + - name: name + level: extended + type: keyword + ignore_above: 1024 + - name: provider + level: extended + type: keyword + ignore_above: 1024 + - name: region + level: extended + type: keyword + ignore_above: 1024 diff --git a/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json index ab26737f92c..1e35a4c8a65 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json @@ -16,6 +16,26 @@ "client": { "ip": "12.53.12.1" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -354,6 +374,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -455,6 +495,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -552,6 +612,26 @@ "name": "elastic-ruby", "version": "2.1.3" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -655,6 +735,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json index 72fbc5d03be..8e43bbca91d 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json @@ -17,6 +17,26 @@ "51234abcdef56789" ] }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -126,6 +146,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -236,6 +276,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -350,6 +410,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -461,6 +541,26 @@ "name": "elastic-ruby", "version": "2.2" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -654,6 +754,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json index 34f43c4ed62..267384f2393 100644 --- a/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json +++ b/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json @@ -12,6 +12,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -123,6 +143,26 @@ "client": { "ip": "12.53.12.1" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -324,6 +364,26 @@ "name": "elastic-ruby", "version": "2.2" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -448,6 +508,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/processor/otel/test_approved/metadata_jaeger-no-language.approved.json b/processor/otel/test_approved/metadata_jaeger-no-language.approved.json index 250b0bb7b1e..12e67a3e900 100644 --- a/processor/otel/test_approved/metadata_jaeger-no-language.approved.json +++ b/processor/otel/test_approved/metadata_jaeger-no-language.approved.json @@ -2,6 +2,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/metadata_jaeger-version.approved.json b/processor/otel/test_approved/metadata_jaeger-version.approved.json index e3f8f2fe707..9634a3682ab 100644 --- a/processor/otel/test_approved/metadata_jaeger-version.approved.json +++ b/processor/otel/test_approved/metadata_jaeger-version.approved.json @@ -2,6 +2,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/metadata_jaeger.approved.json b/processor/otel/test_approved/metadata_jaeger.approved.json index bafac320b0f..527cde483cc 100644 --- a/processor/otel/test_approved/metadata_jaeger.approved.json +++ b/processor/otel/test_approved/metadata_jaeger.approved.json @@ -2,6 +2,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": { "a": "b", "c": "d", diff --git a/processor/otel/test_approved/metadata_jaeger_minimal.approved.json b/processor/otel/test_approved/metadata_jaeger_minimal.approved.json index 16105ffc02d..d76a0c0717e 100644 --- a/processor/otel/test_approved/metadata_jaeger_minimal.approved.json +++ b/processor/otel/test_approved/metadata_jaeger_minimal.approved.json @@ -2,6 +2,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/metadata_minimal.approved.json b/processor/otel/test_approved/metadata_minimal.approved.json index 1fc25e82cd5..34d6b2e0f44 100644 --- a/processor/otel/test_approved/metadata_minimal.approved.json +++ b/processor/otel/test_approved/metadata_minimal.approved.json @@ -2,6 +2,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_1.approved.json b/processor/otel/test_approved/span_error_jaeger_http_1.approved.json index e0ef438655c..79708cea56c 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_1.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_1.approved.json @@ -46,6 +46,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_2.approved.json b/processor/otel/test_approved/span_error_jaeger_http_2.approved.json index 385f4688696..606f92d25f6 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_2.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_2.approved.json @@ -36,6 +36,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_3.approved.json b/processor/otel/test_approved/span_error_jaeger_http_3.approved.json index e624ed722bd..ca1d60aee9e 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_3.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_3.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_4.approved.json b/processor/otel/test_approved/span_error_jaeger_http_4.approved.json index e624ed722bd..ca1d60aee9e 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_4.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_4.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_5.approved.json b/processor/otel/test_approved/span_error_jaeger_http_5.approved.json index 90f85aadb37..ed17aea900c 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_5.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_5.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_error_jaeger_http_6.approved.json b/processor/otel/test_approved/span_error_jaeger_http_6.approved.json index 7841b38e257..eefd4c5ecd2 100644 --- a/processor/otel/test_approved/span_error_jaeger_http_6.approved.json +++ b/processor/otel/test_approved/span_error_jaeger_http_6.approved.json @@ -36,6 +36,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_jaeger_custom_0.approved.json b/processor/otel/test_approved/span_jaeger_custom_0.approved.json index fc2c11daee3..6c0544242a8 100644 --- a/processor/otel/test_approved/span_jaeger_custom_0.approved.json +++ b/processor/otel/test_approved/span_jaeger_custom_0.approved.json @@ -14,6 +14,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_jaeger_db_0.approved.json b/processor/otel/test_approved/span_jaeger_db_0.approved.json index 2e516b2f4f8..177fb11efbd 100644 --- a/processor/otel/test_approved/span_jaeger_db_0.approved.json +++ b/processor/otel/test_approved/span_jaeger_db_0.approved.json @@ -23,6 +23,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_jaeger_http_0.approved.json b/processor/otel/test_approved/span_jaeger_http_0.approved.json index 038e5b7b141..59fa50452ac 100644 --- a/processor/otel/test_approved/span_jaeger_http_0.approved.json +++ b/processor/otel/test_approved/span_jaeger_http_0.approved.json @@ -31,6 +31,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/span_jaeger_http_status_code_0.approved.json b/processor/otel/test_approved/span_jaeger_http_status_code_0.approved.json index c57e6fc79df..639776e23bc 100644 --- a/processor/otel/test_approved/span_jaeger_http_status_code_0.approved.json +++ b/processor/otel/test_approved/span_jaeger_http_status_code_0.approved.json @@ -19,6 +19,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_1.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_1.approved.json index 8803295b05a..aa05838e074 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_1.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_1.approved.json @@ -46,6 +46,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_2.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_2.approved.json index 4b2d174b891..79dccec1cc2 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_2.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_2.approved.json @@ -36,6 +36,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_3.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_3.approved.json index 64326073d79..c378d4ff13f 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_3.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_3.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_4.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_4.approved.json index 64326073d79..c378d4ff13f 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_4.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_4.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_5.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_5.approved.json index 2355f95e873..8887aef44be 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_5.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_5.approved.json @@ -40,6 +40,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_error_jaeger_full_6.approved.json b/processor/otel/test_approved/transaction_error_jaeger_full_6.approved.json index b32193b98c7..f4fe994562b 100644 --- a/processor/otel/test_approved/transaction_error_jaeger_full_6.approved.json +++ b/processor/otel/test_approved/transaction_error_jaeger_full_6.approved.json @@ -36,6 +36,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_custom_0.approved.json b/processor/otel/test_approved/transaction_jaeger_custom_0.approved.json index 8d443a68e98..4e6ccdad1b3 100644 --- a/processor/otel/test_approved/transaction_jaeger_custom_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_custom_0.approved.json @@ -13,6 +13,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_full_0.approved.json b/processor/otel/test_approved/transaction_jaeger_full_0.approved.json index 850424a7ff9..bfa9ed481aa 100644 --- a/processor/otel/test_approved/transaction_jaeger_full_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_full_0.approved.json @@ -37,6 +37,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_no_attrs_0.approved.json b/processor/otel/test_approved/transaction_jaeger_no_attrs_0.approved.json index 26c2072d911..e7bc83b797b 100644 --- a/processor/otel/test_approved/transaction_jaeger_no_attrs_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_no_attrs_0.approved.json @@ -13,6 +13,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_type_component_0.approved.json b/processor/otel/test_approved/transaction_jaeger_type_component_0.approved.json index 181ec63cd16..34b485446d0 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_component_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_component_0.approved.json @@ -13,6 +13,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_type_request_0.approved.json b/processor/otel/test_approved/transaction_jaeger_type_request_0.approved.json index a9e8ac88dc7..647d39c52ea 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_request_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_request_0.approved.json @@ -25,6 +25,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/otel/test_approved/transaction_jaeger_type_request_result_0.approved.json b/processor/otel/test_approved/transaction_jaeger_type_request_result_0.approved.json index bc8221e2940..a2fa08955ed 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_request_result_0.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_request_result_0.approved.json @@ -23,6 +23,18 @@ "Client": { "IP": "" }, + "Cloud": { + "AccountID": "", + "AccountName": "", + "AvailabilityZone": "", + "InstanceID": "", + "InstanceName": "", + "MachineType": "", + "ProjectID": "", + "ProjectName": "", + "Provider": "", + "Region": "" + }, "Labels": {}, "Process": { "Argv": null, diff --git a/processor/stream/package_tests/error_attrs_test.go b/processor/stream/package_tests/error_attrs_test.go index db087ba08ac..437322ddb4a 100644 --- a/processor/stream/package_tests/error_attrs_test.go +++ b/processor/stream/package_tests/error_attrs_test.go @@ -147,6 +147,7 @@ func errorKeywordExceptionKeys() *tests.Set { tests.Group("service"), tests.Group("user"), tests.Group("span"), + tests.Group("cloud"), ) } diff --git a/processor/stream/package_tests/metadata_attrs_test.go b/processor/stream/package_tests/metadata_attrs_test.go index 6e04b44f80c..43773269983 100644 --- a/processor/stream/package_tests/metadata_attrs_test.go +++ b/processor/stream/package_tests/metadata_attrs_test.go @@ -115,6 +115,7 @@ func TestMetadataPayloadAttrsMatchFields(t *testing.T) { {Template: "process.argv", Mapping: "process.args"}, {Template: "labels.*", Mapping: "labels"}, {Template: "service.node.configured_name", Mapping: "service.node.name"}, + {Template: "cloud", Mapping: "cloud"}, } setup.EventFieldsMappedToTemplateFields(t, eventFields, mappingFields) } diff --git a/processor/stream/package_tests/span_attrs_test.go b/processor/stream/package_tests/span_attrs_test.go index cef529b48a6..1fc44fd89fe 100644 --- a/processor/stream/package_tests/span_attrs_test.go +++ b/processor/stream/package_tests/span_attrs_test.go @@ -161,6 +161,7 @@ func spanKeywordExceptionKeys() *tests.Set { tests.Group("user"), tests.Group("url"), tests.Group("http"), + tests.Group("cloud"), ), transactionContext(), ) diff --git a/processor/stream/package_tests/transaction_attrs_test.go b/processor/stream/package_tests/transaction_attrs_test.go index 765d00daf48..79caec9f83b 100644 --- a/processor/stream/package_tests/transaction_attrs_test.go +++ b/processor/stream/package_tests/transaction_attrs_test.go @@ -124,6 +124,7 @@ func transactionKeywordExceptionKeys() *tests.Set { tests.Group("service"), tests.Group("user"), tests.Group("span"), + tests.Group("cloud"), ) } diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json index 56421984c26..35af2d90793 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json @@ -10,6 +10,26 @@ "client": { "ip": "12.53.12.1" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -331,6 +351,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -415,6 +455,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -495,6 +555,26 @@ "name": "elastic-ruby", "version": "2.1.3" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -581,6 +661,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json index 67aac764345..18847fb6b77 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json @@ -11,6 +11,26 @@ "51234abcdef56789" ] }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -103,6 +123,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -196,6 +236,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -293,6 +353,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -387,6 +467,26 @@ "name": "elastic-ruby", "version": "2.2" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -563,6 +663,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationTransactions.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationTransactions.approved.json index d32b98c3ecd..c037a328f0b 100644 --- a/processor/stream/test_approved_es_documents/testIntakeIntegrationTransactions.approved.json +++ b/processor/stream/test_approved_es_documents/testIntakeIntegrationTransactions.approved.json @@ -6,6 +6,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -100,6 +120,26 @@ "client": { "ip": "12.53.12.1" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -284,6 +324,26 @@ "name": "elastic-ruby", "version": "2.2" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, @@ -391,6 +451,26 @@ "name": "elastic-node", "version": "3.14.0" }, + "cloud": { + "account": { + "id": "account_id", + "name": "account_name" + }, + "availability_zone": "cloud_availability_zone", + "instance": { + "id": "instance_id", + "name": "instance_name" + }, + "machine": { + "type": "machine_type" + }, + "project": { + "id": "project_id", + "name": "project_name" + }, + "provider": "cloud_provider", + "region": "cloud_region" + }, "container": { "id": "container-id" }, diff --git a/processor/stream/test_approved_stream_result/testIntegrationResultCloudMetadata.approved.json b/processor/stream/test_approved_stream_result/testIntegrationResultCloudMetadata.approved.json new file mode 100644 index 00000000000..172488d4a5e --- /dev/null +++ b/processor/stream/test_approved_stream_result/testIntegrationResultCloudMetadata.approved.json @@ -0,0 +1,3 @@ +{ + "accepted": 1 +} diff --git a/testdata/intake-v2/errors.ndjson b/testdata/intake-v2/errors.ndjson index 30f8f983b4b..75c2892fc60 100644 --- a/testdata/intake-v2/errors.ndjson +++ b/testdata/intake-v2/errors.ndjson @@ -1,4 +1,4 @@ -{"metadata": {"process": {"ppid": 6789, "pid": 1234, "argv": ["node", "server.js"], "title": "node"}, "user": { "id": 123, "username": "bar", "email": "bar@example.com"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "configured_hostname": "prod.example", "detected_hostname": "myhostname", "architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "service": {"name": "1234_service-12a3","node": {"configured_name": "node-abc"},"language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node", "ephemeral_id":"abcdef123"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}}}} +{"metadata": {"process": {"ppid": 6789, "pid": 1234, "argv": ["node", "server.js"], "title": "node"}, "user": { "id": 123, "username": "bar", "email": "bar@example.com"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "configured_hostname": "prod.example", "detected_hostname": "myhostname", "architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "service": {"name": "1234_service-12a3","node": {"configured_name": "node-abc"},"language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node", "ephemeral_id":"abcdef123"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}},"cloud":{"account":{"id":"account_id","name":"account_name"},"availability_zone":"cloud_availability_zone","instance":{"id":"instance_id","name":"instance_name"},"machine":{"type":"machine_type"},"project":{"id":"project_id","name":"project_name"},"provider":"cloud_provider","region":"cloud_region"}}} {"error": {"id": "0123456789012345", "timestamp": 1494342245999999, "culprit": "my.module.function_name","log": { "message": "My service could not talk to the database named foobar", "param_message": "My service could not talk to the database named %s", "logger_name": "my.logger.name", "level": "warning", "stacktrace": [{"classname": "User::Common"}, {"abs_path": "/real/file/name.py", "filename": "/webpack/file/name.py", "classname": "Webpack::File::Name", "function": "foo", "vars": { "key": "value" }, "pre_context": ["line1", "line2"], "context_line": "line3","library_frame": false,"lineno": 3,"module": "App::MyModule","colno": 4,"post_context": ["line4","line5" ]},{"filename": "lib/instrumentation/index.js","lineno": 102,"function": "instrumented","abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js","vars": {"key": "value"},"pre_context": [" var trans = this.currentTransaction",""," return instrumented",""," function instrumented () {"," var prev = ins.currentTransaction", " ins.currentTransaction = trans"],"context_line": " var result = original.apply(this, arguments)","post_context": [" ins.currentTransaction = prev"," return result","}","}","","Instrumentation.prototype._recoverTransaction = function (trans) {"," if (this.currentTransaction === trans) return"]}]},"exception": {"message": "The username root is unknown","type": "DbError","module": "__builtins__","code": 42,"handled": false,"attributes": {"foo": "bar" }, "cause":[{"type":"InternalDbError", "message":"something wrong writing a file", "cause":[{"type":"VeryInternalDbError", "message":"disk spinning way too fast"}, {"type":"ConnectionError", "message":"on top of it, internet doesn't work", "parent": 0}]}], "stacktrace": [{"classname": "BaseClass"},{ "abs_path": "/real/file/name.py","filename": "file/name.py","classname": "RName","function": "foo","vars": {"key": "value"},"pre_context": ["line1","line2"],"context_line": "line3", "library_frame": true,"lineno": 3,"module": "App::MyModule","colno": 4,"post_context": ["line4","line5"]},{"filename": "lib/instrumentation/index.js","lineno": 102,"function": "instrumented","abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js","vars": {"key": "value"},"pre_context": [" var trans = this.currentTransaction",""," return instrumented",""," function instrumented () {", " var prev = ins.currentTransaction"," ins.currentTransaction = trans"],"context_line": " var result = original.apply(this, arguments)","post_context": [" ins.currentTransaction = prev"," return result","}","}","","Instrumentation.prototype._recoverTransaction = function (trans) {"," if (this.currentTransaction === trans) return"]}]},"context": {"page":{"referer":"http://localhost:8000/test/e2e/","url":"http://localhost:8000/test/e2e/general-usecase/"}, "request": {"socket": {"remote_address": "12.53.12.1","encrypted": true},"http_version": "1.1","method": "POST","url": {"protocol": "https:","full": "https://www.example.com/p/a/t/h?query=string#hash","hostname": "www.example.com","port": 8080,"pathname": "/p/a/t/h","search": "?query=string", "hash": "#hash","raw": "/p/a/t/h?query=string#hash"},"headers": {"user-agent": "Mozilla Chrome Edge","content-type": "text/html","cookie": "c1=v1,c2=v2","some-other-header": "foo","array": ["foo","bar","baz"]}, "cookies": {"c1": "v1", "c2": "v2" },"env": {"SERVER_SOFTWARE": "nginx", "GATEWAY_INTERFACE": "CGI/1.1"},"body": "Hello World"},"response": { "status_code": 200, "headers": { "content-type": "application/json" },"headers_sent": true, "finished": true }, "user": { "id": 99, "username": "foo"},"tags": {"organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8"}, "custom": {"my_key": 1,"some_other_value": "foo bar","and_objects": {"foo": ["bar","baz" ] }},"service": {"name": "service1", "node": {"configured_name": "node-xyz"}, "language": {"version": "1.2"}, "framework": {"version": "1", "name": "Node"}}}}} {"error": {"id": "xFoaabb123FFFFFF", "timestamp": 1533826745999000,"log": {"message": "no user found", "stacktrace": [{"classname": "User::Special"}]}}} {"error": {"id": "cdefab0123456789", "trace_id": null, "timestamp": 1533826745999000,"exception": {"message": "Cannot read property 'baz' no defined"}}} diff --git a/testdata/intake-v2/only-metadata.ndjson b/testdata/intake-v2/only-metadata.ndjson index e0d865e0396..98f74e717c4 100644 --- a/testdata/intake-v2/only-metadata.ndjson +++ b/testdata/intake-v2/only-metadata.ndjson @@ -1 +1 @@ -{"metadata": {"process": {"ppid": 6789, "pid": 1234, "argv": ["node", "server.js"], "title": "node"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "configured_hostname": "foo", "detected_hostname": "myhostname" ,"architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "service": {"name": "1234_service-12a3","node":{"configured_name":"abc-xyz"},"language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node", "ephemeral_id": "123abcdef"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}}, "labels": {"tag0": null, "tag1": "one", "tag2": 2}, "user": {"id": "99","username": "foo","email": "foo@example.com"}}} +{"metadata": {"process": {"ppid": 6789, "pid": 1234, "argv": ["node", "server.js"], "title": "node"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "configured_hostname": "foo", "detected_hostname": "myhostname" ,"architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "service": {"name": "1234_service-12a3","node":{"configured_name":"abc-xyz"},"language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node", "ephemeral_id": "123abcdef"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}}, "labels": {"tag0": null, "tag1": "one", "tag2": 2}, "user": {"id": "99","username": "foo","email": "foo@example.com"},"cloud":{"account":{"id":"account_id","name":"account_name"},"availability_zone":"cloud_availability_zone","instance":{"id":"instance_id","name":"instance_name"},"machine":{"type":"machine_type"},"project":{"id":"project_id","name":"project_name"},"provider":"cloud_provider","region":"cloud_region"}}} diff --git a/testdata/intake-v2/spans.ndjson b/testdata/intake-v2/spans.ndjson index 17380c15ca2..bb953bc8d00 100644 --- a/testdata/intake-v2/spans.ndjson +++ b/testdata/intake-v2/spans.ndjson @@ -1,4 +1,4 @@ -{"metadata": {"user": {"id": "123", "email": "s@test.com", "username": "john"}, "process": {"ppid": 6789, "pid": 1234,"argv": ["node", "server.js"], "title": "node"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "labels": {"tag1": "label1"}, "service": {"name": "backendspans", "language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}}}} +{"metadata": {"user": {"id": "123", "email": "s@test.com", "username": "john"}, "process": {"ppid": 6789, "pid": 1234,"argv": ["node", "server.js"], "title": "node"}, "system": {"platform": "darwin", "hostname": "prod1.example.com", "architecture": "x64", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}, "labels": {"tag1": "label1"}, "service": {"name": "backendspans", "language": {"version": "8", "name": "ecmascript"}, "agent": {"version": "3.14.0", "name": "elastic-node"}, "environment": "staging", "framework": {"version": "1.2.3", "name": "Express"}, "version": "5.1.3", "runtime": {"version": "8.0.0", "name": "node"}},"cloud":{"account":{"id":"account_id","name":"account_name"},"availability_zone":"cloud_availability_zone","instance":{"id":"instance_id","name":"instance_name"},"machine":{"type":"machine_type"},"project":{"id":"project_id","name":"project_name"},"provider":"cloud_provider","region":"cloud_region"}}} {"span": {"trace_id": "fdedef0123456789abcdef9876543210", "parent_id": "abcdef0123456789", "id": "abcdef01234567", "child_ids": ["51234abcdef56789"], "transaction_id": "01af25874dec69dd", "name": "GET /api/types", "type": "db.postgresql.query.custom","start": null, "duration": 141.581, "timestamp": 1532976822281000}} {"span": {"trace_id": "abcdef0123456789abcdef9876543210", "parent_id": "0000000011111111", "id": "1234abcdef567895", "transaction_id": "ab45781d265894fe", "name": "GET /api/types", "type": "request", "start": 22, "duration": 32.592981, "timestamp": 1532976822281000,"context":{"service":{"environment":"prod","agent":{}}}}} {"span": {"trace_id": "abcdef0123456789abcdef9876543210", "parent_id": "abcdefabcdef7890", "id": "0123456a89012345", "transaction_id": "ab23456a89012345", "name": "GET /api/types", "type": "request.http", "start": 1.845, "duration": 3.5642981, "stacktrace": [], "context":{"tags": {"tag1": "value1", "tag2": 123, "tag3": 12.34, "tag4": true, "tag5": null},"service":{}}}} diff --git a/testdata/intake-v2/transactions.ndjson b/testdata/intake-v2/transactions.ndjson index 559e67e3a5d..d9d4d82d301 100644 --- a/testdata/intake-v2/transactions.ndjson +++ b/testdata/intake-v2/transactions.ndjson @@ -1,4 +1,4 @@ -{"metadata": {"service": {"name": "1234_service-12a3","node": {"configured_name": "node-123"},"version": "5.1.3","environment": "staging","language": {"name": "ecmascript","version": "8"},"runtime": {"name": "node","version": "8.0.0"},"framework": {"name": "Express","version": "1.2.3"},"agent": {"name": "elastic-node","version": "3.14.0"}},"user": {"id": "123user", "username": "bar", "email": "bar@user.com"}, "labels": {"tag0": null, "tag1": "one", "tag2": 2}, "process": {"pid": 1234,"ppid": 6789,"title": "node","argv": ["node","server.js"]},"system": {"hostname": "prod1.example.com","architecture": "x64","platform": "darwin", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}}}} +{"metadata": {"service": {"name": "1234_service-12a3","node": {"configured_name": "node-123"},"version": "5.1.3","environment": "staging","language": {"name": "ecmascript","version": "8"},"runtime": {"name": "node","version": "8.0.0"},"framework": {"name": "Express","version": "1.2.3"},"agent": {"name": "elastic-node","version": "3.14.0"}},"user": {"id": "123user", "username": "bar", "email": "bar@user.com"}, "labels": {"tag0": null, "tag1": "one", "tag2": 2}, "process": {"pid": 1234,"ppid": 6789,"title": "node","argv": ["node","server.js"]},"system": {"hostname": "prod1.example.com","architecture": "x64","platform": "darwin", "container": {"id": "container-id"}, "kubernetes": {"namespace": "namespace1", "pod": {"uid": "pod-uid", "name": "pod-name"}, "node": {"name": "node-name"}}},"cloud":{"account":{"id":"account_id","name":"account_name"},"availability_zone":"cloud_availability_zone","instance":{"id":"instance_id","name":"instance_name"},"machine":{"type":"machine_type"},"project":{"id":"project_id","name":"project_name"},"provider":"cloud_provider","region":"cloud_region"}}} {"transaction": { "id": "945254c567a5417e", "trace_id": "0123456789abcdef0123456789abcdef", "parent_id": "abcdefabcdef01234567", "type": "request", "duration": 32.592981, "span_count": { "started": 43 }}} {"transaction": {"id": "4340a8e0df1906ecbfa9", "trace_id": "0acd456789abcdef0123456789abcdef", "name": "GET /api/types","type": "request","duration": 32.592981,"result": "success", "timestamp": 1496170407154000, "sampled": true, "span_count": {"started": 17},"context": {"service": {"runtime": {"version": "7.0"}},"page":{"referer":"http://localhost:8000/test/e2e/","url":"http://localhost:8000/test/e2e/general-usecase/"}, "request": {"socket": {"remote_address": "12.53.12.1","encrypted": true},"http_version": "1.1","method": "POST","url": {"protocol": "https:","full": "https://www.example.com/p/a/t/h?query=string#hash","hostname": "www.example.com","port": "8080","pathname": "/p/a/t/h","search": "?query=string","hash": "#hash","raw": "/p/a/t/h?query=string#hash"},"headers": {"user-agent":["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36","Mozilla Chrome Edge"],"content-type": "text/html","cookie": "c1=v1, c2=v2","some-other-header": "foo","array": ["foo","bar","baz"]},"cookies": {"c1": "v1","c2": "v2"},"env": {"SERVER_SOFTWARE": "nginx","GATEWAY_INTERFACE": "CGI/1.1"},"body": {"str": "hello world","additional": { "foo": {},"bar": 123,"req": "additional information"}}},"response": {"status_code": 200,"headers": {"content-type": "application/json"},"headers_sent": true,"finished": true,"transfer_size":25.8,"encoded_body_size":26.90,"decoded_body_size":29.90}, "user": {"id": "99","username": "foo"},"tags": {"organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8", "tag2": 12, "tag3": 12.45, "tag4": false, "tag5": null },"custom": {"my_key": 1,"some_other_value": "foo bar","and_objects": {"foo": ["bar","baz"]},"(": "not a valid regex and that is fine"}}}} {"transaction": { "id": "cdef4340a8e0df19", "trace_id": "0acd456789abcdef0123456789abcdef", "type": "request", "duration": 13.980558, "timestamp": 1532976822281000, "sampled": null, "span_count": { "dropped": 55, "started": 436 }, "marks": {"navigationTiming": {"appBeforeBootstrap": 608.9300000000001,"navigationStart": -21},"another_mark": {"some_long": 10,"some_float": 10.0}, "performance": {}}, "context": { "request": { "socket": { "remote_address": "192.0.1", "encrypted": null }, "method": "POST", "headers": { "user-agent": null, "content-type": null, "cookie": null }, "url": { "protocol": null, "full": null, "hostname": null, "port": null, "pathname": null, "search": null, "hash": null, "raw": null } }, "response": { "headers": { "content-type": null } }, "service": {"environment":"testing","name": "service1","node": {"configured_name": "node-ABC"}, "language": {"version": "2.5", "name": "ruby"}, "agent": {"version": "2.2", "name": "elastic-ruby", "ephemeral_id": "justanid"}, "framework": {"version": "5.0", "name": "Rails"}, "version": "2", "runtime": {"version": "2.5", "name": "cruby"}}}}}