Skip to content

Commit

Permalink
upgrade to go1.17.6 (#10689)
Browse files Browse the repository at this point in the history
* upgrade to go1.17.6 in circleci and windows GH actions

* changelog

* Use new snyk image with Go1.17

Image is from the build job from https://github.com/DataDog/images/pull/2632

* update builders/buildimages refs

* add go1.17 build flags to new files, including generated files

```
git ls-files | grep '\.go$' | xargs gofmt -w
```

* update docs and go.mod's

* run 'inv tidy-all' in -compat=1.17 mode

* add more -compat=1.17

* update to buildimages v6844966-47298a5

* codeql go version
  • Loading branch information
djmitche authored Feb 3, 2022
1 parent 7636156 commit 4d3948b
Show file tree
Hide file tree
Showing 48 changed files with 485 additions and 276 deletions.
2 changes: 1 addition & 1 deletion .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: datadog/datadog-agent-runner-circle:go11612
- image: datadog/datadog-agent-runner-circle:go1176
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/runner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN set -ex \
ssh

# Golang
ENV GIMME_GO_VERSION 1.16.12
ENV GIMME_GO_VERSION 1.17.6
ENV GOROOT /root/.gimme/versions/go$GIMME_GO_VERSION.linux.amd64
ENV GOPATH /go
ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: 1.16.12
go-version: 1.17.6

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v2
with:
go-version: '1.16.12'
go-version: '1.17.6'

- name: Set up runner
run: |
Expand Down
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,12 @@ variables:
S3_DSD6_URI: s3://dsd6-staging
RELEASE_VERSION_6: nightly
RELEASE_VERSION_7: nightly-a7
DATADOG_AGENT_BUILDIMAGES: v6554889-f294eac
DATADOG_AGENT_BUILDERS: v6554890-8eae026
DATADOG_AGENT_WINBUILDIMAGES: v6763937-323fb78
DATADOG_AGENT_ARMBUILDIMAGES: v6554889-f294eac
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v6696733-b6f229b
DATADOG_AGENT_NIKOS_BUILDIMAGES: v6554889-f294eac
DATADOG_AGENT_BUILDIMAGES: v6844966-47298a5
DATADOG_AGENT_BUILDERS: v6814105-5ec7b27
DATADOG_AGENT_WINBUILDIMAGES: v6844966-47298a5
DATADOG_AGENT_ARMBUILDIMAGES: v6844966-47298a5
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v6844966-47298a5
DATADOG_AGENT_NIKOS_BUILDIMAGES: v6844966-47298a5
DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
NIKOS_INSTALL_DIR: /opt/datadog-agent/embedded/nikos
NIKOS_EMBEDDED_PATH: /opt/datadog-agent/embedded/nikos/embedded
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/source_test/security_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ security_scan_test:
rules:
!reference [.on_main_or_release_branch]
stage: source_test
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/snyk:v5817527-cb0e69f-next
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/snyk:v6779027-23d6b05-next
tags: ["runner:main"]
needs: ["go_deps"]
before_script:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and development, is located under [the docs directory](docs) of the present repo
## Getting started

To build the Agent you need:
* [Go](https://golang.org/doc/install) 1.16 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
* [Go](https://golang.org/doc/install) 1.17 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
* Python 3.7+ along with development libraries for tooling. You will also need Python 2.7 if you are building the Agent with Python 2 support.
* Python dependencies. You may install these with `pip install -r requirements.txt`
This will also pull in [Invoke](http://www.pyinvoke.org) if not yet installed.
Expand Down
1 change: 1 addition & 0 deletions cmd/system-probe/utils/memory_monitor_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build linux
// +build linux

package utils
Expand Down
1 change: 1 addition & 0 deletions cmd/system-probe/utils/memory_monitor_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2016-present Datadog, Inc.

//go:build !linux
// +build !linux

package utils
Expand Down
6 changes: 3 additions & 3 deletions devenv/scripts/Install-DevEnv.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
$ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue'

Write-Host -ForegroundColor Green "Installing go 1.16.12"
Write-Host -ForegroundColor Green "Installing go 1.17.6"

$gozip = "https://dl.google.com/go/go1.16.12.windows-amd64.zip"
$gozip = "https://dl.google.com/go/go1.17.6.windows-amd64.zip"
if ($Env:TARGET_ARCH -eq "x86") {
$gozip = "https://dl.google.com/go/go1.16.12.windows-386.zip"
$gozip = "https://dl.google.com/go/go1.17.6.windows-386.zip"
}

$out = 'c:\go.zip'
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/agent_dev_env.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ variables (see Invoke docs for more details).

## Golang

You must [install Golang](https://golang.org/doc/install) version `1.16.12` or
You must [install Golang](https://golang.org/doc/install) version `1.17.6` or
higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
cannot use any additional tool it might need.

Expand Down
Loading

0 comments on commit 4d3948b

Please sign in to comment.