[
https://issues.apache.org/jira/browse/BEAM-3321?focusedWorklogId=125637&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-125637
]
ASF GitHub Bot logged work on BEAM-3321:
----------------------------------------
Author: ASF GitHub Bot
Created on: 20/Jul/18 20:15
Start Date: 20/Jul/18 20:15
Worklog Time Spent: 10m
Work Description: pongad closed pull request #4707: [BEAM-3321] update
google-cloud-spanner dependency
URL: https://github.com/apache/beam/pull/4707
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.gradle b/build.gradle
index 8e70a5bb274..e50c3202fe9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ def bigtable_proto_version = "1.0.0-pre3"
def google_clients_version = "1.22.0"
def google_auth_version = "0.7.1"
def grpc_version = "1.2.0"
-def protobuf_version = "3.2.0"
+def protobuf_version = "3.5.1"
def guava_version = "20.0"
def netty_version = "4.1.8.Final"
def grpc_google_common_protos = "0.1.9"
@@ -78,7 +78,7 @@ ext.library = [
error_prone_annotations:
"com.google.errorprone:error_prone_annotations:2.0.15",
findbugs_annotations:
"com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1",
findbugs_jsr305: "com.google.code.findbugs:jsr305:3.0.1",
- gax_grpc: "com.google.api:gax-grpc:0.20.0",
+ gax: "com.google.api:gax:1.19.0",
google_api_client:
"com.google.api-client:google-api-client:$google_clients_version",
google_api_client_jackson2:
"com.google.api-client:google-api-client-jackson2:$google_clients_version",
google_api_client_java6:
"com.google.api-client:google-api-client-java6:$google_clients_version",
@@ -91,10 +91,10 @@ ext.library = [
google_api_services_storage:
"com.google.apis:google-api-services-storage:v1-rev71-$google_clients_version",
google_auth_library_credentials:
"com.google.auth:google-auth-library-credentials:$google_auth_version",
google_auth_library_oauth2_http:
"com.google.auth:google-auth-library-oauth2-http:$google_auth_version",
- google_cloud_core: "com.google.cloud:google-cloud-core:1.0.2",
- google_cloud_core_grpc:
"com.google.cloud:google-cloud-core-grpc:$grpc_version",
+ google_cloud_core: "com.google.cloud:google-cloud-core:1.16.0",
+ google_cloud_core_grpc: "com.google.cloud:google-cloud-core-grpc:1.16.0",
google_cloud_dataflow_java_proto_library_all:
"com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
- google_cloud_spanner: "com.google.cloud:google-cloud-spanner:0.20.0-beta",
+ google_cloud_spanner: "com.google.cloud:google-cloud-spanner:0.34.0-beta",
google_http_client:
"com.google.http-client:google-http-client:$google_clients_version",
google_http_client_jackson:
"com.google.http-client:google-http-client-jackson:$google_clients_version",
google_http_client_jackson2:
"com.google.http-client:google-http-client-jackson2:$google_clients_version",
diff --git a/pom.xml b/pom.xml
index 7fe67cb6380..829564a5d2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<google-auth.version>0.7.1</google-auth.version>
<google-clients.version>1.22.0</google-clients.version>
<google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version>
- <google-cloud-core.version>1.0.2</google-cloud-core.version>
+ <google-cloud-core.version>1.16.0</google-cloud-core.version>
<google-cloud-dataflow-java-proto-library-all.version>0.5.160304</google-cloud-dataflow-java-proto-library-all.version>
<guava.version>20.0</guava.version>
<grpc.version>1.2.0</grpc.version>
@@ -145,10 +145,10 @@
<mockito.version>1.9.5</mockito.version>
<netty.version>4.1.8.Final</netty.version>
<netty.tcnative.version>1.1.33.Fork26</netty.tcnative.version>
- <protobuf.version>3.2.0</protobuf.version>
+ <protobuf.version>3.5.1</protobuf.version>
<pubsub.version>v1-rev10-1.22.0</pubsub.version>
<slf4j.version>1.7.25</slf4j.version>
- <spanner.version>0.20.0-beta</spanner.version>
+ <spanner.version>0.34.0-beta</spanner.version>
<spark.version>2.2.1</spark.version>
<spring.version>4.3.5.RELEASE</spring.version>
<stax2.version>3.1.4</stax2.version>
@@ -184,7 +184,7 @@
<compiler.error.flag>-Werror</compiler.error.flag>
<compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag>
<compiler.default.exclude>nothing</compiler.default.exclude>
- <gax-grpc.version>0.20.0</gax-grpc.version>
+ <gax.version>1.19.0</gax.version>
<!-- standard binary for kubectl -->
<kubectl>kubectl</kubectl>
@@ -908,8 +908,8 @@
<dependency>
<groupId>com.google.api</groupId>
- <artifactId>gax-grpc</artifactId>
- <version>${gax-grpc.version}</version>
+ <artifactId>gax</artifactId>
+ <version>${gax.version}</version>
</dependency>
<dependency>
@@ -1135,7 +1135,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
- <version>${grpc.version}</version>
+ <version>${google-cloud-core.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud.bigtable</groupId>
diff --git a/sdks/java/io/google-cloud-platform/build.gradle
b/sdks/java/io/google-cloud-platform/build.gradle
index 6c8a8980722..a64322dc7ea 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -38,7 +38,7 @@ dependencies {
shadow library.java.jackson_databind
shadow library.java.grpc_core
shadow library.java.google_api_services_bigquery
- shadow library.java.gax_grpc
+ shadow library.java.gax
shadow library.java.google_cloud_core_grpc
shadow library.java.google_api_services_pubsub
shadow library.java.grpc_google_cloud_pubsub_v1
diff --git a/sdks/java/io/google-cloud-platform/pom.xml
b/sdks/java/io/google-cloud-platform/pom.xml
index 7aae03b90c7..cceeea25945 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -189,7 +189,7 @@
<dependency>
<groupId>com.google.api</groupId>
- <artifactId>gax-grpc</artifactId>
+ <artifactId>gax</artifactId>
</dependency>
<dependency>
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerConfig.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerConfig.java
index 9be641fbf88..c8c3e4fa988 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerConfig.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerConfig.java
@@ -19,6 +19,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.api.gax.rpc.FixedHeaderProvider;
import com.google.auto.value.AutoValue;
import com.google.cloud.ServiceFactory;
import com.google.cloud.spanner.DatabaseClient;
@@ -27,6 +28,7 @@
import com.google.cloud.spanner.SpannerOptions;
import com.google.common.annotations.VisibleForTesting;
import java.io.Serializable;
+import java.util.Collections;
import javax.annotation.Nullable;
import org.apache.beam.sdk.options.ValueProvider;
import org.apache.beam.sdk.transforms.display.DisplayData;
@@ -150,7 +152,10 @@ public SpannerAccessor connectToSpanner() {
builder.setHost(getHost());
}
ReleaseInfo releaseInfo = ReleaseInfo.getReleaseInfo();
- builder.setUserAgentPrefix(USER_AGENT_PREFIX + "/" +
releaseInfo.getVersion());
+ builder.setHeaderProvider(
+ FixedHeaderProvider.create(
+ Collections.singletonMap(
+ "user-agent", USER_AGENT_PREFIX + "/" +
releaseInfo.getVersion())));
SpannerOptions options = builder.build();
Spanner spanner = options.getService();
DatabaseClient databaseClient = spanner.getDatabaseClient(
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
index 748d87f19f9..4a7a41bff46 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java
@@ -62,15 +62,17 @@ public void testGcpApiSurface() throws Exception {
classesInPackage("com.google.bigtable.v2"),
classesInPackage("com.google.cloud.bigtable.config"),
classesInPackage("com.google.spanner.v1"),
-
Matchers.<Class<?>>equalTo(com.google.api.gax.grpc.ApiException.class),
+
Matchers.<Class<?>>equalTo(com.google.api.gax.rpc.ApiException.class),
+
Matchers.<Class<?>>equalTo(com.google.api.gax.rpc.StatusCode.class),
+
Matchers.<Class<?>>equalTo(com.google.api.gax.rpc.StatusCode.Code.class),
Matchers.<Class<?>>equalTo(com.google.cloud.bigtable.grpc.BigtableClusterName.class),
Matchers.<Class<?>>equalTo(com.google.cloud.bigtable.grpc.BigtableInstanceName.class),
Matchers.<Class<?>>equalTo(com.google.cloud.bigtable.grpc.BigtableTableName.class),
Matchers.<Class<?>>equalTo(com.google.cloud.BaseServiceException.class),
Matchers.<Class<?>>equalTo(com.google.cloud.BaseServiceException.Error.class),
Matchers.<Class<?>>equalTo(com.google.cloud.BaseServiceException.ExceptionData.class),
-
Matchers.<Class<?>>equalTo(com.google.cloud.BaseServiceException.ExceptionData.Builder
- .class),
+ Matchers.<Class<?>>equalTo(
+
com.google.cloud.BaseServiceException.ExceptionData.Builder.class),
Matchers.<Class<?>>equalTo(com.google.cloud.RetryHelper.RetryHelperException.class),
Matchers.<Class<?>>equalTo(com.google.cloud.grpc.BaseGrpcServiceException.class),
Matchers.<Class<?>>equalTo(com.google.cloud.ByteArray.class),
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 125637)
Time Spent: 4h (was: 3h 50m)
> Update gax-grpc dependency to latest
> ------------------------------------
>
> Key: BEAM-3321
> URL: https://issues.apache.org/jira/browse/BEAM-3321
> Project: Beam
> Issue Type: Improvement
> Components: io-java-gcp
> Reporter: Chamikara Jayalath
> Assignee: Garrett Jones
> Priority: Major
> Fix For: 2.7.0
>
> Time Spent: 4h
> Remaining Estimate: 0h
>
> Beam uses 0.20 latest release is 1.15:
> https://mvnrepository.com/artifact/com.google.api/gax-grpc
> This results in compatibility issues when Beam and Datastore client are used
> together:
> https://lists.apache.org/thread.html/8a99f4c0dbb1138f1067ef73b2ba7f44f035b309af41b1876ffc1ff2@%3Cuser.beam.apache.org%3E
> Assigning to Mairbek who added this dependency recently.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
