Skip to content

Commit 64f42b9

Browse files
committed
Merge remote-tracking branch 'origin/main' into streamparser
Conflicts: go.sum pkg/network/ebpf/c/protocols/classification/dispatcher-maps.h pkg/network/ebpf/c/protocols/helpers/big_endian.h pkg/network/ebpf/c/protocols/http/http.h pkg/network/ebpf/c/protocols/kafka/kafka-classification.h pkg/network/ebpf/c/protocols/kafka/kafka-parsing.h pkg/network/ebpf/c/protocols/read_into_buffer.h pkg/network/protocols/ebpf.go pkg/network/protocols/kafka/protocol.go pkg/network/protocols/protocols.go pkg/network/usm/ebpf_main.go pkg/network/usm/kafka_monitor_test.go
2 parents 2426b9a + fcd78a2 commit 64f42b9

File tree

1,924 files changed

+99786
-32103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,924 files changed

+99786
-32103
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ experimental:
1515
templates:
1616
job_template: &job_template
1717
docker:
18-
- image: gcr.io/datadoghq/agent-circleci-runner:v32377621-ce42cb8e
18+
- image: gcr.io/datadoghq/agent-circleci-runner:v34562478-ec7ead93
1919
environment:
2020
USE_SYSTEM_LIBS: "1"
2121
working_directory: /go/src/github.com/DataDog/datadog-agent
@@ -100,7 +100,7 @@ jobs:
100100
- run:
101101
name: run unit tests
102102
no_output_timeout: 20m
103-
command: inv -e test --rerun-fails=2 --python-runtimes 3 --coverage --race --profile --cpus 8 --build-stdlib
103+
command: inv -e test --rerun-fails=2 --python-runtimes 3 --coverage --race --profile --cpus 8 --build-stdlib --test-washer
104104
environment:
105105
GO_TEST_SKIP_FLAKE: "true"
106106
- run:

.codecov.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
1-
comment: off
1+
# See https://docs.codecov.com/docs/pull-request-comments
2+
# comment: false
23

4+
# See https://docs.codecov.com/docs/coverage-configuration
35
coverage:
46
range: 20..100
57
round: down
68
precision: 2
79

10+
# See https://docs.codecov.com/docs/commit-status
811
status:
912
project: off
10-
patch: off
13+
# patch = enable measures on lines adjusted in the PR only.
14+
patch:
15+
default:
16+
# target = choose a minimum coverage ratio that the commit must meet to be considered a success.
17+
# target: auto = compare against the coverage of the PR parent commit.
18+
target: auto
19+
# threshold = Allow the coverage to drop by <number>%, and posting a success status.
20+
threshold: 0%
21+
# Will set the status to success even if the CI fails.
22+
if_ci_failed: success
23+
# Expose Codecov information to other developers without gating PRs based on that information.
24+
informational: true
1125

26+
# See https://docs.codecov.com/docs/ignoring-paths
1227
ignore:
1328
- "pkg/trace/testutil" # code only used in tests
14-
- "pkg/trace/log" # logging utilities with no customer facing impact. Nothing to test.
29+
- "pkg/trace/log" # logging utilities with no customer facing impact. Nothing to test.

.copyright-overrides.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,30 @@ github.com/shibumi/go-pathspec: Copyright (c) 2012 The Go Authors. All rights re
8585
# https://github.com/acomagu/bufpipe/blob/master/LICENSE
8686
github.com/acomagu/bufpipe: Copyright (c) 2019 acomagu
8787

