open-telemetry · jajanet · Aug 22, 2020 · Aug 22, 2020 · Aug 22, 2020 · Aug 22, 2020
diff --git a/examples/zpages/BUILD b/examples/zpages/BUILD
@@ -24,8 +24,7 @@ cc_binary(
         "//conditions:default": ["-pthread"],
     }),
     deps = [
-        "//ext:headers",
-        "//ext/src/zpages",
+        "//ext/zpages",
         "//sdk/src/trace",
     ],
 )
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -1,5 +1,2 @@
-add_subdirectory(src)
-
-if(BUILD_TESTING)
-  add_subdirectory(test)
-endif()
+add_subdirectory(http)
+add_subdirectory(zpages)
diff --git a/ext/http/CMakeLists.txt b/ext/http/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(server)
diff --git a/ext/BUILD → ext/http/server/BUILD b/ext/BUILD → ext/http/server/BUILD
diff --git a/ext/http/server/CMakeLists.txt b/ext/http/server/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(http_server INTERFACE)
+
+target_include_directories(http_server INTERFACE include)
diff --git a/...emetry/ext/http/server/file_http_server.h → ...emetry/ext/http/server/file_http_server.h b/...emetry/ext/http/server/file_http_server.h → ...emetry/ext/http/server/file_http_server.h
diff --git a/...entelemetry/ext/http/server/http_server.h → ...entelemetry/ext/http/server/http_server.h b/...entelemetry/ext/http/server/http_server.h → ...entelemetry/ext/http/server/http_server.h
diff --git a/...ntelemetry/ext/http/server/socket_tools.h → ...ntelemetry/ext/http/server/socket_tools.h b/...ntelemetry/ext/http/server/socket_tools.h → ...ntelemetry/ext/http/server/socket_tools.h
diff --git a/ext/src/CMakeLists.txt b/ext/src/CMakeLists.txt
diff --git a/ext/src/zpages/BUILD b/ext/src/zpages/BUILD
diff --git a/ext/src/zpages/CMakeLists.txt b/ext/src/zpages/CMakeLists.txt
diff --git a/ext/src/zpages/README.md b/ext/src/zpages/README.md
diff --git a/ext/test/CMakeLists.txt b/ext/test/CMakeLists.txt
diff --git a/ext/zpages/BUILD b/ext/zpages/BUILD
@@ -0,0 +1,14 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "zpages",
+    srcs = glob(["src/**/*.cc"]),
+    hdrs = glob(["include/**/*.h"]),
+    strip_include_prefix = "include",
+    deps = [
+        "//api",
+        "//ext/http/server:headers",
+        "//sdk:headers",
+        "@github_nlohmann_json//:json",
+    ],
+)
diff --git a/ext/zpages/CMakeLists.txt b/ext/zpages/CMakeLists.txt
@@ -0,0 +1,14 @@
+add_library(
+  opentelemetry_zpages src/tracez_processor.cc src/tracez_data_aggregator.cc
+  # TODO: add Cmake build for nlohmann JSON
+  # src/tracez_http_server.cc
+)
+
+target_include_directories(opentelemetry_zpages PUBLIC include)
+
+target_link_libraries(opentelemetry_zpages opentelemetry_api
+                      opentelemetry_trace http_server)
+
+if(BUILD_TESTING)
+  add_subdirectory(test)
+endif()
diff --git a/ext/zpages/README.md b/ext/zpages/README.md
@@ -0,0 +1,28 @@
+# zPages
+## Overview
+zPages are a quick and light way to view tracing and metrics information on standard OpenTelemetry C++ instrumented applications. It requires no external dependencies or backend setup. See more information in the OTel zPages experimental [spec](https://github.com/open-telemetry/opentelemetry-specification/blob/5b86d4b6c42e6d1e47d9155ac1e2e27f0f0b7769/experimental/trace/zpages.md). OTel C++ currently only offers Tracez; future zPages to potentially add include TraceConfigz, RPCz, and Statsz. Events and links need to be added to Tracez.
+
+# Usage
+> TODO: Add CMake instructions
+
+1. Add the following 2 lines of code
+ - `#include opentelemetry/ext/zpages/zpages.h // include zPages`
+ - `zpages::Initialize; // start up zPages in your app, before any tracing/span code`
+2. Build and run your application normally
+ - For example, you can do this for the zPages example while at the root `opentelemetry-cpp` directory with:
+   ```
+   bazel build //examples/zpages:zpages_example
+   bazel-bin/examples/zpages/zpages_example
+   ```
+   If you look at the zPages example's source [code](https://github.com/open-telemetry/opentelemetry-cpp/blob/master/examples/zpages/zpages_example.cc), it demonstrates adding zPages, manual application instrumentation (which sends data to zPages for viewing), and simulated use cases for zPages.
+3. View zPages at http://localhost:3000/tracez
+
+
+## More Information
+- OTel zPages experimental [spec](https://github.com/open-telemetry/opentelemetry-specification/blob/5b86d4b6c42e6d1e47d9155ac1e2e27f0f0b7769/experimental/trace/zpages.md)
+- [zPages General Direction Spec (OTEP)](https://github.com/open-telemetry/oteps/blob/master/text/0110-z-pages.md)
+- OTel C++ Design Docs
+  - [Tracez Span Processor](https://docs.google.com/document/d/1kO4iZARYyr-EGBlY2VNM3ELU3iw6ZrC58Omup_YT-fU/edit#)
+  - [Tracez Data Aggregator](https://docs.google.com/document/d/1ziKFgvhXFfRXZjOlAHQRR-TzcNcTXzg1p2I9oPCEIoU/edit?ts=5ef0d177#heading=h.5irk4csrpu0y)
+  - [Tracez Http Server](https://docs.google.com/document/d/1U1V8QZ5LtGl4Mich-aJ6KZGLHrMIE8pWyspmzvnIefI/edit#) - also includes reference picturesof zPages/Tracez UI
+
diff --git a/...telemetry/ext/zpages/latency_boundaries.h → ...telemetry/ext/zpages/latency_boundaries.h b/...telemetry/ext/zpages/latency_boundaries.h → ...telemetry/ext/zpages/latency_boundaries.h
diff --git a/...elemetry/ext/zpages/static/tracez_index.h → ...elemetry/ext/zpages/static/tracez_index.h b/...elemetry/ext/zpages/static/tracez_index.h → ...elemetry/ext/zpages/static/tracez_index.h
diff --git a/...lemetry/ext/zpages/static/tracez_script.h → ...lemetry/ext/zpages/static/tracez_script.h b/...lemetry/ext/zpages/static/tracez_script.h → ...lemetry/ext/zpages/static/tracez_script.h
diff --git a/...elemetry/ext/zpages/static/tracez_style.h → ...elemetry/ext/zpages/static/tracez_style.h b/...elemetry/ext/zpages/static/tracez_style.h → ...elemetry/ext/zpages/static/tracez_style.h
diff --git a/...lemetry/ext/zpages/threadsafe_span_data.h → ...lemetry/ext/zpages/threadsafe_span_data.h b/...lemetry/ext/zpages/threadsafe_span_data.h → ...lemetry/ext/zpages/threadsafe_span_data.h
diff --git a/...de/opentelemetry/ext/zpages/tracez_data.h → ...de/opentelemetry/ext/zpages/tracez_data.h b/...de/opentelemetry/ext/zpages/tracez_data.h → ...de/opentelemetry/ext/zpages/tracez_data.h
diff --git a/...metry/ext/zpages/tracez_data_aggregator.h → ...metry/ext/zpages/tracez_data_aggregator.h b/...metry/ext/zpages/tracez_data_aggregator.h → ...metry/ext/zpages/tracez_data_aggregator.h
diff --git a/...telemetry/ext/zpages/tracez_http_server.h → ...telemetry/ext/zpages/tracez_http_server.h b/...telemetry/ext/zpages/tracez_http_server.h → ...telemetry/ext/zpages/tracez_http_server.h
diff --git a/...entelemetry/ext/zpages/tracez_processor.h → ...entelemetry/ext/zpages/tracez_processor.h b/...entelemetry/ext/zpages/tracez_processor.h → ...entelemetry/ext/zpages/tracez_processor.h
diff --git a/...include/opentelemetry/ext/zpages/zpages.h → ...include/opentelemetry/ext/zpages/zpages.h b/...include/opentelemetry/ext/zpages/zpages.h → ...include/opentelemetry/ext/zpages/zpages.h
diff --git a/...telemetry/ext/zpages/zpages_http_server.h → ...telemetry/ext/zpages/zpages_http_server.h b/...telemetry/ext/zpages/zpages_http_server.h → ...telemetry/ext/zpages/zpages_http_server.h
diff --git a/ext/src/zpages/tracez_data_aggregator.cc → ext/zpages/src/tracez_data_aggregator.cc b/ext/src/zpages/tracez_data_aggregator.cc → ext/zpages/src/tracez_data_aggregator.cc
diff --git a/ext/src/zpages/tracez_http_server.cc → ext/zpages/src/tracez_http_server.cc b/ext/src/zpages/tracez_http_server.cc → ext/zpages/src/tracez_http_server.cc
diff --git a/ext/src/zpages/tracez_processor.cc → ext/zpages/src/tracez_processor.cc b/ext/src/zpages/tracez_processor.cc → ext/zpages/src/tracez_processor.cc
diff --git a/ext/test/zpages/BUILD → ext/zpages/test/BUILD b/ext/test/zpages/BUILD → ext/zpages/test/BUILD
@@ -4,7 +4,7 @@ cc_test(
         "threadsafe_span_data_test.cc",
     ],
     deps = [
-        "//ext/src/zpages",
+        "//ext/zpages",
         "//sdk/src/trace",
         "@com_google_googletest//:gtest_main",
     ],
@@ -16,7 +16,7 @@ cc_test(
         "tracez_data_aggregator_test.cc",
     ],
     deps = [
-        "//ext/src/zpages",
+        "//ext/zpages",
         "//sdk/src/trace",
         "@com_google_googletest//:gtest_main",
     ],
@@ -28,7 +28,7 @@ cc_test(
         "tracez_processor_test.cc",
     ],
     deps = [
-        "//ext/src/zpages",
+        "//ext/zpages",
         "//sdk/src/trace",
         "@com_google_googletest//:gtest_main",
     ],

diff --git a/ext/test/zpages/CMakeLists.txt → ext/zpages/test/CMakeLists.txt b/ext/test/zpages/CMakeLists.txt → ext/zpages/test/CMakeLists.txt
diff --git a/ext/test/zpages/threadsafe_span_data_test.cc → ext/zpages/test/threadsafe_span_data_test.cc b/ext/test/zpages/threadsafe_span_data_test.cc → ext/zpages/test/threadsafe_span_data_test.cc
diff --git a/...est/zpages/tracez_data_aggregator_test.cc → ...pages/test/tracez_data_aggregator_test.cc b/...est/zpages/tracez_data_aggregator_test.cc → ...pages/test/tracez_data_aggregator_test.cc
diff --git a/ext/test/zpages/tracez_processor_test.cc → ext/zpages/test/tracez_processor_test.cc b/ext/test/zpages/tracez_processor_test.cc → ext/zpages/test/tracez_processor_test.cc