aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedHEADmasterXin Li2020-08-270-0/+0
|\ | | | | | | | | | | Bug: 166295507 Merged-In: Iccd71c35ba766fd51f51281c258c6aeb1c1302a5 Change-Id: Ibce9567a2c3e66848efb29cbc2204d1a1595de4c
| * Build the gRPC Java OkHttp library from source am: 332041b059 am: c628597f30Hadrien Zalek2020-06-301-0/+34
| |\ | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345180 Change-Id: Iccd71c35ba766fd51f51281c258c6aeb1c1302a5
| * \ Remove gRPC Netty shaded static library am: b6ad5d62b2 am: ffea17686fHadrien Zalek2020-06-303-23/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345181 Change-Id: I7a1ccbee4b0bef230ad42ef306149af0defaabcd
| * \ \ Build the gRPC Java Authentication library am: 2bf353cc26 am: b5cb35def9Hadrien Zalek2020-06-302-0/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1345182 Change-Id: If6e1365391030c533d38bd6f64898d89cc60efcd
| * \ \ \ Build the gRPC Java testing library am: 58f48cc424 am: 4ddf1be873Hadrien Zalek2020-06-051-0/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1322056 Change-Id: Ibb249787cd44429b4d218fa74fee949d557abf45
| * \ \ \ \ Build the gRPC Java library from source am: 2d04a32487 am: 3124595792Hadrien Zalek2020-06-058-12/+199
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1320727 Change-Id: I27e97c9f5e338117c41b623f8aa1bd8d4b71e56c
| * \ \ \ \ \ Add METADATA to grpc-grpc-java: Apache2=NOTICE am: fd308b8783 am: 830181d779Bob Badour2020-04-301-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d36516fe634654f8f2f017fa8ee8c4efd6d32a8
| * \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 6cdccece45 -s ours am skip reason: subject contains skip directive Change-Id: I8df2e4f62ad14b90ea1fd88eeb52e4a6aa6aa469
| * \ \ \ \ \ \ \ Add protoc-gen-grpc-java-plugin am: b607066383 am: 7e9dd3bc39Colin Cross2020-03-301-0/+30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29081e3a18663d00b2f91477b1f2006bb240c0b3
* | \ \ \ \ \ \ \ \ Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14Hadrien Zalek2020-07-271-0/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536 Change-Id: I432dccbb1b3d95f4aea2cb4164b858c235df8ba0
| * \ \ \ \ \ \ \ \ \ Merge "Add a build module for the Netty Shaded library"Hadrien Zalek2020-07-271-0/+27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add a build module for the Netty Shaded libraryHadrien Zalek2020-07-241-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gRPC documentation recommends that most users use the Netty Shaded library for Transport Layer Security (TLS) on non-Android platforms. The library prepackages netty-tcnative on BoringSSL which makes it easier to use. Note that this change essentially restores the module which was deleted in a previous commit. This new binary is imported for the same version that the source is currently at and does not cause any runtime issues. Test: m grpc-java-netty-shaded Bug: 148404241 Change-Id: I7ae611add53627d2c00beeeac829fa31069d5594
* | | | | | | | | | | | Merge tag 'upstream/v1.16.1' into HEAD am: 9b4675b8abHadrien Zalek2020-07-25123-1954/+12462
|\| | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371342 Change-Id: I210fb442e553d26a0537f14b91779d6bd00612c1
| * | | | | | | | | | Merge tag 'upstream/v1.16.1' into HEADHadrien Zalek2020-07-24123-1954/+12462
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Java gRPC implementation source to that of a released version (v1.16.1) instead of some intermediate commit after v1.15.0. Test: m grpc-java Bug: 148404241 Change-Id: I9c072aee054a4aecc1bdf39adf45e9a243b907f5
| | * | | | | | | | | Bump version to 1.16.1upstream/v1.16.1Eric Anderson2018-10-2619-42/+42
| | | | | | | | | | |
| | * | | | | | | | | Update README to reference 1.16.1Eric Anderson2018-10-261-14/+14
| | | | | | | | | | |
| | * | | | | | | | | core: Make MetadataApplier an interface againEric Anderson2018-10-267-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swapping MetadataApplier to an abstract class is not ABI-safe for callers. So I revert back to the previous interface definition and introduce a CallCredentials2.MetadataApplier which is an abstract class. Once everyone is on CallCredentials2 then we can swap it to an abstract class again. Fixes #5002
| | * | | | | | | | | Bump version to 1.16.1-SNAPSHOTEric Anderson2018-10-2419-42/+42
| | | | | | | | | | |
| | * | | | | | | | | Bump version to 1.16.0upstream/v1.16.0Eric Anderson2018-10-2418-40/+40
| | | | | | | | | | |
| | * | | | | | | | | Update README to reference 1.16.0Eric Anderson2018-10-241-14/+14
| | | | | | | | | | |
| | * | | | | | | | | android-interop-testing: put google() repo firstEric Gribkoff2018-10-241-2/+2
| | | | | | | | | | |
| | * | | | | | | | | grpclb: enter fallback when LB stream broken even before fallback timer ↵Kun Zhang2018-10-242-31/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expires (#4990) (#4997) Previously the client waits ~10 seconds until the fallback timer has expired. While the timer is useful to address the long tail, it shouldn't delay using the fallback in case of obvious errors, like the channel failing to connect or an UNIMPLEMENTED response. This is a cherry-pick of b701e8920daaccf9e6eb2916d2ea94da8df74be5 from master.
| | * | | | | | | | | Revert "core: DnsNameResolver caches refresh (#4812)"Jihun Cho2018-10-243-232/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 189991012bbff42b975c51045c32efceaa07f462.
| | * | | | | | | | | core: ignore localhost and IP addresses for JNDI (1.16.x backport)Carl Mastrangelo2018-10-192-1/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is mainly to fix a test, but it also is an implementation of the proposal here: https://github.com/grpc/proposal/pull/79 In short: * Do not do SRV or TXT lookups when the target name is `localhost`. This can be overriden by a system property * Do not do SRV or TXT lookups when the target name is an IPv6 or IPv4 address. This _cannot_ be overriden. The constructed domains for these queries would themselves not be valid. (e.g. _grpclb._tcp.192.168.0.1) * Speeds up initial connection when communicating over local host, since it is extremely uncommon that such a connection would need gRPCLB or SRV records I expect to remove the system property after a release if no one asks about it.
| | * | | | | | | | | core: annotate Attributes key annotations as experimental API. (#4974) (#4977)Kun Zhang2018-10-193-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also annotate NameResolver.Listener as experimental because annotations of an outer class don't show in the javadoc page of its inner classes.
| | * | | | | | | | | netty: fix local socket bindCarl Mastrangelo2018-10-181-6/+7
| | | | | | | | | | |
| | * | | | | | | | | core: throw exception on resolution failure and no jndi resolverCarl Mastrangelo2018-10-172-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of #4953 Updates #4951
| | * | | | | | | | | travis: Drop testing for Java 10Eric Anderson2018-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oracle10 is failing during setup with: The command "bash install-jdk.sh -F 10 -L BCL --target $JAVA_HOME --workspace ${TRAVIS_HOME}/.cache/install-jdk" failed and exited with 8 during . We should be adding support for Java 11 and dropping Java 9-10 anyway, since Java 9-10 are unsupported.
| | * | | | | | | | | netty: update to 4.1.30 and tcn 2.0.17Carl Mastrangelo2018-10-113-38/+39
| | | | | | | | | | |
| | * | | | | | | | | core: add CallCredentials2 and deprecate CallCredentials' old interface (#4902)Kun Zhang2018-10-1016-94/+514
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step of smoothly changing the CallCredentials API. Security level and authority are parameters required to be passed to applyRequestMetadata(). This change wraps them, along with MethodDescriptor and the transport attributes to RequestInfo, which is more clear to the implementers. ATTR_SECURITY_LEVEL is moved to the internal GrpcAttributes and annotated as TransportAttr, because transports are required to set it, but no user is actually reading them from {Client,Server}Call.getAttributes(). ATTR_AUTHORITY is removed, because no transport is overriding it. All involved interfaces are changed to abstract classes, as this will make further API changes smoother. The CallCredentials name is stabilized, thus we first introduce CallCredentials2, ask CallCredentials implementations to migrate to it, while GRPC accepting both at the same time, then replace CallCredentials with CallCredentials2.
| | * | | | | | | | | okhttp: Add SslGuard to list of allowed security providers. See internal ↵Grant Oakley2018-10-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue b/116007005 for more details.
| | * | | | | | | | | okhttp: make AsyncFrameWriter log quietly when socket is already closed. ↵creamsoup2018-10-092-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, default log level down to INFO(closed) which is same as NettyServerTransport. (#4927)
| | * | | | | | | | | services: fix callbacks not being forwarded in binlog interceptors (#4918)zpencer2018-10-092-0/+18
| | | | | | | | | | |
| | * | | | | | | | | services: fix channelz javadoc lint for reference not found (#4920)zpencer2018-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Referring to the public abstract class seems to be OK, but referring to the package private impl trips the linter.
| | * | | | | | | | | services: allow config str to be passed into binlog object (#4919)zpencer2018-10-082-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not require binlog str to be defined by env var. This allows --flag=value styled configuration, which is more common internally.
| | * | | | | | | | | netty: expose setting a local socket addressCarl Mastrangelo2018-10-083-11/+73
| | | | | | | | | | |
| | * | | | | | | | | core: ForwardingLoadBalancerHelper (#4911)Kun Zhang2018-10-063-4/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used by LoadBalancer plugins that delegates to another, which is what the new request routing (go/grpc-request-routing-design) requires. This will also be used to wrap LoadBalancers to add client-side health-checking functionality.
| | * | | | | | | | | okhttp: remove internal mockito depCarl Mastrangelo2018-10-051-1/+1
| | | | | | | | | | |
| | * | | | | | | | | core: add Grpc.TRANSPORT_ATTR_LOCAL_ADDR (#4906)Kun Zhang2018-10-0310-4/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves #4135
| | * | | | | | | | | services: sync health.proto from grpc-proto repo (#4904)Kun Zhang2018-10-034-7/+181
| | | | | | | | | | |
| | * | | | | | | | | core: name anonymous classes in ManagedChannel for clear stacktracesCarl Mastrangelo2018-10-031-268/+319
| | | | | | | | | | |
| | * | | | | | | | | Update README to reference 1.15.1Eric Anderson2018-10-031-14/+14
| | | | | | | | | | |
| | * | | | | | | | | netty: Add ProtocolNegotiator.closeEric Anderson2018-10-036-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This notifies the negotiator when it will no longer be used, allowing it to clean up any resources.
| | * | | | | | | | | netty: Remove TransportCreationParamsFilterFactoryEric Anderson2018-10-032-146/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now there is a clear lifetime of ProtocolNegotiator.
| | * | | | | | | | | doc: organize Attributes with annotations. (#4892)Kun Zhang2018-10-0111-21/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc: organize Attributes Keys with annotations. Keys are annotated with the following annotations: 1. Grpc.TransportAttr: transport attributes returned by {Client,Server}Call.getAttributes(). 2. NameResolver.ResolutionResultAttr: attributes passed as the argument of NameResolver.Listener.onAddresses() and LoadBalancer.handleResolvedAddressGroups() 3. EquivalentAddressGroup.Attr: attributes from EquivalentAddressGroups. * Expand the usage of annotations to Attributes variables.
| | * | | | | | | | | protobuf: make extension registry method experimentalCarl Mastrangelo2018-09-281-0/+1
| | | | | | | | | | |
| | * | | | | | | | | core: permanently store authority at channel creation (#4886)zpencer2018-09-282-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the authority must not rely on the name resolver being non-null, because that can trivially happen if the channel is shut down.
| | * | | | | | | | | Upgrade to Guava 26.0-android and jsr305 3.0.2Jesse Wilson2018-09-287-17/+45
| | | | | | | | | | |
| | * | | | | | | | | github/lock.yml: Lock GitHub issues after 90 daysEric Anderson2018-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier year was just for testing. Things are working as we'd hope. Choosing 90 days for now. If an issue is closed at the beginning of a release cycle, that gives release cycle + 6 weeks to upgrade, which seems plenty. Worst-case, is users open a new issue referencing the old one they found.
| | * | | | | | | | | alts: plumb authority to ALTS protocol negotiator (#4880)Jiangtao Li2018-09-2712-84/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alts: plumb authority to ALTS protocol negotiator