feat: bump go to 1.25.7 (#740)

* feat: bump go to 1.25.7

* feat: bump terraform-docs

* Update go.mod

* feat: bump x deps

* try upgrading goreleaser

* migrate goreleased config

* Update .goreleaser.yaml

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

* add explicitly run build and dist

---------

Co-authored-by: dmathieu <damien.mathieu@elastic.co>
Co-authored-by: Damien Mathieu <42@dmathieu.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Author: 3 people

.github/workflows/test.yml

@@ -49,7 +49,7 @@ jobs:
           goreleaser: 'true'
 
       - name: Build
-        run: make dist
+        run: make build dist
 
       - uses: actions/upload-artifact@v6
         if: always()

.goreleaser.yaml

@@ -1,5 +1,6 @@
 project_name: apm-lambda-extension
 
+version: 2
 before:
   hooks:
     - make check-licenses
@@ -22,7 +23,7 @@ builds:
 
 archives:
   - id: zip
-    format: zip
+    formats: ['zip']
     name_template: |-
       {{ .Tag }}-{{ .Os }}-{{ .Arch }}
     files:
@@ -35,52 +36,46 @@ archives:
     builds_info:
       mtime: "{{ .CommitTimestamp }}"
 
-dockers:
+dockers_v2:
 
   - &default-docker-image
     id: linux-amd64-image
-    use: buildx
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-x86_64:{{ trimprefix .Tag "v" }}'
-      - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-x86_64:latest"
-    build_flag_templates:
-      - "--platform=linux/amd64"
-      - "--build-arg=EXTENSION_FILE={{ .ProjectName }}"
-      - "--build-arg=COMMIT_TIMESTAMP={{ .CommitTimestamp }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
+    platforms:
+      - 'linux/amd64'
+    images:
+      - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-x86_64'
+    tags:
+      - 'latest'
+      - '{{ trimprefix .Tag "v" }}'
+    labels:
+      'org.opencontainers.image.created': '{{ .Date }}'
+      'org.opencontainers.image.title': '{{ .ProjectName }}'
+      'org.opencontainers.image.revision': '{{ .FullCommit }}'
+      'org.opencontainers.image.version': '{{ .Version }}'
+    build_args:
+      'EXTENSION_FILE': 'linux/amd64/extensions/{{ .ProjectName }}'
+      'COMMIT_TIMESTAMP': '{{ .CommitTimestamp }}'
     extra_files:
       - NOTICE.txt
       - dependencies.asciidoc
 
   - <<: *default-docker-image
     id: linux-arm64-image
-    goarch: arm64
-    image_templates:
-      - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-arm64:{{ trimprefix .Tag "v" }}'
-      - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-arm64:latest"
-    build_flag_templates:
-      - "--platform=linux/arm64"
-      - "--build-arg=EXTENSION_FILE={{ .ProjectName }}"
-      - "--build-arg=COMMIT_TIMESTAMP={{ .CommitTimestamp }}"
-      - "--label=org.opencontainers.image.created={{ .Date }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
-      - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
-      - "--label=org.opencontainers.image.version={{ .Version }}"
-
-docker_manifests:
-  - name_template: '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ trimprefix .Tag "v" }}'
-    image_templates:
-    - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-x86_64:{{ trimprefix .Tag "v" }}'
-    - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-arm64:{{ trimprefix .Tag "v" }}'
-  - name_template: '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest'
-    image_templates:
-    - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-x86_64:latest"
-    - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-arm64:latest"
+    platforms:
+      - 'linux/arm64'
+    images:
+      - '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}-arm64'
+    tags:
+      - 'latest'
+      - '{{ trimprefix .Tag "v" }}'
+    labels:
+      'org.opencontainers.image.created': '{{ .Date }}'
+      'org.opencontainers.image.title': '{{ .ProjectName }}'
+      'org.opencontainers.image.revision': '{{ .FullCommit }}'
+      'org.opencontainers.image.version': '{{ .Version }}'
+    build_args:
+      'EXTENSION_FILE': 'linux/arm64/extensions/{{ .ProjectName }}'
+      'COMMIT_TIMESTAMP': '{{ .CommitTimestamp }}'
 
 publishers:
   - name: publish-aws

Makefile

@@ -1,6 +1,6 @@
 SHELL = /bin/bash -eo pipefail
 
-GORELEASER_VERSION = "v1.19.2"
+GORELEASER_VERSION = "v2.13.3"
 GOLANGCI_LINT_VERSION = "v1.64.4"
 export DOCKER_IMAGE_NAME = observability/apm-lambda-extension
 export DOCKER_REGISTRY = docker.elastic.co
@@ -11,18 +11,18 @@ clean:
 
 .PHONY: dist
 dist:
-	@go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --clean
+	@go run github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION) release --snapshot --clean
 
 .PHONY: zip
 zip:
-	@go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --clean --skip-docker
+	@go run github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION) release --snapshot --clean --skip-docker
 
 build:
-	@go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) build --snapshot --clean
+	@go run github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION) build --snapshot --clean
 
 .PHONY: release
 release:
-	go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --clean
+	go run github.com/goreleaser/goreleaser/v2@$(GORELEASER_VERSION) release --clean
 
 .PHONY: release-notes
 release-notes:

go.mod

@@ -1,6 +1,6 @@
 module github.com/elastic/apm-aws-lambda
 
-go 1.24.2
+go 1.25.7
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.41.1
@@ -24,10 +24,10 @@ tool (
 )
 
 require (
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/BurntSushi/toml v1.4.0 // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
@@ -46,63 +46,58 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/elastic/go-licenser v0.4.2 // indirect
-	github.com/fatih/color v1.17.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/licenseclassifier v0.0.0-20250213175939-b5d1a3369749 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/go-plugin v1.6.1 // indirect
-	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/go-plugin v1.7.0 // indirect
+	github.com/hashicorp/go-version v1.8.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.22.0 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/hashicorp/hcl/v2 v2.24.0 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/iancoleman/orderedmap v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/oklog/run v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/oklog/run v1.2.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sagikazarmark/locafero v0.12.0 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.19.0 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/cobra v1.10.2 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/spf13/viper v1.21.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa // indirect
-	github.com/terraform-docs/terraform-docs v0.20.0 // indirect
+	github.com/terraform-docs/terraform-config-inspect v0.0.0-20250408153412-5b88c7ed5b63 // indirect
+	github.com/terraform-docs/terraform-docs v0.21.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/zclconf/go-cty v1.15.0 // indirect
+	github.com/zclconf/go-cty v1.17.0 // indirect
 	go.elastic.co/go-licence-detector v0.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.42.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/mod v0.29.0 // indirect
-	golang.org/x/net v0.44.0 // indirect
-	golang.org/x/sync v0.17.0 // indirect
-	golang.org/x/sys v0.36.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
-	golang.org/x/tools v0.37.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.66.2 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
+	golang.org/x/mod v0.32.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
+	golang.org/x/tools v0.41.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
+	google.golang.org/grpc v1.77.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	mvdan.cc/xurls/v2 v2.5.0 // indirect
+	mvdan.cc/xurls/v2 v2.6.0 // indirect
 )