Skip to content

Commit

Permalink
Merge branch 'main' into daniel.lavie/USMON-718-per-partition-batch
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielLavie committed Jun 23, 2024
2 parents 03018f0 + 07517c0 commit 555bac0
Show file tree
Hide file tree
Showing 603 changed files with 15,064 additions and 7,755 deletions.
6 changes: 1 addition & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: gcr.io/datadoghq/agent-circleci-runner:v35901572-a9447181
- image: gcr.io/datadoghq/agent-circleci-runner:v37111741-34301f4a
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down Expand Up @@ -103,10 +103,6 @@ jobs:
command: inv -e test --rerun-fails=2 --python-runtimes 3 --coverage --race --profile --cpus 8 --build-stdlib --test-washer
environment:
GO_TEST_SKIP_FLAKE: "true"
- run:
name: upload code coverage results
# Never fail on coverage upload
command: inv -e codecov || true

integration_tests:
<<: *job_template
Expand Down
3 changes: 3 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Codecov is still inaccurate for Go code coverage, so we disable comments for now.
comment: false

github_checks:
annotations: false

# See https://docs.codecov.com/docs/coverage-configuration
coverage:
range: 20..100
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: Datadog Static Analysis

jobs:
static-analysis:
if: github.triggering_actor != 'dependabot[bot]'
runs-on: ubuntu-latest
name: Datadog Static Analyzer
steps:
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/send-failure-summary-notification.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/serverless-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ jobs:
- name: Post comment
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
with:
header: serverless-benchmarks
recreate: true
message: |
## Serverless Benchmark Results
Expand Down Expand Up @@ -175,7 +176,7 @@ jobs:
</details>
<details open>
<details>
<summary>Benchmark stats</summary>
```
Expand Down
31 changes: 24 additions & 7 deletions .github/workflows/serverless-binary-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,41 @@ jobs:
id: compare
run: |
OUTPUT=$(( ${{ steps.current.outputs.result }} - ${{ steps.previous.outputs.result }} ))
echo "binary size changed by $OUTPUT bytes"
echo "diff=$OUTPUT" >> $GITHUB_OUTPUT
OUTPUT=$(( $OUTPUT / 100000 ))
echo "cold start time changed by $OUTPUT ms"
echo "coldstart=$OUTPUT" >> $GITHUB_OUTPUT
### Steps below only run if size diff > SIZE_ALLOWANCE ###
- name: Should post comment
id: should
run: |
cd go/src/github.com/DataDog/datadog-agent
if test $(
git diff $GITHUB_BASE_REF..$GITHUB_SHA --name-only | grep dependencies_linux_amd64.txt
); then
echo "should_run=true" >> $GITHUB_OUTPUT
elif [[ ${{ steps.compare.outputs.diff }} > env.SIZE_ALLOWANCE ]]; then
echo "should_run=true" >> $GITHUB_OUTPUT
else
echo "should_run=false" >> $GITHUB_OUTPUT
fi
### Steps below run if size diff > SIZE_ALLOWANCE or file dependencies_linux_amd64.txt changed ###

- name: Install graphviz
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'

- name: Install digraph
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'
run: |
GOPATH=$(pwd)/go go install golang.org/x/tools/cmd/digraph@latest
- name: List new dependencies
id: deps
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'
run: |
echo "deps<<EOF" >> $GITHUB_OUTPUT
for dep in $(echo "${{ steps.current.outputs.deps }}"); do
Expand All @@ -98,7 +114,7 @@ jobs:
echo "EOF" >> $GITHUB_OUTPUT
- name: Create dependency graphs
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'
run: |
export PATH=$(pwd)/go/bin:$PATH
cd go/src/github.com/DataDog/datadog-lambda-extension
Expand All @@ -110,15 +126,16 @@ jobs:
- name: Archive dependency graphs
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'
with:
name: dependency-graphs
path: go/src/github.com/DataDog/datadog-lambda-extension/graphs

- name: Post comment
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
if: steps.compare.outputs.diff > env.SIZE_ALLOWANCE
if: steps.should.outputs.should_run == 'true'
with:
header: serverless-binary-size
hide_and_recreate: true
hide_classify: "RESOLVED"
message: |
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/serverless-vuln-scan.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/windows-linters.yml

This file was deleted.

65 changes: 0 additions & 65 deletions .github/workflows/windows-unittests.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ pkg/network/netlink/testdata/message_dump*
*~
.dir-locals.el

# Vim
.vimrc

# etags
/TAGS

Expand Down
Loading

0 comments on commit 555bac0

Please sign in to comment.