Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 4b9efcc

Browse files
g-easyg-easy
authored
Move each stats exporter into its own directory. (#48)
1 parent 7d50a11 commit 4b9efcc

File tree

12 files changed

+49
-55
lines changed

12 files changed

+49
-55
lines changed

opencensus/exporters/stats/BUILD renamed to opencensus/exporters/stats/stackdriver/BUILD

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# OpenCensus C++ exporter libraries.
2-
#
31
# Copyright 2018, OpenCensus Authors
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +16,7 @@ load("//opencensus:copts.bzl", "DEFAULT_COPTS", "TEST_COPTS")
1816

1917
licenses(["notice"]) # Apache License 2.0
2018

21-
package(default_visibility = ["//opencensus/exporters/stats:__subpackages__"])
22-
23-
# Public exporter libraries.
19+
package(default_visibility = ["//visibility:private"])
2420

2521
cc_library(
2622
name = "stackdriver_exporter",
@@ -39,20 +35,6 @@ cc_library(
3935
],
4036
)
4137

42-
cc_library(
43-
name = "stdout_exporter",
44-
srcs = ["internal/stdout_exporter.cc"],
45-
hdrs = ["stdout_exporter.h"],
46-
copts = DEFAULT_COPTS,
47-
visibility = ["//visibility:public"],
48-
deps = [
49-
"//opencensus/stats",
50-
"@com_google_absl//absl/memory",
51-
"@com_google_absl//absl/strings",
52-
"@com_google_absl//absl/time",
53-
],
54-
)
55-
5638
# Internal libraries.
5739
# ========================================================================= #
5840

@@ -77,10 +59,10 @@ cc_library(
7759
)
7860

7961
cc_library(
80-
name = "test_utils",
62+
name = "time_series_matcher",
8163
testonly = 1,
82-
srcs = ["internal/testing/time_series_matcher.cc"],
83-
hdrs = ["internal/testing/time_series_matcher.h"],
64+
srcs = ["internal/time_series_matcher.cc"],
65+
hdrs = ["internal/time_series_matcher.h"],
8466
deps = [
8567
"//google/api:distribution",
8668
"//google/api:metric",
@@ -100,7 +82,7 @@ cc_test(
10082
copts = TEST_COPTS,
10183
deps = [
10284
":stackdriver_utils",
103-
":test_utils",
85+
":time_series_matcher",
10486
"//google/api:distribution",
10587
"//google/api:label",
10688
"//google/api:metric",
@@ -112,3 +94,22 @@ cc_test(
11294
"@com_google_googletest//:gtest_main",
11395
],
11496
)
97+
98+
cc_test(
99+
name = "stackdriver_e2e_test",
100+
srcs = ["internal/stackdriver_e2e_test.cc"],
101+
tags = ["manual"],
102+
deps = [
103+
":stackdriver_exporter",
104+
":stackdriver_utils",
105+
":time_series_matcher",
106+
"//google/monitoring/v3:common",
107+
"//google/monitoring/v3:metric",
108+
"//google/monitoring/v3:metric_service",
109+
"//opencensus/stats",
110+
"@com_github_grpc_grpc//:grpc++",
111+
"@com_google_absl//absl/strings",
112+
"@com_google_absl//absl/time",
113+
"@com_google_googletest//:gtest_main",
114+
],
115+
)

opencensus/exporters/stats/e2e/stackdriver_e2e_test.cc renamed to opencensus/exporters/stats/stackdriver/internal/stackdriver_e2e_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "google/protobuf/empty.pb.h"
2626
#include "gtest/gtest.h"
2727
#include "include/grpc++/grpc++.h"
28-
#include "opencensus/exporters/stats/internal/stackdriver_utils.h"
29-
#include "opencensus/exporters/stats/internal/testing/time_series_matcher.h"
30-
#include "opencensus/exporters/stats/stackdriver_exporter.h"
28+
#include "opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.h"
29+
#include "opencensus/exporters/stats/stackdriver/internal/time_series_matcher.h"
30+
#include "opencensus/exporters/stats/stackdriver/stackdriver_exporter.h"
3131
#include "opencensus/stats/stats.h"
3232

3333
namespace opencensus {

opencensus/exporters/stats/internal/stackdriver_exporter.cc renamed to opencensus/exporters/stats/stackdriver/internal/stackdriver_exporter.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "opencensus/exporters/stats/stackdriver_exporter.h"
15+
#include "opencensus/exporters/stats/stackdriver/stackdriver_exporter.h"
1616

1717
#include "absl/strings/str_cat.h"
1818
#include "absl/strings/string_view.h"
1919
#include "absl/synchronization/mutex.h"
2020
#include "google/monitoring/v3/metric_service.grpc.pb.h"
2121
#include "google/protobuf/empty.pb.h"
2222
#include "include/grpc++/grpc++.h"
23-
#include "opencensus/exporters/stats/internal/stackdriver_utils.h"
23+
#include "opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.h"
2424
#include "opencensus/stats/stats.h"
2525

2626
namespace opencensus {

opencensus/exporters/stats/internal/stackdriver_utils.cc renamed to opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "opencensus/exporters/stats/internal/stackdriver_utils.h"
15+
#include "opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.h"
1616

1717
#include <string>
1818

opencensus/exporters/stats/internal/stackdriver_utils.h renamed to opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.h

File renamed without changes.

opencensus/exporters/stats/internal/stackdriver_utils_test.cc renamed to opencensus/exporters/stats/stackdriver/internal/stackdriver_utils_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "opencensus/exporters/stats/internal/stackdriver_utils.h"
15+
#include "opencensus/exporters/stats/stackdriver/internal/stackdriver_utils.h"
1616

1717
#include <string>
1818
#include <vector>
@@ -26,7 +26,7 @@
2626
#include "google/monitoring/v3/common.pb.h"
2727
#include "google/protobuf/timestamp.pb.h"
2828
#include "gtest/gtest.h"
29-
#include "opencensus/exporters/stats/internal/testing/time_series_matcher.h"
29+
#include "opencensus/exporters/stats/stackdriver/internal/time_series_matcher.h"
3030
#include "opencensus/stats/stats.h"
3131
#include "opencensus/stats/testing/test_utils.h"
3232

opencensus/exporters/stats/internal/testing/time_series_matcher.cc renamed to opencensus/exporters/stats/stackdriver/internal/time_series_matcher.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "opencensus/exporters/stats/internal/testing/time_series_matcher.h"
15+
#include "opencensus/exporters/stats/stackdriver/internal/time_series_matcher.h"
1616

1717
#include <cstdint>
1818
#include <map>

opencensus/exporters/stats/internal/testing/time_series_matcher.h renamed to opencensus/exporters/stats/stackdriver/internal/time_series_matcher.h

File renamed without changes.

opencensus/exporters/stats/stackdriver_exporter.h renamed to opencensus/exporters/stats/stackdriver/stackdriver_exporter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_EXPORTER_H_
16-
#define OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_EXPORTER_H_
15+
#ifndef OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_STACKDRIVER_EXPORTER_H_
16+
#define OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_STACKDRIVER_EXPORTER_H_
1717

1818
#include "absl/strings/string_view.h"
1919
#include "opencensus/stats/stats.h"
@@ -53,4 +53,4 @@ class StackdriverExporter : public ::opencensus::stats::StatsExporter::Handler {
5353
} // namespace exporters
5454
} // namespace opencensus
5555

56-
#endif // OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_EXPORTER_H_
56+
#endif // OPENCENSUS_EXPORTERS_STATS_STACKDRIVER_STACKDRIVER_EXPORTER_H_

opencensus/exporters/stats/e2e/BUILD renamed to opencensus/exporters/stats/stdout/BUILD

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# End-to-end tests for stats exporter libraries.
2-
#
31
# Copyright 2018, OpenCensus Authors
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,27 +12,22 @@
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
1614

15+
load("//opencensus:copts.bzl", "DEFAULT_COPTS", "TEST_COPTS")
16+
1717
licenses(["notice"]) # Apache License 2.0
1818

1919
package(default_visibility = ["//visibility:private"])
2020

21-
cc_test(
22-
name = "stackdriver_e2e_test",
23-
srcs = ["stackdriver_e2e_test.cc"],
24-
tags = [
25-
"manual",
26-
],
21+
cc_library(
22+
name = "stdout_exporter",
23+
srcs = ["internal/stdout_exporter.cc"],
24+
hdrs = ["stdout_exporter.h"],
25+
copts = DEFAULT_COPTS,
26+
visibility = ["//visibility:public"],
2727
deps = [
28-
"//google/monitoring/v3:common",
29-
"//google/monitoring/v3:metric",
30-
"//google/monitoring/v3:metric_service",
31-
"//opencensus/exporters/stats:stackdriver_exporter",
32-
"//opencensus/exporters/stats:stackdriver_utils",
33-
"//opencensus/exporters/stats:test_utils",
3428
"//opencensus/stats",
35-
"@com_github_grpc_grpc//:grpc++",
29+
"@com_google_absl//absl/memory",
3630
"@com_google_absl//absl/strings",
3731
"@com_google_absl//absl/time",
38-
"@com_google_googletest//:gtest_main",
3932
],
4033
)

0 commit comments

Comments
 (0)