Skip to content

Commit

Permalink
envoy upstream: update ref and report counters as deltas (#828)
Browse files Browse the repository at this point in the history
Description: updates the envoy ref. Brings in the ability to report counters as deltas in the metrics service stats sink envoyproxy/envoy#10889.

Signed-off-by: Jose Nino <jnino@lyft.com>
  • Loading branch information
junr03 authored Apr 28, 2020
1 parent f79f8b5 commit fdb02ab
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion envoy
Submodule envoy updated 90 files
+4 −475 api/envoy/api/v2/auth/cert.proto
+327 −0 api/envoy/api/v2/auth/common.proto
+50 −0 api/envoy/api/v2/auth/secret.proto
+152 −0 api/envoy/api/v2/auth/tls.proto
+1 −1 api/envoy/api/v2/cluster.proto
+1 −1 api/envoy/api/v2/listener/listener_components.proto
+1 −1 api/envoy/config/bootstrap/v2/bootstrap.proto
+1 −1 api/envoy/config/bootstrap/v3/bootstrap.proto
+1 −1 api/envoy/config/bootstrap/v4alpha/bootstrap.proto
+4 −0 api/envoy/config/cluster/v3/cluster.proto
+4 −0 api/envoy/config/cluster/v4alpha/cluster.proto
+33 −1 api/envoy/config/core/v3/health_check.proto
+26 −0 api/envoy/config/core/v3/proxy_protocol.proto
+33 −1 api/envoy/config/core/v4alpha/health_check.proto
+30 −0 api/envoy/config/core/v4alpha/proxy_protocol.proto
+8 −0 api/envoy/config/metrics/v3/metrics_service.proto
+4 −502 api/envoy/extensions/transport_sockets/tls/v3/cert.proto
+334 −0 api/envoy/extensions/transport_sockets/tls/v3/common.proto
+54 −0 api/envoy/extensions/transport_sockets/tls/v3/secret.proto
+161 −0 api/envoy/extensions/transport_sockets/tls/v3/tls.proto
+1 −183 api/envoy/extensions/transport_sockets/tls/v4alpha/common.proto
+57 −0 api/envoy/extensions/transport_sockets/tls/v4alpha/secret.proto
+163 −0 api/envoy/extensions/transport_sockets/tls/v4alpha/tls.proto
+11 −4 bazel/external/quiche.BUILD
+7 −4 ci/do_ci.sh
+3 −0 docs/generate_extension_db.py
+2 −1 docs/root/api-v2/common_messages/common_messages.rst
+1 −0 docs/root/api-v2/config/transport_socket/transport_socket.rst
+1 −0 docs/root/api-v3/common_messages/common_messages.rst
+1 −1 docs/root/intro/arch_overview/http/http.rst
+36 −8 docs/root/intro/arch_overview/http/upgrades.rst
+3 −1 docs/root/version_history/current.rst
+4 −475 generated_api_shadow/envoy/api/v2/auth/cert.proto
+327 −0 generated_api_shadow/envoy/api/v2/auth/common.proto
+50 −0 generated_api_shadow/envoy/api/v2/auth/secret.proto
+152 −0 generated_api_shadow/envoy/api/v2/auth/tls.proto
+1 −1 generated_api_shadow/envoy/api/v2/cluster.proto
+1 −1 generated_api_shadow/envoy/api/v2/listener/listener_components.proto
+1 −1 generated_api_shadow/envoy/config/bootstrap/v2/bootstrap.proto
+1 −1 generated_api_shadow/envoy/config/bootstrap/v3/bootstrap.proto
+1 −1 generated_api_shadow/envoy/config/bootstrap/v4alpha/bootstrap.proto
+5 −1 generated_api_shadow/envoy/config/cluster/v3/cluster.proto
+4 −0 generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto
+39 −7 generated_api_shadow/envoy/config/core/v3/health_check.proto
+26 −0 generated_api_shadow/envoy/config/core/v3/proxy_protocol.proto
+33 −1 generated_api_shadow/envoy/config/core/v4alpha/health_check.proto
+30 −0 generated_api_shadow/envoy/config/core/v4alpha/proxy_protocol.proto
+1 −1 generated_api_shadow/envoy/config/listener/v3/listener_components.proto
+8 −0 generated_api_shadow/envoy/config/metrics/v3/metrics_service.proto
+4 −499 generated_api_shadow/envoy/extensions/transport_sockets/tls/v3/cert.proto
+331 −0 generated_api_shadow/envoy/extensions/transport_sockets/tls/v3/common.proto
+54 −0 generated_api_shadow/envoy/extensions/transport_sockets/tls/v3/secret.proto
+161 −0 generated_api_shadow/envoy/extensions/transport_sockets/tls/v3/tls.proto
+1 −183 generated_api_shadow/envoy/extensions/transport_sockets/tls/v4alpha/common.proto
+57 −0 generated_api_shadow/envoy/extensions/transport_sockets/tls/v4alpha/secret.proto
+163 −0 generated_api_shadow/envoy/extensions/transport_sockets/tls/v4alpha/tls.proto
+4 −3 include/envoy/upstream/upstream.h
+49 −14 source/common/router/router.cc
+6 −0 source/common/router/router.h
+73 −0 source/common/router/upstream_request.cc
+59 −0 source/common/router/upstream_request.h
+1 −1 source/common/secret/sds_api.cc
+16 −1 source/common/upstream/health_checker_base_impl.cc
+6 −0 source/common/upstream/health_checker_base_impl.h
+7 −3 source/common/upstream/health_checker_impl.cc
+9 −3 source/common/upstream/upstream_impl.cc
+5 −6 source/common/upstream/upstream_impl.h
+1 −3 source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc
+1 −1 source/extensions/quic_listeners/quiche/platform/string_utils.cc
+1 −1 source/extensions/quic_listeners/quiche/quic_transport_socket_factory.cc
+3 −1 source/extensions/stat_sinks/metrics_service/config.cc
+13 −6 source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc
+3 −2 source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h
+1 −1 source/extensions/transport_sockets/tls/config.cc
+3 −2 source/server/config_validation/server.cc
+2 −2 source/server/config_validation/server.h
+20 −0 test/common/router/BUILD
+245 −0 test/common/router/upstream_request_test.cc
+1 −1 test/common/stats/stat_merger_fuzz_test.cc
+116 −0 test/common/upstream/health_checker_impl_test.cc
+13 −0 test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc
+24 −24 test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc
+61 −29 test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc
+1 −1 test/extensions/transport_sockets/tls/context_impl_test.cc
+20 −12 test/integration/tcp_tunneling_integration_test.cc
+2 −1 test/mocks/upstream/host.h
+7 −0 test/server/config_validation/BUILD
+77 −5 test/server/config_validation/server_test.cc
+27 −0 test/server/config_validation/test_data/runtime_config.yaml
+2 −0 test/server/filter_chain_benchmark_test.cc
1 change: 1 addition & 0 deletions library/common/config_template.cc
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ stats_flush_interval: {{ stats_flush_interval_seconds }}s
- name: envoy.metrics_service
typed_config:
"@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig
report_counters_as_deltas: true
grpc_service:
envoy_grpc:
cluster_name: stats
Expand Down

0 comments on commit fdb02ab

Please sign in to comment.