Skip to content

Commit dc2f5ab

Browse files
Release v1.82.3
1 parent 9f2ebbe commit dc2f5ab

151 files changed

Lines changed: 3858 additions & 5391 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config.m4‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ if test "$PHP_GRPC" != "no"; then
8989
src/core/config/config_vars.cc \
9090
src/core/config/config_vars_non_generated.cc \
9191
src/core/config/core_configuration.cc \
92-
src/core/config/experiment_env_var.cc \
9392
src/core/config/load_config.cc \
9493
src/core/credentials/call/call_creds_registry_init.cc \
9594
src/core/credentials/call/call_creds_util.cc \
@@ -137,7 +136,6 @@ if test "$PHP_GRPC" != "no"; then
137136
src/core/credentials/transport/tls/grpc_tls_certificate_distributor.cc \
138137
src/core/credentials/transport/tls/grpc_tls_certificate_match.cc \
139138
src/core/credentials/transport/tls/grpc_tls_certificate_provider.cc \
140-
src/core/credentials/transport/tls/grpc_tls_certificate_selector.cc \
141139
src/core/credentials/transport/tls/grpc_tls_certificate_verifier.cc \
142140
src/core/credentials/transport/tls/grpc_tls_credentials_options.cc \
143141
src/core/credentials/transport/tls/grpc_tls_crl_provider.cc \
@@ -869,7 +867,6 @@ if test "$PHP_GRPC" != "no"; then
869867
src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
870868
src/core/tsi/ssl/session_cache/ssl_session_cache.cc \
871869
src/core/tsi/ssl/session_cache/ssl_session_openssl.cc \
872-
src/core/tsi/ssl_telemetry_utils.cc \
873870
src/core/tsi/ssl_transport_security.cc \
874871
src/core/tsi/ssl_transport_security_utils.cc \
875872
src/core/tsi/transport_security.cc \
@@ -1505,7 +1502,7 @@ if test "$PHP_GRPC" != "no"; then
15051502
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
15061503
-DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
15071504
-DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
1508-
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.83.2\""')
1505+
-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.82.3\""')
15091506
PHP_ADD_BUILD_DIR($ext_builddir/src/core/call)
15101507
PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz)
15111508
PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz/v2tov1)

