From fa14ff6cfae5b6a3128b5d4e6cc76fa5de9c3672 Mon Sep 17 00:00:00 2001 From: esigo Date: Mon, 20 Dec 2021 20:13:51 +0100 Subject: [PATCH 1/3] ZipkinExporter unit-tests --- exporters/zipkin/BUILD | 14 + exporters/zipkin/CMakeLists.txt | 11 + .../exporters/zipkin/zipkin_exporter.h | 1 + exporters/zipkin/test/zipkin_exporter_test.cc | 257 ++++++++++++++++++ 4 files changed, 283 insertions(+) create mode 100644 exporters/zipkin/test/zipkin_exporter_test.cc diff --git a/exporters/zipkin/BUILD b/exporters/zipkin/BUILD index 2049829d73..6cd52b2d05 100644 --- a/exporters/zipkin/BUILD +++ b/exporters/zipkin/BUILD @@ -48,3 +48,17 @@ cc_test( "@com_google_googletest//:gtest_main", ], ) + +cc_test( + name = "zipkin_exporter_test", + srcs = ["test/zipkin_exporter_test.cc"], + tags = [ + "test", + "zipkin", + ], + deps = [ + ":zipkin_exporter", + ":zipkin_recordable", + "@com_google_googletest//:gtest_main", + ], +) diff --git a/exporters/zipkin/CMakeLists.txt b/exporters/zipkin/CMakeLists.txt index 41efc826cd..6b8dfc5039 100644 --- a/exporters/zipkin/CMakeLists.txt +++ b/exporters/zipkin/CMakeLists.txt @@ -47,4 +47,15 @@ if(BUILD_TESTING) TARGET zipkin_recordable_test TEST_PREFIX exporter. TEST_LIST zipkin_recordable_test) + + add_executable(zipkin_exporter_test test/zipkin_exporter_test.cc) + + target_link_libraries( + zipkin_exporter_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} + opentelemetry_exporter_zipkin_trace opentelemetry_resources) + + gtest_add_tests( + TARGET zipkin_exporter_test + TEST_PREFIX exporter. + TEST_LIST zipkin_exporter_test) endif() # BUILD_TESTING diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h index aba926165f..974b797115 100644 --- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h +++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h @@ -94,6 +94,7 @@ class ZipkinExporter final : public opentelemetry::sdk::trace::SpanExporter std::shared_ptr http_client_; opentelemetry::ext::http::common::UrlParser url_parser_; nlohmann::json local_end_point_; + friend class ZipkinExporterTestPeer; }; } // namespace zipkin } // namespace exporter diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc new file mode 100644 index 0000000000..8f2caa1955 --- /dev/null +++ b/exporters/zipkin/test/zipkin_exporter_test.cc @@ -0,0 +1,257 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +#ifndef HAVE_CPP_STDLIB + +# include "opentelemetry/exporters/zipkin/zipkin_exporter.h" +# include +# include "opentelemetry/ext/http/server/http_server.h" +# include "opentelemetry/sdk/trace/batch_span_processor.h" +# include "opentelemetry/sdk/trace/tracer_provider.h" +# include "opentelemetry/trace/provider.h" + +# include + +# include "nlohmann/json.hpp" + +# if defined(_MSC_VER) +# include "opentelemetry/sdk/common/env_variables.h" +using opentelemetry::sdk::common::setenv; +using opentelemetry::sdk::common::unsetenv; +# endif +using namespace testing; + +OPENTELEMETRY_BEGIN_NAMESPACE +namespace exporter +{ +namespace zipkin +{ + +namespace trace_api = opentelemetry::trace; +namespace resource = opentelemetry::sdk::resource; + +template +static nostd::span MakeSpan(T (&array)[N]) +{ + return nostd::span(array); +} + +class ZipkinExporterTestPeer : public ::testing::Test, HTTP_SERVER_NS::HttpRequestCallback +{ +protected: + HTTP_SERVER_NS::HttpServer server_; + std::string server_address_; + std::atomic is_setup_; + std::atomic is_running_; + std::mutex mtx_requests; + std::condition_variable cv_got_events; + std::vector received_requests_json_; + std::map received_requests_headers_; + +public: + ZipkinExporterTestPeer() : is_setup_(false), is_running_(false){}; + + virtual void SetUp() override + { + if (is_setup_.exchange(true)) + { + return; + } + int port = server_.addListeningPort(14371); + std::ostringstream os; + os << "localhost:" << port; + server_address_ = "http://" + os.str() + "/v1/traces"; + server_.setServerName(os.str()); + server_.setKeepalive(false); + server_.addHandler("/v1/traces", *this); + server_.start(); + is_running_ = true; + } + + virtual void TearDown() override + { + if (!is_setup_.exchange(false)) + return; + server_.stop(); + is_running_ = false; + } + + virtual int onHttpRequest(HTTP_SERVER_NS::HttpRequest const &request, + HTTP_SERVER_NS::HttpResponse &response) override + { + const std::string *request_content_type = nullptr; + { + auto it = request.headers.find("Content-Type"); + if (it != request.headers.end()) + { + request_content_type = &it->second; + } + } + received_requests_headers_ = request.headers; + + int response_status = 0; + std::string kHttpJsonContentType{"application/json"}; + if (request.uri == "/v1/traces") + { + response.headers["Content-Type"] = kHttpJsonContentType; + std::unique_lock lk(mtx_requests); + if (nullptr != request_content_type && *request_content_type == kHttpJsonContentType) + { + auto json = nlohmann::json::parse(request.content, nullptr, false); + response.headers["Content-Type"] = kHttpJsonContentType; + if (json.is_discarded()) + { + response.body = "{\"code\": 400, \"message\": \"Parse json failed\"}"; + response_status = 400; + } + else + { + received_requests_json_.push_back(json); + response.body = "{\"code\": 0, \"message\": \"success\"}"; + } + } + else + { + response.body = "{\"code\": 400, \"message\": \"Unsupported content type\"}"; + response_status = 400; + } + + response_status = 200; + } + else + { + std::unique_lock lk(mtx_requests); + response.headers["Content-Type"] = "text/plain"; + response.body = "404 Not Found"; + response_status = 200; + } + + cv_got_events.notify_one(); + + return response_status; + } + + bool waitForRequests(unsigned timeOutSec, size_t expected_count = 1) + { + std::unique_lock lk(mtx_requests); + if (cv_got_events.wait_for(lk, std::chrono::milliseconds(1000 * timeOutSec), + [&] { return getCurrentRequestCount() >= expected_count; })) + { + return true; + } + return false; + } + + size_t getCurrentRequestCount() const { return received_requests_json_.size(); } + +public: + std::unique_ptr GetExporter() + { + ZipkinExporterOptions opts; + opts.endpoint = server_address_; + opts.headers.insert( + std::make_pair("Custom-Header-Key", "Custom-Header-Value")); + return std::unique_ptr(new ZipkinExporter(opts)); + } + + // Get the options associated with the given exporter. + const ZipkinExporterOptions &GetOptions(std::unique_ptr &exporter) + { + return exporter->options_; + } +}; + +// Create spans, let processor call Export() +TEST_F(ZipkinExporterTestPeer, ExportJsonIntegrationTest) +{ + size_t old_count = getCurrentRequestCount(); + auto exporter = GetExporter(); + + resource::ResourceAttributes resource_attributes = {{"service.name", "unit_test_service"}, + {"tenant.id", "test_user"}}; + resource_attributes["bool_value"] = true; + resource_attributes["int32_value"] = static_cast(1); + resource_attributes["uint32_value"] = static_cast(2); + resource_attributes["int64_value"] = static_cast(0x1100000000LL); + resource_attributes["uint64_value"] = static_cast(0x1200000000ULL); + resource_attributes["double_value"] = static_cast(3.1); + resource_attributes["vec_bool_value"] = std::vector{true, false, true}; + resource_attributes["vec_int32_value"] = std::vector{1, 2}; + resource_attributes["vec_uint32_value"] = std::vector{3, 4}; + resource_attributes["vec_int64_value"] = std::vector{5, 6}; + resource_attributes["vec_uint64_value"] = std::vector{7, 8}; + resource_attributes["vec_double_value"] = std::vector{3.2, 3.3}; + resource_attributes["vec_string_value"] = std::vector{"vector", "string"}; + auto resource = resource::Resource::Create(resource_attributes); + + auto processor_opts = sdk::trace::BatchSpanProcessorOptions(); + processor_opts.max_export_batch_size = 5; + processor_opts.max_queue_size = 5; + processor_opts.schedule_delay_millis = std::chrono::milliseconds(256); + auto processor = std::unique_ptr( + new sdk::trace::BatchSpanProcessor(std::move(exporter), processor_opts)); + auto provider = nostd::shared_ptr( + new sdk::trace::TracerProvider(std::move(processor), resource)); + + std::string report_trace_id; + { + char trace_id_hex[2 * trace_api::TraceId::kSize] = {0}; + auto tracer = provider->GetTracer("test"); + auto parent_span = tracer->StartSpan("Test parent span"); + + trace_api::StartSpanOptions child_span_opts = {}; + child_span_opts.parent = parent_span->GetContext(); + + auto child_span = tracer->StartSpan("Test child span", child_span_opts); + child_span->End(); + parent_span->End(); + + nostd::get(child_span_opts.parent) + .trace_id() + .ToLowerBase16(MakeSpan(trace_id_hex)); + report_trace_id.assign(trace_id_hex, sizeof(trace_id_hex)); + } + + ASSERT_TRUE(waitForRequests(8, old_count + 1)); + auto check_json = received_requests_json_.back(); + auto trace_id_kv = check_json.at(0).find("traceId"); + auto received_trace_id = trace_id_kv.value().get(); + EXPECT_EQ(received_trace_id, report_trace_id); + { + auto custom_header = received_requests_headers_.find("Custom-Header-Key"); + ASSERT_TRUE(custom_header != received_requests_headers_.end()); + if (custom_header != received_requests_headers_.end()) + { + EXPECT_EQ("Custom-Header-Value", custom_header->second); + } + } +} + +// Test exporter configuration options +TEST_F(ZipkinExporterTestPeer, ConfigTest) +{ + ZipkinExporterOptions opts; + opts.endpoint = "http://localhost:45455/v1/traces"; + std::unique_ptr exporter(new ZipkinExporter(opts)); + EXPECT_EQ(GetOptions(exporter).endpoint, "http://localhost:45455/v1/traces"); +} + +# ifndef NO_GETENV +// Test exporter configuration options from env +TEST_F(ZipkinExporterTestPeer, ConfigFromEnv) +{ + const std::string endpoint = "http://localhost:9999/v1/traces"; + setenv("OTEL_EXPORTER_ZIPKIN_ENDPOINT", endpoint.c_str(), 1); + + std::unique_ptr exporter(new ZipkinExporter()); + EXPECT_EQ(GetOptions(exporter).endpoint, endpoint); + + unsetenv("OTEL_EXPORTER_ZIPKIN_ENDPOINT"); +} + +# endif // NO_GETENV + +} // namespace zipkin +} // namespace exporter +OPENTELEMETRY_END_NAMESPACE +#endif // HAVE_CPP_STDLIB From af440642adef5ac9d348d566012eb15597bdd3e7 Mon Sep 17 00:00:00 2001 From: esigo Date: Tue, 21 Dec 2021 11:49:08 +0100 Subject: [PATCH 2/3] shutdown test --- exporters/zipkin/CMakeLists.txt | 13 ++++- .../exporters/zipkin/zipkin_exporter.h | 7 +++ exporters/zipkin/src/zipkin_exporter.cc | 8 +++ exporters/zipkin/test/zipkin_exporter_test.cc | 52 +++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/exporters/zipkin/CMakeLists.txt b/exporters/zipkin/CMakeLists.txt index 6b8dfc5039..46a13ac787 100644 --- a/exporters/zipkin/CMakeLists.txt +++ b/exporters/zipkin/CMakeLists.txt @@ -48,11 +48,22 @@ if(BUILD_TESTING) TEST_PREFIX exporter. TEST_LIST zipkin_recordable_test) + if(MSVC) + if(GMOCK_LIB) + unset(GMOCK_LIB CACHE) + endif() + endif() + if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug") + find_library(GMOCK_LIB gmockd PATH_SUFFIXES lib) + else() + find_library(GMOCK_LIB gmock PATH_SUFFIXES lib) + endif() + add_executable(zipkin_exporter_test test/zipkin_exporter_test.cc) target_link_libraries( zipkin_exporter_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} - opentelemetry_exporter_zipkin_trace opentelemetry_resources) + ${GMOCK_LIB} opentelemetry_exporter_zipkin_trace opentelemetry_resources) gtest_add_tests( TARGET zipkin_exporter_test diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h index 974b797115..e9ce429ca7 100644 --- a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h +++ b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h @@ -94,7 +94,14 @@ class ZipkinExporter final : public opentelemetry::sdk::trace::SpanExporter std::shared_ptr http_client_; opentelemetry::ext::http::common::UrlParser url_parser_; nlohmann::json local_end_point_; + // For testing friend class ZipkinExporterTestPeer; + /** + * Create an ZipkinExporter using the specified thrift sender. + * Only tests can call this constructor directly. + * @param http_client the http client to be used for exporting + */ + ZipkinExporter(std::shared_ptr http_client); }; } // namespace zipkin } // namespace exporter diff --git a/exporters/zipkin/src/zipkin_exporter.cc b/exporters/zipkin/src/zipkin_exporter.cc index cbd49a344b..9a047e3a23 100644 --- a/exporters/zipkin/src/zipkin_exporter.cc +++ b/exporters/zipkin/src/zipkin_exporter.cc @@ -30,6 +30,14 @@ ZipkinExporter::ZipkinExporter() : options_(ZipkinExporterOptions()), url_parser InitializeLocalEndpoint(); } +ZipkinExporter::ZipkinExporter( + std::shared_ptr http_client) + : options_(ZipkinExporterOptions()), url_parser_(options_.endpoint) +{ + http_client_ = http_client; + InitializeLocalEndpoint(); +} + // ----------------------------- Exporter methods ------------------------------ std::unique_ptr ZipkinExporter::MakeRecordable() noexcept diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc index 8f2caa1955..fe9820e114 100644 --- a/exporters/zipkin/test/zipkin_exporter_test.cc +++ b/exporters/zipkin/test/zipkin_exporter_test.cc @@ -5,12 +5,14 @@ # include "opentelemetry/exporters/zipkin/zipkin_exporter.h" # include +# include "opentelemetry/ext/http/client/curl/http_client_curl.h" # include "opentelemetry/ext/http/server/http_server.h" # include "opentelemetry/sdk/trace/batch_span_processor.h" # include "opentelemetry/sdk/trace/tracer_provider.h" # include "opentelemetry/trace/provider.h" # include +# include "gmock/gmock.h" # include "nlohmann/json.hpp" @@ -19,6 +21,7 @@ using opentelemetry::sdk::common::setenv; using opentelemetry::sdk::common::unsetenv; # endif +namespace sdk_common = opentelemetry::sdk::common; using namespace testing; OPENTELEMETRY_BEGIN_NAMESPACE @@ -154,6 +157,12 @@ class ZipkinExporterTestPeer : public ::testing::Test, HTTP_SERVER_NS::HttpReque return std::unique_ptr(new ZipkinExporter(opts)); } + std::unique_ptr GetExporter( + std::shared_ptr http_client) + { + return std::unique_ptr(new ZipkinExporter(http_client)); + } + // Get the options associated with the given exporter. const ZipkinExporterOptions &GetOptions(std::unique_ptr &exporter) { @@ -161,6 +170,21 @@ class ZipkinExporterTestPeer : public ::testing::Test, HTTP_SERVER_NS::HttpReque } }; +class MockHttpClient : public opentelemetry::ext::http::client::HttpClientSync +{ +public: + MOCK_METHOD(ext::http::client::Result, + Post, + (const nostd::string_view &, + const ext::http::client::Body &, + const ext::http::client::Headers &), + (noexcept, override)); + MOCK_METHOD(ext::http::client::Result, + Get, + (const nostd::string_view &, const ext::http::client::Headers &), + (noexcept, override)); +}; + // Create spans, let processor call Export() TEST_F(ZipkinExporterTestPeer, ExportJsonIntegrationTest) { @@ -227,6 +251,34 @@ TEST_F(ZipkinExporterTestPeer, ExportJsonIntegrationTest) } } +// Create spans, let processor call Export() +TEST_F(ZipkinExporterTestPeer, ShutdownTest) +{ + auto mock_http_client = new MockHttpClient; + auto exporter = GetExporter( + std::shared_ptr{mock_http_client}); + auto recordable_1 = exporter->MakeRecordable(); + recordable_1->SetName("Test span 1"); + auto recordable_2 = exporter->MakeRecordable(); + recordable_2->SetName("Test span 2"); + + // exporter shuold not be shutdown by default + nostd::span> batch_1(&recordable_1, 1); + EXPECT_CALL(*mock_http_client, Post(_, _, _)) + .Times(Exactly(1)) + .WillOnce(Return(ByMove(std::move(ext::http::client::Result{ + std::unique_ptr{new ext::http::client::curl::Response()}, + ext::http::client::SessionState::Response})))); + auto result = exporter->Export(batch_1); + EXPECT_EQ(sdk_common::ExportResult::kSuccess, result); + + exporter->Shutdown(); + + nostd::span> batch_2(&recordable_2, 1); + result = exporter->Export(batch_2); + EXPECT_EQ(sdk_common::ExportResult::kFailure, result); +} + // Test exporter configuration options TEST_F(ZipkinExporterTestPeer, ConfigTest) { From 1534515efd6db2424dbec1094a5a059c415b0687 Mon Sep 17 00:00:00 2001 From: Oblivion Date: Wed, 5 Jan 2022 18:11:27 +0000 Subject: [PATCH 3/3] fix Windows CI --- exporters/zipkin/test/zipkin_exporter_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc index fe9820e114..27a2130ca3 100644 --- a/exporters/zipkin/test/zipkin_exporter_test.cc +++ b/exporters/zipkin/test/zipkin_exporter_test.cc @@ -3,6 +3,7 @@ #ifndef HAVE_CPP_STDLIB +# define _WINSOCKAPI_ // stops including winsock.h # include "opentelemetry/exporters/zipkin/zipkin_exporter.h" # include # include "opentelemetry/ext/http/client/curl/http_client_curl.h"