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

ddtrace/tracer: remove agent_psr when rule_psr is set #2668

Merged
merged 8 commits into from May 8, 2024
Merged

ddtrace/tracer: remove agent_psr when rule_psr is set #2668

merged 8 commits into from May 8, 2024

Commits on Apr 19, 2024

  1. forbid re-sampling on manually sampled spans

    @dianashevchenko
    dianashevchenko committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    0603fc6 View commit details
    Browse the repository at this point in the history

  2. added a test

    @dianashevchenko
    dianashevchenko committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    16f77e4 View commit details
    Browse the repository at this point in the history

  3. fixed the race condition

    @dianashevchenko
    dianashevchenko committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    e5830ad View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into shevchenko/manual-keep-bug

    @dianashevchenko
    dianashevchenko committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fa9237d View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. remove agent_psr if rule_psr is set

    @dianashevchenko
    dianashevchenko committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    df7ac53 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into shevchenko/remove-agent_psr-when-rule-sampling

    @dianashevchenko
    dianashevchenko committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    eeffc6e View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge branch 'main' into shevchenko/remove-agent_psr-when-rule-sampling

    @dianashevchenko
    dianashevchenko committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    6fa2b0a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge branch 'main' into shevchenko/remove-agent_psr-when-rule-sampling

    @darccio
    darccio committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3106987 View commit details
    Browse the repository at this point in the history