Move the client-side collection library to a subdirectory.
Change-Id: I42d89ab5ff28d8ee65588bbdaa993b4128f7c5ea
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e44033..1bacf72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -663,7 +663,7 @@
# Project directories
add_subdirectory(algorithms)
add_subdirectory(analyzer)
-add_subdirectory(client)
+add_subdirectory(client/collection)
add_subdirectory(config)
add_subdirectory(encoder)
add_subdirectory(end_to_end_tests)
diff --git a/client/CMakeLists.txt b/client/collection/CMakeLists.txt
similarity index 100%
rename from client/CMakeLists.txt
rename to client/collection/CMakeLists.txt
diff --git a/client/observation.h b/client/collection/observation.h
similarity index 93%
rename from client/observation.h
rename to client/collection/observation.h
index f6c9011..65cbe15 100644
--- a/client/observation.h
+++ b/client/collection/observation.h
@@ -7,8 +7,8 @@
// correspond to the identically-named protobuf messages found in
// observation.proto.
-#ifndef COBALT_CLIENT_OBSERVATION_H_
-#define COBALT_CLIENT_OBSERVATION_H_
+#ifndef COBALT_CLIENT_COLLECTION_OBSERVATION_H_
+#define COBALT_CLIENT_COLLECTION_OBSERVATION_H_
#include <functional>
#include <string>
@@ -86,4 +86,4 @@
} // namespace client
} // namespace cobalt
-#endif // COBALT_CLIENT_OBSERVATION_H_
+#endif // COBALT_CLIENT_COLLECTION_OBSERVATION_H_
diff --git a/client/observations_collector.cc b/client/collection/observations_collector.cc
similarity index 97%
rename from client/observations_collector.cc
rename to client/collection/observations_collector.cc
index ba7cc64..1caa037 100644
--- a/client/observations_collector.cc
+++ b/client/collection/observations_collector.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "client/observations_collector.h"
+#include "client/collection/observations_collector.h"
namespace cobalt {
namespace client {
diff --git a/client/observations_collector.h b/client/collection/observations_collector.h
similarity index 95%
rename from client/observations_collector.h
rename to client/collection/observations_collector.h
index 0847ee5..5aea1c1 100644
--- a/client/observations_collector.h
+++ b/client/collection/observations_collector.h
@@ -29,8 +29,8 @@
// ...
// }
-#ifndef COBALT_CLIENT_OBSERVATIONS_COLLECTOR_H_
-#define COBALT_CLIENT_OBSERVATIONS_COLLECTOR_H_
+#ifndef COBALT_CLIENT_COLLECTION_OBSERVATIONS_COLLECTOR_H_
+#define COBALT_CLIENT_COLLECTION_OBSERVATIONS_COLLECTOR_H_
#include <atomic>
#include <chrono>
@@ -44,7 +44,7 @@
#include <utility>
#include <vector>
-#include "client/observation.h"
+#include "client/collection/observation.h"
namespace cobalt {
namespace client {
@@ -169,4 +169,4 @@
} // namespace client
} // namespace cobalt
-#endif // COBALT_CLIENT_OBSERVATIONS_COLLECTOR_H_
+#endif // COBALT_CLIENT_COLLECTION_OBSERVATIONS_COLLECTOR_H_
diff --git a/client/observations_collector_test.cc b/client/collection/observations_collector_test.cc
similarity index 97%
rename from client/observations_collector_test.cc
rename to client/collection/observations_collector_test.cc
index a93beea..5d0fc5d 100644
--- a/client/observations_collector_test.cc
+++ b/client/collection/observations_collector_test.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "client/observations_collector.h"
+#include "client/collection/observations_collector.h"
#include "gflags/gflags.h"
#include "glog/logging.h"
