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.

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

fix(asm): remove datadog.api_security metrics #8906

Merged

Conversation

christophe-papazian
Copy link
Contributor

@christophe-papazian christophe-papazian commented Apr 9, 2024

Metrics were added during R&D phase on API Security. This PR removes them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

https://github.com/DataDog/dd-analytics/pull/30330 is also put in place to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Change is maintainable (easy to change, telemetry, documentation)
  • Release note makes sense to a user of the library
  • Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

@christophe-papazian christophe-papazian added ASM Application Security Monitoring enhancement changelog/no-changelog A changelog entry is not required for this PR. backport 2.5 labels Apr 9, 2024
@christophe-papazian christophe-papazian changed the title remove datadog.api_security metrics chore(asm): remove datadog.api_security metrics Apr 9, 2024
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Apr 9, 2024

Datadog Report

Branch report: christophe-papazian/remove_api_security_span_metrics
Commit report: 82b34cb
Test service: dd-trace-py

✅ 0 Failed, 338 Passed, 111199 Skipped, 15m 18.8s Total duration (1h 34m 59.17s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Apr 9, 2024

Benchmarks

Benchmark execution time: 2024-04-09 12:55:25

Comparing candidate commit 3c99d08 in PR branch christophe-papazian/remove_api_security_span_metrics with baseline commit 131837d in branch main.

Found 1 performance improvements and 4 performance regressions! Performance is the same for 196 metrics, 9 unstable metrics.

scenario:flasksimple-appsec-get

  • 🟩 execution_time [-280.160µs; -229.772µs] or [-4.280%; -3.511%]

scenario:httppropagationinject-ids_only

  • 🟥 max_rss_usage [+567.007KB; +617.965KB] or [+2.667%; +2.907%]

scenario:httppropagationinject-with_all

  • 🟥 max_rss_usage [+663.743KB; +789.518KB] or [+3.144%; +3.740%]

scenario:httppropagationinject-with_tags

  • 🟥 max_rss_usage [+784.735KB; +829.908KB] or [+3.724%; +3.938%]

scenario:httppropagationinject-with_tags_max_size

  • 🟥 max_rss_usage [+722.721KB; +778.873KB] or [+3.424%; +3.690%]

@christophe-papazian christophe-papazian removed the changelog/no-changelog A changelog entry is not required for this PR. label Apr 9, 2024
@christophe-papazian christophe-papazian marked this pull request as ready for review April 9, 2024 13:03
@christophe-papazian christophe-papazian requested review from a team as code owners April 9, 2024 13:03
@christophe-papazian christophe-papazian enabled auto-merge (squash) April 9, 2024 13:07
@christophe-papazian christophe-papazian changed the title chore(asm): remove datadog.api_security metrics fix(asm): remove datadog.api_security metrics Apr 9, 2024
@christophe-papazian christophe-papazian merged commit 616c5a9 into main Apr 9, 2024
105 of 119 checks passed
@christophe-papazian christophe-papazian deleted the christophe-papazian/remove_api_security_span_metrics branch April 9, 2024 13:09
Copy link
Contributor

github-actions bot commented Apr 9, 2024

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport-8906-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 616c5a93ad26647a6b9cb98f45e9bc4a35687d83
# Push it to GitHub
git push --set-upstream origin backport-8906-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport-8906-to-2.5.

Copy link
Contributor

github-actions bot commented Apr 9, 2024

The backport to 2.6 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.6 2.6
# Navigate to the new working tree
cd .worktrees/backport-2.6
# Create a new branch
git switch --create backport-8906-to-2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 616c5a93ad26647a6b9cb98f45e9bc4a35687d83
# Push it to GitHub
git push --set-upstream origin backport-8906-to-2.6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.6

Then, create a pull request where the base branch is 2.6 and the compare/head branch is backport-8906-to-2.6.

Copy link
Contributor

github-actions bot commented Apr 9, 2024

The backport to 2.7 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.7 2.7
# Navigate to the new working tree
cd .worktrees/backport-2.7
# Create a new branch
git switch --create backport-8906-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 616c5a93ad26647a6b9cb98f45e9bc4a35687d83
# Push it to GitHub
git push --set-upstream origin backport-8906-to-2.7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.7

Then, create a pull request where the base branch is 2.7 and the compare/head branch is backport-8906-to-2.7.

github-actions bot pushed a commit that referenced this pull request Apr 9, 2024
Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [ ] Title is accurate
- [ ] All changes are related to the pull request's stated goal
- [ ] Description motivates each change
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [ ] Testing strategy adequately addresses listed risks
- [ ] Change is maintainable (easy to change, telemetry, documentation)
- [ ] Release note makes sense to a user of the library
- [ ] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [ ] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 616c5a9)
christophe-papazian added a commit that referenced this pull request Apr 9, 2024
Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

- [ ] Title is accurate
- [ ] All changes are related to the pull request's stated goal
- [ ] Description motivates each change
- [ ] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [ ] Testing strategy adequately addresses listed risks
- [ ] Change is maintainable (easy to change, telemetry, documentation)
- [ ] Release note makes sense to a user of the library
- [ ] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [ ] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 616c5a9)
christophe-papazian added a commit that referenced this pull request Apr 9, 2024
#8906

Backport
616c5a9
from #8906 to 2.7.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
github-actions bot pushed a commit that referenced this pull request Apr 9, 2024
#8906

Backport
616c5a9
from #8906 to 2.7.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 33877e4)
github-actions bot pushed a commit that referenced this pull request Apr 9, 2024
#8906

Backport
616c5a9
from #8906 to 2.7.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

(cherry picked from commit 33877e4)
@christophe-papazian
Copy link
Contributor Author

Backports to 2.6 and 2.5 were cut directly from backport to 2.7

christophe-papazian added a commit that referenced this pull request Apr 9, 2024
Backport 33877e4 from #8913 to 2.6.

#8906

Backport
616c5a9
from #8906 to 2.7.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com>
christophe-papazian added a commit that referenced this pull request Apr 9, 2024
Backport 33877e4 from #8913 to 2.5.

#8906

Backport
616c5a9
from #8906 to 2.7.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com>
christophe-papazian added a commit that referenced this pull request Apr 9, 2024
Backport 616c5a9 from #8906 to 2.8.

Metrics were added during R&D phase on API Security. This PR removes
them.
It prevents to send unneeded data to DD backend.

APPSEC-52415

DataDog/dd-analytics#30330 is also put in place
to ensure no additional charges for customers using non updated tracers.

This PR is backported to all versions containing api security.

## Checklist

- [x] Change(s) are motivated and described in the PR description
- [x] Testing strategy is described if automated tests are not included
in the PR
- [x] Risks are described (performance impact, potential for breakage,
maintainability)
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed or label `changelog/no-changelog` is set
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/))
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
- [x] If this PR changes the public interface, I've notified
`@DataDog/apm-tees`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ASM Application Security Monitoring enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants