diff --git a/source/extensions/tracers/opencensus/config.cc b/source/extensions/tracers/opencensus/config.cc index ec0e766e532d..caafc23a28ee 100644 --- a/source/extensions/tracers/opencensus/config.cc +++ b/source/extensions/tracers/opencensus/config.cc @@ -16,7 +16,8 @@ OpenCensusTracerFactory::OpenCensusTracerFactory() : FactoryBase(TracerNames::ge Tracing::HttpTracerPtr OpenCensusTracerFactory::createHttpTracerTyped( const envoy::config::trace::v2::OpenCensusConfig& proto_config, Server::Instance& server) { - Tracing::DriverPtr driver = std::make_unique(proto_config, server.localInfo()); + Tracing::DriverPtr driver = + std::make_unique(proto_config, server.localInfo(), server.api()); return std::make_unique(std::move(driver), server.localInfo()); } diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc index 0a954eedeaf0..b604b9f457a0 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc @@ -235,7 +235,7 @@ void Span::setSampled(bool sampled) { span_.AddAnnotation("setSampled", {{"sampl } // namespace Driver::Driver(const envoy::config::trace::v2::OpenCensusConfig& oc_config, - const LocalInfo::LocalInfo& localinfo) + const LocalInfo::LocalInfo& localinfo, Api::Api& api) : oc_config_(oc_config), local_info_(localinfo) { if (oc_config.has_trace_config()) { applyTraceConfig(oc_config.trace_config()); @@ -264,7 +264,8 @@ Driver::Driver(const envoy::config::trace::v2::OpenCensusConfig& oc_config, sts_options.scope = "https://www.googleapis.com/auth/cloud-platform"; auto call_creds = grpc::experimental::StsCredentials(sts_options); auto ssl_creds_options = grpc::SslCredentialsOptions(); - ssl_creds_options.pem_root_certs = "/etc/ssl/certs/ca-certificates.crt"; + ssl_creds_options.pem_root_certs = + api.fileSystem().fileReadToEnd("/etc/ssl/certs/ca-certificates.crt"); auto channel_creds = grpc::SslCredentials(ssl_creds_options); auto channel = ::grpc::CreateChannel("cloudtrace.googleapis.com", diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h index 1b334e928172..d2aeadbf6b50 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h @@ -1,5 +1,6 @@ #pragma once +#include "envoy/api/api.h" #include "envoy/config/trace/v2/trace.pb.validate.h" #include "envoy/local_info/local_info.h" #include "envoy/tracing/http_tracer.h" @@ -17,7 +18,7 @@ namespace OpenCensus { class Driver : public Tracing::Driver, Logger::Loggable { public: Driver(const envoy::config::trace::v2::OpenCensusConfig& oc_config, - const LocalInfo::LocalInfo& localinfo); + const LocalInfo::LocalInfo& localinfo, Api::Api& api); /** * Implements the abstract Driver's startSpan operation. diff --git a/test/extensions/filters/common/expr/context_test.cc b/test/extensions/filters/common/expr/context_test.cc index 75971170c0de..d982a0918687 100644 --- a/test/extensions/filters/common/expr/context_test.cc +++ b/test/extensions/filters/common/expr/context_test.cc @@ -239,7 +239,6 @@ TEST(Context, ResponseAttributes) { EXPECT_EQ(148, value.value().Int64OrDie()); } - { auto value = empty_response[CelValue::CreateString(TotalSize)]; EXPECT_TRUE(value.has_value());