Skip to content

Update Envoy to cada1f0 (Jan 23th 2021). #966

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
mum4k merged 2 commits into from
Jan 24, 2023
Merged

Update Envoy to cada1f0 (Jan 23th 2021). #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347991d
Update Envoy to cada1f0 (Jan 23th 2021).
chipmunkie Jan 23, 2023
c294893
Undo format on test/mocks/common/mock_termination_predicate.h.
chipmunkie Jan 24, 2023
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
2 changes: 1 addition & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl

# Docker sandbox
# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b0ff77ae3f25b0bf595f9b8bba46b489723ab446
build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:7304f974de2724617b7492ccb4c9c58cd420353a
build:docker-sandbox --spawn_strategy=docker
build:docker-sandbox --strategy=Javac=docker
build:docker-sandbox --strategy=Closure=docker
Expand Down
4 changes: 2 additions & 2 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

ENVOY_COMMIT = "4fb3eeb1a12b9005133639e96425fef16816c2a4"
ENVOY_SHA = "2709be35255bf1fb9bb4419d1f3eb2d070902805a3c5c2393792335030d511d1"
ENVOY_COMMIT = "cada1f00eee8edcb12392e6d2fd22322a0002419"
ENVOY_SHA = "296aedaed7849e6ea467a72fb221733ab56abb955c5ef6d5d95c0e262f5d9020"

HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
Expand Down
2 changes: 1 addition & 1 deletion source/client/process_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ void ProcessImpl::maybeCreateTracingDriver(const envoy::config::trace::v3::Traci
zipkin_config, *cluster_manager_, store_root_, tls_,
Envoy::Runtime::LoaderSingleton::get(), *local_info_, generator_, time_system_);
http_tracer_ =
std::make_unique<Envoy::Tracing::HttpTracerImpl>(std::move(zipkin_driver), *local_info_);
std::make_unique<Envoy::Tracing::TracerImpl>(std::move(zipkin_driver), *local_info_);
#else
ENVOY_LOG(error, "Not build with any tracing support");
#endif
Expand Down
6 changes: 3 additions & 3 deletions test/benchmark_http_client_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class BenchmarkClientHttpTest : public Test {
dispatcher_(api_->allocateDispatcher("test_thread")),
cluster_manager_(std::make_unique<Envoy::Upstream::MockClusterManager>()),
cluster_info_(std::make_unique<Envoy::Upstream::MockClusterInfo>()),
http_tracer_(std::make_unique<Envoy::Tracing::MockHttpTracer>()), response_code_("200"),
http_tracer_(std::make_unique<Envoy::Tracing::MockTracer>()), response_code_("200"),
statistic_(std::make_unique<StreamingStatistic>(), std::make_unique<StreamingStatistic>(),
std::make_unique<StreamingStatistic>(), std::make_unique<StreamingStatistic>(),
std::make_unique<StreamingStatistic>(), std::make_unique<StreamingStatistic>(),
Expand All @@ -82,9 +82,9 @@ class BenchmarkClientHttpTest : public Test {
EXPECT_CALL(thread_local_cluster_, httpConnPool(_, _, _))
.WillRepeatedly(Return(Envoy::Upstream::HttpPoolData([]() {}, &pool_)));

auto& tracer = static_cast<Envoy::Tracing::MockHttpTracer&>(*http_tracer_);
auto& tracer = static_cast<Envoy::Tracing::MockTracer&>(*http_tracer_);
EXPECT_CALL(tracer, startSpan_(_, _, _, _))
.WillRepeatedly([](const Envoy::Tracing::Config& config, const Envoy::Http::HeaderMap&,
.WillRepeatedly([](const Envoy::Tracing::Config& config, Envoy::Tracing::TraceContext&,
const Envoy::StreamInfo::StreamInfo&,
const Envoy::Tracing::Decision) -> Envoy::Tracing::Span* {
EXPECT_EQ(Envoy::Tracing::OperationName::Egress, config.operationName());
Expand Down
2 changes: 1 addition & 1 deletion test/factories_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FactoriesTest : public Test {
public:
FactoriesTest()
: api_(Envoy::Api::createApiForTest(stats_store_)),
http_tracer_(std::make_unique<Envoy::Tracing::MockHttpTracer>()) {}
http_tracer_(std::make_unique<Envoy::Tracing::MockTracer>()) {}

Envoy::Api::ApiPtr api_;
Envoy::Stats::MockIsolatedStatsStore stats_store_;
Expand Down
8 changes: 4 additions & 4 deletions test/stream_decoder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class StreamDecoderTest : public Test, public StreamDecoderCompletionCallback {
request_headers_(std::make_shared<Envoy::Http::TestRequestHeaderMapImpl>(
std::initializer_list<std::pair<std::string, std::string>>(
{{":method", "GET"}, {":path", "/foo"}}))),
http_tracer_(std::make_unique<Envoy::Tracing::HttpNullTracer>()),
http_tracer_(std::make_unique<Envoy::Tracing::NullTracer>()),
test_header_(std::make_unique<Envoy::Http::TestResponseHeaderMapImpl>(
std::initializer_list<std::pair<std::string, std::string>>({{":status", "200"}}))),
test_trailer_(std::make_unique<Envoy::Http::TestResponseTrailerMapImpl>(
Expand Down Expand Up @@ -130,11 +130,11 @@ TEST_F(StreamDecoderTest, LatencyIsNotMeasured) {
}

TEST_F(StreamDecoderTest, LatencyIsMeasured) {
http_tracer_ = std::make_unique<Envoy::Tracing::MockHttpTracer>();
EXPECT_CALL(*dynamic_cast<Envoy::Tracing::MockHttpTracer*>(http_tracer_.get()),
http_tracer_ = std::make_unique<Envoy::Tracing::MockTracer>();
EXPECT_CALL(*dynamic_cast<Envoy::Tracing::MockTracer*>(http_tracer_.get()),
startSpan_(_, _, _, _))
.WillRepeatedly(
Invoke([&](const Envoy::Tracing::Config& config, const Envoy::Http::HeaderMap&,
Invoke([&](const Envoy::Tracing::Config& config, Envoy::Tracing::TraceContext&,
const Envoy::StreamInfo::StreamInfo&,
const Envoy::Tracing::Decision) -> Envoy::Tracing::Span* {
EXPECT_EQ(Envoy::Tracing::OperationName::Egress, config.operationName());
Expand Down