diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile index 2cbfea75ab558..b928c41bf435a 100644 --- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile +++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile @@ -31,7 +31,7 @@ RUN curl -OL https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.xz && mv /usr/local/node-v18.16.0-linux-x64 /usr/local/node ENV PATH="${PATH}:/usr/local/node/bin" #Install Go -ARG go_version=1.21.0 +ARG go_version=1.21.1 RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz && \ rm go${go_version}.linux-amd64.tar.gz @@ -52,7 +52,7 @@ ENV PATH="${PATH}:/usr/local/gradle/bin" RUN curl -OL https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz && \ tar -xvf gh_2.31.0_linux_amd64.tar.gz && \ rm gh_2.31.0_linux_amd64.tar.gz && \ - mv gh_2.31.0_linux_amd64/bin/gh /usr/local/bin + mv gh_2.31.0_linux_amd64/bin/gh /usr/local/bin #Install GCloud CLI and Kubectl RUN curl -OL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-367.0.0-linux-x86_64.tar.gz && \ tar -xvf google-cloud-sdk-367.0.0-linux-x86_64.tar.gz && \ diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index c118ad0983342..91d5282ba753a 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -78,7 +78,7 @@ RUN pip3 install distlib==0.3.1 yapf==0.29.0 pytest ### # Install Go ### -ENV DOWNLOAD_GO_VERSION=1.21.0 +ENV DOWNLOAD_GO_VERSION=1.21.1 RUN wget https://golang.org/dl/go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go${DOWNLOAD_GO_VERSION}.linux-amd64.tar.gz ENV GOROOT /usr/local/go diff --git a/playground/backend/go.mod b/playground/backend/go.mod index 9f5fb433ab7e6..2b26017c32b71 100644 --- a/playground/backend/go.mod +++ b/playground/backend/go.mod @@ -74,7 +74,7 @@ require ( go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.21.0 // indirect + go.uber.org/zap v1.21.1 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java index 17aea34045ff1..ab4be35247109 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java @@ -1331,6 +1331,14 @@ public DataflowPipelineJob run(Pipeline pipeline) { hooks.modifyEnvironmentBeforeSubmission(newJob.getEnvironment()); } + // enable upload_graph when the graph is too large + if ((Utf8.encodedLength(newJob.toString()) >= CREATE_JOB_REQUEST_LIMIT_BYTES) && + !hasExperiment(options, "upload_graph")) { + List experiments = new ArrayList<>(options.getExperiments()); + experiments.add("upload_graph"); + options.setExperiments(ImmutableList.copyOf(experiments)); + } + // Upload the job to GCS and remove the graph object from the API call. The graph // will be downloaded from GCS by the service. if (hasExperiment(options, "upload_graph")) { diff --git a/sdks/go.mod b/sdks/go.mod index ac7db57479178..3ed1e0756eb92 100644 --- a/sdks/go.mod +++ b/sdks/go.mod @@ -30,7 +30,7 @@ require ( cloud.google.com/go/pubsub v1.33.0 cloud.google.com/go/spanner v1.49.0 cloud.google.com/go/storage v1.33.0 - github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/config v1.18.40 github.com/aws/aws-sdk-go-v2/credentials v1.13.38 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.84 diff --git a/sdks/go/run_with_go_version.sh b/sdks/go/run_with_go_version.sh index aa31399193a6a..a2d7ab600cbf3 100755 --- a/sdks/go/run_with_go_version.sh +++ b/sdks/go/run_with_go_version.sh @@ -37,7 +37,7 @@ set -e # # This variable is also used as the execution command downscript. # The list of downloadable versions are at https://go.dev/dl/ -GOVERS=go1.21.0 +GOVERS=go1.21.1 if ! command -v go &> /dev/null then