From ce608baa28b1a5490f1b6d22d90fb7d562b8ae18 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:32:09 -0700 Subject: [PATCH 1/4] [chore] update test to use slices.Reverse (#10878) This addresses a TODO in the extension test code. Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- service/extensions/extensions_test.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/service/extensions/extensions_test.go b/service/extensions/extensions_test.go index 8b40d8c90f7..eaa827663d1 100644 --- a/service/extensions/extensions_test.go +++ b/service/extensions/extensions_test.go @@ -6,6 +6,7 @@ package extensions import ( "context" "errors" + "slices" "testing" "github.com/stretchr/testify/assert" @@ -193,16 +194,9 @@ func (tc testOrderCase) testOrdering(t *testing.T) { err = exts.Shutdown(context.Background()) require.NoError(t, err) - // TODO From Go 1.21 can use slices.Reverse() - reverseSlice := func(s []string) { - for i, j := 0, len(s)-1; i < j; i, j = i+1, j-1 { - s[i], s[j] = s[j], s[i] - } - } - if len(tc.order) > 0 { require.Equal(t, tc.order, startOrder) - reverseSlice(shutdownOrder) + slices.Reverse(shutdownOrder) require.Equal(t, tc.order, shutdownOrder) } } From 76acd37b2cf6473f236fd406e5dd19e1dc03f70c Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:32:29 -0700 Subject: [PATCH 2/4] Added support for go1.23, bumped the minimum version to 1.22 (#10869) Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/codeboten_go-1.23.yaml | 27 +++++++++++++++++++ .github/workflows/api-compatibility.yml | 3 +-- .github/workflows/build-and-test-arm.yml | 2 +- .github/workflows/build-and-test-windows.yaml | 8 +++--- .github/workflows/build-and-test.yml | 14 +++++----- .../workflows/builder-integration-test.yaml | 8 +++--- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-analysis.yml | 10 +++---- .github/workflows/contrib-tests.yml | 10 +++---- .github/workflows/perf.yml | 2 +- .github/workflows/prepare-release.yml | 4 +-- .github/workflows/tidy-dependencies.yml | 2 +- CONTRIBUTING.md | 4 +-- Makefile.Common | 2 +- client/go.mod | 2 +- cmd/builder/go.mod | 2 +- cmd/builder/internal/builder/main.go | 2 +- .../internal/builder/templates/go.mod.tmpl | 2 +- cmd/mdatagen/go.mod | 2 +- cmd/otelcorecol/go.mod | 4 +-- component/componentprofiles/go.mod | 2 +- component/componentstatus/go.mod | 2 +- component/go.mod | 2 +- config/configauth/go.mod | 2 +- config/configcompression/go.mod | 2 +- config/configgrpc/go.mod | 2 +- config/confighttp/go.mod | 2 +- config/confignet/go.mod | 2 +- config/configopaque/go.mod | 2 +- config/configretry/go.mod | 2 +- config/configtelemetry/go.mod | 2 +- config/configtls/go.mod | 2 +- config/internal/go.mod | 2 +- confmap/converter/expandconverter/go.mod | 2 +- confmap/go.mod | 2 +- confmap/internal/e2e/go.mod | 2 +- confmap/provider/envprovider/go.mod | 2 +- confmap/provider/fileprovider/go.mod | 2 +- confmap/provider/httpprovider/go.mod | 2 +- confmap/provider/httpsprovider/go.mod | 2 +- confmap/provider/yamlprovider/go.mod | 2 +- connector/connectorprofiles/go.mod | 2 +- connector/forwardconnector/go.mod | 2 +- connector/go.mod | 2 +- consumer/consumerprofiles/go.mod | 2 +- consumer/consumertest/go.mod | 2 +- consumer/go.mod | 2 +- exporter/debugexporter/go.mod | 2 +- exporter/exporterprofiles/go.mod | 2 +- exporter/go.mod | 2 +- exporter/loggingexporter/go.mod | 2 +- exporter/nopexporter/go.mod | 2 +- exporter/otlpexporter/go.mod | 2 +- exporter/otlphttpexporter/go.mod | 2 +- extension/auth/go.mod | 2 +- extension/ballastextension/go.mod | 2 +- extension/go.mod | 2 +- extension/memorylimiterextension/go.mod | 2 +- extension/zpagesextension/go.mod | 2 +- featuregate/go.mod | 2 +- filter/go.mod | 2 +- go.mod | 2 +- internal/e2e/go.mod | 2 +- internal/globalgates/go.mod | 2 +- internal/tools/go.mod | 2 +- otelcol/go.mod | 2 +- otelcol/otelcoltest/go.mod | 2 +- pdata/go.mod | 2 +- pdata/pprofile/go.mod | 2 +- pdata/testdata/go.mod | 2 +- processor/batchprocessor/go.mod | 2 +- processor/go.mod | 2 +- processor/memorylimiterprocessor/go.mod | 2 +- processor/processorprofiles/go.mod | 2 +- receiver/go.mod | 2 +- receiver/nopreceiver/go.mod | 2 +- receiver/otlpreceiver/go.mod | 2 +- receiver/receiverprofiles/go.mod | 2 +- renovate.json | 2 +- semconv/go.mod | 2 +- service/go.mod | 2 +- 81 files changed, 130 insertions(+), 104 deletions(-) create mode 100644 .chloggen/codeboten_go-1.23.yaml diff --git a/.chloggen/codeboten_go-1.23.yaml b/.chloggen/codeboten_go-1.23.yaml new file mode 100644 index 00000000000..60cacf65cc0 --- /dev/null +++ b/.chloggen/codeboten_go-1.23.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: all + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added support for go1.23, bumped the minimum version to 1.22 + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [10869] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index d6eda5fa387..92dbb6e3686 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -20,7 +20,6 @@ jobs: BASE_REF: ${{ github.base_ref }} HEAD_REF: ${{ github.head_ref }} steps: - - name: Checkout-Main uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: @@ -35,7 +34,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 # Generate apidiff states of Main - name: Generate-States diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml index 5f1e9887cd9..4e6ecf9dccf 100644 --- a/.github/workflows/build-and-test-arm.yml +++ b/.github/workflows/build-and-test-arm.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: "~1.22.4" + go-version: "~1.22.6" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index 32897beb947..d89ca657143 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -1,9 +1,9 @@ name: build-and-test-windows on: push: - branches: [ main ] + branches: [main] tags: - - 'v[0-9]+.[0-9]+.[0-9]+*' + - "v[0-9]+.[0-9]+.[0-9]+*" pull_request: concurrency: @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 @@ -47,7 +47,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0ae8d9fbd9c..6916b9bea36 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache @@ -45,7 +45,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache @@ -69,7 +69,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache @@ -94,7 +94,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache @@ -141,7 +141,7 @@ jobs: strategy: matrix: runner: [ubuntu-latest] - go-version: ["~1.22", "~1.21.13"] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["~1.23", "~1.22"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ${{ matrix.runner }} needs: [setup-environment] steps: @@ -194,7 +194,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache @@ -256,7 +256,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index 528618261bf..c0712ec95d4 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -3,15 +3,15 @@ name: Builder - Integration tests on: # on changes to the main branch touching the builder push: - branches: [ main ] + branches: [main] # on PRs touching the builder pull_request: - branches: [ main ] + branches: [main] # once a day at 6:17 AM UTC schedule: - - cron: '17 6 * * *' + - cron: "17 6 * * *" # manual execution workflow_dispatch: @@ -33,6 +33,6 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 - name: Test run: make builder-integration-test diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index bd175f5786a..6cadf39e098 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 - name: Cache Go id: go-cache uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 66cd66e6dbd..d6bdb43ee7d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,7 +1,7 @@ name: "CodeQL Analysis" on: push: - branches: [ main ] + branches: [main] pull_request: concurrency: @@ -14,9 +14,9 @@ permissions: jobs: CodeQL-Build: permissions: - actions: read # for github/codeql-action/init to get workflow details - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/autobuild to send a status report + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/autobuild to send a status report runs-on: ubuntu-latest steps: @@ -26,7 +26,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index 47d835d951b..6f5226a20c7 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -1,12 +1,12 @@ name: contrib-tests on: push: - branches: [ main ] + branches: [main] tags: - v[0-9]+.[0-9]+.[0-9]+.* pull_request: types: [opened, ready_for_review, synchronize, reopened, labeled, unlabeled] - branches: [ main ] + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.head_ref }} @@ -43,18 +43,18 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Run Contrib Tests run: | contrib_path=/tmp/opentelemetry-collector-contrib git clone --depth=1 https://github.com/open-telemetry/opentelemetry-collector-contrib.git $contrib_path - make CONTRIB_PATH=$contrib_path SKIP_RESTORE_CONTRIB=true GROUP=${{ matrix.group }} check-contrib + make CONTRIB_PATH=$contrib_path SKIP_RESTORE_CONTRIB=true GROUP=${{ matrix.group }} check-contrib contrib_tests: runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.labels.*.name, 'Skip Contrib Tests') }} - needs: [ contrib-tests-matrix ] + needs: [contrib-tests-matrix] steps: - name: Print result run: echo ${{ needs.contrib-tests-matrix.result }} diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index f13cae93023..12fd41b4eac 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 - name: Run benchmark run: make gobenchmark diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index addb7a7e2c2..8c35088c778 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -60,7 +60,7 @@ jobs: # Releasing opentelemetry-collector prepare-release: - needs: + needs: - validate-versions runs-on: ubuntu-latest steps: @@ -94,7 +94,7 @@ jobs: - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 # Prepare Core for release. # - Update CHANGELOG.md file, this is done via chloggen # - Run make prepare-release PREVIOUS_VERSION=1.0.0 RELEASE_CANDIDATE=1.1.0 MODSET=stable diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 94e56d19632..f0ed338285d 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ~1.21.13 + go-version: ~1.22.6 cache: false - name: Cache Go id: go-cache diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad214e8ce62..f1f655ab61d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,7 +161,7 @@ section of the general project contributing guide. Working with the project sources requires the following tools: 1. [git](https://git-scm.com/) -2. [go](https://golang.org/) (version 1.21 and up) +2. [go](https://golang.org/) (version 1.22 and up) 3. [make](https://www.gnu.org/software/make/) 4. [docker](https://www.docker.com/) @@ -218,7 +218,7 @@ before merging (but see the above paragraph about writing good commit messages i ## General Notes -This project uses Go 1.21.* and [Github Actions.](https://github.com/features/actions) +This project uses Go 1.22.* and [Github Actions.](https://github.com/features/actions) It is recommended to run `make gofmt all` before submitting your PR. diff --git a/Makefile.Common b/Makefile.Common index 31f5a80d156..15c1407d446 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -67,7 +67,7 @@ fmt: $(GOIMPORTS) .PHONY: tidy tidy: rm -fr go.sum - $(GOCMD) mod tidy -compat=1.21.0 + $(GOCMD) mod tidy -compat=1.22.0 .PHONY: lint lint: $(LINT) diff --git a/client/go.mod b/client/go.mod index 6b65583392b..0d862716094 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/client -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index 1ea1bd5d9e4..e724b8c175d 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/cmd/builder -go 1.21.0 +go 1.22.0 require ( github.com/hashicorp/go-version v1.7.0 diff --git a/cmd/builder/internal/builder/main.go b/cmd/builder/internal/builder/main.go index fbbb3a0942c..3c62bd3ff1e 100644 --- a/cmd/builder/internal/builder/main.go +++ b/cmd/builder/internal/builder/main.go @@ -139,7 +139,7 @@ func GetModules(cfg Config) error { return nil } - if _, err := runGoCommand(cfg, "mod", "tidy", "-compat=1.21"); err != nil { + if _, err := runGoCommand(cfg, "mod", "tidy", "-compat=1.22"); err != nil { return fmt.Errorf("failed to update go.mod: %w", err) } diff --git a/cmd/builder/internal/builder/templates/go.mod.tmpl b/cmd/builder/internal/builder/templates/go.mod.tmpl index 3ce0e7eb454..a7ad357aac6 100644 --- a/cmd/builder/internal/builder/templates/go.mod.tmpl +++ b/cmd/builder/internal/builder/templates/go.mod.tmpl @@ -2,7 +2,7 @@ module {{.Distribution.Module}} -go 1.21 +go 1.22 require ( {{if .Distribution.SupportsConfmapFactories -}} diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 900c7ce3d60..07cd23b4a57 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/cmd/mdatagen -go 1.21.0 +go 1.22.0 require ( github.com/google/go-cmp v0.6.0 diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index d4a64dfb98d..58b26110409 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -2,9 +2,9 @@ module go.opentelemetry.io/collector/cmd/otelcorecol -go 1.21.0 +go 1.22.0 -toolchain go1.21.13 +toolchain go1.22.6 require ( go.opentelemetry.io/collector/component v0.107.0 diff --git a/component/componentprofiles/go.mod b/component/componentprofiles/go.mod index 7a62e78f493..95f77282eac 100644 --- a/component/componentprofiles/go.mod +++ b/component/componentprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/component/componentprofiles -go 1.21.0 +go 1.22.0 require go.opentelemetry.io/collector/component v0.107.0 diff --git a/component/componentstatus/go.mod b/component/componentstatus/go.mod index db189dfacb3..81fd6379da0 100644 --- a/component/componentstatus/go.mod +++ b/component/componentstatus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/component/componentstatus -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/component/go.mod b/component/go.mod index 95bf4f5f05a..8bde1f4f873 100644 --- a/component/go.mod +++ b/component/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/component -go 1.21.0 +go 1.22.0 require ( github.com/prometheus/client_golang v1.19.1 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 1afbb2577e6..67d49fed81e 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configauth -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/config/configcompression/go.mod b/config/configcompression/go.mod index 159d320056b..3e9b00c0d02 100644 --- a/config/configcompression/go.mod +++ b/config/configcompression/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configcompression -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 5259c41c366..c124e5eef00 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configgrpc -go 1.21.0 +go 1.22.0 require ( github.com/mostynb/go-grpc-compression v1.2.3 diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index da295585adf..9521f051d77 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/confighttp -go 1.21.0 +go 1.22.0 require ( github.com/golang/snappy v0.0.4 diff --git a/config/confignet/go.mod b/config/confignet/go.mod index f1f33364d78..ec8317ee55f 100644 --- a/config/confignet/go.mod +++ b/config/confignet/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/confignet -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index 599192dabf5..8381fe16cbc 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configopaque -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/config/configretry/go.mod b/config/configretry/go.mod index fa25d5627f9..c118ae63bae 100644 --- a/config/configretry/go.mod +++ b/config/configretry/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configretry -go 1.21.0 +go 1.22.0 require ( github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/config/configtelemetry/go.mod b/config/configtelemetry/go.mod index e3a49a0bdca..27bfd5c92cc 100644 --- a/config/configtelemetry/go.mod +++ b/config/configtelemetry/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configtelemetry -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/config/configtls/go.mod b/config/configtls/go.mod index aad40d2598b..e16fba9956e 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configtls -go 1.21.0 +go 1.22.0 require ( github.com/fsnotify/fsnotify v1.7.0 diff --git a/config/internal/go.mod b/config/internal/go.mod index e884ae58113..f0813bb1408 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/internal -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index c98c0dd1502..599fc4edfa2 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -2,7 +2,7 @@ // Using the expandconverter with `confmap.Resolver` will cause double escaping, so `$$$$` -> `$` instead of `$$`. module go.opentelemetry.io/collector/confmap/converter/expandconverter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/go.mod b/confmap/go.mod index 02634f25890..5fb7c86ab00 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap -go 1.21.0 +go 1.22.0 require ( github.com/go-viper/mapstructure/v2 v2.1.0 diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 2802215e3b4..2d91dff7026 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/internal/e2e -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index 2550ec0c869..5d50d6b343f 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/provider/envprovider -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 4f85b000bfa..9ca444e8aa5 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/provider/fileprovider -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index 5eb656598a9..94311d2d625 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/provider/httpprovider -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 9219f7f4e29..7cec3b97628 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/provider/httpsprovider -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index b6c68633a26..c9e133226c6 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap/provider/yamlprovider -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/connector/connectorprofiles/go.mod b/connector/connectorprofiles/go.mod index 3b88c383391..e162d93cc8b 100644 --- a/connector/connectorprofiles/go.mod +++ b/connector/connectorprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/connector/connectorprofiles -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 1c9c270e43a..343ee8ca2f9 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/connector/forwardconnector -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/connector/go.mod b/connector/go.mod index bef2ee8e731..f01bf11e517 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/connector -go 1.21.0 +go 1.22.0 require ( github.com/google/uuid v1.6.0 diff --git a/consumer/consumerprofiles/go.mod b/consumer/consumerprofiles/go.mod index 327265ee290..4791b42dd5b 100644 --- a/consumer/consumerprofiles/go.mod +++ b/consumer/consumerprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/consumer/consumerprofiles -go 1.21.0 +go 1.22.0 replace go.opentelemetry.io/collector/pdata => ../../pdata diff --git a/consumer/consumertest/go.mod b/consumer/consumertest/go.mod index 7f34bbfcfd4..a2ff56b05f4 100644 --- a/consumer/consumertest/go.mod +++ b/consumer/consumertest/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/consumer/consumertest -go 1.21.0 +go 1.22.0 replace go.opentelemetry.io/collector/consumer => ../ diff --git a/consumer/go.mod b/consumer/go.mod index 60bb51c3614..d4640a781de 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/consumer -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 11732cbebd7..61b002adaf6 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/debugexporter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/exporterprofiles/go.mod b/exporter/exporterprofiles/go.mod index f8f2838591a..aba55964d02 100644 --- a/exporter/exporterprofiles/go.mod +++ b/exporter/exporterprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/exporterprofiles -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/go.mod b/exporter/go.mod index 6caa8232fbe..de344232074 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter -go 1.21.0 +go 1.22.0 require ( github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 933dc48a7d4..ed7f24f981f 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -1,7 +1,7 @@ // Deprecated: loggingexporter is deprecated in favour of the debugexporter. It will be removed in September 2024. module go.opentelemetry.io/collector/exporter/loggingexporter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index db1e6e71c69..928bd92d178 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/nopexporter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index ee27b0877b8..835331a455c 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/otlpexporter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index c50438d0c8a..8441d280c91 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/otlphttpexporter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 72ddfdd65f9..034caa4ad24 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/auth -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 26c9299164e..d6671accaac 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -1,7 +1,7 @@ // Deprecated: Use the GOMEMLIMIT environment variable instead. module go.opentelemetry.io/collector/extension/ballastextension -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/extension/go.mod b/extension/go.mod index ba57a750ef9..bde73828a12 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension -go 1.21.0 +go 1.22.0 require ( github.com/google/uuid v1.6.0 diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index f1e07180de8..ed93bee5fea 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/memorylimiterextension -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 8c047a03c69..6e8e654a2ef 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/zpagesextension -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/featuregate/go.mod b/featuregate/go.mod index d84687e6d87..3d7395ac156 100644 --- a/featuregate/go.mod +++ b/featuregate/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/featuregate -go 1.21.0 +go 1.22.0 require ( github.com/hashicorp/go-version v1.7.0 diff --git a/filter/go.mod b/filter/go.mod index 950ce75ba16..9cca5006d07 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/filter -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/go.mod b/go.mod index 9840848bcc8..75bc59f8366 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ module go.opentelemetry.io/collector // For the OpenTelemetry Collector Core distribution specifically, see // https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol -go 1.21.0 +go 1.22.0 require ( github.com/shirou/gopsutil/v4 v4.24.7 diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index fdd77976629..0740dfbdac6 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/internal/e2e -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/internal/globalgates/go.mod b/internal/globalgates/go.mod index 8e6c4e39ad9..7f2ff458350 100644 --- a/internal/globalgates/go.mod +++ b/internal/globalgates/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/internal/globalgates -go 1.21.0 +go 1.22.0 require go.opentelemetry.io/collector/featuregate v1.13.0 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 6eb46e6bbb5..f1adc4045cf 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/internal/tools -go 1.21.0 +go 1.22.0 require ( github.com/a8m/envsubst v1.4.2 diff --git a/otelcol/go.mod b/otelcol/go.mod index 6f098f06f42..183627fe6c4 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/otelcol -go 1.21.0 +go 1.22.0 require ( github.com/spf13/cobra v1.8.1 diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index 690b1d9c13e..d0bff4aef19 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/otelcol/otelcoltest -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/pdata/go.mod b/pdata/go.mod index 0bedaefc0fe..3817fb5eb08 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/pdata -go 1.21.0 +go 1.22.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod index 4eca58e4f0c..1397f761d29 100644 --- a/pdata/pprofile/go.mod +++ b/pdata/pprofile/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/pdata/pprofile -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index 8e884b1ff87..1d5d424252d 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/pdata/testdata -go 1.21.0 +go 1.22.0 require ( go.opentelemetry.io/collector/pdata v1.13.0 diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 219400affbe..3440de8f375 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor/batchprocessor -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/processor/go.mod b/processor/go.mod index 181810bce21..13308bec517 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor -go 1.21.0 +go 1.22.0 require ( github.com/google/uuid v1.6.0 diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 3a47ead05d2..0e92dbea1ac 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor/memorylimiterprocessor -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/processor/processorprofiles/go.mod b/processor/processorprofiles/go.mod index fbb6e3666c5..81d231eb2f9 100644 --- a/processor/processorprofiles/go.mod +++ b/processor/processorprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor/processorprofiles -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/receiver/go.mod b/receiver/go.mod index 6bdebe35e8c..2db3fe687df 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver -go 1.21.0 +go 1.22.0 require ( github.com/google/uuid v1.6.0 diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index ca9ac27c921..bdd2711e4ed 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver/nopreceiver -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 24766ca6447..56246a36e74 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver/otlpreceiver -go 1.21.0 +go 1.22.0 require ( github.com/gogo/protobuf v1.3.2 diff --git a/receiver/receiverprofiles/go.mod b/receiver/receiverprofiles/go.mod index 8b82f749c74..5f58075f88a 100644 --- a/receiver/receiverprofiles/go.mod +++ b/receiver/receiverprofiles/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver/receiverprofiles -go 1.21.0 +go 1.22.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/renovate.json b/renovate.json index 97c5d8a2792..d41340adbf3 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,7 @@ "dependencies" ], "constraints": { - "go": "1.21" + "go": "1.22" }, "extends": ["config:recommended"], "schedule": ["every tuesday"], diff --git a/semconv/go.mod b/semconv/go.mod index 09c3f5a8d6d..cffa4f74aa2 100644 --- a/semconv/go.mod +++ b/semconv/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/semconv -go 1.21.0 +go 1.22.0 require ( github.com/hashicorp/go-version v1.7.0 diff --git a/service/go.mod b/service/go.mod index 7fe8a32b507..d46b24603df 100644 --- a/service/go.mod +++ b/service/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/service -go 1.21.0 +go 1.22.0 require ( github.com/google/uuid v1.6.0 From 70f58ceda7879bf55be6594f880f5a7f7d6f4b1a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 15:21:19 -0700 Subject: [PATCH 3/4] Update github/codeql-action action to v3.26.1 (#10880) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github/codeql-action](https://togithub.com/github/codeql-action) | action | patch | `v3.26.0` -> `v3.26.1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
github/codeql-action (github/codeql-action) ### [`v3.26.1`](https://togithub.com/github/codeql-action/compare/v3.26.0...v3.26.1) [Compare Source](https://togithub.com/github/codeql-action/compare/v3.26.0...v3.26.1)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecard.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d6bdb43ee7d..417951b12eb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,12 +30,12 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/init@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1 with: languages: go - name: Autobuild - uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/autobuild@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/analyze@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index e4ff70fc016..2b5eb7872e7 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -64,6 +64,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1 with: sarif_file: results.sarif From b0085e55918813624eda423079d7a8ff4bf8dfca Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:09:01 -0700 Subject: [PATCH 4/4] [chore] use slices.Concat instead of a series of append (#10879) Follows https://github.com/open-telemetry/opentelemetry-collector/pull/10869 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- cmd/builder/internal/builder/main.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/builder/internal/builder/main.go b/cmd/builder/internal/builder/main.go index 3c62bd3ff1e..ba54c40e591 100644 --- a/cmd/builder/internal/builder/main.go +++ b/cmd/builder/internal/builder/main.go @@ -10,6 +10,7 @@ import ( "os" "os/exec" "path/filepath" + "slices" "strings" "text/template" "time" @@ -221,13 +222,8 @@ func (c *Config) coreModuleAndVersion() (string, string) { } func (c *Config) allComponents() []Module { - // TODO: Use slices.Concat when we drop support for Go 1.21 - return append(c.Exporters, - append(c.Receivers, - append(c.Processors, - append(c.Extensions, - append(c.Connectors, - *c.Providers...)...)...)...)...) + return slices.Concat[[]Module](c.Exporters, c.Receivers, c.Processors, + c.Extensions, c.Connectors, *c.Providers) } func (c *Config) readGoModFile() (string, map[string]string, error) {