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

v2-dev: Merge main into v2-dev & fix go.mod #2424

Closed
wants to merge 20 commits into from

Conversation

darccio
Copy link
Member

@darccio darccio commented Dec 11, 2023

What does this PR do?

This PR merges main into v2-dev, as there was one week of work pending to merge. Also, it fixes contribs by using replace directives to detect more easily when changes in other modules affect them.

Motivation

It was needed to make sure no main changes go missing while merging them into v2-dev.

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.

For Datadog employees:

  • If this PR touches code that handles credentials of any kind, such as Datadog API keys, I've requested a review from @DataDog/security-design-and-guidance.
  • This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

internal/appsec/appsec.go Outdated Show resolved Hide resolved
@darccio
Copy link
Member Author

darccio commented Dec 12, 2023

Next draft PR will fix system tests and appsec tests for v2

@darccio darccio closed this Dec 12, 2023
@darccio darccio deleted the dario.castane/main-merge-20231211 branch December 18, 2023 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants