Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions source/extensions/tracers/BUILD

This file was deleted.

2 changes: 0 additions & 2 deletions source/extensions/tracers/datadog/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/datadog/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/tracers/datadog/datadog_tracer_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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();

Expand Down
1 change: 0 additions & 1 deletion source/extensions/tracers/dynamic_ot/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/dynamic_ot/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
#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 {
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,
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/tracers/lightstep/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/lightstep/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/tracers/lightstep/lightstep_tracer_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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();

Expand Down
1 change: 0 additions & 1 deletion source/extensions/tracers/opencensus/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/opencensus/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
34 changes: 0 additions & 34 deletions source/extensions/tracers/well_known_names.h

This file was deleted.

1 change: 0 additions & 1 deletion source/extensions/tracers/xray/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/xray/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
#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 {
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,
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/tracers/zipkin/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand All @@ -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",
],
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/zipkin/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
#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 {
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,
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/tracers/zipkin/zipkin_tracer_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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();

Expand Down
1 change: 0 additions & 1 deletion test/per_file_coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down