Merge branch 'main' into renovate/kubernetes-go

Dynatrace · Nov 25, 2024 · 9c654fe · 9c654fe
2 parents 8b2343d + f6e631b
commit 9c654fe
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 24 deletions.
diff --git a/.github/actions/create-cluster/action.yaml b/.github/actions/create-cluster/action.yaml
@@ -15,14 +15,17 @@ 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:
 
     - 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,6 +6,10 @@ on:
     tags:
       - 'v*'
 
+env:
+  # renovate: datasource=golang-version depName=go
+  GO_VERSION: "1.22.6"
+
 jobs:
   build:
     name: Release
@@ -28,12 +32,12 @@ 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
       - uses: docker/setup-buildx-action@v3
-      - uses: anchore/sbom-action/[email protected].7
+      - uses: anchore/sbom-action/[email protected].8
       - name: Cache tools
         uses: actions/cache@v4
         with:

diff --git 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
@@ -25,7 +29,7 @@ jobs:
 
       - uses: docker/setup-buildx-action@v3
 
-      - uses: anchore/sbom-action/[email protected].7
+      - uses: anchore/sbom-action/[email protected].8
 
       - name: Cache tools
         id: cache-tools

diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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=

diff --git 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=(?<datasource>.+?) depName=(?<depName>.+?)\\s.*(:|=|\\?=|:=|\\+=) ?\\\"?(?<currentValue>.+?)?\\\"?\\s"
+      ]
     }
   ],
   "regexManagers": [