From 0c2e65be6cff8e5619c2950557c624c81bd92e29 Mon Sep 17 00:00:00 2001 From: odubajDT <93584209+odubajDT@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:57:42 +0100 Subject: [PATCH 1/3] [chore] Adapt renovate config to update all repository dependencies (#377) Signed-off-by: odubajDT --- .github/actions/create-cluster/action.yaml | 5 +++- .github/workflows/changelog.yml | 10 +++++-- .github/workflows/ci.yaml | 6 +++- .github/workflows/e2e.yaml | 10 ++++--- .github/workflows/load-tests.yml | 8 ++++-- .github/workflows/release.yaml | 6 +++- .github/workflows/snapshot.yaml | 6 +++- Makefile | 2 +- renovate.json | 32 +++++++++++++++++++++- 9 files changed, 71 insertions(+), 14 deletions(-) diff --git a/.github/actions/create-cluster/action.yaml b/.github/actions/create-cluster/action.yaml index c8d9954a..323cc76c 100644 --- a/.github/actions/create-cluster/action.yaml +++ b/.github/actions/create-cluster/action.yaml @@ -15,6 +15,9 @@ inputs: required: false description: "Name of the kind cluster" default: "kind" +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" runs: using: "composite" steps: @@ -22,7 +25,7 @@ runs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 167da6b5..949d13bc 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -10,6 +10,12 @@ on: branches: - main +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" + # renovate: datasource=github-releases depName=tcort/markdown-link-check + MARKDOWN_LINK_CHECK_VERSION: "v3.12.2" + concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true @@ -33,7 +39,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: ~1.22.6 + go-version: ${{ env.GO_VERSION }} - name: Cache Go id: go-cache uses: actions/cache@v4 @@ -82,7 +88,7 @@ jobs: run: cat changelog_preview.md - name: Install markdown-link-check - run: npm install -g markdown-link-check@3.12.2 + run: npm install -g markdown-link-check@${{ env.MARKDOWN_LINK_CHECK_VERSION }} - name: Run markdown-link-check run: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6c53c6e..4a0ea33e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,6 +7,10 @@ on: branches: [main] workflow_dispatch: +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" + jobs: build: name: Build and Test @@ -20,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 88897766..94e27f23 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -11,6 +11,8 @@ defaults: shell: bash env: KUBECONFIG: /tmp/kube-config-collector-e2e-testing + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" jobs: docker-build: @@ -22,7 +24,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false @@ -98,7 +100,7 @@ jobs: - zipkin - statsd - redaction - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: docker-build steps: - name: Check out code @@ -147,7 +149,7 @@ jobs: ./internal/testbed/scripts/install_dt_collector_helm.sh || exit 1; eec-confmap-provider: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: docker-build steps: - name: Check out code @@ -156,7 +158,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml index 6b3b0a4a..550cc778 100644 --- a/.github/workflows/load-tests.yml +++ b/.github/workflows/load-tests.yml @@ -8,6 +8,10 @@ on: - "**/README.md" workflow_dispatch: +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" + jobs: setup-environment: timeout-minutes: 30 @@ -19,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false @@ -66,7 +70,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} check-latest: true cache: false diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9ff8ed03..fdd0484f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,6 +6,10 @@ on: tags: - 'v*' +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" + jobs: build: name: Release @@ -28,7 +32,7 @@ jobs: grep "version: ${VERSION}" manifest.yaml || (echo "value of 'dist.version' in manifest.yaml does not match tag version ${VERSION}, please update it" && exit 1) - uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} - uses: docker/setup-qemu-action@v3 with: platforms: arm64 diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 5c91cdd3..e40ec82c 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -4,6 +4,10 @@ on: pull_request: branches: [main] +env: + # renovate: datasource=golang-version depName=go + GO_VERSION: "1.22.6" + jobs: build: name: Build @@ -16,7 +20,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "~1.22.6" + go-version: ${{ env.GO_VERSION }} cache: false - uses: docker/setup-qemu-action@v3 diff --git a/Makefile b/Makefile index 37182048..df7f5a55 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ SOURCES := $(shell find internal/confmap -type f | sort ) BIN = $(BIN_DIR)/dynatrace-otel-collector MAIN = $(BUILD_DIR)/main.go -# renovate: datasource=github-releases depName=github.com/jstemmer/go-junit-report +# renovate: datasource=github-releases depName=jstemmer/go-junit-report GO_JUNIT_REPORT_VERSION?=v2.1.0 # Files to be copied directly from the project root diff --git a/renovate.json b/renovate.json index 25f1ea13..9e1408e1 100644 --- a/renovate.json +++ b/renovate.json @@ -1,13 +1,43 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended", + "schedule:nonOfficeHours", + "customManagers:githubActionsVersions", + "customManagers:makefileVersions" ], "labels": ["dependencies"], + "prConcurrentLimit": 25, + "minimumReleaseAge": "3 days", + "timezone": "Europe/Vienna", + "rebaseWhen": "conflicted", + "postUpdateOptions": [ + "gomodTidy", + "gomodMassage" + ], "packageRules": [ { "matchPackagePatterns": ["^(go\\.opentelemetry\\.io/collector|github\\.com/open-telemetry/opentelemetry-collector-contrib)"], "groupName": "OpenTelemetry Collector" + }, + { + "matchDatasources": ["golang-version"], + "rangeStrategy": "bump" + } + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": [ + "(^|\\/)Makefile$", + "(^|\\/)Dockerfile", + "(^|\\/).*\\.ya?ml$", + "(^|\\/).*\\.toml$", + "(^|\\/).*\\.sh$" + ], + "matchStrings": [ + "# renovate: datasource=(?.+?) depName=(?.+?)\\s.*(:|=|\\?=|:=|\\+=) ?\\\"?(?.+?)?\\\"?\\s" + ] } ], "regexManagers": [ From a9f3b2ad9131103149907012ac36ff8b7b4b0a22 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:55:18 +0100 Subject: [PATCH 2/3] chore(deps): update anchore/sbom-action action to v0.17.8 (#384) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yaml | 2 +- .github/workflows/snapshot.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fdd0484f..1bc30ccc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -37,7 +37,7 @@ jobs: with: platforms: arm64 - uses: docker/setup-buildx-action@v3 - - uses: anchore/sbom-action/download-syft@v0.17.7 + - uses: anchore/sbom-action/download-syft@v0.17.8 - name: Cache tools uses: actions/cache@v4 with: diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index e40ec82c..d55a01b0 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -29,7 +29,7 @@ jobs: - uses: docker/setup-buildx-action@v3 - - uses: anchore/sbom-action/download-syft@v0.17.7 + - uses: anchore/sbom-action/download-syft@v0.17.8 - name: Cache tools id: cache-tools From f6e631b6729d430e8d99fe6c291c3dfe636584b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:14:46 +0000 Subject: [PATCH 3/3] fix(deps): update module github.com/stretchr/testify to v1.10.0 (#383) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: odubajDT <93584209+odubajDT@users.noreply.github.com> --- internal/confmap/provider/eecprovider/go.mod | 2 +- internal/confmap/provider/eecprovider/go.sum | 4 ++-- internal/testbed/go.mod | 2 +- internal/testbed/go.sum | 3 ++- internal/testcommon/go.mod | 2 +- internal/testcommon/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/internal/confmap/provider/eecprovider/go.mod b/internal/confmap/provider/eecprovider/go.mod index 6116cb44..1980d704 100644 --- a/internal/confmap/provider/eecprovider/go.mod +++ b/internal/confmap/provider/eecprovider/go.mod @@ -3,7 +3,7 @@ module github.com/Dynatrace/dynatrace-otel-collector/internal/confmap/provider/e go 1.22.6 require ( - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/confmap v1.20.0 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/internal/confmap/provider/eecprovider/go.sum b/internal/confmap/provider/eecprovider/go.sum index f16eed9e..802c3d8c 100644 --- a/internal/confmap/provider/eecprovider/go.sum +++ b/internal/confmap/provider/eecprovider/go.sum @@ -20,8 +20,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/collector/confmap v1.20.0 h1:ARfOwmkKxFOud1njl03yAHQ30+uenlzqCO6LBYamDTE= go.opentelemetry.io/collector/confmap v1.20.0/go.mod h1:DMpd9Ay/ffls3JoQBQ73vWeRsz1rNuLbwjo6WtjSQus= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/internal/testbed/go.mod b/internal/testbed/go.mod index c025c1a9..2a25a4f3 100644 --- a/internal/testbed/go.mod +++ b/internal/testbed/go.mod @@ -7,7 +7,7 @@ require ( github.com/google/uuid v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.114.0 github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.114.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.114.0 go.opentelemetry.io/collector/consumer v0.114.0 go.opentelemetry.io/collector/consumer/consumertest v0.114.0 diff --git a/internal/testbed/go.sum b/internal/testbed/go.sum index 9c5d01fa..0f138f31 100644 --- a/internal/testbed/go.sum +++ b/internal/testbed/go.sum @@ -2829,8 +2829,9 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/substrait-io/substrait-go v0.4.2/go.mod h1:qhpnLmrcvAnlZsUyPXZRqldiHapPTXC3t7xFgDi3aQg= diff --git a/internal/testcommon/go.mod b/internal/testcommon/go.mod index 420b7ce5..8242e74f 100644 --- a/internal/testcommon/go.mod +++ b/internal/testcommon/go.mod @@ -5,7 +5,7 @@ go 1.22.6 require ( github.com/docker/docker v27.3.1+incompatible github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.114.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component/componenttest v0.114.0 go.opentelemetry.io/collector/consumer/consumertest v0.114.0 go.opentelemetry.io/collector/featuregate v1.20.0 diff --git a/internal/testcommon/go.sum b/internal/testcommon/go.sum index f39711ef..e2893da4 100644 --- a/internal/testcommon/go.sum +++ b/internal/testcommon/go.sum @@ -326,8 +326,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=