‎config.w32‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ if (PHP_GRPC != "no") {
5353
"src\\core\\config\\config_vars.cc " +
5454
"src\\core\\config\\config_vars_non_generated.cc " +
5555
"src\\core\\config\\core_configuration.cc " +
56-
"src\\core\\config\\experiment_env_var.cc " +
5756
"src\\core\\config\\load_config.cc " +
5857
"src\\core\\credentials\\call\\call_creds_registry_init.cc " +
5958
"src\\core\\credentials\\call\\call_creds_util.cc " +
@@ -101,7 +100,6 @@ if (PHP_GRPC != "no") {
101100
"src\\core\\credentials\\transport\\tls\\grpc_tls_certificate_distributor.cc " +
102101
"src\\core\\credentials\\transport\\tls\\grpc_tls_certificate_match.cc " +
103102
"src\\core\\credentials\\transport\\tls\\grpc_tls_certificate_provider.cc " +
104-
"src\\core\\credentials\\transport\\tls\\grpc_tls_certificate_selector.cc " +
105103
"src\\core\\credentials\\transport\\tls\\grpc_tls_certificate_verifier.cc " +
106104
"src\\core\\credentials\\transport\\tls\\grpc_tls_credentials_options.cc " +
107105
"src\\core\\credentials\\transport\\tls\\grpc_tls_crl_provider.cc " +
@@ -833,7 +831,6 @@ if (PHP_GRPC != "no") {
833831
"src\\core\\tsi\\ssl\\session_cache\\ssl_session_boringssl.cc " +
834832
"src\\core\\tsi\\ssl\\session_cache\\ssl_session_cache.cc " +
835833
"src\\core\\tsi\\ssl\\session_cache\\ssl_session_openssl.cc " +
836-
"src\\core\\tsi\\ssl_telemetry_utils.cc " +
837834
"src\\core\\tsi\\ssl_transport_security.cc " +
838835
"src\\core\\tsi\\ssl_transport_security_utils.cc " +
839836
"src\\core\\tsi\\transport_security.cc " +

‎include/grpc/grpc_audit_logging.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ class AuditLoggerFactory {
7878
virtual ~AuditLoggerFactory() = default;
7979
virtual absl::string_view name() const = 0;
8080

81-
virtual absl::StatusOr<std::shared_ptr<const Config>> ParseAuditLoggerConfig(
81+
virtual absl::StatusOr<std::unique_ptr<Config>> ParseAuditLoggerConfig(
8282
const Json& json) = 0;
8383

8484
virtual std::unique_ptr<AuditLogger> CreateAuditLogger(
85-
std::shared_ptr<const Config> config) = 0;
85+
std::unique_ptr<AuditLoggerFactory::Config>) = 0;
8686
};
8787

8888
// Registers an audit logger factory. This should only be called during

‎include/grpc/grpc_security_constants.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ typedef enum {
155155
GRPC_TLS_GROUP_X25519,
156156
/** X25519_MLKEM768 hybrid key exchange. Post-quantum cryptography. */
157157
GRPC_TLS_GROUP_X25519_MLKEM768,
158-
/** secp384r1 ECDH key exchange. */
159-
GRPC_TLS_GROUP_SECP384R1,
160158
} grpc_tls_key_exchange_group;
161159

162160
#ifdef __cplusplus

‎include/grpc/impl/channel_arg_names.h‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,6 @@
120120
before the request is cancelled */
121121
#define GRPC_ARG_SERVER_MAX_UNREQUESTED_TIME_IN_SERVER_SECONDS \
122122
"grpc.server_max_unrequested_time_in_server"
123-
/** The soft limit on the number of pending requests in the server. Int valued.
124-
* If the number of pending queued requests exceeds this soft limit, then the
125-
* server will start to probabilistically reject new incoming requests up until
126-
* the hard limit. Defaults to 1000.
127-
* Note: It is not recommended to change this value unless the operational
128-
* implications are fully understood.
129-
*/
130-
#define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests"
131-
/** The hard limit on the number of pending requests in the server. Int valued.
132-
* If the number of pending queued requests reaches this hard limit, all new
133-
* incoming requests will be rejected. Defaults to 3000.
134-
* Note: It is not recommended to change this value unless the operational
135-
* implications are fully understood.
136-
*/
137-
#define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \
138-
"grpc.server.max_pending_requests_hard_limit"
139123
/** Channel arg to override the http2 :scheme header. String valued. */
140124
#define GRPC_ARG_HTTP2_SCHEME "grpc.http2_scheme"
141125
/** How many pings can the client send before needing to send a data/header
@@ -457,14 +441,7 @@
457441
/** \} */
458442
/** If non-zero, enable TCP tracing and stats collection. */
459443
#define GRPC_ARG_TCP_TRACING_ENABLED "grpc.tcp_tracing_enabled"
460-
/* Enable tracing full buffer payloads for TCP telemetry. */
461-
#define GRPC_ARG_TCP_TRACE_FULL_BUFFER "grpc.experimental.tcp_trace_full_buffer"
462444
/** Server config fetcher. */
463445
#define GRPC_ARG_SERVER_CONFIG_FETCHER "grpc.server_config_fetcher"
464-
/** Set the maximum size of a security frame that can be received on a HTTP2
465-
* Connection. Check file core/ext/transport/chttp2/transport/frame.cc for
466-
* details on the Security Frame.
467-
*/
468-
#define GRPC_ARG_MAX_SECURITY_FRAME_SIZE "grpc.http2.max_security_frame_size"
469446

470447
#endif /* GRPC_IMPL_CHANNEL_ARG_NAMES_H */

‎package.xml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
<date>2019-09-24</date>
1414
<time>16:06:07</time>
1515
<version>
16-
<release>1.83.2</release>
17-
<api>1.83.2</api>
16+
<release>1.82.3</release>
17+
<api>1.82.3</api>
1818
</version>
1919
<stability>
2020
<release>stable</release>
2121
<api>stable</api>
2222
</stability>
2323
<license>Apache 2.0</license>
2424
<notes>
25-
- gRPC Core 1.83.2 update
25+
- gRPC Core 1.82.3 update
2626
</notes>
2727
<contents>
2828
<dir baseinstalldir="/" name="/">
@@ -218,8 +218,6 @@
218218
<file baseinstalldir="/" name="src/core/config/config_vars_non_generated.cc" role="src" />
219219
<file baseinstalldir="/" name="src/core/config/core_configuration.cc" role="src" />
220220
<file baseinstalldir="/" name="src/core/config/core_configuration.h" role="src" />
221-
<file baseinstalldir="/" name="src/core/config/experiment_env_var.cc" role="src" />
222-
<file baseinstalldir="/" name="src/core/config/experiment_env_var.h" role="src" />
223221
<file baseinstalldir="/" name="src/core/config/load_config.cc" role="src" />
224222
<file baseinstalldir="/" name="src/core/config/load_config.h" role="src" />
225223
<file baseinstalldir="/" name="src/core/credentials/call/call_credentials.h" role="src" />
@@ -309,8 +307,6 @@
309307
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_match.cc" role="src" />
310308
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_provider.cc" role="src" />
311309
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_provider.h" role="src" />
312-
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_selector.cc" role="src" />
313-
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_selector.h" role="src" />
314310
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_verifier.cc" role="src" />
315311
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_certificate_verifier.h" role="src" />
316312
<file baseinstalldir="/" name="src/core/credentials/transport/tls/grpc_tls_credentials_options.cc" role="src" />
@@ -1870,9 +1866,7 @@
18701866
<file baseinstalldir="/" name="src/core/load_balancing/xds/xds_override_host.cc" role="src" />
18711867
<file baseinstalldir="/" name="src/core/load_balancing/xds/xds_override_host.h" role="src" />
18721868
<file baseinstalldir="/" name="src/core/load_balancing/xds/xds_wrr_locality.cc" role="src" />
1873-
<file baseinstalldir="/" name="src/core/mitigation_engine/mitigation.h" role="src" />
18741869
<file baseinstalldir="/" name="src/core/mitigation_engine/mitigation_engine.h" role="src" />
1875-
<file baseinstalldir="/" name="src/core/mitigation_engine/mitigation_provider.h" role="src" />
18761870
<file baseinstalldir="/" name="src/core/net/socket_mutator.cc" role="src" />
18771871
<file baseinstalldir="/" name="src/core/net/socket_mutator.h" role="src" />
18781872
<file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
@@ -2012,8 +2006,6 @@
20122006
<file baseinstalldir="/" name="src/core/tsi/ssl/session_cache/ssl_session_cache.cc" role="src" />
20132007
<file baseinstalldir="/" name="src/core/tsi/ssl/session_cache/ssl_session_cache.h" role="src" />
20142008
<file baseinstalldir="/" name="src/core/tsi/ssl/session_cache/ssl_session_openssl.cc" role="src" />
2015-
<file baseinstalldir="/" name="src/core/tsi/ssl_telemetry_utils.cc" role="src" />
2016-
<file baseinstalldir="/" name="src/core/tsi/ssl_telemetry_utils.h" role="src" />
20172009
<file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.cc" role="src" />
20182010
<file baseinstalldir="/" name="src/core/tsi/ssl_transport_security.h" role="src" />
20192011
<file baseinstalldir="/" name="src/core/tsi/ssl_transport_security_utils.cc" role="src" />

‎src/core/call/call_filters.h‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,11 +1976,7 @@ class CallFilters {
19761976
// Returns a promise that resolves to a StatusFlag indicating success
19771977
StatusFlag PushServerInitialMetadata(ServerMetadataHandle md) {
19781978
push_server_initial_metadata_ = std::move(md);
1979-
auto flag = call_state_.PushServerInitialMetadata();
1980-
if (!IsStatusOk(flag)) {
1981-
push_server_initial_metadata_ = nullptr;
1982-
}
1983-
return flag;
1979+
return call_state_.PushServerInitialMetadata();
19841980
}
19851981
// Client: Fetch server initial metadata
19861982
// Returns a promise that resolves to ValueOrFailure<ServerMetadataHandle>
@@ -2019,13 +2015,7 @@ class CallFilters {
20192015
GRPC_DCHECK_NE(message.get(), nullptr);
20202016
GRPC_DCHECK_EQ(push_client_to_server_message_.get(), nullptr);
20212017
push_client_to_server_message_ = std::move(message);
2022-
return Map([this]() { return call_state_.PollPushClientToServerMessage(); },
2023-
[this](StatusFlag r) {
2024-
if (!IsStatusOk(r)) {
2025-
push_client_to_server_message_ = nullptr;
2026-
}
2027-
return r;
2028-
});
2018+
return [this]() { return call_state_.PollPushClientToServerMessage(); };
20292019
}
20302020
// Client: Indicate that no more messages will be sent
20312021
void FinishClientToServerSends() { call_state_.ClientToServerHalfClose(); }
@@ -2057,13 +2047,7 @@ class CallFilters {
20572047
GRPC_MUST_USE_RESULT auto PushServerToClientMessage(MessageHandle message) {
20582048
call_state_.BeginPushServerToClientMessage();
20592049
push_server_to_client_message_ = std::move(message);
2060-
return Map([this]() { return call_state_.PollPushServerToClientMessage(); },
2061-
[this](StatusFlag r) {
2062-
if (!IsStatusOk(r)) {
2063-
push_server_to_client_message_ = nullptr;
2064-
}
2065-
return r;
2066-
});
2050+
return [this]() { return call_state_.PollPushServerToClientMessage(); };
20672051
}
20682052
// Server: Fetch server to client message
20692053
// Returns a promise that resolves to ServerToClientNextMessage

‎src/core/call/call_spine.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "src/core/lib/promise/pipe.h"
3434
#include "src/core/lib/promise/prioritized_race.h"
3535
#include "src/core/lib/promise/promise.h"
36-
#include "src/core/lib/promise/race.h"
3736
#include "src/core/lib/promise/status_flag.h"
3837
#include "src/core/lib/promise/try_seq.h"
3938
#include "src/core/util/dual_ref_counted.h"
@@ -224,9 +223,10 @@ class CallSpine final : public Party, public channelz::DataSource {
224223
template <typename Promise>
225224
auto UntilCallCompletes(Promise&& promise) {
226225
using Result = PromiseResult<std::decay_t<Promise>>;
227-
return Race(Map(WasCancelled(),
228-
[](bool) { return FailureStatusCast<Result>(Failure{}); }),
229-
std::forward<Promise>(promise));
226+
return PrioritizedRace(std::forward<Promise>(promise),
227+
Map(WasCancelled(), [](bool) {
228+
return FailureStatusCast<Result>(Failure{});
229+
}));
230230
}
231231

232232
template <typename PromiseFactory>

‎src/core/call/client_call.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ void ClientCall::OnReceivedStatus(ServerMetadataHandle server_trailing_metadata,
443443
.value_or(GRPC_STATUS_UNKNOWN);
444444
*out_status = status;
445445
Slice message_slice;
446-
if (status != GRPC_STATUS_OK) {
446+
if (!IsErrorFlattenEnabled() || status != GRPC_STATUS_OK) {
447447
if (Slice* message =
448448
server_trailing_metadata->get_pointer(GrpcMessageMetadata())) {
449449
message_slice = message->Ref();

‎src/core/call/metadata.cc‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,10 @@ ServerMetadataHandle ServerMetadataFromStatus(const absl::Status& status) {
3737
absl::Status ServerMetadataToStatus(ServerMetadata& md) {
3838
const auto grpc_status =
3939
md.get(GrpcStatusMetadata()).value_or(GRPC_STATUS_UNKNOWN);
40-
if (grpc_status == GRPC_STATUS_OK) {
41-
return absl::OkStatus();
42-
}
4340
const auto* error_slice = md.get_pointer(GrpcMessageMetadata());
44-
absl::string_view message = error_slice != nullptr
45-
? error_slice->as_string_view()
46-
: absl::string_view();
4741
return grpc_error_set_int(
48-
absl::Status(static_cast<absl::StatusCode>(grpc_status), message),
42+
absl::Status(static_cast<absl::StatusCode>(grpc_status),
43+
error_slice->as_string_view()),
4944
StatusIntProperty::kRpcStatus, grpc_status);
5045
}
5146

0 commit comments

Comments
 (0)