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

[sampling] Fix merging of per-operation strategies into service strategies without them #5277

Merged
merged 16 commits into from
Apr 20, 2024
Merged

[sampling] Fix merging of per-operation strategies into service strategies without them #5277

merged 16 commits into from
Apr 20, 2024

Commits on Mar 15, 2024

  1. Fix for jaegertracing#5270 - return default probabilistic operation l… 

    …evel strategies for ratelimiting service configurations

Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    bce0053 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Updated unit tests to load expected responses from fixtures folder 

    Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    19a9c60 View commit details
    Browse the repository at this point in the history

  2. Renamed fixture files, updated expected sampling probabilities to avo… 

    …id being treated as empty during marshaling/unmarshaling

Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    cd75115 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Added JSON regeneration flag, addressed MR comments 

    Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    202b52e View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. simplify 

    Signed-off-by: Yuri Shkuro <github@ysh.us>
    @yurishkuro
    yurishkuro committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    030d19a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into otel_5504_issue_fix

    @yurishkuro
    yurishkuro authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    bffcb91 View commit details
    Browse the repository at this point in the history

  3. reformat 

    Signed-off-by: Yuri Shkuro <github@ysh.us>
    @yurishkuro
    yurishkuro committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    39f2859 View commit details
    Browse the repository at this point in the history

  4. refactor and document the code better 

    Signed-off-by: Yuri Shkuro <github@ysh.us>
    @yurishkuro
    yurishkuro committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    62b7b08 View commit details
    Browse the repository at this point in the history

  5. remove commented out code 

    Signed-off-by: Yuri Shkuro <github@ysh.us>
    @yurishkuro
    yurishkuro committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    5eadac5 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into otel_5504_issue_fix

    @yurishkuro
    yurishkuro authored Mar 30, 2024
    Configuration menu
    Copy the full SHA
    db352a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Fix for jaegertracing#5270 is disabled by default. Added a switch for… 

    … enabling via sampling.strategies.bugfix-5270=true.

Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    7b1dec3 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Reintroduced original function until deprecation, moved deprecation w… 

    …arning to constructor, updated test names

Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    4954a13 View commit details
    Browse the repository at this point in the history

  2. Clarified flag message. 

    Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis @yurishkuro
    kuujis and yurishkuro authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    1391866 View commit details
    Browse the repository at this point in the history

  3. Added handling for missing strategies source and strategies not being… 

    … available in the provided source, updated warning messages per MR suggestions.

Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    d7377db View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into otel_5504_issue_fix

    @yurishkuro
    yurishkuro authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    2171073 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Added parameterised tests to ensure code coverage. 

    Signed-off-by: Kazimieras Pociunas <kazimieras.pociunas@gmail.com>
    @kuujis
    kuujis committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    db54fd0 View commit details
    Browse the repository at this point in the history