From 538feb4677f75206b07526360265730e57a5a0fc Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Wed, 22 May 2024 18:06:03 +0800 Subject: [PATCH] Depend on apm-data plugin (#12066) * docker-compose: enable apm-data * testing/docker: don't install APM integration * Update system tests to use apm-data * Remove wait_for_integration config * Add changelog --- changelogs/head.asciidoc | 2 + docker-compose.yml | 1 + internal/beater/beater.go | 18 +- internal/beater/beatertest/server.go | 5 - internal/beater/checkintegration.go | 146 ---- internal/beater/config/config_test.go | 9 +- internal/beater/config/data_streams.go | 13 +- internal/beater/config/fleet.go | 30 - internal/beater/server_test.go | 176 +---- systemtest/apmservertest/config.go | 1 - .../approvals/TestAgentConfig.approved.json | 6 + .../TestApprovedMetrics.approved.json | 97 ++- .../TestCompressedSpans.approved.json | 42 ++ .../approvals/TestDropUnsampled.approved.json | 30 + .../approvals/TestErrorIngest.approved.json | 42 ++ .../approvals/TestIntake/Errors.approved.json | 414 ++++++----- .../TestIntake/ErrorsTxID.approved.json | 178 ++--- .../approvals/TestIntake/Events.approved.json | 376 +++++----- .../TestIntake/Metricsets.approved.json | 97 ++- .../TestIntake/MinimalEvents.approved.json | 51 ++ .../approvals/TestIntake/Spans.approved.json | 600 +++++++++++---- .../TestIntake/Transactions.approved.json | 289 ++++++-- .../TransactionsHugeTraces.approved.json | 121 +-- .../TestIntake/UnknownSpanType.approved.json | 167 +++-- .../TestIntakeLog/with_faas.approved.json | 27 + .../with_flat_ecs_fields.approved.json | 33 + .../with_nested_ecs_fields.approved.json | 33 + ...fields_overrides_flat_fields.approved.json | 33 + .../with_timestamp.approved.json | 27 + .../with_timestamp_as_str.approved.json | 27 + .../without_timestamp.approved.json | 27 + .../TestJaeger/batch_0.approved.json | 105 +++ .../TestJaeger/batch_1.approved.json | 315 ++++++++ .../TestNoMatchingSourcemap.approved.json | 62 +- .../approvals/TestOTLPGRPCLogs.approved.json | 9 + .../TestOTLPGRPCLogsClientIP.approved.json | 9 + .../TestOTLPGRPCMetrics_counter.approved.json | 12 + ...estOTLPGRPCMetrics_histogram.approved.json | 12 + .../TestOTLPGRPCMetrics_summary.approved.json | 12 + .../TestOTLPGRPCTraces.approved.json | 36 + .../standalone.approved.json | 236 +----- .../standalone.approved.json | 236 +----- .../TestRUMRoutingIntegration.approved.json | 691 ++++++++++++++++-- .../TestRUMSpanSourcemapping.approved.json | 107 +-- .../TestRUMXForwardedFor.approved.json | 30 + ...erviceDestinationAggregation.approved.json | 36 + ...iceSummaryMetricsAggregation.approved.json | 27 + ...ryMetricsAggregationOverflow.approved.json | 63 ++ ...ransactionMetricsAggregation.approved.json | 54 ++ .../TestTransactionAggregation.approved.json | 225 ++++++ ...ansactionAggregationShutdown.approved.json | 63 ++ ...tionDroppedSpansStatsMetrics.approved.json | 54 ++ ...DroppedSpansStatsTransaction.approved.json | 18 + systemtest/gencorpora/apmserver.go | 2 - testing/docker/kibana/kibana.yml | 5 - 55 files changed, 3712 insertions(+), 1825 deletions(-) delete mode 100644 internal/beater/checkintegration.go delete mode 100644 internal/beater/config/fleet.go diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 52b4689ed43..1449a322f50 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -7,6 +7,7 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] ==== Bug fixes - Avoid data race due to reuse of `bytes.Buffer` in ES bulk requests {pull}13155[13155] +- APM Server now relies on the Elasticsearch apm-data plugin's index templates, which reverts some unsafe uses of `flattened` field types {pull}12066[12066] [float] ==== Breaking Changes @@ -21,3 +22,4 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] ==== Added - Add `elasticsearch.flushed.uncompressed.bytes` metric {pull}13155[13155] +- APM Server now relies on the Elasticsearch apm-data plugin's index templates, removing the requirement to install the APM integration package {pull}12066[12066] diff --git a/docker-compose.yml b/docker-compose.yml index 9f52746e25e..fc6f31dfa31 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,7 @@ services: - "http.host=0.0.0.0" - "cluster.routing.allocation.disk.threshold_enabled=false" - "discovery.type=single-node" + - "xpack.apm_data.enabled=true" - "xpack.security.authc.anonymous.roles=remote_monitoring_collector" - "xpack.security.authc.realms.file.file1.order=0" - "xpack.security.authc.realms.native.native1.order=1" diff --git a/internal/beater/beater.go b/internal/beater/beater.go index 2e88ae759f1..0ad84361f29 100644 --- a/internal/beater/beater.go +++ b/internal/beater/beater.go @@ -85,7 +85,6 @@ type Runner struct { rawConfig *agentconfig.C config *config.Config - fleetConfig *config.Fleet outputConfig agentconfig.Namespace elasticsearchOutputConfig *agentconfig.C @@ -113,7 +112,6 @@ func NewRunner(args RunnerParams) (*Runner, error) { var unpackedConfig struct { APMServer *agentconfig.C `config:"apm-server"` Output agentconfig.Namespace `config:"output"` - Fleet *config.Fleet `config:"fleet"` DataStream struct { Namespace string `config:"namespace"` } `config:"data_stream"` @@ -147,7 +145,6 @@ func NewRunner(args RunnerParams) (*Runner, error) { rawConfig: args.Config, config: cfg, - fleetConfig: unpackedConfig.Fleet, outputConfig: unpackedConfig.Output, elasticsearchOutputConfig: elasticsearchOutputConfig, @@ -328,7 +325,7 @@ func (s *Runner) Run(ctx context.Context) error { publishReady := make(chan struct{}) drain := make(chan struct{}) g.Go(func() error { - if err := s.waitReady(ctx, kibanaClient, tracer); err != nil { + if err := s.waitReady(ctx, tracer); err != nil { // One or more preconditions failed; drop events. close(drain) return errors.Wrap(err, "error waiting for server to be ready") @@ -567,7 +564,6 @@ func linearScaledValue(perGBIncrement, memLimitGB, constant float64) int { // waitReady waits until the server is ready to index events. func (s *Runner) waitReady( ctx context.Context, - kibanaClient *kibana.Client, tracer *apm.Tracer, ) error { var preconditions []func(context.Context) error @@ -618,18 +614,6 @@ func (s *Runner) waitReady( }) } - // When running standalone with data streams enabled, by default we will add - // a precondition that ensures the integration is installed. - fleetManaged := s.fleetConfig != nil - if !fleetManaged && s.config.DataStreams.WaitForIntegration { - if kibanaClient == nil && esOutputClient == nil { - return errors.New("cannot wait for integration without either Kibana or Elasticsearch config") - } - preconditions = append(preconditions, func(ctx context.Context) error { - return checkIntegrationInstalled(ctx, kibanaClient, esOutputClient, s.logger) - }) - } - if len(preconditions) == 0 { return nil } diff --git a/internal/beater/beatertest/server.go b/internal/beater/beatertest/server.go index bab5f02de49..9fc64c8fdf0 100644 --- a/internal/beater/beatertest/server.go +++ b/internal/beater/beatertest/server.go @@ -86,10 +86,6 @@ func NewUnstartedServer(t testing.TB, opts ...option) *Server { config: []*agentconfig.C{agentconfig.MustNewConfigFrom(map[string]interface{}{ "apm-server": map[string]interface{}{ "host": "localhost:0", - - // Disable waiting for integration to be installed by default, - // to simplify tests. This feature is tested independently. - "data_streams.wait_for_integration": false, }, })}, } @@ -206,7 +202,6 @@ type option func(*options) // // apm-server: // host: localhost:0 -// data_streams.wait_for_integration: false func WithConfig(cfg ...*agentconfig.C) option { return func(opts *options) { opts.config = append(opts.config, cfg...) diff --git a/internal/beater/checkintegration.go b/internal/beater/checkintegration.go deleted file mode 100644 index f0fe62ebc59..00000000000 --- a/internal/beater/checkintegration.go +++ /dev/null @@ -1,146 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package beater - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "io" - "net/http" - - "github.com/pkg/errors" - "golang.org/x/sync/errgroup" - - "github.com/elastic/elastic-agent-libs/logp" - - "github.com/elastic/apm-server/internal/elasticsearch" - "github.com/elastic/apm-server/internal/kibana" - "github.com/elastic/go-elasticsearch/v8/esapi" -) - -// checkIntegrationInstalled checks if the APM integration is installed by querying Kibana -// and/or Elasticsearch, returning nil if and only if it is installed. -func checkIntegrationInstalled( - ctx context.Context, - kibanaClient *kibana.Client, - esClient *elasticsearch.Client, - logger *logp.Logger, -) (err error) { - defer func() { - if err != nil { - // We'd like to include some remediation actions when the APM Integration isn't installed. - err = &actionableError{ - Err: err, - Name: "apm integration installed", - Remediation: "please install the apm integration: https://ela.st/apm-integration-quickstart", - } - } - }() - if kibanaClient != nil { - installed, err := checkIntegrationInstalledKibana(ctx, kibanaClient, logger) - if err != nil { - // We only return the Kibana error if we have no Elasticsearch client, - // as we may not have sufficient privileges to query the Fleet API. - if esClient == nil { - return fmt.Errorf("error querying Kibana for integration package status: %w", err) - } - } else if !installed { - // We were able to query Kibana, but the package is not yet installed. - // We should continue querying the package status via Kibana, as it is - // more authoritative than checking for index template installation. - return errors.New("integration package not yet installed") - } - // Fall through and query Elasticsearch (if we have a client). Kibana may prematurely - // report packages as installed: https://github.com/elastic/kibana/issues/108649 - } - if esClient != nil { - installed, err := checkIntegrationInstalledElasticsearch(ctx, esClient, logger) - if err != nil { - return fmt.Errorf("error querying Elasticsearch for integration index templates: %w", err) - } else if !installed { - return errors.New("integration index templates not installed") - } - } - return nil -} - -// checkIntegrationInstalledKibana checks if the APM integration package -// is installed by querying Kibana. -func checkIntegrationInstalledKibana(ctx context.Context, kibanaClient *kibana.Client, logger *logp.Logger) (bool, error) { - resp, err := kibanaClient.Send(ctx, "GET", "/api/fleet/epm/packages/apm", nil, nil, nil) - if err != nil { - return false, err - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - body, _ := io.ReadAll(resp.Body) - return false, fmt.Errorf("unexpected HTTP status: %s (%s)", resp.Status, bytes.TrimSpace(body)) - } - var result struct { - Response struct { - Status string `json:"status"` - } `json:"response"` - } - if err := json.NewDecoder(resp.Body).Decode(&result); err != nil { - return false, errors.Wrap(err, "error decoding integration package response") - } - logger.Infof("integration package status: %s", result.Response.Status) - return result.Response.Status == "installed", nil -} - -func checkIntegrationInstalledElasticsearch(ctx context.Context, esClient *elasticsearch.Client, _ *logp.Logger) (bool, error) { - // TODO(axw) generate the list of expected index templates. - templates := []string{ - "traces-apm", - "traces-apm.sampled", - "metrics-apm.app", - "metrics-apm.internal", - "logs-apm.error", - } - for _, intervals := range []string{"1m", "10m", "60m"} { - for _, ds := range []string{"metrics-apm.transaction", "metrics-apm.service_transaction", "metrics-apm.service_destination", "metrics-apm.service_summary"} { - templates = append(templates, fmt.Sprintf("%s.%s", ds, intervals)) - } - } - // IndicesGetIndexTemplateRequest accepts a slice of template names, - // but the REST API expects just one index template name. Query them - // in parallel. - g, ctx := errgroup.WithContext(ctx) - for _, template := range templates { - template := template // copy for closure - g.Go(func() error { - req := esapi.IndicesGetIndexTemplateRequest{Name: template} - resp, err := req.Do(ctx, esClient) - if err != nil { - return err - } - defer resp.Body.Close() - - if resp.IsError() { - body, _ := io.ReadAll(resp.Body) - return fmt.Errorf("unexpected HTTP status: %s (%s)", resp.Status(), bytes.TrimSpace(body)) - } - return nil - }) - } - err := g.Wait() - return err == nil, err -} diff --git a/internal/beater/config/config_test.go b/internal/beater/config/config_test.go index ed99f0caea1..9b136f95b72 100644 --- a/internal/beater/config/config_test.go +++ b/internal/beater/config/config_test.go @@ -370,8 +370,7 @@ func TestUnpackConfig(t *testing.T) { }, DefaultServiceEnvironment: "overridden", DataStreams: DataStreamsConfig{ - Namespace: "default", - WaitForIntegration: true, + Namespace: "default", }, WaitReadyInterval: 5 * time.Second, }, @@ -419,8 +418,7 @@ func TestUnpackConfig(t *testing.T) { "storage_limit": "1GB", }, "data_streams": map[string]interface{}{ - "namespace": "foo", - "wait_for_integration": false, + "namespace": "foo", }, }, outCfg: &Config{ @@ -503,8 +501,7 @@ func TestUnpackConfig(t *testing.T) { }, }, DataStreams: DataStreamsConfig{ - Namespace: "foo", - WaitForIntegration: false, + Namespace: "foo", }, WaitReadyInterval: 5 * time.Second, }, diff --git a/internal/beater/config/data_streams.go b/internal/beater/config/data_streams.go index 0a0456eaa4c..0dbc6d53267 100644 --- a/internal/beater/config/data_streams.go +++ b/internal/beater/config/data_streams.go @@ -20,21 +20,10 @@ package config // DataStreamsConfig holds data streams configuration. type DataStreamsConfig struct { Namespace string `config:"namespace"` - - // WaitForIntegration controls whether APM Server waits for the Fleet - // integration package to be installed before indexing events. - // - // This config is ignored when running under Elastic Agent; it is intended - // for running APM Server standalone, relying on Fleet to install the integration - // for creating Elasticsearch index templates, ILM policies, and ingest pipelines. - // - // This configuration requires either a connection to Kibana or Elasticsearch. - WaitForIntegration bool `config:"wait_for_integration"` } func defaultDataStreamsConfig() DataStreamsConfig { return DataStreamsConfig{ - Namespace: "default", - WaitForIntegration: true, + Namespace: "default", } } diff --git a/internal/beater/config/fleet.go b/internal/beater/config/fleet.go deleted file mode 100644 index 3b584fe3b08..00000000000 --- a/internal/beater/config/fleet.go +++ /dev/null @@ -1,30 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package config - -import ( - "github.com/elastic/elastic-agent-libs/transport/tlscommon" -) - -// Fleet holds configuration required for communicating with fleet-server. -type Fleet struct { - Hosts []string `config:"hosts"` - Protocol string `config:"protocol"` - AccessAPIKey string `config:"access_api_key"` - TLS *tlscommon.Config `config:"ssl"` -} diff --git a/internal/beater/server_test.go b/internal/beater/server_test.go index 5f3cd4abe6a..4540f45f368 100644 --- a/internal/beater/server_test.go +++ b/internal/beater/server_test.go @@ -28,12 +28,10 @@ import ( "net/http/httptest" "net/url" "os" - "path" "path/filepath" "reflect" "runtime" "strings" - "sync/atomic" "testing" "time" @@ -329,180 +327,18 @@ func TestServerOTLPGRPC(t *testing.T) { assert.NoError(t, err) } -func TestServerWaitForIntegrationKibana(t *testing.T) { - var requests int64 - requestCh := make(chan struct{}) - mux := http.NewServeMux() - mux.HandleFunc("/api/status", func(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(`{"version":{"number":"1.2.3"}}`)) - }) - mux.HandleFunc("/api/fleet/epm/packages/apm", func(w http.ResponseWriter, r *http.Request) { - switch atomic.AddInt64(&requests, 1) { - case 1: - w.WriteHeader(500) - case 2: - fmt.Fprintln(w, `{"response":{"status":"not_installed"}}`) - case 3: - fmt.Fprintln(w, `{"response":{"status":"installed"}}`) - } - select { - case requestCh <- struct{}{}: - case <-r.Context().Done(): - } - }) - kibanaServer := httptest.NewServer(mux) - defer kibanaServer.Close() - - srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ - "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "kibana.enabled": true, - "kibana.host": kibanaServer.URL, - "data_streams.wait_for_integration": true, - }, - }))) - - timeout := time.After(10 * time.Second) - for i := 0; i < 3; i++ { - select { - case <-requestCh: - case <-timeout: - t.Fatal("timed out waiting for request") - } - } - - // TODO(axw) there _should_ be just 2 logs, but there might be an initial - // log message due to the Kibana client connecting asynchronously. We should - // update internal/kibana to remove the async behaviour. - logs := srv.Logs.FilterMessageSnippet("please install the apm integration") - assert.NotZero(t, logs.Len()) - - select { - case <-requestCh: - t.Fatal("unexpected request") - case <-time.After(50 * time.Millisecond): - } -} - -func TestServerWaitForIntegrationElasticsearch(t *testing.T) { - var tracesRequests atomic.Int64 - tracesRequestsCh := make(chan int, 2) - bulkCh := make(chan struct{}, 2) - mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("X-Elastic-Product", "Elasticsearch") - // We must send a valid JSON response for the libbeat - // elasticsearch client to send bulk requests. - fmt.Fprintln(w, `{"version":{"number":"1.2.3"}}`) - }) - mux.HandleFunc("/_index_template/", func(w http.ResponseWriter, r *http.Request) { - template := path.Base(r.URL.Path) - if template == "traces-apm" { - count := tracesRequests.Add(1) - if count == 1 { - w.WriteHeader(404) - } - tracesRequestsCh <- int(count) - } - }) - mux.HandleFunc("/_bulk", func(w http.ResponseWriter, r *http.Request) { - select { - case bulkCh <- struct{}{}: - default: - } - }) - elasticsearchServer := httptest.NewServer(mux) - defer elasticsearchServer.Close() - - srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ - "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "data_streams.wait_for_integration": true, - }, - "output.elasticsearch": map[string]interface{}{ - "hosts": []string{elasticsearchServer.URL}, - "backoff": map[string]interface{}{"init": "10ms", "max": "10ms"}, - "max_retries": 1000, - "flush_interval": "1ms", - }, - }))) - - // Send some events to the server. They should be accepted and enqueued. - req := makeTransactionRequest(t, srv.URL) - req.Header.Add("Content-Type", "application/x-ndjson") - resp, err := srv.Client.Do(req) - assert.NoError(t, err) - assert.Equal(t, http.StatusAccepted, resp.StatusCode) - resp.Body.Close() - - // Healthcheck should report that the server is not publish-ready. - resp, err = srv.Client.Get(srv.URL + api.RootPath) - require.NoError(t, err) - out := decodeJSONMap(t, resp.Body) - resp.Body.Close() - assert.Equal(t, false, out["publish_ready"]) - - // Indexing should be blocked until we receive from tracesRequestsCh. - select { - case <-bulkCh: - t.Fatal("unexpected bulk request") - case <-time.After(50 * time.Millisecond): - } - - timeout := time.After(10 * time.Second) - var done bool - for !done { - select { - case n := <-tracesRequestsCh: - done = n == 2 - case <-timeout: - t.Fatal("timed out waiting for request") - } - } - - // libbeat should keep retrying, and finally succeed now it is unblocked. - select { - case <-bulkCh: - case <-time.After(10 * time.Second): - t.Fatal("timed out waiting for bulk request") - } - - logs := srv.Logs.FilterMessageSnippet("please install the apm integration") - assert.Len(t, logs.All(), 1, "couldn't find remediation message logs") - - // Healthcheck should now report that the server is publish-ready. - resp, err = srv.Client.Get(srv.URL + api.RootPath) - require.NoError(t, err) - out = decodeJSONMap(t, resp.Body) - resp.Body.Close() - assert.Equal(t, true, out["publish_ready"]) -} - func TestServerFailedPreconditionDoesNotIndex(t *testing.T) { bulkCh := make(chan struct{}, 1) - mux := http.NewServeMux() - mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("X-Elastic-Product", "Elasticsearch") - // We must send a valid JSON response for the libbeat - // elasticsearch client to send bulk requests. - fmt.Fprintln(w, `{"version":{"number":"1.2.3"}}`) - }) - mux.HandleFunc("/_index_template/", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(404) - }) - mux.HandleFunc("/_bulk", func(w http.ResponseWriter, r *http.Request) { - select { - case bulkCh <- struct{}{}: - default: - } - }) - elasticsearchServer := httptest.NewServer(mux) + elasticsearchServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // When apm-server starts up it will request the Elasticsearch + // cluster UUID, and will not index anything until this is done. + http.Error(w, "server misbehaving", http.StatusInternalServerError) + })) defer elasticsearchServer.Close() srv := beatertest.NewServer(t, beatertest.WithConfig(agentconfig.MustNewConfigFrom(map[string]interface{}{ "apm-server": map[string]interface{}{ - "wait_ready_interval": "100ms", - "data_streams.wait_for_integration": true, + "wait_ready_interval": "100ms", }, "output.elasticsearch.hosts": []string{elasticsearchServer.URL}, }))) diff --git a/systemtest/apmservertest/config.go b/systemtest/apmservertest/config.go index 48253f332b5..77bd71d2ae3 100644 --- a/systemtest/apmservertest/config.go +++ b/systemtest/apmservertest/config.go @@ -46,7 +46,6 @@ type Config struct { Kibana *KibanaConfig `json:"apm-server.kibana,omitempty"` Sampling *SamplingConfig `json:"apm-server.sampling,omitempty"` RUM *RUMConfig `json:"apm-server.rum,omitempty"` - WaitForIntegration *bool `json:"apm-server.data_streams.wait_for_integration,omitempty"` DefaultServiceEnvironment string `json:"apm-server.default_service_environment,omitempty"` AgentConfig *AgentConfig `json:"apm-server.agent.config,omitempty"` TLS *TLSConfig `json:"apm-server.ssl,omitempty"` 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..f34d403c731 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" ], @@ -78,23 +93,6 @@ "error.culprit": [ "my.module.function_name" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -110,71 +108,8 @@ "error.exception.module": [ "__builtins__" ], - "error.exception.stacktrace": [ - { - "classname": "BaseClass", - "exclude_from_grouping": false - }, - { - "abs_path": "/real/file/name.py", - "classname": "RName", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "file/name.py", - "function": "foo", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "DbError", @@ -203,71 +138,6 @@ "error.log.param_message": [ "My service could not talk to the database named %s" ], - "error.log.stacktrace": [ - { - "classname": "User::Common", - "exclude_from_grouping": false - }, - { - "abs_path": "/real/file/name.py", - "classname": "Webpack::File::Name", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "/webpack/file/name.py", - "function": "foo", - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "App::MyModule", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/Users/watson/code/node_modules/elastic/lib/instrumentation/index.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}", - "}", - "", - "Instrumentation.prototype._recoverTransaction = function (trans) {", - " if (this.currentTransaction === trans) return" - ], - "pre": [ - " var trans = this.currentTransaction", - "", - " return instrumented", - "", - " function instrumented () {", - " var prev = ins.currentTransaction", - " ins.currentTransaction = trans" - ] - }, - "exclude_from_grouping": false, - "filename": "lib/instrumentation/index.js", - "function": "instrumented", - "line": { - "context": " var result = original.apply(this, arguments)", - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "x64" ], @@ -280,42 +150,38 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": "Hello World" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -326,8 +192,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -344,9 +214,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 +266,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 +353,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 +382,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -494,6 +394,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -503,6 +406,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -512,6 +418,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -521,6 +430,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -557,6 +469,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -566,9 +481,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 +530,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 +601,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -674,6 +613,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -683,6 +625,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -692,6 +637,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -701,6 +649,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -725,12 +676,6 @@ "error.log.message": [ "no user found" ], - "error.log.stacktrace": [ - { - "classname": "User::Special", - "exclude_from_grouping": false - } - ], "host.architecture": [ "x64" ], @@ -743,6 +688,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -752,9 +700,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 +749,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 +820,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.1.3" ], @@ -860,6 +832,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -869,6 +844,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -878,6 +856,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -887,6 +868,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -920,6 +904,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -929,9 +916,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 +965,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 +1039,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1040,6 +1051,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1049,6 +1063,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1058,6 +1075,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1067,6 +1087,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1106,6 +1129,9 @@ "host.name": [ "prod.example" ], + "host.name.text": [ + "prod.example" + ], "host.os.platform": [ "darwin" ], @@ -1115,9 +1141,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 +1193,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 +1247,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..dc21fa8e33a 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" ], @@ -30,23 +33,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -62,44 +48,8 @@ "error.exception.module": [ "org.springframework.http.client" ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "java.net.UnknownHostException", @@ -128,47 +78,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -181,41 +90,37 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -223,8 +128,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -241,9 +150,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 +213,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..e1d4848c822 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" ], @@ -33,23 +36,6 @@ "error.culprit": [ "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)" ], - "error.custom": [ - { - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], - "error.exception.attributes": [ - { - "foo": "bar" - } - ], "error.exception.code": [ "42" ], @@ -65,44 +51,8 @@ "error.exception.module": [ "org.springframework.http.client" ], - "error.exception.stacktrace": [ - { - "abs_path": "/tmp/AbstractPlainSocketImpl.java", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "AbstractPlainSocketImpl.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "AbstractClientHttpRequest.java", - "function": "execute", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } + "error.exception.parent": [ + 1 ], "error.exception.type": [ "java.net.UnknownHostException", @@ -131,47 +81,6 @@ "error.log.param_message": [ "Request method 'POST' /events/:event not supported" ], - "error.log.stacktrace": [ - { - "abs_path": "/tmp/Socket.java", - "classname": "Request::Socket", - "context": { - "post": [ - "line4", - "line5" - ], - "pre": [ - "line1", - "line2" - ] - }, - "exclude_from_grouping": false, - "filename": "Socket.java", - "function": "connect", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 3 - }, - "module": "java.net", - "vars": { - "key": "value" - } - }, - { - "abs_path": "/tmp/SimpleBufferingClientHttpRequest.java", - "exclude_from_grouping": false, - "filename": "SimpleBufferingClientHttpRequest.java", - "function": "executeInternal", - "line": { - "number": 102 - }, - "vars": { - "key": "value" - } - } - ], "host.architecture": [ "amd64" ], @@ -184,41 +93,37 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": "HelloWorld" - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Length": [ - "0" - ], - "http.request.headers.Cookie": [ - "c1=v1", - "c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" - ], - "http.request.headers.Forwarded": [ - "for=192.168.0.1" - ], - "http.request.headers.Host": [ - "opbeans-java:3000" + "http.request.headers": [ + { + "Content-Length": [ + "0" + ], + "Cookie": [ + "c1=v1", + "c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01" + ], + "Forwarded": [ + "for=192.168.0.1" + ], + "Host": [ + "opbeans-java:3000" + ] + } ], "http.request.method": [ "POST" @@ -226,8 +131,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -244,9 +153,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 +216,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 +332,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0" ], @@ -429,6 +362,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -438,9 +374,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 +398,9 @@ "metricset.name": [ "span_breakdown" ], + "metricset.name.text": [ + "span_breakdown" + ], "numeric_labels.code": [ 200 ], @@ -495,24 +440,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 +494,9 @@ "transaction.name": [ "GET/" ], + "transaction.name.text": [ + "GET/" + ], "transaction.type": [ "request" ] @@ -551,6 +514,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -584,6 +550,9 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], @@ -596,8 +565,12 @@ "http.response.encoded_body_size": [ 356 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 302 @@ -611,9 +584,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 +641,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 +695,9 @@ "span.db.user.name": [ "postgres" ], + "span.db.user.name.text": [ + "postgres" + ], "span.duration.us": [ 3781 ], @@ -710,34 +707,12 @@ "span.name": [ "GET users-authenticated" ], + "span.name.text": [ + "GET users-authenticated" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "exclude_from_grouping": false, - "filename": "DispatcherServlet.java", - "line": { - "number": 547 - } - }, - { - "abs_path": "/tmp/AbstractView.java", - "exclude_from_grouping": false, - "filename": "AbstractView.java", - "function": "render", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "org.springframework.web.servlet.view", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "http" ], @@ -776,6 +751,9 @@ "agent.name": [ "java" ], + "agent.name.text": [ + "java" + ], "agent.version": [ "1.10.0-SNAPSHOT" ], @@ -824,44 +802,34 @@ "host.name": [ "host1" ], + "host.name.text": [ + "host1" + ], "host.os.platform": [ "Linux" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additionalinformation" - }, - "string": "helloworld" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Elastic-Apm-Traceparent": [ - "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", - "MozillaChromeEdge" + "http.request.headers": [ + { + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Elastic-Apm-Traceparent": [ + "00-33a0bd4cceff0370a7c57d807032688e-69feaabc5b88d7e8-01" + ], + "User-Agent": [ + "Mozilla/5.0(Macintosh;IntelMacOSX10_10_5)AppleWebKit/537.36(KHTML,likeGecko)Chrome/51.0.2704.103Safari/537.36", + "MozillaChromeEdge" + ] + } ], "http.request.method": [ "POST" @@ -875,8 +843,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -896,9 +868,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 +928,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" ], @@ -986,19 +979,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "notavalidregexandthatisfine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foobar" - } - ], "transaction.duration.us": [ 32592 ], @@ -1074,9 +1054,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..8de4e79fb7e 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,58 +271,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -322,6 +324,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -331,6 +336,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -340,6 +348,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -349,6 +360,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -358,6 +372,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -385,6 +402,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -394,9 +414,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 +466,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 +517,9 @@ "span.name": [ "get /api/types" ], + "span.name.text": [ + "get /api/types" + ], "span.representative_count": [ 1 ], @@ -520,6 +564,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -529,6 +576,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -538,6 +588,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -547,6 +600,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -556,6 +612,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -583,6 +642,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -592,9 +654,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 +715,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 +763,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -724,6 +810,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -733,6 +822,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -742,6 +834,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -751,6 +846,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -760,6 +858,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -787,6 +888,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -796,9 +900,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 +952,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 +1000,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -916,6 +1044,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -925,6 +1056,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -934,6 +1068,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -943,6 +1080,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -952,6 +1092,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -982,6 +1125,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -991,9 +1137,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 +1189,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 +1249,9 @@ "span.name": [ "SELECT FROM p_details" ], + "span.name.text": [ + "SELECT FROM p_details" + ], "span.representative_count": [ 1 ], @@ -1129,6 +1299,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -1138,6 +1311,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1147,6 +1323,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1156,6 +1335,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1165,6 +1347,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1204,6 +1389,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1228,9 +1416,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 +1468,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 +1534,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,58 +1558,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], @@ -1439,6 +1611,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1448,6 +1623,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1457,6 +1635,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1466,6 +1647,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1475,6 +1659,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1508,6 +1695,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1517,9 +1707,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 +1759,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 +1813,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 +1869,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1664,6 +1884,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1673,6 +1896,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1682,6 +1908,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1691,6 +1920,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1721,6 +1953,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1730,9 +1965,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 +2017,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 +2068,9 @@ "span.name": [ "GET /api/types" ], + "span.name.text": [ + "GET /api/types" + ], "span.representative_count": [ 1 ], @@ -1856,6 +2115,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1865,6 +2127,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1874,6 +2139,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1883,6 +2151,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -1892,6 +2163,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1931,6 +2205,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1940,9 +2217,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 +2269,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 +2323,9 @@ "span.destination.service.name": [ "external" ], + "span.destination.service.name.text": [ + "external" + ], "span.destination.service.resource": [ "localhost:8080" ], @@ -2037,6 +2341,9 @@ "span.name": [ "Request" ], + "span.name.text": [ + "Request" + ], "span.representative_count": [ 1 ], @@ -2084,6 +2391,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -2093,6 +2403,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -2102,6 +2415,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -2111,6 +2427,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -2120,6 +2439,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -2159,6 +2481,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -2186,9 +2511,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 +2563,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 +2623,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,58 +2647,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "classname": "Core.js", - "exclude_from_grouping": false, - "filename": "net.js", - "line": { - "number": 547 - } - }, - { - "context": { - "post": [ - " ins.currentTransaction = prev", - "}" - ] - }, - "exclude_from_grouping": false, - "filename": "file2.js", - "line": { - "number": 12 - } - }, - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - } - ], "span.subtype": [ "postgresql" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index ffa5be2928d..d7603216333 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" ], @@ -301,6 +358,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -310,9 +370,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" ], @@ -359,24 +425,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" ], @@ -444,6 +525,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -468,6 +552,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -477,6 +564,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -486,6 +576,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -495,6 +588,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -525,49 +621,39 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1, c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1, c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -584,8 +670,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -605,9 +695,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" ], @@ -660,24 +756,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" ], @@ -696,19 +807,6 @@ "trace.id": [ "0acd456789abcdef0123456789abcdef" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -781,9 +879,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" ], @@ -822,6 +926,9 @@ "agent.name": [ "elastic-ruby" ], + "agent.name.text": [ + "elastic-ruby" + ], "agent.version": [ "2.2" ], @@ -831,6 +938,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -840,6 +950,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -849,6 +962,9 @@ "cloud.project.name": [ "project_name" ], + "cloud.project.name.text": [ + "project_name" + ], "cloud.provider": [ "cloud_provider" ], @@ -858,6 +974,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -885,6 +1004,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -897,9 +1019,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" ], @@ -943,24 +1071,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" ], @@ -1050,6 +1193,9 @@ "agent.name": [ "elastic-node" ], + "agent.name.text": [ + "elastic-node" + ], "agent.version": [ "3.14.0" ], @@ -1059,6 +1205,9 @@ "cloud.account.name": [ "account_name" ], + "cloud.account.name.text": [ + "account_name" + ], "cloud.availability_zone": [ "cloud_availability_zone" ], @@ -1068,6 +1217,9 @@ "cloud.instance.name": [ "instance_name" ], + "cloud.instance.name.text": [ + "instance_name" + ], "cloud.machine.type": [ "machine_type" ], @@ -1083,12 +1235,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" ], @@ -1098,6 +1256,9 @@ "cloud.service.name": [ "lambda" ], + "cloud.service.name.text": [ + "lambda" + ], "container.id": [ "container-id" ], @@ -1122,6 +1283,9 @@ "faas.name": [ "faasName" ], + "faas.name.text": [ + "faasName" + ], "faas.trigger.request_id": [ "FuH2Cir_vHcEMUA=" ], @@ -1143,6 +1307,9 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], @@ -1152,9 +1319,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" ], @@ -1198,33 +1371,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..e37a5126355 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,49 +105,39 @@ "host.name": [ "node-name" ], + "host.name.text": [ + "node-name" + ], "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1, c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1, c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36", + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -149,8 +154,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -170,9 +179,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 +240,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" ], @@ -261,19 +291,6 @@ "trace.id": [ "646df3b8b5279e982cc12a2f1ac004f3" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -349,9 +366,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..78b5df3636e 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,45 +160,12 @@ "span.name": [ "SELECT FROM product_types" ], + "span.name.text": [ + "SELECT FROM product_types" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "net.js", - "context": { - "post": [ - " ins.currentTransaction = prev", - " return result", - "}" - ], - "pre": [ - " var trans = this.currentTransaction", - "" - ] - }, - "exclude_from_grouping": false, - "filename": "net.js", - "function": "onread", - "library_frame": true, - "line": { - "column": 4, - "context": "line3", - "number": 547 - }, - "module": "some module", - "vars": { - "key": "value" - } - }, - { - "exclude_from_grouping": false, - "filename": "my2file.js", - "line": { - "number": 10 - } - } - ], "span.sync": [ false ], @@ -216,6 +207,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "1.3" ], @@ -234,6 +228,9 @@ "event.outcome": [ "success" ], + "event.success_count": [ + 1 + ], "host.architecture": [ "x64" ], @@ -243,45 +240,32 @@ "host.os.platform": [ "darwin" ], - "http.request.body": [ - { - "original": { - "additional": { - "bar": 123, - "req": "additional information" - }, - "str": "hello world" - } - } - ], - "http.request.cookies.c1": [ - "v1" - ], - "http.request.cookies.c2": [ - "v2" - ], "http.request.env.GATEWAY_INTERFACE": [ "CGI/1.1" ], "http.request.env.SERVER_SOFTWARE": [ "nginx" ], - "http.request.headers.Array": [ - "foo", - "bar", - "baz" - ], - "http.request.headers.Content-Type": [ - "text/html" - ], - "http.request.headers.Cookie": [ - "c1=v1,c2=v2" - ], - "http.request.headers.Some-Other-Header": [ - "foo" - ], - "http.request.headers.User-Agent": [ - "Mozilla Chrome Edge" + "http.request.headers": [ + { + "Array": [ + "foo", + "bar", + "baz" + ], + "Content-Type": [ + "text/html" + ], + "Cookie": [ + "c1=v1,c2=v2" + ], + "Some-Other-Header": [ + "foo" + ], + "User-Agent": [ + "Mozilla Chrome Edge" + ] + } ], "http.request.method": [ "POST" @@ -292,8 +276,12 @@ "http.response.finished": [ true ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.headers_sent": [ true @@ -310,6 +298,9 @@ "kubernetes.pod.name": [ "pod-name" ], + "kubernetes.pod.name.text": [ + "pod-name" + ], "kubernetes.pod.uid": [ "pod-uid" ], @@ -356,24 +347,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" ], @@ -386,19 +392,6 @@ "trace.id": [ "945254c567a5417eaaaaaaaaaaaaaaaa" ], - "transaction.custom": [ - { - "(": "not a valid regex and that is fine", - "and_objects": { - "foo": [ - "bar", - "baz" - ] - }, - "my_key": 1, - "some_other_value": "foo bar" - } - ], "transaction.duration.us": [ 32592 ], @@ -480,9 +473,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 3484db6e060..02292a6a1fd 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" ], @@ -516,6 +609,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.as": [ "thrift" ], @@ -549,12 +645,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 71f7aef4764..ccc49861cc5 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" ], @@ -427,6 +511,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -448,12 +535,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 ], @@ -463,6 +559,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -486,6 +585,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -513,6 +615,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757338C" ], @@ -534,12 +639,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 ], @@ -549,6 +663,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -572,6 +689,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -599,6 +719,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T708771C" ], @@ -620,12 +743,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 ], @@ -635,6 +767,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -658,6 +793,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -685,6 +823,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -706,12 +847,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 ], @@ -721,6 +871,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -744,6 +897,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -771,6 +927,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T710624C" ], @@ -792,12 +951,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 ], @@ -807,6 +975,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -830,6 +1001,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -857,6 +1031,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T781861C" ], @@ -878,12 +1055,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 ], @@ -893,6 +1079,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -916,6 +1105,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -943,6 +1135,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T705860C" ], @@ -964,12 +1159,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 ], @@ -979,6 +1183,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1002,6 +1209,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1029,6 +1239,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T762465C" ], @@ -1050,12 +1263,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 ], @@ -1065,6 +1287,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1088,6 +1313,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1115,6 +1343,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752547C" ], @@ -1136,12 +1367,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 ], @@ -1151,6 +1391,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1174,6 +1417,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1201,6 +1447,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T752110C" ], @@ -1222,12 +1471,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 ], @@ -1237,6 +1495,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1260,6 +1521,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1287,6 +1551,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T757670C" ], @@ -1308,12 +1575,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 ], @@ -1323,6 +1599,9 @@ "span.name": [ "GetDriver" ], + "span.name.text": [ + "GetDriver" + ], "span.representative_count": [ 1 ], @@ -1346,6 +1625,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1373,6 +1655,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_location": [ "728,326" ], @@ -1394,12 +1679,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 ], @@ -1409,6 +1703,9 @@ "span.name": [ "FindDriverIDs" ], + "span.name.text": [ + "FindDriverIDs" + ], "span.representative_count": [ 1 ], @@ -1432,6 +1729,9 @@ "agent.name": [ "Jaeger/Go" ], + "agent.name.text": [ + "Jaeger/Go" + ], "agent.version": [ "2.20.1" ], @@ -1459,6 +1759,9 @@ "host.name": [ "host01" ], + "host.name.text": [ + "host01" + ], "labels.param_driverID": [ "T712515C" ], @@ -1480,12 +1783,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 ], @@ -1495,6 +1807,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..deab65b210c 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,38 +66,12 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "exclude_from_grouping": false, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "line": { - "column": 18, - "number": 1 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-agent-js service.version=1.0.0 bundle.path=http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map" - } - } - ], "span.type": [ "transaction" ], @@ -106,6 +89,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 d90d2fe8f8c..b7294fb9d0e 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" ], @@ -60,9 +63,15 @@ "service.language.name": [ "java" ], + "service.language.name.text": [ + "java" + ], "service.name": [ "unknown" ], + "service.name.text": [ + "unknown" + ], "source.ip": [ "89.160.20.128" ], 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 dbcfe453a16..0ff335c1c5f 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" ], @@ -249,12 +276,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..1652cdaada6 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" ], @@ -27,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -228,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], @@ -287,6 +66,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +108,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..1652cdaada6 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" ], @@ -27,192 +30,6 @@ "error.exception.message": [ "Uncaught Error: timeout test error" ], - "error.exception.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "__webpack_require__", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/../test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "library_frame": true, - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ], - "pre": [ - "", - " \t// expose the modules object (__webpack_modules__)", - " \t__webpack_require__.m = modules;", - "", - " \t// expose the module cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \t__webpack_require__.c = installedModules;", - "number": 33 - }, - "original": { - "abs_path": "http://localhost:8000/test/./e2e/general-usecase/bundle.js.map", - "colno": 181, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invokeTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 15, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "runTask", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - "", - "", - "/** WEBPACK FOOTER **", - " ** webpack/bootstrap 6002740481c9666b0d38" - ], - "pre": [ - "", - " \t// __webpack_public_path__", - " \t__webpack_require__.p = \"\";", - "", - " \t// Load entry module and return exports" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "moduleId", - "line": { - "column": 0, - "context": " \treturn __webpack_require__(0);", - "number": 39 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 199, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "invoke", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - " \t\t\treturn installedModules[moduleId].exports;", - "", - " \t\t// Create a new module (and put it into the cache)", - " \t\tvar module = installedModules[moduleId] = {", - " \t\t\texports: {}," - ], - "pre": [ - "", - " \t// The require function", - " \tfunction __webpack_require__(moduleId) {", - "", - " \t\t// Check if module is in cache" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \t\tif(installedModules[moduleId])", - "number": 8 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 33, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "timer", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "error.exception.type": [ "Error" ], @@ -228,44 +45,6 @@ "error.log.message": [ "Uncaught Error: log timeout test error" ], - "error.log.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "http.request.referrer": [ "http://localhost:8000/test/e2e/" ], @@ -287,6 +66,9 @@ "service.name": [ "apm-agent-js" ], + "service.name.text": [ + "apm-agent-js" + ], "service.version": [ "1.0.1" ], @@ -326,9 +108,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..4f3e5090cb7 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" ], @@ -458,20 +767,53 @@ "observer.type": [ "apm-server" ], - "observer.version": [ - "dynamic" + "observer.version": [ + "dynamic" + ], + "parent.id": [ + "ec2e280be8345240" + ], + "processor.event": [ + "span" + ], + "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" ], - "parent.id": [ - "ec2e280be8345240" + "service.runtime.name": [ + "v8" ], - "processor.event": [ - "span" + "service.runtime.name.text": [ + "v8" ], - "service.environment": [ - "prod" + "service.runtime.version": [ + "8.0" ], - "service.name": [ - "apm-a-rum-test-e2e-general-usecase" + "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,33 +988,8 @@ "span.name": [ "Fire \"DOMContentLoaded\" event" ], - "span.stacktrace": [ - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "generateError", - "line": { - "column": 9, - "number": 7662 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - }, - { - "abs_path": "http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "exclude_from_grouping": false, - "filename": "test/e2e/general-usecase/app.e2e-bundle.min.js?token=secret", - "function": "\u003canonymous\u003e", - "line": { - "column": 3, - "number": 7666 - }, - "sourcemap": { - "error": "unable to find sourcemap.url for service.name=apm-a-rum-test-e2e-general-usecase service.version=0.0.1 bundle.path=http://localhost:8000/test/e2e/general-usecase/app.e2e-bundle.min.js" - } - } + "span.name.text": [ + "Fire \"DOMContentLoaded\" event" ], "span.subtype": [ "browser-timing" @@ -613,6 +1005,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 +1047,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -679,9 +1107,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 +1152,9 @@ "span.destination.service.name": [ "http://localhost:8000" ], + "span.destination.service.name.text": [ + "http://localhost:8000" + ], "span.destination.service.resource": [ "localhost:8000" ], @@ -706,6 +1170,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 +1193,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 +1235,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -777,9 +1280,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 +1331,9 @@ "span.name": [ "Parsing the document, executing sy. scripts" ], + "span.name.text": [ + "Parsing the document, executing sy. scripts" + ], "span.subtype": [ "browser-timing" ], @@ -809,6 +1348,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 +1390,9 @@ "agent.name": [ "js-base" ], + "agent.name.text": [ + "js-base" + ], "agent.version": [ "4.8.1" ], @@ -836,8 +1411,15 @@ "event.outcome": [ "success" ], - "http.request.headers.Accept": [ - "application/json" + "event.success_count": [ + 1 + ], + "http.request.headers": [ + { + "Accept": [ + "application/json" + ] + } ], "http.request.method": [ "GET" @@ -851,8 +1433,12 @@ "http.response.encoded_body_size": [ 690 ], - "http.response.headers.Content-Type": [ - "application/json" + "http.response.headers": [ + { + "Content-Type": [ + "application/json" + ] + } ], "http.response.status_code": [ 200 @@ -890,21 +1476,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" ], @@ -923,11 +1521,6 @@ "trace.id": [ "286ac3ad697892c406528f13c82e0ce1" ], - "transaction.custom": [ - { - "testContext": "testContext" - } - ], "transaction.duration.us": [ 295000 ], @@ -1078,9 +1671,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..deab65b210c 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,83 +66,12 @@ "span.name": [ "transaction" ], + "span.name.text": [ + "transaction" + ], "span.representative_count": [ 1 ], - "span.stacktrace": [ - { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003cunknown\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain1.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - }, - { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "context": { - "post": [ - "", - " \t\t// Check if module is in cache", - " \t\tif(installedModules[moduleId])", - " \t\t\treturn installedModules[moduleId].exports;", - "" - ], - "pre": [ - " \t// The module cache", - " \tvar installedModules = {};", - "", - " \t// The require function" - ] - }, - "exclude_from_grouping": false, - "filename": "webpack:///webpack/bootstrap 6002740481c9666b0d38", - "function": "\u003canonymous\u003e", - "line": { - "column": 0, - "context": " \tfunction __webpack_require__(moduleId) {", - "number": 5 - }, - "original": { - "abs_path": "http://subdomain2.localhost:8000/test/e2e/general-usecase/bundle.js.map", - "colno": 18, - "filename": "~/test/e2e/general-usecase/bundle.js.map", - "function": "\u003canonymous\u003e", - "lineno": 1 - }, - "sourcemap": { - "updated": true - } - } - ], "span.type": [ "transaction" ], @@ -151,6 +89,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/gencorpora/apmserver.go b/systemtest/gencorpora/apmserver.go index 18720e28786..ed9cc6fd94f 100644 --- a/systemtest/gencorpora/apmserver.go +++ b/systemtest/gencorpora/apmserver.go @@ -38,8 +38,6 @@ type APMServer struct { // using the Elasticsearch output. func NewAPMServer(ctx context.Context, esHost string) *apmservertest.Server { srv := apmservertest.NewUnstartedServer() - waitForIntegration := false - srv.Config.WaitForIntegration = &waitForIntegration srv.Config.Output.Elasticsearch.Hosts = []string{esHost} srv.Config.Kibana = nil return srv diff --git a/testing/docker/kibana/kibana.yml b/testing/docker/kibana/kibana.yml index 007497a88ad..028463de011 100644 --- a/testing/docker/kibana/kibana.yml +++ b/testing/docker/kibana/kibana.yml @@ -8,8 +8,3 @@ xpack.encryptedSavedObjects.encryptionKey: fhjskloppd678ehkdfdlliverpoolfcr # Disable the Fleet agent ID verification pipeline, # which sets Fleet-specific fields that we don't want. xpack.fleet.agentIdVerificationEnabled: false - -# Install the APM integration package. -xpack.fleet.packages: - - name: apm - version: latest