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

fix: child span not acquiring transaction lock in some cases #1487

Merged
merged 14 commits into from
Jul 26, 2023
Merged

fix: child span not acquiring transaction lock in some cases #1487

merged 14 commits into from
Jul 26, 2023

Commits on Jul 11, 2023

  1. fix: acquire lock before adding dropped spans 

    Spans from the same transaction share the dropped spans map.
If they end concurrency a race condition could happen when updating
the map.
Add a RW lock to prevent that.
    @kruskall
    kruskall committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7fe3968 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Revert "fix: acquire lock before adding dropped spans" 

    This reverts commit 7fe3968.
    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    09050b0 View commit details
    Browse the repository at this point in the history

  2. fix: child span not acquiring transaction lock in some cases 

    The previous fix didn't cover all cases. The issue is deeper and affects more than the
transaction data. We need to always acquire the tx lock before ending the span.
    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    1f47514 View commit details
    Browse the repository at this point in the history

  3. test: add test case for dropped spans race condition

    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    b4a4da9 View commit details
    Browse the repository at this point in the history

  4. fix: also acquire transactiondata lock 

    Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>
    @kruskall @marclop
    kruskall and marclop committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    77fc883 View commit details
    Browse the repository at this point in the history

  5. test: end parent and transaction 

    Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>
    @kruskall @marclop
    kruskall and marclop committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4916db9 View commit details
    Browse the repository at this point in the history

  6. test: close tracer once test ends 

    Co-authored-by: Marc Lopez Rubio <marc5.12@outlook.com>
    @kruskall @marclop
    kruskall and marclop committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    9aa8480 View commit details
    Browse the repository at this point in the history

  7. docs: update doc with go support policy (elastic#1488) 

    * docs: update doc with go support policy

* docs: remove go.mod comment

the doc doesn't actually mention specific versions
    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f1bc636 View commit details
    Browse the repository at this point in the history

  8. ci: update json spec files (elastic#1491)

    @simitt @kruskall
    simitt authored and kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    82d02db View commit details
    Browse the repository at this point in the history

  9. Add CODEOWNERS (elastic#1493)

    @axw @kruskall
    axw authored and kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0924803 View commit details
    Browse the repository at this point in the history

  10. update default value of ELASTIC_APM_CLOUD_PROVIDER in doc (elastic#1495)

    @yang-wei @kruskall
    yang-wei authored and kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c9e7fe5 View commit details
    Browse the repository at this point in the history

  11. docs: remove SECURITY.md to fallback to org-wide security policy (el… 

    …astic#1496)

* docs: mention public bug bounty program in security policy

* docs: remove SECURITY.md to fallback to org-wide security policy
    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f1ce16e View commit details
    Browse the repository at this point in the history

  12. Remove container_metadata_discovery from tests (elastic#1497)

    @simitt @kruskall
    simitt authored and kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    863c772 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into fix/dropped-span-race

    @kruskall
    kruskall committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    a949859 View commit details
    Browse the repository at this point in the history