[release-4.15] OCPBUGS-25231: UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs

[openshift-cherrypick-robot]

This is an automated cherry-pick of #58

/assign jsafrane

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-23811 has been cloned as Jira Issue OCPBUGS-25231. Will retitle bug to link to clone.
/retitle [release-4.15] OCPBUGS-25231: UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs

Details

In response to this:

This is an automated cherry-pick of #58

/assign jsafrane

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-25231, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.0) matches configured target version for branch (4.15.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-23811 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-23811 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #58

/assign jsafrane

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jsafrane]

/lgtm
/approve
/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [jsafrane]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[Phaow]

/label qe-approved
/label cherry-pick-approved
CI looks good and the bump version is above the CVE fixed version.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-25231, which is valid.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.0) matches configured target version for branch (4.15.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-23811 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-23811 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @Phaow

Details

In response to this:

This is an automated cherry-pick of #58

/assign jsafrane

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-25231: All pull requests linked via external trackers have merged:

• openshift/csi-node-driver-registrar#60

Jira Issue OCPBUGS-25231 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #58

/assign jsafrane

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build csi-node-driver-registrar-container-v4.15.0-202312131831.p0.g9005584.assembly.stream for distgit csi-node-driver-registrar.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2023-12-14-023407

[jsafrane]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@jsafrane: #60 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/github.com/go-logr/logr/funcr/funcr.go
M	vendor/github.com/go-logr/logr/logr.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/version.go
A	vendor/go.opentelemetry.io/otel/.gitignore
A	vendor/go.opentelemetry.io/otel/.golangci.yml
A	vendor/go.opentelemetry.io/otel/CHANGELOG.md
A	vendor/go.opentelemetry.io/otel/CODEOWNERS
A	vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
A	vendor/go.opentelemetry.io/otel/Makefile
A	vendor/go.opentelemetry.io/otel/README.md
A	vendor/go.opentelemetry.io/otel/RELEASING.md
A	vendor/go.opentelemetry.io/otel/attribute/set.go
A	vendor/go.opentelemetry.io/otel/baggage/baggage.go
A	vendor/go.opentelemetry.io/otel/codes/doc.go
A	vendor/go.opentelemetry.io/otel/internal/global/handler.go
A	vendor/go.opentelemetry.io/otel/internal/global/internal_logging.go
A	vendor/go.opentelemetry.io/otel/internal/global/state.go
A	vendor/go.opentelemetry.io/otel/internal/global/trace.go
A	vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go
A	vendor/go.opentelemetry.io/otel/metric/asyncint64.go
A	vendor/go.opentelemetry.io/otel/metric/doc.go
A	vendor/go.opentelemetry.io/otel/metric/global/metric.go
A	vendor/go.opentelemetry.io/otel/metric/instrument.go
A	vendor/go.opentelemetry.io/otel/metric/internal/global/instruments.go
A	vendor/go.opentelemetry.io/otel/metric/internal/global/meter.go
A	vendor/go.opentelemetry.io/otel/metric/internal/global/state.go
A	vendor/go.opentelemetry.io/otel/metric/meter.go
A	vendor/go.opentelemetry.io/otel/metric/syncfloat64.go
A	vendor/go.opentelemetry.io/otel/metric/syncint64.go
A	vendor/go.opentelemetry.io/otel/propagation/trace_context.go
A	vendor/go.opentelemetry.io/otel/trace/config.go
A	vendor/go.opentelemetry.io/otel/trace/doc.go
A	vendor/go.opentelemetry.io/otel/trace/noop.go
A	vendor/go.opentelemetry.io/otel/trace/trace.go
A	vendor/go.opentelemetry.io/otel/trace/tracestate.go
A	vendor/go.opentelemetry.io/otel/version.go
A	vendor/go.opentelemetry.io/otel/versions.yaml
M	vendor/google.golang.org/grpc/README.md
M	vendor/google.golang.org/grpc/attributes/attributes.go
M	vendor/google.golang.org/grpc/balancer/balancer.go
M	vendor/google.golang.org/grpc/call.go
M	vendor/google.golang.org/grpc/clientconn.go
M	vendor/google.golang.org/grpc/dialoptions.go
M	vendor/google.golang.org/grpc/encoding/encoding.go
M	vendor/google.golang.org/grpc/internal/internal.go
M	vendor/google.golang.org/grpc/internal/status/status.go
M	vendor/google.golang.org/grpc/internal/transport/handler_server.go
M	vendor/google.golang.org/grpc/internal/transport/http2_client.go
M	vendor/google.golang.org/grpc/internal/transport/http2_server.go.git/rebase-apply/patch:3734: trailing whitespace.
lint-markdown: 
.git/rebase-apply/patch:13137: trailing whitespace.
not git grep "\(import \|^\s*\)\"google.golang.org/grpc/interop/grpc_testing" -- "*.go" 
.git/rebase-apply/patch:9455: new blank line at EOF.
+
.git/rebase-apply/patch:9595: new blank line at EOF.
+
.git/rebase-apply/patch:9735: new blank line at EOF.
+
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.

M	vendor/google.golang.org/grpc/internal/transport/http_util.go
M	vendor/google.golang.org/grpc/internal/transport/transport.go
M	vendor/google.golang.org/grpc/server.go
M	vendor/google.golang.org/grpc/stream.go
M	vendor/google.golang.org/grpc/version.go
M	vendor/google.golang.org/grpc/vet.sh
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/google.golang.org/grpc/vet.sh
Auto-merging vendor/google.golang.org/grpc/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/version.go
Auto-merging vendor/google.golang.org/grpc/stream.go
Auto-merging vendor/google.golang.org/grpc/server.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/server.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/transport.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http_util.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/transport/http_util.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_client.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/transport/http2_client.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/handler_server.go
Auto-merging vendor/google.golang.org/grpc/internal/status/status.go
Auto-merging vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/internal.go
Auto-merging vendor/google.golang.org/grpc/encoding/encoding.go
Auto-merging vendor/google.golang.org/grpc/dialoptions.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/dialoptions.go
Auto-merging vendor/google.golang.org/grpc/clientconn.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/clientconn.go
Auto-merging vendor/google.golang.org/grpc/call.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/call.go
Auto-merging vendor/google.golang.org/grpc/balancer/balancer.go
Auto-merging vendor/google.golang.org/grpc/attributes/attributes.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/attributes/attributes.go
Auto-merging vendor/google.golang.org/grpc/README.md
Removing vendor/golang.org/x/net/http2/not_go118.go
Removing vendor/golang.org/x/net/http2/not_go115.go
Removing vendor/golang.org/x/net/http2/not_go111.go
Removing vendor/golang.org/x/net/http2/go118.go
Removing vendor/golang.org/x/net/http2/go115.go
Removing vendor/golang.org/x/net/http2/go111.go
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/versions.yaml deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/versions.yaml left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/tracestate.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/trace/tracestate.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/trace.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/trace/trace.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/noop.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/trace/noop.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/doc.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/trace/doc.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/config.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/trace/config.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/propagation/trace_context.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/propagation/trace_context.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncint64.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/syncint64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncfloat64.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/syncfloat64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/meter.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/meter.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/instrument.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/instrument.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/doc.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/doc.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/asyncint64.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/asyncint64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go left in tree.
CONFLICT (rename/delete): vendor/go.opentelemetry.io/otel/metric/global/metric.go deleted in HEAD and renamed to vendor/go.opentelemetry.io/otel/metric.go in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/metric.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/trace.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/trace.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/state.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/state.go left in tree.
CONFLICT (rename/delete): vendor/go.opentelemetry.io/otel/metric/internal/global/meter.go deleted in HEAD and renamed to vendor/go.opentelemetry.io/otel/internal/global/meter.go in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/meter.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/internal_logging.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/internal_logging.go left in tree.
CONFLICT (rename/delete): vendor/go.opentelemetry.io/otel/metric/internal/global/instruments.go deleted in HEAD and renamed to vendor/go.opentelemetry.io/otel/internal/global/instruments.go in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/instruments.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/handler.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/internal/global/handler.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/baggage/baggage.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/baggage/baggage.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/attribute/set.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/attribute/set.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/RELEASING.md deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/RELEASING.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/README.md deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/README.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/Makefile deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/Makefile left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/CONTRIBUTING.md deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/CONTRIBUTING.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/CODEOWNERS deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/CODEOWNERS left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/CHANGELOG.md deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/CHANGELOG.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/.golangci.yml deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/.golangci.yml left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/.gitignore deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/otel/.gitignore left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go left in tree.
Auto-merging vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
CONFLICT (content): Merge conflict in vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
Removing vendor/github.com/google/uuid/.travis.yml
Removing vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go
Removing vendor/github.com/google/go-cmp/cmp/export_panic.go
Auto-merging vendor/github.com/go-openapi/swag/post_go18.go
CONFLICT (content): Merge conflict in vendor/github.com/go-openapi/swag/post_go18.go
Auto-merging vendor/github.com/go-openapi/swag/file.go
CONFLICT (content): Merge conflict in vendor/github.com/go-openapi/swag/file.go
Auto-merging vendor/github.com/go-logr/logr/logr.go
CONFLICT (content): Merge conflict in vendor/github.com/go-logr/logr/logr.go
CONFLICT (modify/delete): vendor/github.com/go-logr/logr/funcr/funcr.go deleted in HEAD and modified in UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs. Version UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs of vendor/github.com/go-logr/logr/funcr/funcr.go left in tree.
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 354: Bump Bump OpenTelemetry to fix CVEs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.