diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index ff33348fd4..fb9d05b97a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,7 @@ jobs: pull-requests: write steps: - name: Checkout Actions - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' repository: grafana/grafana-github-actions diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml index 4e565fbafc..a4d02d0246 100644 --- a/.github/workflows/check-docs.yml +++ b/.github/workflows/check-docs.yml @@ -17,7 +17,7 @@ jobs: check-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - name: Set up Go uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 diff --git a/.github/workflows/config-checker.yml b/.github/workflows/config-checker.yml index e597a6ab1e..a49460e867 100644 --- a/.github/workflows/config-checker.yml +++ b/.github/workflows/config-checker.yml @@ -17,7 +17,7 @@ jobs: contents: read steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - name: Set up Go diff --git a/.github/workflows/generate-binaries.yml b/.github/workflows/generate-binaries.yml index 6a136d0f01..7eff91c4d9 100644 --- a/.github/workflows/generate-binaries.yml +++ b/.github/workflows/generate-binaries.yml @@ -17,7 +17,7 @@ jobs: contents: write steps: - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: ref: ${{ github.event.release.tag_name || github.event.inputs.tag_name }} fetch-depth: 0 diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index d2d5906792..efc40053c8 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -4,7 +4,7 @@ on: jobs: release-beyla-helm-chart: - uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@64b1c8260d69a9b1d9a186df25c51358b92f7662 + uses: grafana/helm-charts/.github/workflows/update-helm-repo.yaml@e5ee6963cce3ab19519dc6dbd5f250aa14dc6f12 permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index d68fffd98c..74b560e60a 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' fetch-depth: 0 # required for chart-testing to work @@ -66,7 +66,7 @@ jobs: tests: ${{ steps.list_tests.outputs.tests }} steps: - name: Checkout code - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' @@ -91,20 +91,20 @@ jobs: fail-fast: false steps: - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: path: source persist-credentials: 'false' - name: Checkout code - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: path: helm-chart-toolbox repository: grafana/helm-chart-toolbox persist-credentials: 'false' - name: Set up Helm - uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0 + uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1 - name: Install Flux CLI uses: fluxcd/flux2/action@6bf37f6a560fd84982d67f853162e4b3c2235edb # v2.6.4 diff --git a/.github/workflows/obi-drift-check.yml b/.github/workflows/obi-drift-check.yml index 61281f2916..6511b96964 100644 --- a/.github/workflows/obi-drift-check.yml +++ b/.github/workflows/obi-drift-check.yml @@ -23,7 +23,7 @@ jobs: pull-requests: write # Needed for PR comments steps: - name: Checkout repo - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false submodules: true # Initialize submodules to get .obi-src content diff --git a/.github/workflows/publish-technical-documentation-next.yml b/.github/workflows/publish-technical-documentation-next.yml index 09493973e7..644bc47320 100644 --- a/.github/workflows/publish-technical-documentation-next.yml +++ b/.github/workflows/publish-technical-documentation-next.yml @@ -20,9 +20,9 @@ jobs: id-token: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false - - uses: grafana/writers-toolkit/publish-technical-documentation@39cdc38767184996e25d611923f8ce697e33bc70 # publish-technical-documentation/v1 + - uses: grafana/writers-toolkit/publish-technical-documentation@9aed4f7c5b3caa1b58d72ee39232333407d4acbf # publish-technical-documentation/v1 with: website_directory: content/docs/beyla/next diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml index f4074ed13d..3c49e2fb2e 100644 --- a/.github/workflows/publish-technical-documentation-release.yml +++ b/.github/workflows/publish-technical-documentation-release.yml @@ -22,7 +22,7 @@ jobs: id-token: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: fetch-depth: 0 persist-credentials: 'false' diff --git a/.github/workflows/publish_dockerhub_main.yml b/.github/workflows/publish_dockerhub_main.yml index daa5c8ad34..e7ce6a17ea 100644 --- a/.github/workflows/publish_dockerhub_main.yml +++ b/.github/workflows/publish_dockerhub_main.yml @@ -15,11 +15,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla context: . @@ -31,7 +31,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/publish_dockerhub_pre_release.yml b/.github/workflows/publish_dockerhub_pre_release.yml index b5f2cc933c..082966795a 100644 --- a/.github/workflows/publish_dockerhub_pre_release.yml +++ b/.github/workflows/publish_dockerhub_pre_release.yml @@ -23,11 +23,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: "false" - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla context: . @@ -39,7 +39,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/publish_dockerhub_release.yml b/.github/workflows/publish_dockerhub_release.yml index 54843dfc0e..4735cd8a71 100644 --- a/.github/workflows/publish_dockerhub_release.yml +++ b/.github/workflows/publish_dockerhub_release.yml @@ -15,11 +15,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: push-beyla-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla context: . @@ -33,7 +33,7 @@ jobs: push: true - id: push-beyla-k8s-cache-to-dockerhub - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: repository: grafana/beyla-k8s-cache file: k8scache.Dockerfile diff --git a/.github/workflows/pull_request_integration_tests.yml b/.github/workflows/pull_request_integration_tests.yml index 9d283bfb32..6de215b060 100644 --- a/.github/workflows/pull_request_integration_tests.yml +++ b/.github/workflows/pull_request_integration_tests.yml @@ -41,7 +41,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -71,7 +71,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_k8s_integration_tests.yml b/.github/workflows/pull_request_k8s_integration_tests.yml index 2dd03d91f5..2fb50d2083 100644 --- a/.github/workflows/pull_request_k8s_integration_tests.yml +++ b/.github/workflows/pull_request_k8s_integration_tests.yml @@ -41,7 +41,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -68,7 +68,7 @@ jobs: fail-fast: false matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_oats_test.yml b/.github/workflows/pull_request_oats_test.yml index ae1e2d7cd8..e48e11ae82 100644 --- a/.github/workflows/pull_request_oats_test.yml +++ b/.github/workflows/pull_request_oats_test.yml @@ -40,7 +40,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: # Required for uploading artifacts actions: write steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/.github/workflows/pull_request_test_docker_build.yml b/.github/workflows/pull_request_test_docker_build.yml index 1c0520f5bb..6966474195 100644 --- a/.github/workflows/pull_request_test_docker_build.yml +++ b/.github/workflows/pull_request_test_docker_build.yml @@ -17,11 +17,11 @@ jobs: steps: - id: checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - id: docker-build-beyla - uses: grafana/shared-workflows/actions/build-push-to-dockerhub@fa48192dac470ae356b3f7007229f3ac28c48a25 # main + uses: grafana/shared-workflows/actions/build-push-to-dockerhub@776d57f0c1cf5bab2fff564229d23efa4a9b7649 # main with: context: . file: ${{ matrix.file }} diff --git a/.github/workflows/release-binaries-base.yml b/.github/workflows/release-binaries-base.yml index 68ab9d0b0f..eaf7d1981a 100644 --- a/.github/workflows/release-binaries-base.yml +++ b/.github/workflows/release-binaries-base.yml @@ -36,7 +36,7 @@ jobs: GOOS: linux GOARCH: ${{ inputs.arch }} - name: Upload release asset - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1 + uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 env: GITHUB_TOKEN: ${{ github.token }} with: diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 9b9d937890..6de47aaf20 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 with: persist-credentials: 'false' fetch-depth: 0 diff --git a/.github/workflows/update-make-docs.yml b/.github/workflows/update-make-docs.yml index 289ac3590d..fe48eefc93 100644 --- a/.github/workflows/update-make-docs.yml +++ b/.github/workflows/update-make-docs.yml @@ -17,7 +17,7 @@ jobs: contents: write # Needed for creating commits or PRs pull-requests: write # Needed if the action creates PRs steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: 'false' - uses: grafana/writers-toolkit/update-make-docs@f65819d6a412b752c0e0263375215f049507b0e6 # update-make-docs/v1 diff --git a/.github/workflows/update-offsets.yml b/.github/workflows/update-offsets.yml index bc9dffd52f..832e1eba6a 100644 --- a/.github/workflows/update-offsets.yml +++ b/.github/workflows/update-offsets.yml @@ -29,7 +29,7 @@ jobs: - name: "Update offsets" run: make update-offsets - name: "Create/update PR" - uses: peter-evans/create-pull-request@4e1beaa7521e8b457b572c090b25bd3db56bf1c5 # v5 + uses: peter-evans/create-pull-request@4e1beaa7521e8b457b572c090b25bd3db56bf1c5 # v5.0.3 with: commit-message: Automatic update of offsets.json title: Automatic update of offsets.json diff --git a/.github/workflows/vale.yml b/.github/workflows/vale.yml index f5cf52d624..e625fb13d6 100644 --- a/.github/workflows/vale.yml +++ b/.github/workflows/vale.yml @@ -12,11 +12,11 @@ jobs: vale: runs-on: ubuntu-latest container: - image: grafana/vale@sha256:5eded74785e98384d84878073d5d41125b2ad21f1d711b06ab214c7890a81a19 + image: grafana/vale@sha256:0011fd36f792b1fb7e98a076b987f6739af46b6920077117b9c67546f46615d1 steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false - - uses: grafana/writers-toolkit/vale-action@1dd3173b59e3128c9d74645c4684a7b57aadbb77 # vale-action/v1 + - uses: grafana/writers-toolkit/vale-action@f49dd90f007967990095ac2d18c5bdf37b412a5f # vale-action/v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/workflow_integration_tests_vm.yml b/.github/workflows/workflow_integration_tests_vm.yml index b4149186e9..b7a4a97d74 100644 --- a/.github/workflows/workflow_integration_tests_vm.yml +++ b/.github/workflows/workflow_integration_tests_vm.yml @@ -26,7 +26,7 @@ jobs: outputs: matrix: ${{ steps.build-matrix.outputs.matrix }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false @@ -62,7 +62,7 @@ jobs: arch: "x86_64" test: ${{ fromJson(needs.vm-test-matrix.outputs.matrix).include }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 with: persist-credentials: false diff --git a/configs/offsets/kafkago/go.mod b/configs/offsets/kafkago/go.mod index e4f97c9ca7..64d395bb04 100644 --- a/configs/offsets/kafkago/go.mod +++ b/configs/offsets/kafkago/go.mod @@ -2,7 +2,7 @@ module kafkago_off go 1.25.1 -require github.com/segmentio/kafka-go v0.4.47 +require github.com/segmentio/kafka-go v0.4.49 require ( github.com/klauspost/compress v1.15.9 // indirect diff --git a/configs/offsets/kafkago/go.sum b/configs/offsets/kafkago/go.sum index 3c1b808d0f..74b476c2d4 100644 --- a/configs/offsets/kafkago/go.sum +++ b/configs/offsets/kafkago/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= @@ -7,11 +6,8 @@ github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= -github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/segmentio/kafka-go v0.4.49 h1:GJiNX1d/g+kG6ljyJEoi9++PUMdXGAxb7JGPiDCuNmk= +github.com/segmentio/kafka-go v0.4.49/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -20,49 +16,9 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/debug.Dockerfile b/debug.Dockerfile index d865698070..e7dc6cd4b2 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25-alpine@sha256:aee43c3ccbf24fdffb7295693b6e33b21e01baec1b2a55acc351fde345e9ec34 as builder +FROM golang:1.25-alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb as builder ARG TARGETARCH diff --git a/examples/greeting-apps/docker-compose.yaml b/examples/greeting-apps/docker-compose.yaml index ef78936d20..944d7c9dd9 100644 --- a/examples/greeting-apps/docker-compose.yaml +++ b/examples/greeting-apps/docker-compose.yaml @@ -2,7 +2,7 @@ version: "3.8" services: nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:553f64aecdc31b5bf944521731cd70e35da4faed96b2b7548a3d8e2598c52a42 container_name: demo-nginx ports: - 3333:3330 @@ -18,7 +18,7 @@ services: # Beyla for NGINX nginxbeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:b40af03e3b617b397ea592b2b7e579069ca6ef173829278a934178fdd03da6ff volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -48,7 +48,7 @@ services: # Beyla for Java Spring Boot 3.0 GraalVM Native Image gobeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:b40af03e3b617b397ea592b2b7e579069ca6ef173829278a934178fdd03da6ff volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -78,7 +78,7 @@ services: # Beyla for Java Spring Boot 3.0 GraalVM Native Image javabeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:b40af03e3b617b397ea592b2b7e579069ca6ef173829278a934178fdd03da6ff volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -108,7 +108,7 @@ services: # Beyla for Rust Actix rustbeyla: - image: grafana/beyla:latest@sha256:c3b5fd320f2e46d484d023bac17f2e4f3595355d22358e9f5f16de81855deddb + image: grafana/beyla:latest@sha256:b40af03e3b617b397ea592b2b7e579069ca6ef173829278a934178fdd03da6ff volumes: - ./configs/:/configs - ./system/sys/kernel/security:/sys/kernel/security @@ -130,7 +130,7 @@ services: # Grafana Agent agent: - image: grafana/agent@sha256:fd70f053b520ce2097e655296f08e5e37b8d644f27b983a35a8c3af4a4754abf + image: grafana/agent@sha256:ddbd9372c0c1492bfe2af60c7265ddb1b32a4ed64e265fba13201dfff6ee77f6 container_name: demo-agent command: - run @@ -145,7 +145,7 @@ services: # Tempo tempo: - image: grafana/tempo@sha256:f11e4d5bde8738f549823539acc7b7f50996c7f5fbba61a70798222eb424d8b4 + image: grafana/tempo@sha256:7e2c2c2d8b4b8e927aaafad84fa847d82fd8829f2382ef7bc8eeb2997055f375 container_name: demo-tempo command: - -config.file @@ -159,7 +159,7 @@ services: # Mimir -config.file=config-mimir.yaml -server.grpc-listen-port=9096 mimir: - image: grafana/mimir@sha256:5788fc30c5bafaf0f65ae6b15622cc02c7c14a76c3cdf09fc1781234612a7496 + image: grafana/mimir@sha256:dfa02581c519a28e2ce50c7304d05a635bb1e14b36e2f8a7a54815b36d4d1f9b container_name: demo-mimir command: - -config.file=/etc/mimir/mimir-config.yaml @@ -171,7 +171,7 @@ services: - "9096:9096" grafana: - image: grafana/grafana@sha256:35c41e0fd0295f5d0ee5db7e780cf33506abfaf47686196f825364889dee878b + image: grafana/grafana@sha256:70d9599b186ce287be0d2c5ba9a78acb2e86c1a68c9c41449454d0fc3eeb84e8 container_name: demo-grafana volumes: - ./configs/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml diff --git a/go.mod b/go.mod index eefbd888e4..e090b6ffee 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/gin-gonic/gin v1.10.1 github.com/goccy/go-json v0.10.5 github.com/gorilla/mux v1.8.1 - github.com/grafana/pyroscope-go/godeltaprof v0.1.8 + github.com/grafana/pyroscope-go/godeltaprof v0.1.9 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/mariomac/guara v0.0.0-20250408105519-1e4dbdfb7136 github.com/pkg/errors v0.9.1 @@ -44,8 +44,8 @@ require ( google.golang.org/grpc v1.75.1 google.golang.org/protobuf v1.36.10 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apimachinery v0.34.1 - k8s.io/client-go v0.34.1 + k8s.io/apimachinery v0.34.2 + k8s.io/client-go v0.34.2 sigs.k8s.io/e2e-framework v0.6.0 ) diff --git a/internal/test/cmd/python_pingserver/Dockerfile b/internal/test/cmd/python_pingserver/Dockerfile index 05dae8fa36..79297feb7d 100644 --- a/internal/test/cmd/python_pingserver/Dockerfile +++ b/internal/test/cmd/python_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:latest@sha256:671d8548cfc6ec789cbdd74c8585bd614864d1005970167350a2586be8db5650 +FROM python:latest@sha256:6942ebef735aad5f708ef9c5e750cbe37dbc7751cee35c140e33764e34843ab9 EXPOSE 8080 RUN pip install fastapi uvicorn COPY main.py /main.py diff --git a/internal/test/cmd/ruby_pingserver/Dockerfile b/internal/test/cmd/ruby_pingserver/Dockerfile index f0c0a09bab..04a1a6c6a7 100644 --- a/internal/test/cmd/ruby_pingserver/Dockerfile +++ b/internal/test/cmd/ruby_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs a simple ruby http server on port 8080 -FROM ruby:latest@sha256:4bef3ee023c0525189f1907ac256bc4511cc9ef4d5dc088c20b5c5a478638e28 +FROM ruby:latest@sha256:6a1290331f4f9c5955515bb0135de54b45faccb3772b81b58d2b7bb450d759e7 EXPOSE 8080 COPY pingserver.rb /pingserver.rb CMD ["ruby", "pingserver.rb"] \ No newline at end of file diff --git a/internal/test/cmd/rust_ironssl/Dockerfile b/internal/test/cmd/rust_ironssl/Dockerfile index f97d6bcbf7..22e67be799 100644 --- a/internal/test/cmd/rust_ironssl/Dockerfile +++ b/internal/test/cmd/rust_ironssl/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust ironssl HTTPS on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:ad8c72c693b517ed60c930839daed91a5696fa6118f031d888cd0b7055a921a3 EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingiron/Dockerfile b/internal/test/cmd/rust_pingiron/Dockerfile index 9d1777ef4e..b356796419 100644 --- a/internal/test/cmd/rust_pingiron/Dockerfile +++ b/internal/test/cmd/rust_pingiron/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust ironssl HTTP on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:ad8c72c693b517ed60c930839daed91a5696fa6118f031d888cd0b7055a921a3 EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingrouille/Cargo.lock b/internal/test/cmd/rust_pingrouille/Cargo.lock index eb40cc0443..183cf9ac85 100644 --- a/internal/test/cmd/rust_pingrouille/Cargo.lock +++ b/internal/test/cmd/rust_pingrouille/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler32" @@ -56,15 +56,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "brotli" version = "3.3.4" @@ -148,15 +139,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.3.2" @@ -166,16 +148,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "cxx" version = "1.0.92" @@ -230,16 +202,6 @@ dependencies = [ "gzip-header", ] -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "errno" version = "0.2.8" @@ -291,16 +253,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.8" @@ -601,9 +553,9 @@ dependencies = [ [[package]] name = "rouille" -version = "3.6.1" +version = "3.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f86e4c51a773f953f02bbab5fd049f004bfd384341d62da2a079aff812ab176" +checksum = "3716fbf57fc1084d7a706adf4e445298d123e4a44294c4e8213caf1b85fcc921" dependencies = [ "base64", "brotli", @@ -611,13 +563,12 @@ dependencies = [ "deflate", "filetime", "multipart", - "num_cpus", "percent-encoding", "rand", "serde", "serde_derive", "serde_json", - "sha1", + "sha1_smol", "threadpool", "time", "tiny_http", @@ -692,15 +643,10 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.5" +name = "sha1_smol" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "syn" @@ -798,12 +744,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - [[package]] name = "unicase" version = "2.6.0" diff --git a/internal/test/cmd/rust_pingrouille/Dockerfile b/internal/test/cmd/rust_pingrouille/Dockerfile index 02cf1bf506..e9c211750b 100644 --- a/internal/test/cmd/rust_pingrouille/Dockerfile +++ b/internal/test/cmd/rust_pingrouille/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust rouille HTTP on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:ad8c72c693b517ed60c930839daed91a5696fa6118f031d888cd0b7055a921a3 EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/cmd/rust_pingserver/Dockerfile b/internal/test/cmd/rust_pingserver/Dockerfile index 5cdac2d6db..e9f075e095 100644 --- a/internal/test/cmd/rust_pingserver/Dockerfile +++ b/internal/test/cmd/rust_pingserver/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs rust basic net tcp on port 8080 -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd +FROM rust:latest@sha256:ad8c72c693b517ed60c930839daed91a5696fa6118f031d888cd0b7055a921a3 EXPOSE 8080 RUN mkdir -p /src COPY src/main.rs /src/main.rs diff --git a/internal/test/integration/components/beyla-k8s-cache/Dockerfile b/internal/test/integration/components/beyla-k8s-cache/Dockerfile index 44023468a0..62f3263066 100644 --- a/internal/test/integration/components/beyla-k8s-cache/Dockerfile +++ b/internal/test/integration/components/beyla-k8s-cache/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/beyla/Dockerfile b/internal/test/integration/components/beyla/Dockerfile index 0851f54eda..6d83ca7b82 100644 --- a/internal/test/integration/components/beyla/Dockerfile +++ b/internal/test/integration/components/beyla/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -23,7 +23,7 @@ COPY internal/test/integration/components/beyla/beyla_wrapper.sh /beyla_wrapper. RUN make compile-for-coverage # Create final image from minimal + built binary -FROM ubuntu@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 +FROM ubuntu@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 COPY --from=builder /src/bin/beyla /beyla # Wrap the executable in a script that waits for the processes to end diff --git a/internal/test/integration/components/beyla/Dockerfile_dbg b/internal/test/integration/components/beyla/Dockerfile_dbg index eff40def98..557d82cf70 100644 --- a/internal/test/integration/components/beyla/Dockerfile_dbg +++ b/internal/test/integration/components/beyla/Dockerfile_dbg @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile b/internal/test/integration/components/go_grpc_server_mux/Dockerfile index 5ba56aec05..3236b86fd6 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ COPY x509/server_test_key.pem x509/server_test_key.pem RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls index ad0339c2e4..b1880a9676 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ COPY x509/server_test_key.pem x509/server_test_key.pem RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/go_otel/Dockerfile b/internal/test/integration/components/go_otel/Dockerfile index e21180bdb9..121fa5b29e 100644 --- a/internal/test/integration/components/go_otel/Dockerfile +++ b/internal/test/integration/components/go_otel/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/go_otel/ . RUN go build -o rolldice main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/rolldice . diff --git a/internal/test/integration/components/go_otel_grpc/Dockerfile b/internal/test/integration/components/go_otel_grpc/Dockerfile index 140258b0e5..1de8bdcb4a 100644 --- a/internal/test/integration/components/go_otel_grpc/Dockerfile +++ b/internal/test/integration/components/go_otel_grpc/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/go_otel_grpc/ . RUN go build -o rolldice main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/rolldice . diff --git a/internal/test/integration/components/gohttp2/client/Dockerfile b/internal/test/integration/components/gohttp2/client/Dockerfile index fa80df9831..eeb49f62e4 100644 --- a/internal/test/integration/components/gohttp2/client/Dockerfile +++ b/internal/test/integration/components/gohttp2/client/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o http2client ./internal/test/integration/components/gohttp2/client/main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/http2client . diff --git a/internal/test/integration/components/gohttp2/server/Dockerfile b/internal/test/integration/components/gohttp2/server/Dockerfile index d3b16d8ce0..aac856563f 100644 --- a/internal/test/integration/components/gohttp2/server/Dockerfile +++ b/internal/test/integration/components/gohttp2/server/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o http2srv ./internal/test/integration/components/gohttp2/server/main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/http2srv . diff --git a/internal/test/integration/components/gokafka-seg/Dockerfile b/internal/test/integration/components/gokafka-seg/Dockerfile index 54285d6273..4435760cd4 100644 --- a/internal/test/integration/components/gokafka-seg/Dockerfile +++ b/internal/test/integration/components/gokafka-seg/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gokafka-seg/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gokafka-seg/go.mod b/internal/test/integration/components/gokafka-seg/go.mod index 3211a8cc8d..b318642534 100644 --- a/internal/test/integration/components/gokafka-seg/go.mod +++ b/internal/test/integration/components/gokafka-seg/go.mod @@ -2,7 +2,7 @@ module grafana.com/gokafka-seg go 1.25.1 -require github.com/segmentio/kafka-go v0.4.47 +require github.com/segmentio/kafka-go v0.4.49 require ( github.com/klauspost/compress v1.15.9 // indirect diff --git a/internal/test/integration/components/gokafka-seg/go.sum b/internal/test/integration/components/gokafka-seg/go.sum index 3c1b808d0f..74b476c2d4 100644 --- a/internal/test/integration/components/gokafka-seg/go.sum +++ b/internal/test/integration/components/gokafka-seg/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= @@ -7,11 +6,8 @@ github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= -github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/segmentio/kafka-go v0.4.49 h1:GJiNX1d/g+kG6ljyJEoi9++PUMdXGAxb7JGPiDCuNmk= +github.com/segmentio/kafka-go v0.4.49/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= @@ -20,49 +16,9 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/test/integration/components/gokafka/Dockerfile b/internal/test/integration/components/gokafka/Dockerfile index 59496f11d3..d572b1165e 100644 --- a/internal/test/integration/components/gokafka/Dockerfile +++ b/internal/test/integration/components/gokafka/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gokafka/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gomongo/Dockerfile b/internal/test/integration/components/gomongo/Dockerfile index e870dc74fb..9182e1df66 100644 --- a/internal/test/integration/components/gomongo/Dockerfile +++ b/internal/test/integration/components/gomongo/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.25@sha256:d7098379b7da665ab25b99795465ec320b1ca9d4addb9f77409c4827dc904211 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gomongo/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:7e490910eea2861b9664577a96b54ce68ea3e02ce7f51d89cb0103a6f9c386e0 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gomongo/go.mod b/internal/test/integration/components/gomongo/go.mod index 11adf6300f..04bc3c9ae3 100644 --- a/internal/test/integration/components/gomongo/go.mod +++ b/internal/test/integration/components/gomongo/go.mod @@ -2,7 +2,7 @@ module opentelemetry.io/obi/mongo go 1.25.1 -require go.mongodb.org/mongo-driver v1.17.4 +require go.mongodb.org/mongo-driver v1.17.6 require ( github.com/golang/snappy v0.0.4 // indirect diff --git a/internal/test/integration/components/gomongo/go.sum b/internal/test/integration/components/gomongo/go.sum index cca03422a4..9e96366dc4 100644 --- a/internal/test/integration/components/gomongo/go.sum +++ b/internal/test/integration/components/gomongo/go.sum @@ -17,8 +17,8 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= -go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= +go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= diff --git a/internal/test/integration/components/gomongov2/Dockerfile b/internal/test/integration/components/gomongov2/Dockerfile index e870dc74fb..9182e1df66 100644 --- a/internal/test/integration/components/gomongov2/Dockerfile +++ b/internal/test/integration/components/gomongov2/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.25@sha256:d7098379b7da665ab25b99795465ec320b1ca9d4addb9f77409c4827dc904211 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/gomongo/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:7e490910eea2861b9664577a96b54ce68ea3e02ce7f51d89cb0103a6f9c386e0 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/goredis/Dockerfile b/internal/test/integration/components/goredis/Dockerfile index 986f813f0b..176c68289e 100644 --- a/internal/test/integration/components/goredis/Dockerfile +++ b/internal/test/integration/components/goredis/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -15,7 +15,7 @@ COPY internal/test/integration/components/goredis/ . RUN go build -o testserver main.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/gosql/Dockerfile b/internal/test/integration/components/gosql/Dockerfile index ce200e8b32..e8052e8c2b 100644 --- a/internal/test/integration/components/gosql/Dockerfile +++ b/internal/test/integration/components/gosql/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ RUN go mod download RUN go build -o gosql gosql.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/gosql . diff --git a/internal/test/integration/components/grpcpinger/Dockerfile b/internal/test/integration/components/grpcpinger/Dockerfile index d3ce5b90e8..b579ec674a 100644 --- a/internal/test/integration/components/grpcpinger/Dockerfile +++ b/internal/test/integration/components/grpcpinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o grpcpinger ./internal/test/integration/components/grpcpinger/grpcpinger.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/grpcpinger . diff --git a/internal/test/integration/components/httppinger/Dockerfile b/internal/test/integration/components/httppinger/Dockerfile index 6d0904ceae..6ac5f0957c 100644 --- a/internal/test/integration/components/httppinger/Dockerfile +++ b/internal/test/integration/components/httppinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o httppinger ./internal/test/integration/components/httppinger/httppinger.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/httppinger . diff --git a/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties b/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties index 12fbe1e907..c0bcafe984 100644 --- a/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties +++ b/internal/test/integration/components/javakafka/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/internal/test/integration/components/javakafka/Dockerfile b/internal/test/integration/components/javakafka/Dockerfile index 55b61d06f4..56d4ee36fe 100644 --- a/internal/test/integration/components/javakafka/Dockerfile +++ b/internal/test/integration/components/javakafka/Dockerfile @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f EXPOSE 8080 diff --git a/internal/test/integration/components/javakafka/Dockerfile_400 b/internal/test/integration/components/javakafka/Dockerfile_400 index 3a629dd19a..937be444c5 100644 --- a/internal/test/integration/components/javakafka/Dockerfile_400 +++ b/internal/test/integration/components/javakafka/Dockerfile_400 @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:df52e55e3361a81ac1bead266f3373ee55d29aa50cf0975d440c2be3483d8ed3 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f EXPOSE 8080 diff --git a/internal/test/integration/components/javakafka/mvnw b/internal/test/integration/components/javakafka/mvnw index 19529ddf8c..bd8896bf22 100755 --- a/internal/test/integration/components/javakafka/mvnw +++ b/internal/test/integration/components/javakafka/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties b/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties index 12fbe1e907..c0bcafe984 100644 --- a/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties +++ b/internal/test/integration/components/javatestserver/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/internal/test/integration/components/javatestserver/Dockerfile b/internal/test/integration/components/javatestserver/Dockerfile index 5f1472d909..7525dbf234 100644 --- a/internal/test/integration/components/javatestserver/Dockerfile +++ b/internal/test/integration/components/javatestserver/Dockerfile @@ -29,7 +29,7 @@ RUN ./mvnw -version RUN ./mvnw -Pnative native:compile # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f EXPOSE 8085 diff --git a/internal/test/integration/components/javatestserver/Dockerfile_jar b/internal/test/integration/components/javatestserver/Dockerfile_jar index d9320df138..3ddf9c8808 100644 --- a/internal/test/integration/components/javatestserver/Dockerfile_jar +++ b/internal/test/integration/components/javatestserver/Dockerfile_jar @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17@sha256:54a16ef91e00c11ac9b05029faa5efd02c37296844204a6561d2440629559c38 AS javabuilder +FROM eclipse-temurin:17@sha256:5a66a3ffd8728ed6c76eb4ec674c37991ac679927381f71774f5aa44cf420082 AS javabuilder # Install tar and gzip to extract the Maven binaries RUN apt install -y tar gzip @@ -22,7 +22,7 @@ RUN ./mvnw -version RUN ./mvnw clean package # The App Image -FROM eclipse-temurin:17-jre@sha256:db1c787e2cd41943a90b025191e4e66cbecfc0695e4ff619353eef92e460378f +FROM eclipse-temurin:17.0.17_10-jre@sha256:75ab7d1b4b18483e9245342cbee253b558952c1def5c1c18956196330a01683e EXPOSE 8085 diff --git a/internal/test/integration/components/javatestserver/mvnw b/internal/test/integration/components/javatestserver/mvnw index 19529ddf8c..bd8896bf22 100755 --- a/internal/test/integration/components/javatestserver/mvnw +++ b/internal/test/integration/components/javatestserver/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/internal/test/integration/components/nodeclient/Dockerfile b/internal/test/integration/components/nodeclient/Dockerfile index 67ef5d1ec8..3c5d7b73ff 100644 --- a/internal/test/integration/components/nodeclient/Dockerfile +++ b/internal/test/integration/components/nodeclient/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:9e70124bd00f47dd023e349cd587132ae61892acc0e47ed641416c3e18f401c3 # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsserver/Dockerfile b/internal/test/integration/components/nodejsserver/Dockerfile index 6be58464a7..c08a41a9af 100644 --- a/internal/test/integration/components/nodejsserver/Dockerfile +++ b/internal/test/integration/components/nodejsserver/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:9e70124bd00f47dd023e349cd587132ae61892acc0e47ed641416c3e18f401c3 # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsserver/Dockerfile_otel b/internal/test/integration/components/nodejsserver/Dockerfile_otel index 2cd150e856..aa133398cb 100644 --- a/internal/test/integration/components/nodejsserver/Dockerfile_otel +++ b/internal/test/integration/components/nodejsserver/Dockerfile_otel @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:9e70124bd00f47dd023e349cd587132ae61892acc0e47ed641416c3e18f401c3 # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodemultiproc/Dockerfile b/internal/test/integration/components/nodemultiproc/Dockerfile index 595e84a9a9..ac0521263a 100644 --- a/internal/test/integration/components/nodemultiproc/Dockerfile +++ b/internal/test/integration/components/nodemultiproc/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de948562f9850 +FROM node:20-slim@sha256:9e70124bd00f47dd023e349cd587132ae61892acc0e47ed641416c3e18f401c3 WORKDIR /app diff --git a/internal/test/integration/components/old_grpc/backend/Dockerfile b/internal/test/integration/components/old_grpc/backend/Dockerfile index 5456c7d36b..1908488778 100644 --- a/internal/test/integration/components/old_grpc/backend/Dockerfile +++ b/internal/test/integration/components/old_grpc/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder WORKDIR /src @@ -6,7 +6,7 @@ COPY internal/test/integration/components/old_grpc/backend . RUN make compile -FROM ubuntu:latest@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 +FROM ubuntu:latest@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 WORKDIR / COPY --from=builder /src/bin/backend /backend diff --git a/internal/test/integration/components/old_grpc/backend/vendor/golang.org/x/net/http2/Dockerfile b/internal/test/integration/components/old_grpc/backend/vendor/golang.org/x/net/http2/Dockerfile index b869a05070..93c35a836d 100644 --- a/internal/test/integration/components/old_grpc/backend/vendor/golang.org/x/net/http2/Dockerfile +++ b/internal/test/integration/components/old_grpc/backend/vendor/golang.org/x/net/http2/Dockerfile @@ -6,7 +6,7 @@ # Go tests use this curl binary for integration tests. # -FROM ubuntu:trusty@sha256:64483f3496c1373bfd55348e88694d1c4d0c9b660dee6bfef5e12f43b9933b30 +FROM ubuntu:14.04.5@sha256:30204139c6ab96ebd75d72f34db390f28c4decd5e563488b4e485bf979397b67 RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/internal/test/integration/components/old_grpc/worker/Dockerfile b/internal/test/integration/components/old_grpc/worker/Dockerfile index c5e4b36fb6..98dd99e033 100644 --- a/internal/test/integration/components/old_grpc/worker/Dockerfile +++ b/internal/test/integration/components/old_grpc/worker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder WORKDIR /src @@ -6,7 +6,7 @@ COPY internal/test/integration/components/old_grpc/worker . RUN make compile -FROM ubuntu:latest@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 +FROM ubuntu:latest@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 WORKDIR / COPY --from=builder /src/bin/worker /worker diff --git a/internal/test/integration/components/old_grpc/worker/vendor/golang.org/x/net/http2/Dockerfile b/internal/test/integration/components/old_grpc/worker/vendor/golang.org/x/net/http2/Dockerfile index b869a05070..93c35a836d 100644 --- a/internal/test/integration/components/old_grpc/worker/vendor/golang.org/x/net/http2/Dockerfile +++ b/internal/test/integration/components/old_grpc/worker/vendor/golang.org/x/net/http2/Dockerfile @@ -6,7 +6,7 @@ # Go tests use this curl binary for integration tests. # -FROM ubuntu:trusty@sha256:64483f3496c1373bfd55348e88694d1c4d0c9b660dee6bfef5e12f43b9933b30 +FROM ubuntu:14.04.5@sha256:30204139c6ab96ebd75d72f34db390f28c4decd5e563488b4e485bf979397b67 RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql index 87c474b549..c7a5910513 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_mysql @@ -1,4 +1,4 @@ -FROM mysql:8.0.34-debian@sha256:2a31847951cdf92d6901ef58b4c5a9fbe75b47823d9ade1f7a4652ede7a88e2d +FROM mysql:8.0.44-debian@sha256:9a83525860305d8add9138b85c17a9bf0df110f519a530d1045dcd42c7990738 SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx index 4ef95c8330..77a5763470 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_nginx @@ -1,4 +1,4 @@ -FROM nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 +FROM nginx:latest@sha256:553f64aecdc31b5bf944521731cd70e35da4faed96b2b7548a3d8e2598c52a42 SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php index e576c29cf8..90f59805be 100644 --- a/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php +++ b/internal/test/integration/components/php/unix_sock_sql/docker/Dockerfile_php @@ -1,4 +1,4 @@ -FROM php:8.2-fpm@sha256:14b7774a36d424da12c1a138fad283142bdf297ebd625176dce04ea674781c6c +FROM php:8.2-fpm@sha256:cdc4c2a16a7860b73153f0a9fcef027dd836425b35d7bb4d8ce747e0b5b9b5c3 SHELL ["/bin/bash", "-c"] diff --git a/internal/test/integration/components/pingclient/Dockerfile b/internal/test/integration/components/pingclient/Dockerfile index e8f2428db1..f7e9bb2c79 100644 --- a/internal/test/integration/components/pingclient/Dockerfile +++ b/internal/test/integration/components/pingclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o pingclient ./internal/test/integration/components/pingclient/pingclient.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/pingclient . diff --git a/internal/test/integration/components/postgresql/Dockerfile b/internal/test/integration/components/postgresql/Dockerfile index 426e2a992d..4faa09c361 100644 --- a/internal/test/integration/components/postgresql/Dockerfile +++ b/internal/test/integration/components/postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:latest@sha256:7499fa0ed6b106d3b513fe792d673f1b496a539a541674fdcd9539c13c6427f3 +FROM postgres:latest@sha256:5ec39c188013123927f30a006987c6b0e20f3ef2b54b140dfa96dac6844d883f ENV POSTGRES_DB sqltest COPY accounting.sql /docker-entrypoint-initdb.d/ EXPOSE 5432 diff --git a/internal/test/integration/components/pythongrpc/Dockerfile b/internal/test/integration/components/pythongrpc/Dockerfile index 965e3f273e..35373463ae 100644 --- a/internal/test/integration/components/pythongrpc/Dockerfile +++ b/internal/test/integration/components/pythongrpc/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN pip install fastapi uvicorn grpcio grpcio_tools COPY main.py /main.py diff --git a/internal/test/integration/components/pythongrpc/Dockerfile_srv b/internal/test/integration/components/pythongrpc/Dockerfile_srv index 9edc6f1a36..31d2bea013 100644 --- a/internal/test/integration/components/pythongrpc/Dockerfile_srv +++ b/internal/test/integration/components/pythongrpc/Dockerfile_srv @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 50051 RUN pip install grpcio grpcio_tools COPY route_guide_server.py /route_guide_server.py diff --git a/internal/test/integration/components/pythonkafka/Dockerfile b/internal/test/integration/components/pythonkafka/Dockerfile index 2791e3b857..32a461eee2 100644 --- a/internal/test/integration/components/pythonkafka/Dockerfile +++ b/internal/test/integration/components/pythonkafka/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python -FROM python:3.11@sha256:80d0556a9376af37548850151f0838cfa50137214fe7a2563e627c297d4811e1 +FROM python:3.11@sha256:a3f963d22cc2bd1b0e9a62c8e6f31b3bd3340d554fae00cc312c3359b61a6d7e EXPOSE 8080 RUN apt update RUN pip install kafka-python diff --git a/internal/test/integration/components/pythonmongo/Dockerfile b/internal/test/integration/components/pythonmongo/Dockerfile index f1451ce69b..632e018f4d 100644 --- a/internal/test/integration/components/pythonmongo/Dockerfile +++ b/internal/test/integration/components/pythonmongo/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:1cb6108b64a4caf2a862499bf90dc65703a08101e8bfb346a18c9d12c0ed5b7e +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN pip install fastapi uvicorn pymongo COPY main.py /main.py diff --git a/internal/test/integration/components/pythonredis/Dockerfile b/internal/test/integration/components/pythonredis/Dockerfile index 3c5e681377..153b8e11c2 100644 --- a/internal/test/integration/components/pythonredis/Dockerfile +++ b/internal/test/integration/components/pythonredis/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN pip install fastapi uvicorn redis COPY main.py /main.py diff --git a/internal/test/integration/components/pythonsql/Dockerfile b/internal/test/integration/components/pythonsql/Dockerfile index 7c5a95d5d4..384be4176c 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile +++ b/internal/test/integration/components/pythonsql/Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN apt update RUN apt install -y libpq-dev diff --git a/internal/test/integration/components/pythonsql/Dockerfile_mysql b/internal/test/integration/components/pythonsql/Dockerfile_mysql index 9d2154fe6e..debe794405 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile_mysql +++ b/internal/test/integration/components/pythonsql/Dockerfile_mysql @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN apt update RUN pip install fastapi uvicorn mysql-connector-python diff --git a/internal/test/integration/components/pythonsql/Dockerfile_ssl b/internal/test/integration/components/pythonsql/Dockerfile_ssl index 81b225e2f7..3f1ead4d0d 100644 --- a/internal/test/integration/components/pythonsql/Dockerfile_ssl +++ b/internal/test/integration/components/pythonsql/Dockerfile_ssl @@ -1,5 +1,5 @@ # Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080 -FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9 +FROM python:3.12@sha256:2b075cba87fcf51f14e6be18f83f209fb2013d72362ec874aed7d01933253e8b EXPOSE 8080 RUN apt update RUN apt install -y libpq-dev diff --git a/internal/test/integration/components/rustssltestserver/Cargo.lock b/internal/test/integration/components/rustssltestserver/Cargo.lock index 95efc62fb2..caa1360be1 100644 --- a/internal/test/integration/components/rustssltestserver/Cargo.lock +++ b/internal/test/integration/components/rustssltestserver/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +checksum = "6c0d87f10d70e2948ad40e8edea79c8e77c6c66e0250a4c1f09b690465199576" dependencies = [ "actix-http", "actix-service", @@ -31,7 +31,7 @@ dependencies = [ "actix-web", "bitflags", "bytes", - "derive_more", + "derive_more 2.0.1", "futures-core", "http-range", "log", @@ -59,7 +59,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -195,7 +195,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -471,6 +471,27 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -794,9 +815,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" @@ -1108,18 +1129,28 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1128,14 +1159,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1203,9 +1235,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1365,6 +1397,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "url" version = "2.5.2" diff --git a/internal/test/integration/components/rustssltestserver/Dockerfile b/internal/test/integration/components/rustssltestserver/Dockerfile index 394c473c3d..f3a383ee39 100644 --- a/internal/test/integration/components/rustssltestserver/Dockerfile +++ b/internal/test/integration/components/rustssltestserver/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm@sha256:26f2a7cab45014541c65f9d140ccfa6aaefbb49686c6759bea9c6f7f5bb3d72f AS rustbuilder +FROM debian:bookworm@sha256:3d957cd5e0693cf44cbb65aa43033fb701443df6b0afa4dcc9293c9bb7a258f9 AS rustbuilder RUN apt update RUN apt install -y build-essential curl pkg-config libssl-dev @@ -17,7 +17,7 @@ COPY internal/test/integration/components/rusttestserver/large_data.json . RUN cargo build --release # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f RUN apt update RUN apt install libssl3 -y diff --git a/internal/test/integration/components/rusttestserver/Cargo.lock b/internal/test/integration/components/rusttestserver/Cargo.lock index 8a4d117cd0..2de3defeca 100644 --- a/internal/test/integration/components/rusttestserver/Cargo.lock +++ b/internal/test/integration/components/rusttestserver/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" +checksum = "6c0d87f10d70e2948ad40e8edea79c8e77c6c66e0250a4c1f09b690465199576" dependencies = [ "actix-http", "actix-service", @@ -31,7 +31,7 @@ dependencies = [ "actix-web", "bitflags 2.6.0", "bytes", - "derive_more", + "derive_more 2.0.1", "futures-core", "http-range", "log", @@ -58,7 +58,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -174,7 +174,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -262,9 +262,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -484,6 +484,27 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -913,9 +934,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" @@ -1344,18 +1365,28 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1364,14 +1395,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1439,9 +1471,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1651,6 +1683,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "url" version = "2.5.2" diff --git a/internal/test/integration/components/rusttestserver/Dockerfile b/internal/test/integration/components/rusttestserver/Dockerfile index d5c2138ab9..c8c01b440e 100644 --- a/internal/test/integration/components/rusttestserver/Dockerfile +++ b/internal/test/integration/components/rusttestserver/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:latest@sha256:52e36cdd822b813542e13e06a816953234ecad01ebae2d0d7ec4a084c7cda6bd AS rustbuilder +FROM rust:latest@sha256:ad8c72c693b517ed60c930839daed91a5696fa6118f031d888cd0b7055a921a3 AS rustbuilder # Set the working directory to /build WORKDIR /build @@ -10,7 +10,7 @@ COPY internal/test/integration/components/rusttestserver . RUN cargo build --release # The App Image -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f RUN apt update RUN apt install libssl3 -y diff --git a/internal/test/integration/components/sqlclient/Dockerfile b/internal/test/integration/components/sqlclient/Dockerfile index d1f7fb5f44..ce8742536e 100644 --- a/internal/test/integration/components/sqlclient/Dockerfile +++ b/internal/test/integration/components/sqlclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ RUN go mod download RUN go build gosqlite.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/gosqlite . diff --git a/internal/test/integration/components/testserver/Dockerfile b/internal/test/integration/components/testserver/Dockerfile index c8c5800807..82cb10af0c 100644 --- a/internal/test/integration/components/testserver/Dockerfile +++ b/internal/test/integration/components/testserver/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_duplicate b/internal/test/integration/components/testserver/Dockerfile_duplicate index 4461694420..6c2ec15a2b 100644 --- a/internal/test/integration/components/testserver/Dockerfile_duplicate +++ b/internal/test/integration/components/testserver/Dockerfile_duplicate @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_nodebug b/internal/test/integration/components/testserver/Dockerfile_nodebug index 6f79406685..34c0246457 100644 --- a/internal/test/integration/components/testserver/Dockerfile_nodebug +++ b/internal/test/integration/components/testserver/Dockerfile_nodebug @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver -ldflags="-s -w" ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_rename1 b/internal/test/integration/components/testserver/Dockerfile_rename1 index e8079d890c..9edd33d5bd 100644 --- a/internal/test/integration/components/testserver/Dockerfile_rename1 +++ b/internal/test/integration/components/testserver/Dockerfile_rename1 @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -18,7 +18,7 @@ COPY go.sum go.sum RUN go build -o testserver ./internal/test/integration/components/testserver/testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver/Dockerfile_static b/internal/test/integration/components/testserver/Dockerfile_static index 703452b1de..1fd0d494b8 100644 --- a/internal/test/integration/components/testserver/Dockerfile_static +++ b/internal/test/integration/components/testserver/Dockerfile_static @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.25@sha256:8c945d3e25320e771326dafc6fb72ecae5f87b0f29328cbbd87c4dff506c9135 AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH @@ -20,7 +20,7 @@ RUN go build -tags -a -ldflags '-linkmode external -extldflags "-static"' -o tes # Create final image from minimal + built binary #TODO: use minimal image -FROM debian:12@sha256:26f2a7cab45014541c65f9d140ccfa6aaefbb49686c6759bea9c6f7f5bb3d72f +FROM debian:12@sha256:3d957cd5e0693cf44cbb65aa43033fb701443df6b0afa4dcc9293c9bb7a258f9 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/testserver_1.17/Dockerfile b/internal/test/integration/components/testserver_1.17/Dockerfile index 1611f5501a..7edd5972d2 100644 --- a/internal/test/integration/components/testserver_1.17/Dockerfile +++ b/internal/test/integration/components/testserver_1.17/Dockerfile @@ -15,7 +15,7 @@ COPY internal/test/integration/components/testserver_1.17/ . RUN go build -o testserver testserver.go # Create final image from minimal + built binary -FROM debian:bookworm-slim@sha256:78d2f66e0fec9e5a39fb2c72ea5e052b548df75602b5215ed01a17171529f706 +FROM debian:bookworm-slim@sha256:b4aa902587c2e61ce789849cb54c332b0400fe27b1ee33af4669e1f7e7c3e22f WORKDIR / COPY --from=builder /src/testserver . diff --git a/internal/test/integration/components/testserver_1.17/go.mod b/internal/test/integration/components/testserver_1.17/go.mod index 6d9adc00eb..1486749b21 100644 --- a/internal/test/integration/components/testserver_1.17/go.mod +++ b/internal/test/integration/components/testserver_1.17/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/caarlos0/env/v9 v9.0.0 github.com/gin-gonic/gin v1.7.7 - github.com/gorilla/mux v1.8.0 + github.com/gorilla/mux v1.8.1 google.golang.org/grpc v1.40.1 google.golang.org/protobuf v1.31.0 ) diff --git a/internal/test/integration/docker-compose-netolly-rdns.yml b/internal/test/integration/docker-compose-netolly-rdns.yml index 7fdc9a6829..6ad7a0f76f 100644 --- a/internal/test/integration/docker-compose-netolly-rdns.yml +++ b/internal/test/integration/docker-compose-netolly-rdns.yml @@ -2,7 +2,7 @@ version: "3.8" services: curler: - image: alpine/curl@sha256:d9d451635fea7317186adda62cebe3f7e46810a3de6ddfcae662339e456b6c55 + image: alpine/curl@sha256:c60d33c5cde0c9dadad01e10fbf4f8000020e5769e4fcbe5bc01dad0798cdf30 command: - sh - -c diff --git a/internal/test/integration/docker-compose-php-fpm.yml b/internal/test/integration/docker-compose-php-fpm.yml index db89f965e1..75a6cd4a37 100644 --- a/internal/test/integration/docker-compose-php-fpm.yml +++ b/internal/test/integration/docker-compose-php-fpm.yml @@ -2,7 +2,7 @@ version: "3.8" services: nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:553f64aecdc31b5bf944521731cd70e35da4faed96b2b7548a3d8e2598c52a42 mem_limit: 128m container_name: hatest-nginx ports: @@ -14,7 +14,7 @@ services: - php-fpm php-fpm: - image: php:fpm@sha256:231ab3ac3db542e1d019a35abee1bd106d278a5712d1dc2bb4fbe103de016792 + image: php:fpm@sha256:82dfb99acd7694582f75eca8070b02b5ada368d90008e433dbe99b8260fd6f63 mem_limit: 512m container_name: hatest-php-fpm volumes: diff --git a/internal/test/integration/docker-compose-ruby.yml b/internal/test/integration/docker-compose-ruby.yml index 37f6e8c5c2..fbb67bcf89 100644 --- a/internal/test/integration/docker-compose-ruby.yml +++ b/internal/test/integration/docker-compose-ruby.yml @@ -13,7 +13,7 @@ services: condition: service_started nginx: - image: nginx:latest@sha256:029d4461bd98f124e531380505ceea2072418fdf28752aa73b7b273ba3048903 + image: nginx:latest@sha256:553f64aecdc31b5bf944521731cd70e35da4faed96b2b7548a3d8e2598c52a42 container_name: nginx_server ports: - "8443:443" # Expose TLS port diff --git a/internal/test/oats/redis/docker-compose-beyla-go-redis.yml b/internal/test/oats/redis/docker-compose-beyla-go-redis.yml index 0315d4b553..d768fc3438 100644 --- a/internal/test/oats/redis/docker-compose-beyla-go-redis.yml +++ b/internal/test/oats/redis/docker-compose-beyla-go-redis.yml @@ -1,7 +1,7 @@ services: # Use postgres as a test SQL server redis: - image: redis:latest@sha256:acb90ced0bd769b7c04cb4c32c4494ba7b3e0ee068bdbfff0eeb0d31c2a21078 + image: redis:latest@sha256:43355efd22490e31ca14b9d569367d05121e2be61fd8e47937563ae2a80952ae ports: - "6379:6379" # Simple python HTTP server, which exposes one endpoint /query that does a few redis queries diff --git a/internal/test/oats/redis/docker-compose-beyla-redis.yml b/internal/test/oats/redis/docker-compose-beyla-redis.yml index 09fee8e9f1..5160278daa 100644 --- a/internal/test/oats/redis/docker-compose-beyla-redis.yml +++ b/internal/test/oats/redis/docker-compose-beyla-redis.yml @@ -1,7 +1,7 @@ services: # Use postgres as a test SQL server redis: - image: redis:latest@sha256:acb90ced0bd769b7c04cb4c32c4494ba7b3e0ee068bdbfff0eeb0d31c2a21078 + image: redis:latest@sha256:43355efd22490e31ca14b9d569367d05121e2be61fd8e47937563ae2a80952ae ports: - "6379:6379" # Simple python HTTP server, which exposes one endpoint /query that does a few redis queries diff --git a/k8scache.Dockerfile b/k8scache.Dockerfile index e578f24aa8..da0caaad2a 100644 --- a/k8scache.Dockerfile +++ b/k8scache.Dockerfile @@ -1,5 +1,5 @@ # Build the binary for the k8s-cache service -FROM golang:1.25@sha256:0d8c14c93010e9eab98599f1ddd37e80b8fd39e9c662d670c4e4d9d0b101831d AS builder +FROM golang:1.25@sha256:f60eaa87c79e604967c84d18fd3b151b3ee3f033bcdade4f3494e38411e60963 AS builder ARG TARGETARCH ENV GOARCH=$TARGETARCH