Skip to content

Split the rest of the //envoy/stats:stats_interface #45971

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

Open
yanavlasov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Split the rest of the //envoy/stats:stats_interface #45971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 36 additions & 7 deletions envoy/stats/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ envoy_cc_library(
":scope_interface",
":stats_interface",
":stats_matcher_interface",
":tag_producer_interface",
"//envoy/common:optref_lib",
"//envoy/common:pure_lib",
"//envoy/event:dispatcher_interface",
Expand All @@ -42,8 +43,8 @@ envoy_cc_library(
name = "scope_interface",
hdrs = ["scope.h"],
deps = [
":histogram_interface",
":refcount_ptr_interface",
":stats_interface",
":stats_matcher_interface",
":tag_interface",
"//envoy/common:pure_lib",
Expand All @@ -59,20 +60,48 @@ envoy_cc_library(
],
)

# TODO(jmarantz): atomize the build rules to match the include files.
envoy_cc_library(
name = "histogram_interface",
hdrs = ["histogram.h"],
deps = [
":refcount_ptr_interface",
":stats_interface",
"//envoy/common:pure_lib",
"@abseil-cpp//absl/strings",
],
)

envoy_cc_library(
name = "tag_extractor_interface",
hdrs = ["tag_extractor.h"],
deps = [
":tag_interface",
"//envoy/common:interval_set_interface",
"//envoy/common:pure_lib",
"@abseil-cpp//absl/strings",
],
)

envoy_cc_library(
name = "tag_producer_interface",
hdrs = ["tag_producer.h"],
deps = [
":tag_interface",
"//envoy/common:pure_lib",
"@abseil-cpp//absl/strings",
],
)

envoy_cc_library(
name = "stats_interface",
hdrs = [
"histogram.h",
"stats.h",
"tag_extractor.h",
"tag_producer.h",
],
deps = [
":refcount_ptr_interface",
":tag_interface",
"//envoy/common:interval_set_interface",
"@abseil-cpp//absl/container:inlined_vector",
"//envoy/common:pure_lib",
"@abseil-cpp//absl/strings",
],
)

Expand Down
4 changes: 4 additions & 0 deletions envoy/stats/histogram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

#include <cstdint>
#include <memory>
#include <optional>
#include <string>
#include <vector>

#include "envoy/common/pure.h"
#include "envoy/stats/refcount_ptr.h"
#include "envoy/stats/stats.h"

#include "absl/strings/string_view.h"

namespace Envoy {
namespace Stats {

Expand Down
3 changes: 1 addition & 2 deletions envoy/stats/tag_extractor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#pragma once

#include <cstddef>
#include <memory>
#include <string>
#include <vector>

#include "envoy/common/interval_set.h"
#include "envoy/common/pure.h"
Expand Down
1 change: 0 additions & 1 deletion envoy/stats/tag_producer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include <memory>
#include <string>
#include <vector>

#include "envoy/common/pure.h"
#include "envoy/stats/tag.h"
Expand Down
5 changes: 3 additions & 2 deletions source/common/stats/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ envoy_cc_library(
srcs = ["tag_extractor_impl.cc"],
hdrs = ["tag_extractor_impl.h"],
deps = [
"//envoy/stats:stats_interface",
"//envoy/stats:tag_extractor_interface",
"//source/common/common:assert_lib",
"//source/common/common:perf_annotation_lib",
"//source/common/common:regex_lib",
Expand All @@ -232,6 +232,7 @@ envoy_cc_library(
":tag_extractor_lib",
":utility_lib",
"//envoy/stats:stats_interface",
"//envoy/stats:tag_extractor_interface",
"//source/common/common:perf_annotation_lib",
"//source/common/config:well_known_names",
"//source/common/protobuf",
Expand Down Expand Up @@ -278,7 +279,7 @@ envoy_cc_library(
hdrs = ["timespan_impl.h"],
deps = [
"//envoy/common:time_interface",
"//envoy/stats:stats_interface",
"//envoy/stats:histogram_interface",
"//envoy/stats:timespan_interface",
"//source/common/common:assert_lib",
],
Expand Down
1 change: 0 additions & 1 deletion source/common/stats/timespan_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "envoy/common/time.h"
#include "envoy/stats/histogram.h"
#include "envoy/stats/stats.h"
#include "envoy/stats/timespan.h"

namespace Envoy {
Expand Down
Loading