Improve test case, build static lib

Author: Isaac Hier

CMakeLists.txt

@@ -48,16 +48,24 @@ set(srcs
   "src/opentracing-c/tracer.c"
   "src/opentracing-c/tracer.h"
   "src/opentracing-c/value.h")
+
+add_library(opentracingc-static STATIC ${srcs})
+set_target_properties(opentracingc-static PROPERTIES OUTPUT_NAME opentracingc)
+
 add_library(opentracingc SHARED ${srcs})
-target_include_directories(opentracingc PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
-  $<INSTALL_INTERFACE:include>)
-target_compile_options(opentracingc PUBLIC ${flags} ${coverage_flags})
+
+foreach(lib opentracingc opentracingc-static)
+  target_include_directories(${lib} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
+    $<INSTALL_INTERFACE:include>)
+  target_compile_options(${lib} PUBLIC ${flags})
+endforeach()
 
 if(BUILD_TESTING)
+  target_compile_options(opentracingc-static PUBLIC ${coverage_flags})
   add_executable(tracer_test "test/tracer_test.c")
-  target_link_libraries(tracer_test PUBLIC opentracingc)
+  target_link_libraries(tracer_test PUBLIC opentracingc-static)
   add_test(tracer_test tracer_test)
   if(OPENTRACINGC_COVERAGE)
     setup_target_for_coverage(NAME tracer_test_coverage EXECUTABLE tracer_test)

cmake/toolchain.cmake

@@ -1,3 +1,3 @@
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD 90)
-set(CMAKE_C_EXTENSIONS ON)
+set(CMAKE_C_EXTENSIONS OFF)

src/opentracing-c/tracer.c

@@ -205,10 +205,13 @@ opentracing_tracer* opentracing_global_tracer(void)
     return global_tracer;
 }
 
-void opentracing_set_global_tracer(opentracing_tracer* tracer)
+void opentracing_init_global_tracer(opentracing_tracer* tracer)
 {
     assert(tracer != NULL);
     assert(global_tracer != NULL);
+    if (global_tracer == tracer) {
+        return;
+    }
     ((opentracing_destructible*) global_tracer)
         ->destroy((opentracing_destructible*) global_tracer);
     global_tracer = tracer;

test/tracer_test.c

@@ -1,15 +1,39 @@
 #include <assert.h>
 #include <opentracing-c/tracer.h>
+#include <string.h>
 
 int main()
 {
-    opentracing_tracer* tracer = opentracing_global_tracer();
-    opentracing_span* span = tracer->start_span(tracer, "a");
+    opentracing_tracer* tracer;
+    opentracing_span* span;
+    opentracing_span_context* span_context;
+    int return_code;
+    opentracing_value value;
+    tracer = opentracing_global_tracer();
+    span = tracer->start_span(tracer, "a");
     assert(span != NULL);
     assert(span->span_context(span) != NULL);
     assert(span->tracer(span) == tracer);
+    value = (opentracing_value){opentracing_value_bool, {opentracing_true}};
+    assert(span->set_operation_name(span, "b"));
+    assert(span->set_tag(span, "test", &value));
+    assert(span->log_fields(span, NULL, 0));
+    assert(span->set_baggage_item(span, "key", "value"));
+    assert(strlen(span->baggage_item(span, "key")) == 0);
+
     span->finish(span);
     ((opentracing_destructible*) span)
         ->destroy((opentracing_destructible*) span);
+
+    return_code = tracer->extract(
+        tracer, opentracing_propagation_format_binary, NULL, &span_context);
+    assert(return_code == 0);
+    assert(span_context != NULL);
+    return_code = tracer->inject(
+        tracer, opentracing_propagation_format_text_map, NULL, span_context);
+    ((opentracing_destructible*) span_context)
+        ->destroy((opentracing_destructible*) span_context);
+
+    opentracing_init_global_tracer(opentracing_global_tracer());
     return 0;
 }