[
https://issues.apache.org/jira/browse/BEAM-3321?focusedWorklogId=125590&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-125590
]
ASF GitHub Bot logged work on BEAM-3321:
----------------------------------------
Author: ASF GitHub Bot
Created on: 20/Jul/18 17:48
Start Date: 20/Jul/18 17:48
Worklog Time Spent: 10m
Work Description: lukecwik closed pull request #5988: [BEAM-3321,
BEAM-3098, BEAM-4795] Bumping google cloud versions
URL: https://github.com/apache/beam/pull/5988
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/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 1461ace929f..23e96a27e28 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -296,23 +296,25 @@ class BeamModulePlugin implements Plugin<Project> {
def bigtable_version = "1.0.0"
def bigtable_proto_version = "1.0.0-pre3"
def google_clients_version = "1.23.0"
- def google_auth_version = "0.7.1"
- def grpc_version = "1.2.0"
- def protobuf_version = "3.2.0"
+ def google_auth_version = "0.10.0"
+ def grpc_version = "1.13.1"
+ def protobuf_version = "3.6.0"
def guava_version = "20.0"
- def netty_version = "4.1.8.Final"
- def grpc_google_common_protos = "0.1.9"
+ def netty_version = "4.1.25.Final"
+ def proto_google_common_protos = "1.12.0"
def hamcrest_version = "1.3"
def hadoop_version = "2.7.3"
def jackson_version = "2.9.5"
def spark_version = "2.3.1"
- def pubsub_grpc_version = "0.1.18"
+ def spanner_grpc_version = "0.19.0"
+ def pubsub_grpc_version = "1.18.0"
def apex_core_version = "3.7.0"
def apex_malhar_version = "3.4.0"
def postgres_version = "42.2.2"
def jaxb_api_version = "2.2.12"
def kafka_version = "1.0.0"
def quickcheck_version = "0.8"
+ def google_cloud_core_version = "1.36.0"
// A map of maps containing common libraries used per language. To use:
// dependencies {
@@ -342,14 +344,14 @@ class BeamModulePlugin implements Plugin<Project> {
commons_io_2x :
"commons-io:commons-io:2.5",
commons_lang3 :
"org.apache.commons:commons-lang3:3.6",
commons_math3 :
"org.apache.commons:commons-math3:3.6.1",
- datastore_v1_proto_client :
"com.google.cloud.datastore:datastore-v1-proto-client:1.4.0",
- datastore_v1_protos :
"com.google.cloud.datastore:datastore-v1-protos:1.3.0",
+ datastore_v1_proto_client :
"com.google.cloud.datastore:datastore-v1-proto-client:1.6.0",
+ datastore_v1_protos :
"com.google.cloud.datastore:datastore-v1-protos:1.5.0",
error_prone_annotations :
"com.google.errorprone:error_prone_annotations:2.0.15",
- gax_grpc :
"com.google.api:gax-grpc:0.20.0",
+ gax_grpc :
"com.google.api:gax-grpc:1.29.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",
- google_api_common :
"com.google.api:api-common:1.0.0-rc2",
+ google_api_common :
"com.google.api:api-common:1.6.0",
google_api_services_bigquery :
"com.google.apis:google-api-services-bigquery:v2-rev374-$google_clients_version",
google_api_services_clouddebugger :
"com.google.apis:google-api-services-clouddebugger:v2-rev233-$google_clients_version",
google_api_services_cloudresourcemanager :
"com.google.apis:google-api-services-cloudresourcemanager:v1-rev477-$google_clients_version",
@@ -358,10 +360,10 @@ class BeamModulePlugin implements Plugin<Project> {
google_api_services_storage :
"com.google.apis:google-api-services-storage:v1-rev124-$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:$google_cloud_core_version",
+ google_cloud_core_grpc :
"com.google.cloud:google-cloud-core-grpc:$google_cloud_core_version",
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.0b-beta",
+ google_cloud_spanner :
"com.google.cloud:google-cloud-spanner:0.54.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",
@@ -401,14 +403,14 @@ class BeamModulePlugin implements Plugin<Project> {
malhar_library :
"org.apache.apex:malhar-library:$apex_malhar_version",
mockito_core :
"org.mockito:mockito-core:1.9.5",
netty_handler :
"io.netty:netty-handler:$netty_version",
- netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:1.1.33.Fork26",
+ netty_tcnative_boringssl_static :
"io.netty:netty-tcnative-boringssl-static:2.0.8.Final",
netty_transport_native_epoll :
"io.netty:netty-transport-native-epoll:$netty_version",
postgres :
"org.postgresql:postgresql:$postgres_version",
protobuf_java :
"com.google.protobuf:protobuf-java:$protobuf_version",
protobuf_java_util :
"com.google.protobuf:protobuf-java-util:$protobuf_version",
proto_google_cloud_pubsub_v1 :
"com.google.api.grpc:proto-google-cloud-pubsub-v1:$pubsub_grpc_version",
- proto_google_cloud_spanner_admin_database_v1:
"com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$grpc_google_common_protos",
- proto_google_common_protos :
"com.google.api.grpc:proto-google-common-protos:$grpc_google_common_protos",
+ proto_google_cloud_spanner_admin_database_v1:
"com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$spanner_grpc_version",
+ proto_google_common_protos :
"com.google.api.grpc:proto-google-common-protos:$proto_google_common_protos",
slf4j_api :
"org.slf4j:slf4j-api:1.7.25",
slf4j_simple :
"org.slf4j:slf4j-simple:1.7.25",
slf4j_jdk14 :
"org.slf4j:slf4j-jdk14:1.7.25",
@@ -1180,7 +1182,7 @@ artifactId=${project.name}
// An artifact spec for a protoc plugin, with "grpc" as
// the identifier, which can be referred to in the "plugins"
// container of the "generateProtoTasks" closure.
- grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.2.0" }
+ grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.13.1" }
}
generateProtoTasks {
@@ -1255,7 +1257,7 @@ artifactId=${project.name}
relocate "com.google.longrunning",
"org.apache.beam.vendor.proto_google_common_protos.v1.com.google.longrunning"
relocate "com.google.rpc",
"org.apache.beam.vendor.proto_google_common_protos.v1.com.google.rpc"
relocate "com.google.type",
"org.apache.beam.vendor.proto_google_common_protos.v1.com.google.type"
- relocate "io.opencensus",
"org.apache.beam.vendor.opencensus.v0_11_0.io.opencensus"
+ relocate "io.opencensus",
"org.apache.beam.vendor.opencensus.v0_12_3.io.opencensus"
// Adapted from
https://github.com/grpc/grpc-java/blob/e283f70ad91f99c7fee8b31b605ef12a4f9b1690/netty/shaded/build.gradle#L41
relocate "io.netty", "org.apache.beam.vendor.netty.v4.io.netty"
@@ -1309,22 +1311,22 @@ artifactId=${project.name}
project.dependencies {
compile 'com.google.guava:guava:20.0'
- compile 'com.google.protobuf:protobuf-java:3.5.1'
- compile 'com.google.protobuf:protobuf-java-util:3.5.1'
+ compile 'com.google.protobuf:protobuf-java:3.6.0'
+ compile 'com.google.protobuf:protobuf-java-util:3.6.0'
compile 'com.google.code.gson:gson:2.7'
- compile 'io.grpc:grpc-auth:1.12.0'
- compile 'io.grpc:grpc-core:1.12.0'
- compile 'io.grpc:grpc-context:1.12.0'
- compile 'io.grpc:grpc-netty:1.12.0'
- compile 'io.grpc:grpc-protobuf:1.12.0'
- compile 'io.grpc:grpc-stub:1.12.0'
- compile 'io.netty:netty-transport-native-epoll:4.1.22.Final'
- compile 'io.netty:netty-tcnative-boringssl-static:2.0.7.Final'
- compile 'com.google.auth:google-auth-library-credentials:0.9.1'
- compile 'io.grpc:grpc-testing:1.12.0'
- compile 'com.google.api.grpc:proto-google-common-protos:1.0.0'
- compile 'io.opencensus:opencensus-api:0.11.0'
- compile 'io.opencensus:opencensus-contrib-grpc-metrics:0.11.0'
+ compile 'io.grpc:grpc-auth:1.13.1'
+ compile 'io.grpc:grpc-core:1.13.1'
+ compile 'io.grpc:grpc-context:1.13.1'
+ compile 'io.grpc:grpc-netty:1.13.1'
+ compile 'io.grpc:grpc-protobuf:1.13.1'
+ compile 'io.grpc:grpc-stub:1.13.1'
+ compile 'io.netty:netty-transport-native-epoll:4.1.25.Final'
+ compile 'io.netty:netty-tcnative-boringssl-static:2.0.8.Final'
+ compile 'com.google.auth:google-auth-library-credentials:0.10.0'
+ compile 'io.grpc:grpc-testing:1.13.1'
+ compile 'com.google.api.grpc:proto-google-common-protos:1.12.0'
+ compile 'io.opencensus:opencensus-api:0.12.3'
+ compile 'io.opencensus:opencensus-contrib-grpc-metrics:0.12.3'
shadow 'com.google.errorprone:error_prone_annotations:2.1.2'
}
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 0d3504d2610..e5893270a24 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.BatchClient;
@@ -151,8 +152,8 @@ public SpannerAccessor connectToSpanner() {
if (getHost() != null) {
builder.setHost(getHost().get());
}
- ReleaseInfo releaseInfo = ReleaseInfo.getReleaseInfo();
- builder.setUserAgentPrefix(USER_AGENT_PREFIX + "/" +
releaseInfo.getVersion());
+ String userAgentString = USER_AGENT_PREFIX + "/" +
ReleaseInfo.getReleaseInfo().getVersion();
+ builder.setHeaderProvider(FixedHeaderProvider.create("user-agent",
userAgentString));
SpannerOptions options = builder.build();
Spanner spanner = options.getService();
DatabaseClient databaseClient =
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 25d5272f5f5..5e7a1ba248a 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,10 +62,10 @@ public void testGcpApiSurface() throws Exception {
classesInPackage("com.google.bigtable.v2"),
classesInPackage("com.google.cloud.bigtable.config"),
classesInPackage("com.google.spanner.v1"),
- Matchers.equalTo(com.google.api.gax.grpc.ApiException.class),
+ Matchers.equalTo(com.google.api.gax.rpc.ApiException.class),
Matchers.<Class<?>>equalTo(com.google.api.gax.paging.Page.class),
-
Matchers.<Class<?>>equalTo(com.google.api.resourcenames.ResourceName.class),
-
Matchers.<Class<?>>equalTo(com.google.api.resourcenames.ResourceNameType.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),
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/ReadSpannerSchemaTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/ReadSpannerSchemaTest.java
index 55d577a70e2..61cf8d7fa8b 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/ReadSpannerSchemaTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/ReadSpannerSchemaTest.java
@@ -29,7 +29,6 @@
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.Struct;
import com.google.cloud.spanner.Type;
-import com.google.cloud.spanner.Value;
import java.util.Arrays;
import java.util.List;
import org.apache.beam.sdk.transforms.DoFnTester;
@@ -49,18 +48,25 @@
private static Struct columnMetadata(String tableName, String columnName,
String type) {
return Struct.newBuilder()
- .add("table_name", Value.string(tableName))
- .add("column_name", Value.string(columnName))
- .add("spanner_type", Value.string(type))
- .add("cells_mutated", Value.int64(3L))
+ .set("table_name")
+ .to(tableName)
+ .set("column_name")
+ .to(columnName)
+ .set("spanner_type")
+ .to(type)
+ .set("cells_mutated")
+ .to(3L)
.build();
}
private static Struct pkMetadata(String tableName, String columnName, String
ordering) {
return Struct.newBuilder()
- .add("table_name", Value.string(tableName))
- .add("column_name", Value.string(columnName))
- .add("column_ordering", Value.string(ordering))
+ .set("table_name")
+ .to(tableName)
+ .set("column_name")
+ .to(columnName)
+ .set("column_ordering")
+ .to(ordering)
.build();
}
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOReadTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOReadTest.java
index 0d950e49975..59b60ea59a7 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOReadTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOReadTest.java
@@ -78,12 +78,12 @@
private static final List<Struct> FAKE_ROWS =
Arrays.asList(
- Struct.newBuilder().add("id", Value.int64(1)).add("name",
Value.string("Alice")).build(),
- Struct.newBuilder().add("id", Value.int64(2)).add("name",
Value.string("Bob")).build(),
- Struct.newBuilder().add("id", Value.int64(3)).add("name",
Value.string("Carl")).build(),
- Struct.newBuilder().add("id", Value.int64(4)).add("name",
Value.string("Dan")).build(),
- Struct.newBuilder().add("id", Value.int64(5)).add("name",
Value.string("Evan")).build(),
- Struct.newBuilder().add("id", Value.int64(6)).add("name",
Value.string("Floyd")).build());
+
Struct.newBuilder().set("id").to(Value.int64(1)).set("name").to("Alice").build(),
+
Struct.newBuilder().set("id").to(Value.int64(2)).set("name").to("Bob").build(),
+
Struct.newBuilder().set("id").to(Value.int64(3)).set("name").to("Carl").build(),
+
Struct.newBuilder().set("id").to(Value.int64(4)).set("name").to("Dan").build(),
+
Struct.newBuilder().set("id").to(Value.int64(5)).set("name").to("Evan").build(),
+
Struct.newBuilder().set("id").to(Value.int64(6)).set("name").to("Floyd").build());
@Before
@SuppressWarnings("unchecked")
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOWriteTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOWriteTest.java
index 0018f025b09..39a773f5c79 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOWriteTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOWriteTest.java
@@ -39,7 +39,6 @@
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.Struct;
import com.google.cloud.spanner.Type;
-import com.google.cloud.spanner.Value;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import java.io.Serializable;
@@ -92,18 +91,25 @@ public void setUp() throws Exception {
private static Struct columnMetadata(
String tableName, String columnName, String type, long cellsMutated) {
return Struct.newBuilder()
- .add("table_name", Value.string(tableName))
- .add("column_name", Value.string(columnName))
- .add("spanner_type", Value.string(type))
- .add("cells_mutated", Value.int64(cellsMutated))
+ .set("table_name")
+ .to(tableName)
+ .set("column_name")
+ .to(columnName)
+ .set("spanner_type")
+ .to(type)
+ .set("cells_mutated")
+ .to(cellsMutated)
.build();
}
private static Struct pkMetadata(String tableName, String columnName, String
ordering) {
return Struct.newBuilder()
- .add("table_name", Value.string(tableName))
- .add("column_name", Value.string(columnName))
- .add("column_ordering", Value.string(ordering))
+ .set("table_name")
+ .to(tableName)
+ .set("column_name")
+ .to(columnName)
+ .set("column_ordering")
+ .to(ordering)
.build();
}
----------------------------------------------------------------
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: 125590)
Time Spent: 3h 50m (was: 3h 40m)
> 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
> Time Spent: 3h 50m
> 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)
