Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.x] Add support for Composite spans in the intake API (backport #5661) #5777

Merged
merged 10 commits into from
Jul 22, 2021
Merged

[7.x] Add support for Composite spans in the intake API (backport #5661) #5777

merged 10 commits into from
Jul 22, 2021

Commits on Jul 21, 2021

  1. Support composite spans in the intake API 

    (cherry picked from commit d0310d1)
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    4d1e078 View commit details
    Browse the repository at this point in the history

  2. Update documentation for new composite span fields in ES 

    (cherry picked from commit 93332d2)

# Conflicts:
#	include/fields.go
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    234f683 View commit details
    Browse the repository at this point in the history

  3. Update approvals file 

    (cherry picked from commit 598e573)
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    b6ac69e View commit details
    Browse the repository at this point in the history

  4. Update duration and composite sum fields to be more realistic 

    (cherry picked from commit edaedcc)
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    1a5db2c View commit details
    Browse the repository at this point in the history

  5. Update changelog 

    (cherry picked from commit 3429db6)

# Conflicts:
#	changelogs/head.asciidoc
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    3d2d947 View commit details
    Browse the repository at this point in the history

  6. Fix minor typo in composite.sum field 

    (cherry picked from commit b827b2b)

# Conflicts:
#	include/fields.go
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    7aa686e View commit details
    Browse the repository at this point in the history

  7. Update description of span duration and composite sum 

    (cherry picked from commit 24284d8)
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    4be53ec View commit details
    Browse the repository at this point in the history

  8. Add note to Composite.Sum that it's in milliseconds 

    (cherry picked from commit f65e583)
    @estolfo
    estolfo authored and mergify-bot committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    85f4c9c View commit details
    Browse the repository at this point in the history

  9. Update include/fields.go

    @estolfo
    estolfo committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    2df2583 View commit details
    Browse the repository at this point in the history

  10. Remove head.asciidoc

    @estolfo
    estolfo committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    91b75e7 View commit details
    Browse the repository at this point in the history