Skip to content

Commit

Permalink
Merge branch 'main' into APR-57-retry-healthcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
lukesteensen authored Apr 22, 2024
2 parents e2ad05f + c4f5159 commit 9236083
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/label-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:
cache-dependency-path: '**/requirements*.txt'
- name: Install dependencies
run: pip install -r requirements.txt -r tasks/requirements.txt
- name: Remove unsupported git config
# Triggers dulwich.repo.UnsupportedExtension: b'worktreeConfig' see https://github.com/GitTools/actions/issues/1115
run: git config --unset-all extensions.worktreeconfig
- name: Check release note
env:
BRANCH_NAME: ${{ github.head_ref }}
Expand Down
4 changes: 0 additions & 4 deletions pkg/network/encoding/marshal/usm.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ func (bc *USMConnectionIndex[K, V]) Find(c network.ConnectionStats) *USMConnecti
result.claimed = true
}

if log.ShouldLog(seelog.TraceLvl) {
log.Tracef("could not find connection %+v in usm data", c)
}

return result
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
optimization_goal: memory
erratic: false
erratic: true

target:
name: datadog-agent
Expand Down

0 comments on commit 9236083

Please sign in to comment.