From 82e6ce99e56301eb8c1078759c15e04451668ba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 15:50:54 -0400 Subject: [PATCH 01/14] build(deps): bump golang.org/x/sys from 0.17.0 to 0.18.0 (#5248) Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/sys&package-manager=go_modules&previous-version=0.17.0&new-version=0.18.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Vamshi Maskuri --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6cc7c15d4e6..ead162f31b5 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 - golang.org/x/sys v0.17.0 + golang.org/x/sys v0.18.0 google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 44d667f284a..a1bcb34363e 100644 --- a/go.sum +++ b/go.sum @@ -701,8 +701,8 @@ 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.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= From 484f90059dc1a2f0f00f11db0ae7040f5bfc8d50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 01:22:26 -0400 Subject: [PATCH 02/14] build(deps): bump anchore/sbom-action from 0.15.2 to 0.15.9 (#5264) Bumps [anchore/sbom-action](https://github.com/anchore/sbom-action) from 0.15.2 to 0.15.9.
Release notes

Sourced from anchore/sbom-action's releases.

v0.15.9

Changes in v0.15.9

v0.15.8

Changes in v0.15.8

v0.15.7

Changes in v0.15.7

  • chore: migrate action to use node v20.11.0 (Iron) FROM node v16.x.x (#440) [spiffcs]

v0.15.6

Changes in v0.15.6

v0.15.5

Changes in v0.15.5

v0.15.4

Changes in v0.15.4

v0.15.3

Changes in v0.15.3

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=anchore/sbom-action&package-manager=github_actions&previous-version=0.15.2&new-version=0.15.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Vamshi Maskuri --- .github/workflows/ci-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 3b1efe5d166..4c13907e71f 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -111,7 +111,7 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Generate SBOM - uses: anchore/sbom-action@719133684c7d294116626d1344fe64f0d2ff3e9e # v0.15.2 + uses: anchore/sbom-action@9fece9e20048ca9590af301449208b2b8861333b # v0.15.9 with: output-file: jaeger-SBOM.spdx.json upload-release-assets: false From b619038a22cde823a55652bcdb4be798aaa8320f Mon Sep 17 00:00:00 2001 From: fyuan1316 Date: Mon, 11 Mar 2024 20:35:55 +0800 Subject: [PATCH 03/14] Fix Zipkin spanFormat (#5261) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Which problem is this PR solving? - Resolves #5260 ## Description of the changes - ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` Signed-off-by: Yuan Fang Co-authored-by: Yuri Shkuro Signed-off-by: Vamshi Maskuri --- cmd/collector/app/handler/zipkin_receiver.go | 3 +++ cmd/collector/app/handler/zipkin_receiver_test.go | 2 ++ 2 files changed, 5 insertions(+) diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go index f2cbff9160e..a477c970bf1 100644 --- a/cmd/collector/app/handler/zipkin_receiver.go +++ b/cmd/collector/app/handler/zipkin_receiver.go @@ -69,6 +69,9 @@ func startZipkinReceiver( } consumerAdapter := newConsumerDelegate(logger, spanProcessor, tm) + // reset Zipkin spanFormat + consumerAdapter.batchConsumer.spanOptions.SpanFormat = processor.ZipkinSpanFormat + nextConsumer, err := newTraces(consumerAdapter.consume) if err != nil { return nil, fmt.Errorf("could not create Zipkin consumer: %w", err) diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index 8d783588de6..54abedd1964 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/receiver" "github.com/jaegertracing/jaeger/cmd/collector/app/flags" + "github.com/jaegertracing/jaeger/cmd/collector/app/processor" zipkinthrift "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" "github.com/jaegertracing/jaeger/pkg/tenancy" "github.com/jaegertracing/jaeger/pkg/testutils" @@ -126,6 +127,7 @@ func TestZipkinReceiver(t *testing.T) { t.Logf("response: %s %s", response.Status, string(bodyBytes)) } require.NoError(t, response.Body.Close()) + require.Equal(t, processor.ZipkinSpanFormat, spanProcessor.getSpanFormat()) }) } } From 044107aeb091060debaca22e90a0189cf17dd6fe Mon Sep 17 00:00:00 2001 From: tgolang <154592711+tgolang@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:48:37 +0800 Subject: [PATCH 04/14] [chore] Remove repetitive words (#5265) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Which problem is this PR solving? - ## Description of the changes - remove repetitive words ## How was this change tested? - ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` Signed-off-by: tgolang Co-authored-by: Yuri Shkuro Signed-off-by: Vamshi Maskuri --- plugin/sampling/strategystore/adaptive/options.go | 2 +- plugin/storage/cassandra/schema/create.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/sampling/strategystore/adaptive/options.go b/plugin/sampling/strategystore/adaptive/options.go index f1bc2eddc6a..64288632dbf 100644 --- a/plugin/sampling/strategystore/adaptive/options.go +++ b/plugin/sampling/strategystore/adaptive/options.go @@ -116,7 +116,7 @@ type Options struct { // AddFlags adds flags for Options func AddFlags(flagSet *flag.FlagSet) { flagSet.Float64(targetSamplesPerSecond, defaultTargetSamplesPerSecond, - "The the global target rate of samples per operation.", + "The global target rate of samples per operation.", ) flagSet.Float64(deltaTolerance, defaultDeltaTolerance, "The acceptable amount of deviation between the observed samples-per-second and the desired (target) samples-per-second, expressed as a ratio.", diff --git a/plugin/storage/cassandra/schema/create.sh b/plugin/storage/cassandra/schema/create.sh index f3a6aaa390f..b53c15b3708 100755 --- a/plugin/storage/cassandra/schema/create.sh +++ b/plugin/storage/cassandra/schema/create.sh @@ -12,7 +12,7 @@ function usage { >&2 echo " DEPENDENCIES_TTL - time to live for dependencies data, in seconds (default: 0, no TTL)" >&2 echo " KEYSPACE - keyspace (default: jaeger_v1_{datacenter})" >&2 echo " REPLICATION_FACTOR - replication factor for prod (default: 2 for prod, 1 for test)" - >&2 echo " VERSION - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is is provided." + >&2 echo " VERSION - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is provided." >&2 echo "" >&2 echo "The template-file argument must be fully qualified path to a v00#.cql.tmpl template file." >&2 echo "If omitted, the template file with the highest available version will be used." From fc63da79a0f09ae1e02346f85ac32ba6ad635239 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Thu, 14 Mar 2024 01:55:43 +0530 Subject: [PATCH 05/14] added github action to block-pr-on-main Signed-off-by: Vamshi Maskuri --- .github/actions/block-pr-not-on-main/action.yml | 17 +++++++++++++++++ .github/workflows/ci-lint-checks.yaml | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 .github/actions/block-pr-not-on-main/action.yml diff --git a/.github/actions/block-pr-not-on-main/action.yml b/.github/actions/block-pr-not-on-main/action.yml new file mode 100644 index 00000000000..06e4af910f2 --- /dev/null +++ b/.github/actions/block-pr-not-on-main/action.yml @@ -0,0 +1,17 @@ +name: 'block-pr-not-on-main' +description: 'Blocks PRs from main branch of forked repository' +runs: + using: "composite" + steps: + - name: Ensure PR is not on main branch + shell: bash + run: | + echo "Repo: ${{ github.repository }}" + echo "Head Repo: ${{ github.event.pull_request.head.repo.full_name }}" + echo "Forked: ${{ github.event.repository.fork }}" + echo "Branch: ${{ github.event.pull_request.head.ref }}" + + if [ "${{ github.event.repository.fork }}" == "true" ] && [ "${{ github.event.pull_request.head.ref }}" == 'main' ]; then + echo "PRs from the main branch of forked repositories are not allowed." + exit 1 + fi diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index 1525be60037..f025f84dfbd 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -35,3 +35,6 @@ jobs: - name: Lint run: make lint + + - name: Ensure PR is not on main branch + uses: ./.github/actions/block-pr-not-on-main \ No newline at end of file From 999a838257e7abf1a501105491a26c16c36a84aa Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Tue, 12 Mar 2024 22:45:06 +0530 Subject: [PATCH 06/14] github actions added to block prs from fork/main branch Signed-off-by: Vamshi Maskuri --- .../action.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/actions/block-PRs-from-fork-main-branch/action.yml diff --git a/.github/actions/block-PRs-from-fork-main-branch/action.yml b/.github/actions/block-PRs-from-fork-main-branch/action.yml new file mode 100644 index 00000000000..6ebd0cf0fb2 --- /dev/null +++ b/.github/actions/block-PRs-from-fork-main-branch/action.yml @@ -0,0 +1,20 @@ +name: Block Main Branch PRs + +on: + pull_request: + types: + - opened + - synchronize + +jobs: + block_main_branch_pr: + runs-on: ubuntu-latest + steps: + - name: Check PR branch + id: check_branch + run: | + if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" && "${{ github.event.pull_request.head.ref }}" == 'main' ]]; then + echo "PRs from the main branch of forked repositories are not allowed." + exit 1 + fi + From 066e2d8f7c2405590b5962d76ff7fa1fd99af497 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Thu, 14 Mar 2024 01:15:44 +0530 Subject: [PATCH 07/14] added github action to block-pr-on-main Signed-off-by: Vamshi Maskuri --- .../action.yml | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/actions/block-PRs-from-fork-main-branch/action.yml diff --git a/.github/actions/block-PRs-from-fork-main-branch/action.yml b/.github/actions/block-PRs-from-fork-main-branch/action.yml deleted file mode 100644 index 6ebd0cf0fb2..00000000000 --- a/.github/actions/block-PRs-from-fork-main-branch/action.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Block Main Branch PRs - -on: - pull_request: - types: - - opened - - synchronize - -jobs: - block_main_branch_pr: - runs-on: ubuntu-latest - steps: - - name: Check PR branch - id: check_branch - run: | - if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" && "${{ github.event.pull_request.head.ref }}" == 'main' ]]; then - echo "PRs from the main branch of forked repositories are not allowed." - exit 1 - fi - From 41412853ede2016ddbd2fe29b29756f2f05e2b29 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Thu, 14 Mar 2024 01:42:22 +0530 Subject: [PATCH 08/14] Revert "[chore] Remove repetitive words (#5265)" This reverts commit f296ccd0e2c6556d4665b0d2070c65705f57e027. Signed-off-by: Vamshi Maskuri --- plugin/sampling/strategystore/adaptive/options.go | 2 +- plugin/storage/cassandra/schema/create.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/sampling/strategystore/adaptive/options.go b/plugin/sampling/strategystore/adaptive/options.go index 64288632dbf..f1bc2eddc6a 100644 --- a/plugin/sampling/strategystore/adaptive/options.go +++ b/plugin/sampling/strategystore/adaptive/options.go @@ -116,7 +116,7 @@ type Options struct { // AddFlags adds flags for Options func AddFlags(flagSet *flag.FlagSet) { flagSet.Float64(targetSamplesPerSecond, defaultTargetSamplesPerSecond, - "The global target rate of samples per operation.", + "The the global target rate of samples per operation.", ) flagSet.Float64(deltaTolerance, defaultDeltaTolerance, "The acceptable amount of deviation between the observed samples-per-second and the desired (target) samples-per-second, expressed as a ratio.", diff --git a/plugin/storage/cassandra/schema/create.sh b/plugin/storage/cassandra/schema/create.sh index b53c15b3708..f3a6aaa390f 100755 --- a/plugin/storage/cassandra/schema/create.sh +++ b/plugin/storage/cassandra/schema/create.sh @@ -12,7 +12,7 @@ function usage { >&2 echo " DEPENDENCIES_TTL - time to live for dependencies data, in seconds (default: 0, no TTL)" >&2 echo " KEYSPACE - keyspace (default: jaeger_v1_{datacenter})" >&2 echo " REPLICATION_FACTOR - replication factor for prod (default: 2 for prod, 1 for test)" - >&2 echo " VERSION - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is provided." + >&2 echo " VERSION - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is is provided." >&2 echo "" >&2 echo "The template-file argument must be fully qualified path to a v00#.cql.tmpl template file." >&2 echo "If omitted, the template file with the highest available version will be used." From 6c51eeb63609a44cf70b2345c8378604fc9e292c Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Thu, 14 Mar 2024 01:43:46 +0530 Subject: [PATCH 09/14] Revert "Fix Zipkin spanFormat (#5261)" This reverts commit 139b5f63d83e5d86781bd482fb3814c1f9cf009f. Signed-off-by: Vamshi Maskuri --- cmd/collector/app/handler/zipkin_receiver.go | 3 --- cmd/collector/app/handler/zipkin_receiver_test.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go index a477c970bf1..f2cbff9160e 100644 --- a/cmd/collector/app/handler/zipkin_receiver.go +++ b/cmd/collector/app/handler/zipkin_receiver.go @@ -69,9 +69,6 @@ func startZipkinReceiver( } consumerAdapter := newConsumerDelegate(logger, spanProcessor, tm) - // reset Zipkin spanFormat - consumerAdapter.batchConsumer.spanOptions.SpanFormat = processor.ZipkinSpanFormat - nextConsumer, err := newTraces(consumerAdapter.consume) if err != nil { return nil, fmt.Errorf("could not create Zipkin consumer: %w", err) diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index 54abedd1964..8d783588de6 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/receiver" "github.com/jaegertracing/jaeger/cmd/collector/app/flags" - "github.com/jaegertracing/jaeger/cmd/collector/app/processor" zipkinthrift "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" "github.com/jaegertracing/jaeger/pkg/tenancy" "github.com/jaegertracing/jaeger/pkg/testutils" @@ -127,7 +126,6 @@ func TestZipkinReceiver(t *testing.T) { t.Logf("response: %s %s", response.Status, string(bodyBytes)) } require.NoError(t, response.Body.Close()) - require.Equal(t, processor.ZipkinSpanFormat, spanProcessor.getSpanFormat()) }) } } From 0ae43e62ca459786cd342222e4c26434e94cd9cf Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Thu, 14 Mar 2024 02:09:54 +0530 Subject: [PATCH 10/14] test Signed-off-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> --- .github/workflows/ci-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 4c13907e71f..3b1efe5d166 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -111,7 +111,7 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Generate SBOM - uses: anchore/sbom-action@9fece9e20048ca9590af301449208b2b8861333b # v0.15.9 + uses: anchore/sbom-action@719133684c7d294116626d1344fe64f0d2ff3e9e # v0.15.2 with: output-file: jaeger-SBOM.spdx.json upload-release-assets: false From 244eaa5068844f5ed5b2b6b4577bacf7ef2e832d Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Thu, 14 Mar 2024 02:11:04 +0530 Subject: [PATCH 11/14] Update go.mod Signed-off-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ead162f31b5..451c7769452 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 - golang.org/x/sys v0.18.0 + golang.org/x/sys v0.17.0 google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 From 386238ed75ba565ea32ff19eae188b5b8e5c6b59 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Thu, 14 Mar 2024 02:13:05 +0530 Subject: [PATCH 12/14] Update go.sum Signed-off-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index a1bcb34363e..44d667f284a 100644 --- a/go.sum +++ b/go.sum @@ -701,8 +701,8 @@ 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.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= From 6e6165fa76d6249c696d5fb64ccc74f8c556a6ea Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Thu, 14 Mar 2024 02:14:42 +0530 Subject: [PATCH 13/14] Update go.mod Signed-off-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 451c7769452..6cc7c15d4e6 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/net v0.21.0 - golang.org/x/sys v0.17.0 + golang.org/x/sys v0.17.0 google.golang.org/grpc v1.62.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 From 8395f22a841fb8db2296fc940cb9234eddd2dce8 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri Date: Thu, 14 Mar 2024 09:12:36 +0530 Subject: [PATCH 14/14] added fork flag correctly Signed-off-by: Vamshi Maskuri --- .github/actions/block-pr-not-on-main/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/block-pr-not-on-main/action.yml b/.github/actions/block-pr-not-on-main/action.yml index 06e4af910f2..d37fb92990c 100644 --- a/.github/actions/block-pr-not-on-main/action.yml +++ b/.github/actions/block-pr-not-on-main/action.yml @@ -8,10 +8,10 @@ runs: run: | echo "Repo: ${{ github.repository }}" echo "Head Repo: ${{ github.event.pull_request.head.repo.full_name }}" - echo "Forked: ${{ github.event.repository.fork }}" + echo "Forked: ${{ github.event.pull_request.head.repo.fork }}" echo "Branch: ${{ github.event.pull_request.head.ref }}" - if [ "${{ github.event.repository.fork }}" == "true" ] && [ "${{ github.event.pull_request.head.ref }}" == 'main' ]; then + if [ "${{ github.event.pull_request.head.repo.fork }}" == "true" ] && [ "${{ github.event.pull_request.head.ref }}" == 'main' ]; then echo "PRs from the main branch of forked repositories are not allowed." exit 1 fi