Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/download-a…
Browse files Browse the repository at this point in the history
…rtifact-4.1.8
  • Loading branch information
chouetz authored Dec 11, 2024
2 parents 0078376 + 6d7ae5b commit c199b49
Show file tree
Hide file tree
Showing 6,355 changed files with 291,187 additions and 153,671 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .circleci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ This image is now built alongside other images in [agent-buildimages](https://gi
Once you have created a new image by building a new version of agent-buildimages, you can test your modification with the associated invoke task:

```bash
invoke -e pipeline.update-buildimages --image-tag v12345678-c0mm1t5
invoke -e buildimages.update --tag v12345678-c0mm1t5
```
This will update the configuration of circleci and gitlab to use the __test version__ of these images.
Once your test is successful, you can either move the `_test_version` from files or invoke
This will update the configuration of circleci and gitlab to use the __test__ version of these images.
Once your test is successful, you can either move the `_test_only` from files or invoke
```bash
invoke -e pipeline.update-buildimages --image-tag v12345678-c0mm1t5 --no-test-version
invoke -e buildimages.update --tag v12345678-c0mm1t5 --no-test
```

If everything is green, get a review and merge the PR.
173 changes: 1 addition & 172 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:v38375519-53773733
- image: gcr.io/datadoghq/agent-circleci-runner:v50263243-1a30c934
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down Expand Up @@ -66,19 +66,6 @@ jobs:
name: grab go deps
command: |
inv -e deps
- run:
name: build rtloader
command: |
inv rtloader.make --install-prefix=/go/src/github.com/DataDog/datadog-agent/dev
inv rtloader.install
- run:
name: lint rtloader
command: |
inv rtloader.format --raise-if-changed
- run:
name: test rtloader
command: |
inv rtloader.test
- run:
name: install go tooling
command: |
Expand All @@ -91,19 +78,6 @@ jobs:
- /go/src/github.com/DataDog/datadog-agent/dev
- /usr/local/bin

unit_tests:
<<: *job_template
resource_class: xlarge
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run unit tests
no_output_timeout: 20m
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"

integration_tests:
<<: *job_template
resource_class: large
Expand All @@ -115,80 +89,6 @@ jobs:
name: run integration tests
command: inv -e integration-tests --race --remote-docker

go_linting:
<<: *job_template
resource_class: xlarge
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run go linters
no_output_timeout: 20m
command: inv -e linter.go

licenses_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run license linting
command: inv -e lint-licenses

copyrights_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run copyrights linting
command: inv -e linter.copyrights

filename_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run filename linting
command: inv -e linter.filenames

shell_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: Install shellcheck
command: inv -e install-shellcheck
- run:
name: Print shellcheck version
command: shellcheck --version
- run:
name: Run shellcheck
#Excludes:
#SC2028: echo may not expand escape sequences. Use printf.
#SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo".
command: shellcheck --severity=info -e SC2059 -e SC2028 --shell=bash ./cmd/**/*.sh ./omnibus/package-scripts/*/*

component_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run component linting
command: inv -e lint-components lint-fxutil-oneshot-test

codeowner_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run CODEOWNER linting
command: inv -e github.lint-codeowner

docker_tests:
<<: *job_template
steps:
Expand All @@ -202,40 +102,6 @@ jobs:
name: run docker image integration tests
command: inv -e docker.integration-tests

build_binaries:
<<: *job_template
resource_class: large
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: build dogstatsd
command: inv -e dogstatsd.build --static
- run:
name: build agent
command: inv -e agent.build --exclude-rtloader

build_iot_agent:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: build iot agent
command: inv -e agent.build --flavor iot
- run:
name: test iot agent
command: DD_HOSTNAME=test-circleci-hostname ./bin/agent/agent -c ./bin/agent/dist check cpu

documentation_generation:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: generate doxygen documentation
command: inv -e rtloader.generate-doc

workflows:
version: 2
test_and_build:
Expand All @@ -244,46 +110,9 @@ workflows:
- dependencies:
requires:
- checkout_code
- unit_tests:
requires:
- dependencies
- integration_tests:
requires:
- dependencies
- go_linting:
requires:
- dependencies
- licenses_linting:
requires:
- dependencies
- copyrights_linting:
requires:
- dependencies
- filename_linting:
requires:
- dependencies
- shell_linting:
requires:
- dependencies
- component_linting:
requires:
- dependencies
- codeowner_linting:
requires:
- dependencies
- docker_tests:
requires:
- dependencies
- documentation_generation:
requires:
- dependencies
- build_binaries:
requires:
- unit_tests
- integration_tests
- docker_tests
- build_iot_agent:
requires:
- unit_tests
- integration_tests
- docker_tests
42 changes: 0 additions & 42 deletions .clang-tidy

This file was deleted.

16 changes: 12 additions & 4 deletions .copyright-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ github.com/elastic/*: Copyright 2017-2018 Elasticsearch B.V.
github.com/golang/*: Copyright (c) 2009 The Go Authors. All rights reserved.
github.com/googleapis/*: Copyright 2017 Google Inc.
github.com/google/go-cmp/*: Copyright (c) 2017 The Go Authors. All rights reserved.
github.com/grpc-ecosystem/*: Copyright (c) 2015, Gengo, Inc.
github.com/hashicorp/*: Copyright © 2014-2018 HashiCorp, Inc
github.com/prometheus/*: Copyright 2012-2015 The Prometheus Authors
github.com/open-telemetry/*: Copyright The OpenTelemetry Authors
Expand All @@ -44,8 +43,9 @@ sigs.k8s.io/*: Copyright 2017 The Kubernetes Authors.
contrib.go.opencensus.io/exporter/prometheus: Copyright 2020, OpenCensus Authors
go.opencensus.io: Copyright 2018, OpenCensus Authors
go.opencensus.io/*: Copyright 2018, OpenCensus Authors
github.com/grpc-ecosystem/*: Copyright 2016 Michal Witkowski. All Rights Reserved.
google.golang.org/genproto/*: Copyright 2015 Google LLC
github.com/grpc-ecosystem/go-grpc-prometheus: Copyright 2016 Michal Witkowski. All Rights Reserved.
github.com/grpc-ecosystem/go-grpc-middleware: Copyright (c) The go-grpc-middleware Authors.
github.com/grpc-ecosystem/grpc-gateway: Copyright (c) 2015, Gengo, Inc.
google.golang.org/grpc: Copyright 2014 gRPC authors.
google.golang.org/grpc/*: Copyright 2014 gRPC authors.
github.com/skydive-project/go-debouncer: Copyright (C) 2018 Red Hat, Inc.
Expand Down Expand Up @@ -213,9 +213,11 @@ github.com/gogo/protobuf: ["Copyright (c) 2013, The GoGo Authors. All rights res
# * Automatic "Copyright (c)"
# * Year is based on the year of the first commit to the repository
# * Author, when known only by GitHub username, is "GitHub Full Name (github-username)"
github.com/moby/docker-image-spec/specs-go/v1: Copyright 2012-2017 Docker, Inc.
github.com/moby/sys/mountinfo: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/moby/sys/signal: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/moby/sys/user: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/moby/sys/userns: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/modern-go/concurrent: Copyright (c) 2018 Tao Wen
github.com/modern-go/reflect2: Copyright (c) 2018 Tao Wen
github.com/opencontainers/selinux/*: Copyright (c) 2017 The Authors
Expand Down Expand Up @@ -247,6 +249,7 @@ github.com/chrusty/protoc-gen-jsonschema: Copyright (c) 2017 The Authors
github.com/antchfx/htmlquery: Copyright (c) 2016 Zheng Chun
github.com/antchfx/xmlquery: Copyright (c) 2016 Zheng Chun
github.com/antchfx/xpath: Copyright (c) 2016 Zheng Chun
github.com/kouhin/envflag: Copyright (c) 2015 kouhin


# The Copyright information is not contained in the LICENSE file, but it can be found in other
Expand Down Expand Up @@ -331,6 +334,7 @@ github.com/pjbgf/sha1cd:
- Copyright 2009 The Go Authors. All rights reserved.
- Copyright 2017 Marc Stevens <[email protected]>, Dan Shumow <[email protected]>
- Copyright 2022 Paulo Gomes <[email protected]>
- Copyright 2023 pjbgf

github.com/kr/pretty: Copyright 2012 Keith Rarick
github.com/kr/text: Copyright 2012 Keith Rarick
Expand All @@ -341,7 +345,6 @@ github.com/openvex/go-vex: Copyright 2023 The OpenVEX Authors
# Copyright information is in the LICENSE
github.com/aquasecurity/trivy-policies/pkg/spec: Copyright (c) 2024 Aqua Security
github.com/aquasecurity/trivy-policies/rules/specs: Copyright (c) 2024 Aqua Security
github.com/pjbgf/sha1cd: Copyright 2023 pjbgf
github.com/go-errors/errors: Copyright (c) 2015 Conrad Irwin <[email protected]>
github.com/apache/arrow/*: Copyright (C) 1995-1998 Eric Young ([email protected])
github.com/tailscale/tailscale: Copyright (c) 2020 Tailscale Inc & AUTHORS.
Expand All @@ -362,6 +365,7 @@ github.com/signalfx/sapm-proto/*: Copyright 2019 Splunk, Inc.
go.mongodb.org/atlas/mongodbatlas: Copyright 2022 MongoDB Inc
github.com/go-jose/go-jose/v4: Copyright 2014 Square Inc.
github.com/gocolly/colly: Copyright 2018 Adam Tauber
github.com/puzpuzpuz/xsync/v3: Copyright (c) 2021 Andrey Pechkurov

github.com/vibrantbyte/go-antpath/antpath: vibrantbyte <[email protected]>|suchao <[email protected]>
github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao <[email protected]>
Expand All @@ -370,3 +374,7 @@ github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp: Copyright 2024 gRPC authors.
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/grpc_gcp: Copyright 2024 gRPC authors.
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024 gRPC authors.

github.com/NVIDIA/go-nvml/*: Copyright 2023 NVIDIA CORPORATION

github.com/jonboulle/clockwork: Copyright 2014 Nell Boulle
7 changes: 7 additions & 0 deletions .custom-gcl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: v1.60.3

name: golangci-lint

plugins:
- module: 'github.com/DataDog/datadog-agent/pkg/linters/components/pkgconfigusage'
path: ./pkg/linters/components/pkgconfigusage
Loading

0 comments on commit c199b49

Please sign in to comment.