88+
# https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/doc.go
89+
github.com/GoogleCloudPlatform/opentelemetry-operations-go: Copyright 2020 Google LLC
90+
91+
# https://github.com/ardielle/ardielle-go/README.md
92+
github.com/ardielle/ardielle-go: Copyright 2015 Yahoo Inc.
93+
94+
# https://bitbucket.org/atlassian/go-asap/src/master/LICENSE.txt
95+
bitbucket.org/atlassian/go-asap/v2: Copyright 2015 Atlassian Pty Ltd
96+
97+
# https://github.com/jcmturner/gokrb5/NOTICE
98+
github.com/jcmturner/*: Copyright 2016, Jonathan Turner <[email protected]>
99+
100+
# https://github.com/signalfx/com_signalfx_metrics_protobuf/README.md
101+
github.com/signalfx/com_signalfx_metrics_protobuf/*: Copyright © 2015-2017 SignalFx
102+
103+
# https://github.com/SAP/go-hdb/blob/main/.reuse/dep5
104+
github.com/SAP/go-hdb/*: Copyright 2014-2024 SAP SE or an SAP affiliate company and go-hdb contributors
105+
106+
# https://github.com/golang-sql/civil/blob/master/civil.go
107+
github.com/golang-sql/civil: Copyright 2016 Google LLC
108+
109+
# https://github.com/grafana/loki/blob/main/clients/cmd/fluentd/README.md
110+
github.com/grafana/loki: Copyright 2018- Grafana Labs
111+
88112
# For Apache projects, copyright is typically in individual source files and
89113
# not scanned automatically.
90114
github.com/tklauser/numcpus: Copyright 2018 Tobias Klauser
@@ -162,6 +186,7 @@ github.com/dgraph-io/badger:
162186
- "Copyright 2021 Dgraph Labs, Inc. and Contributors"
163187
github.com/mostynb/go-grpc-compression: "Copyright 2023 Mostyn Bramley-Moore."
164188
github.com/stormcat24/protodep: "Copyright Akinori Yamada"
189+
go4.org/mem: "Copyright 2020 The Go4 AUTHORS"
165190

166191
# These have large AUTHORS/CONTRIBUTORS files but attribute copyright as a group
167192
github.com/aptly-dev/aptly: Copyright 2013-2015 aptly authors. All rights reserved.
@@ -308,12 +333,29 @@ github.com/aquasecurity/trivy-policies/pkg/spec: Copyright (c) 2024 Aqua Securit
308333
github.com/aquasecurity/trivy-policies/rules/specs: Copyright (c) 2024 Aqua Security
309334
github.com/pjbgf/sha1cd: Copyright 2023 pjbgf
310335
github.com/go-errors/errors: Copyright (c) 2015 Conrad Irwin <[email protected]>
336+
github.com/apache/arrow/*: Copyright (C) 1995-1998 Eric Young ([email protected])
337+
github.com/tailscale/tailscale: Copyright (c) 2020 Tailscale Inc & AUTHORS.
311338

312339
# Copyright information is in the source headers
313340
github.com/csaf-poc/csaf_distribution: Copyright 2021-2023 German Federal Office for Information Security (BSI) <https://www.bsi.bund.de>
314341
github.com/google/btree: Copyright 2014-2022 Google Inc.
315342
github.com/google/shlex: Copyright 2012 Google Inc. All Rights Reserved.
343+
github.com/facebook/time/*: Copyright (c) Facebook, Inc. and its affiliates.
344+
github.com/grobie/gomemcache/memcache: Copyright 2011 Google Inc.
345+
github.com/lightstep/go-expohisto/*: Copyright The OpenTelemetry Authors
346+
github.com/envoyproxy/go-control-plane/*: Copyright 2020 Envoyproxy Authors
347+
github.com/envoyproxy/protoc-gen-validate/validate: Copyright 2020 Envoyproxy Authors
348+
github.com/cncf/xds: Copyright 2020 Envoyproxy Authors
349+
github.com/mwitkow/go-conntrack: Copyright 2016 Michal Witkowski. All Rights Reserved.
350+
github.com/pquerna/cachecontrol/cacheobject: Copyright 2015 Paul Querna
351+
github.com/signalfx/sapm-proto/*: Copyright 2019 Splunk, Inc.
352+
go.mongodb.org/atlas/mongodbatlas: Copyright 2022 MongoDB Inc
353+
github.com/go-jose/go-jose/v4: Copyright 2014 Square Inc.
316354

317355
github.com/vibrantbyte/go-antpath/antpath: vibrantbyte <[email protected]>|suchao <[email protected]>
318356
github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao <[email protected]>
319357

358+
# https://github.com/GoogleCloudPlatform/grpc-gcp-go/blob/main/LICENSE
359+
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp: Copyright 2024 gRPC authors.
360+
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/grpc_gcp: Copyright 2024 gRPC authors.
361+
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024 gRPC authors.

.ddqa/config.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@ jira_issue_type = "Task"
130130
jira_statuses = ["To Do", "In Progress", "Done"]
131131
github_team = "container-integrations"
132132
github_labels = ["team/containers"]
133+
exclude_members = ["clamoriniere"]
134+
135+
[teams."Container Platform"]
136+
jira_project = "CONTP"
137+
jira_issue_type = "Task"
138+
jira_statuses = ["To Do", "In Progress", "Done"]
139+
github_team = "container-platform"
140+
github_labels = ["team/container-platform"]
141+
exclude_members = ["clamoriniere"]
133142

134143
[teams."Container Ecosystems"]
135144
jira_project = "CECO"

0 commit comments

Comments
 (0)