Skip to content

[7.x] intake: Handle transaction.dropped_spans_stats (backport #6200)#6237

Merged
marclop merged 2 commits into7.xfrom
mergify/bp/7.x/pr-6200
Sep 23, 2021
Merged

[7.x] intake: Handle transaction.dropped_spans_stats (backport #6200)#6237
marclop merged 2 commits into7.xfrom
mergify/bp/7.x/pr-6200

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 23, 2021

This is an automatic backport of pull request #6200 done by Mergify.
Cherry-pick of 1213006 has failed:

On branch mergify/bp/7.x/pr-6200
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 12130068.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   beater/integration_test.go
	new file:   beater/test_approved_es_documents/TestPublishIntegrationTransactionsHugeTraces.approved.json
	modified:   docs/spec/v2/transaction.json
	modified:   model/modeldecoder/rumv3/transaction_test.go
	modified:   model/modeldecoder/v2/decoder.go
	modified:   model/modeldecoder/v2/model.go
	modified:   model/modeldecoder/v2/model_generated.go
	modified:   model/modeldecoder/v2/model_test.go
	modified:   model/modeldecoder/v2/transaction_test.go
	modified:   model/transaction.go
	modified:   model/transaction_test.go
	modified:   processor/stream/processor_test.go
	new file:   processor/stream/test_approved_es_documents/testIntakeIntegrationTransactionsHugeTraces.approved.json
	modified:   systemtest/approvals.go
	new file:   systemtest/approvals/TestTransactionDroppedSpansStatsMetrics.approved.json
	new file:   systemtest/approvals/TestTransactionDroppedSpansStatsTransaction.approved.json
	new file:   systemtest/huge_traces_test.go
	modified:   systemtest/main_test.go
	new file:   testdata/intake-v2/transactions-huge_traces.ndjson
	modified:   tests/system/test_pipelines.py
	modified:   x-pack/apm-server/aggregation/spanmetrics/aggregator.go
	modified:   x-pack/apm-server/aggregation/spanmetrics/aggregator_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Adds a new `transaction.dropped_spans_stats` optional field to the API,
which accepts an array of spans which were due to transaction_max_spans
or exit_span_min_duration being exceeded. Additionally, the metrics
aggregator for the `destination_service` metricset has been updated to
process transaction where `transaction.dropped_spans_stats > 0`.

```
{
  "transaction": {
    "dropped_spans_stats": [
      {
        "type": "external",
        "subtype": "http",
        "destination_service_resource": "example.com:443",
        "outcome": "failure",
        "duration": {
            "count": 28,
            "sum.us": 123456
        }
      },
      {
        "type": "db",
        "subtype": "mysql",
        "destination_service_resource": "mysql",
        "outcome": "success",
        "duration": {
            "count": 81,
            "sum.us": 9876543
        }
      }
    ]
  }
}
```

Signed-off-by: Marc Lopez Rubio <marc5.12@outlook.com>
(cherry picked from commit 1213006)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 23, 2021
Signed-off-by: Marc Lopez Rubio <marc5.12@outlook.com>
@ghost
Copy link
Copy Markdown

ghost commented Sep 23, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-23T13:11:45.659+0000

  • Duration: 47 min 20 sec

  • Commit: 4277e3b

Test stats 🧪

Test Results
Failed 0
Passed 4493
Skipped 15
Total 4508

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

@marclop marclop enabled auto-merge (squash) September 23, 2021 13:23
@marclop marclop merged commit 84acf8c into 7.x Sep 23, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-6200 branch September 23, 2021 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant