diff --git a/source/extensions/tracers/BUILD b/source/extensions/tracers/BUILD deleted file mode 100644 index 06456dbbcb5e7..0000000000000 --- a/source/extensions/tracers/BUILD +++ /dev/null @@ -1,17 +0,0 @@ -load( - "//bazel:envoy_build_system.bzl", - "envoy_cc_library", - "envoy_package", -) - -licenses(["notice"]) # Apache 2 - -envoy_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - deps = [ - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/tracers/datadog/BUILD b/source/extensions/tracers/datadog/BUILD index d09597b5eaf9e..325f4345a7170 100644 --- a/source/extensions/tracers/datadog/BUILD +++ b/source/extensions/tracers/datadog/BUILD @@ -26,7 +26,6 @@ envoy_cc_library( "//source/common/tracing:http_tracer_lib", "//source/common/upstream:cluster_update_tracker_lib", "//source/common/version:version_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common/ot:opentracing_driver_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], @@ -39,7 +38,6 @@ envoy_cc_extension( security_posture = "robust_to_untrusted_downstream", deps = [ ":datadog_tracer_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/datadog/config.cc b/source/extensions/tracers/datadog/config.cc index e03a6d82573ca..1113708d5fde2 100644 --- a/source/extensions/tracers/datadog/config.cc +++ b/source/extensions/tracers/datadog/config.cc @@ -8,7 +8,6 @@ #include "common/tracing/http_tracer_impl.h" #include "extensions/tracers/datadog/datadog_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" #include "datadog/opentracing.h" @@ -17,7 +16,7 @@ namespace Extensions { namespace Tracers { namespace Datadog { -DatadogTracerFactory::DatadogTracerFactory() : FactoryBase(TracerNames::get().Datadog) {} +DatadogTracerFactory::DatadogTracerFactory() : FactoryBase("envoy.tracers.datadog") {} Tracing::HttpTracerSharedPtr DatadogTracerFactory::createHttpTracerTyped( const envoy::config::trace::v3::DatadogConfig& proto_config, diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.cc b/source/extensions/tracers/datadog/datadog_tracer_impl.cc index a2be59579ca8a..3635e490d6599 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.cc +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.cc @@ -11,8 +11,6 @@ #include "common/tracing/http_tracer_impl.h" #include "common/version/version.h" -#include "extensions/tracers/well_known_names.h" - namespace Envoy { namespace Extensions { namespace Tracers { @@ -30,7 +28,7 @@ Driver::Driver(const envoy::config::trace::v3::DatadogConfig& datadog_config, POOL_COUNTER_PREFIX(scope, "tracing.datadog."))}, tls_(tls.allocateSlot()) { - Config::Utility::checkCluster(TracerNames::get().Datadog, datadog_config.collector_cluster(), cm_, + Config::Utility::checkCluster("envoy.tracers.datadog", datadog_config.collector_cluster(), cm_, /* allow_added_via_api */ true); cluster_ = datadog_config.collector_cluster(); diff --git a/source/extensions/tracers/dynamic_ot/BUILD b/source/extensions/tracers/dynamic_ot/BUILD index bd5a269fc1303..eb9cc5ee24c64 100644 --- a/source/extensions/tracers/dynamic_ot/BUILD +++ b/source/extensions/tracers/dynamic_ot/BUILD @@ -32,7 +32,6 @@ envoy_cc_extension( security_posture = "robust_to_untrusted_downstream", deps = [ ":dynamic_opentracing_driver_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/dynamic_ot/config.cc b/source/extensions/tracers/dynamic_ot/config.cc index c9667ac2a5d67..f8ddf4ceeeb5c 100644 --- a/source/extensions/tracers/dynamic_ot/config.cc +++ b/source/extensions/tracers/dynamic_ot/config.cc @@ -8,7 +8,6 @@ #include "common/tracing/http_tracer_impl.h" #include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" -#include "extensions/tracers/well_known_names.h" namespace Envoy { namespace Extensions { @@ -16,7 +15,7 @@ namespace Tracers { namespace DynamicOt { DynamicOpenTracingTracerFactory::DynamicOpenTracingTracerFactory() - : FactoryBase(TracerNames::get().DynamicOt) {} + : FactoryBase("envoy.tracers.dynamic_ot") {} Tracing::HttpTracerSharedPtr DynamicOpenTracingTracerFactory::createHttpTracerTyped( const envoy::config::trace::v3::DynamicOtConfig& proto_config, diff --git a/source/extensions/tracers/lightstep/BUILD b/source/extensions/tracers/lightstep/BUILD index 840162fe4f379..1fb5d0e30171c 100644 --- a/source/extensions/tracers/lightstep/BUILD +++ b/source/extensions/tracers/lightstep/BUILD @@ -26,7 +26,6 @@ envoy_cc_library( "//source/common/stats:symbol_table_lib", "//source/common/tracing:http_tracer_lib", "//source/common/upstream:cluster_update_tracker_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common/ot:opentracing_driver_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], @@ -39,7 +38,6 @@ envoy_cc_extension( security_posture = "robust_to_untrusted_downstream", deps = [ ":lightstep_tracer_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/lightstep/config.cc b/source/extensions/tracers/lightstep/config.cc index 52509819dcaf7..3a636b76dd9ab 100644 --- a/source/extensions/tracers/lightstep/config.cc +++ b/source/extensions/tracers/lightstep/config.cc @@ -8,7 +8,6 @@ #include "common/tracing/http_tracer_impl.h" #include "extensions/tracers/lightstep/lightstep_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" #include "lightstep/tracer.h" @@ -17,7 +16,7 @@ namespace Extensions { namespace Tracers { namespace Lightstep { -LightstepTracerFactory::LightstepTracerFactory() : FactoryBase(TracerNames::get().Lightstep) {} +LightstepTracerFactory::LightstepTracerFactory() : FactoryBase("envoy.tracers.lightstep") {} Tracing::HttpTracerSharedPtr LightstepTracerFactory::createHttpTracerTyped( const envoy::config::trace::v3::LightstepConfig& proto_config, diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc index 9cafe7e8a9fa6..e66a3c3558458 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc @@ -16,8 +16,6 @@ #include "common/http/message_impl.h" #include "common/tracing/http_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" - namespace Envoy { namespace Extensions { namespace Tracers { @@ -198,7 +196,7 @@ LightStepDriver::LightStepDriver(const envoy::config::trace::v3::LightstepConfig pool_.add(lightstep::CollectorServiceFullName()), pool_.add(lightstep::CollectorMethodName())} { - Config::Utility::checkCluster(TracerNames::get().Lightstep, lightstep_config.collector_cluster(), + Config::Utility::checkCluster("envoy.tracers.lightstep", lightstep_config.collector_cluster(), cm_, /* allow_added_via_api */ true); cluster_ = lightstep_config.collector_cluster(); diff --git a/source/extensions/tracers/opencensus/BUILD b/source/extensions/tracers/opencensus/BUILD index eb8ee9cb879ed..3494746500a11 100644 --- a/source/extensions/tracers/opencensus/BUILD +++ b/source/extensions/tracers/opencensus/BUILD @@ -19,7 +19,6 @@ envoy_cc_extension( security_posture = "robust_to_untrusted_downstream", deps = [ ":opencensus_tracer_impl", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/opencensus/config.cc b/source/extensions/tracers/opencensus/config.cc index af778ad04f7cb..24a439a98a650 100644 --- a/source/extensions/tracers/opencensus/config.cc +++ b/source/extensions/tracers/opencensus/config.cc @@ -7,14 +7,13 @@ #include "common/tracing/http_tracer_impl.h" #include "extensions/tracers/opencensus/opencensus_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" namespace Envoy { namespace Extensions { namespace Tracers { namespace OpenCensus { -OpenCensusTracerFactory::OpenCensusTracerFactory() : FactoryBase(TracerNames::get().OpenCensus) {} +OpenCensusTracerFactory::OpenCensusTracerFactory() : FactoryBase("envoy.tracers.opencensus") {} Tracing::HttpTracerSharedPtr OpenCensusTracerFactory::createHttpTracerTyped( const envoy::config::trace::v3::OpenCensusConfig& proto_config, diff --git a/source/extensions/tracers/well_known_names.h b/source/extensions/tracers/well_known_names.h deleted file mode 100644 index 8a83cdf21d02f..0000000000000 --- a/source/extensions/tracers/well_known_names.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace Tracers { - -/** - * Well-known tracer names. - * NOTE: New tracers should use the well known name: envoy.tracers.name. - */ -class TracerNameValues { -public: - // Lightstep tracer - const std::string Lightstep = "envoy.tracers.lightstep"; - // Zipkin tracer - const std::string Zipkin = "envoy.tracers.zipkin"; - // Dynamic tracer - const std::string DynamicOt = "envoy.tracers.dynamic_ot"; - // Datadog tracer - const std::string Datadog = "envoy.tracers.datadog"; - // OpenCensus tracer - const std::string OpenCensus = "envoy.tracers.opencensus"; - // AWS XRay tracer - const std::string XRay = "envoy.tracers.xray"; -}; - -using TracerNames = ConstSingleton; - -} // namespace Tracers -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/tracers/xray/BUILD b/source/extensions/tracers/xray/BUILD index 09fa6ea671914..a186e661eaad2 100644 --- a/source/extensions/tracers/xray/BUILD +++ b/source/extensions/tracers/xray/BUILD @@ -61,7 +61,6 @@ envoy_cc_extension( deps = [ ":xray_lib", "//source/common/config:datasource_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", diff --git a/source/extensions/tracers/xray/config.cc b/source/extensions/tracers/xray/config.cc index ad4bfc0ebcfe0..b9af01f887ad4 100644 --- a/source/extensions/tracers/xray/config.cc +++ b/source/extensions/tracers/xray/config.cc @@ -11,7 +11,6 @@ #include "common/config/datasource.h" #include "common/tracing/http_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" #include "extensions/tracers/xray/xray_tracer_impl.h" namespace Envoy { @@ -19,7 +18,7 @@ namespace Extensions { namespace Tracers { namespace XRay { -XRayTracerFactory::XRayTracerFactory() : FactoryBase(TracerNames::get().XRay) {} +XRayTracerFactory::XRayTracerFactory() : FactoryBase("envoy.tracers.xray") {} Tracing::HttpTracerSharedPtr XRayTracerFactory::createHttpTracerTyped(const envoy::config::trace::v3::XRayConfig& proto_config, diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD index 942d2c3744e2b..ee0328353fa06 100644 --- a/source/extensions/tracers/zipkin/BUILD +++ b/source/extensions/tracers/zipkin/BUILD @@ -58,7 +58,6 @@ envoy_cc_library( "//source/common/singleton:const_singleton", "//source/common/tracing:http_tracer_lib", "//source/common/upstream:cluster_update_tracker_lib", - "//source/extensions/tracers:well_known_names", "@com_github_openzipkin_zipkinapi//:zipkin_cc_proto", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], @@ -71,7 +70,6 @@ envoy_cc_extension( security_posture = "robust_to_untrusted_downstream", deps = [ ":zipkin_lib", - "//source/extensions/tracers:well_known_names", "//source/extensions/tracers/common:factory_base_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], diff --git a/source/extensions/tracers/zipkin/config.cc b/source/extensions/tracers/zipkin/config.cc index 0fca39dd4a310..36d1f38fae8e7 100644 --- a/source/extensions/tracers/zipkin/config.cc +++ b/source/extensions/tracers/zipkin/config.cc @@ -7,7 +7,6 @@ #include "common/common/utility.h" #include "common/tracing/http_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" #include "extensions/tracers/zipkin/zipkin_tracer_impl.h" namespace Envoy { @@ -15,7 +14,7 @@ namespace Extensions { namespace Tracers { namespace Zipkin { -ZipkinTracerFactory::ZipkinTracerFactory() : FactoryBase(TracerNames::get().Zipkin) {} +ZipkinTracerFactory::ZipkinTracerFactory() : FactoryBase("envoy.tracers.zipkin") {} Tracing::HttpTracerSharedPtr ZipkinTracerFactory::createHttpTracerTyped( const envoy::config::trace::v3::ZipkinConfig& proto_config, diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc index 238ffe64bc0ba..a96d91aab5652 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc @@ -11,7 +11,6 @@ #include "common/http/utility.h" #include "common/tracing/http_tracer_impl.h" -#include "extensions/tracers/well_known_names.h" #include "extensions/tracers/zipkin/span_context_extractor.h" #include "extensions/tracers/zipkin/zipkin_core_constants.h" @@ -74,7 +73,7 @@ Driver::Driver(const envoy::config::trace::v3::ZipkinConfig& zipkin_config, POOL_COUNTER_PREFIX(scope, "tracing.zipkin."))}, tls_(tls.allocateSlot()), runtime_(runtime), local_info_(local_info), time_source_(time_source) { - Config::Utility::checkCluster(TracerNames::get().Zipkin, zipkin_config.collector_cluster(), cm_, + Config::Utility::checkCluster("envoy.tracers.zipkin", zipkin_config.collector_cluster(), cm_, /* allow_added_via_api */ true); cluster_ = zipkin_config.collector_cluster(); diff --git a/test/per_file_coverage.sh b/test/per_file_coverage.sh index b71a45f126dfd..76126145cda75 100755 --- a/test/per_file_coverage.sh +++ b/test/per_file_coverage.sh @@ -43,7 +43,6 @@ declare -a KNOWN_LOW_COVERAGE=( "source/extensions/retry:95.5" "source/extensions/retry/host:85.7" "source/extensions/stat_sinks/statsd:85.2" -"source/extensions/tracers:96.3" "source/extensions/tracers/opencensus:91.2" "source/extensions/tracers/xray:95.3" "source/extensions/transport_sockets:94.9"