Skip to content

use grpc-netty-shaded #2832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pongad merged 7 commits into from
Feb 7, 2018
Merged

use grpc-netty-shaded #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35038e4
DO NOT SUBMIT: use grpc-netty-shaded
pongad Feb 1, 2018
f59a56f
pr comment
pongad Feb 2, 2018
472e08a
Merge branch 'master' into bump-grpc
pongad Feb 6, 2018
e2549f5
fix logging dep
pongad Feb 6, 2018
20a7a64
format
pongad Feb 6, 2018
091e840
Merge branch 'master' into bump-grpc
pongad Feb 7, 2018
c0f2ffb
spanner: use shaded netty
pongad Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions google-cloud-bigquerydatatransfer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
<artifact.version>${project.version}</artifact.version>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -41,7 +37,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-bigtable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-bigtable</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand Down Expand Up @@ -50,7 +46,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
11 changes: 8 additions & 3 deletions google-cloud-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@
<api-client.version>1.23.0</api-client.version>

<api-common.version>1.2.0</api-common.version>
<gax.version>1.17.0</gax.version>
<gax-grpc.version>1.17.0</gax-grpc.version>
<gax-httpjson.version>0.34.0</gax-httpjson.version>
<gax.version>1.18.0</gax.version>
<gax-grpc.version>1.18.0</gax-grpc.version>
<gax-httpjson.version>0.35.0</gax-httpjson.version>
<generated-proto-beta.version>0.1.29</generated-proto-beta.version>
<generated-proto-ga.version>1.0.5</generated-proto-ga.version>
<google.auth.version>0.9.0</google.auth.version>
Expand Down Expand Up @@ -897,6 +897,11 @@
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
<artifact.version>${project.version}</artifact.version>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -41,7 +37,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-core-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-core-grpc</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
Expand Down Expand Up @@ -67,7 +63,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-dataproc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-dataproc</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -40,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-dialogflow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-dialogflow-v2beta1</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -36,7 +32,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-dlp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-dlp-v2beta1</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -36,7 +32,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-errorreporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-errorreporting</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -36,7 +32,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-firestore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<site.installationModule>google-cloud-firestore</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand Down Expand Up @@ -57,7 +53,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-language/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-language</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -40,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-logging</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -40,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
39 changes: 10 additions & 29 deletions ...e-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,26 @@

package com.google.cloud.logging.v2.testing;


import io.grpc.ManagedChannel;
import io.grpc.Server;
import io.grpc.netty.NegotiationType;
import io.grpc.netty.NettyChannelBuilder;
import io.grpc.netty.NettyServerBuilder;
import io.netty.channel.local.LocalAddress;
import io.netty.channel.local.LocalChannel;
import io.netty.channel.local.LocalServerChannel;

import io.grpc.inprocess.InProcessChannelBuilder;
import io.grpc.inprocess.InProcessServerBuilder;
import java.io.IOException;
import java.net.SocketAddress;

/**
* LocalLoggingHelper runs an in-memory Logging server for use in tests.
*/
public class LocalLoggingHelper {
private static final int FLOW_CONTROL_WINDOW = 65 * 1024;

private final SocketAddress address;
private final String address;
private final Server server;
private final LocalLoggingImpl loggingImpl;

/**
* Constructs a new LocalLoggingHelper. The method start() must
* be called before it is used.
*/
public LocalLoggingHelper(String addressString) {
address = new LocalAddress(addressString);
loggingImpl = new LocalLoggingImpl();
NettyServerBuilder builder =
NettyServerBuilder.forAddress(address)
.flowControlWindow(FLOW_CONTROL_WINDOW)
.channelType(LocalServerChannel.class);
builder.addService(loggingImpl.bindService());
server = builder.build();
/** Constructs a new LocalLoggingHelper. The method start() must be called before it is used. */
public LocalLoggingHelper(String address) {
this.address = address;
this.loggingImpl = new LocalLoggingImpl();
this.server =
InProcessServerBuilder.forName(address).addService(loggingImpl.bindService()).build();
}
/**
* Starts the in-memory service.
Expand Down Expand Up @@ -77,10 +61,7 @@ public LocalLoggingImpl getLoggingImpl() {
* Creates a channel for making requests to the in-memory service.
*/
public ManagedChannel createChannel() {
return NettyChannelBuilder.forAddress(address)
.negotiationType(NegotiationType.PLAINTEXT)
.channelType(LocalChannel.class)
.build();
return InProcessChannelBuilder.forName(address).usePlaintext(true).build();
}
/**
* Shuts down the in-memory service.
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-monitoring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-monitoring</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -36,7 +32,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<site.installationModule>google-cloud-notification</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand Down Expand Up @@ -60,7 +56,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-os-login/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-os-login</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -40,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
6 changes: 1 addition & 5 deletions google-cloud-pubsub/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<site.installationModule>google-cloud-pubsub</site.installationModule>
</properties>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>google-cloud-core</artifactId>
Expand All @@ -40,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<artifactId>grpc-netty-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
Loading