Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEST] Rename w3c_tracecontext_test to w3c_tracecontext_http_test_server #3132

Merged
merged 6 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ jobs:
CXX_STANDARD: '14'
run: |
./ci/do_ci.sh cmake.w3c.trace-context.build-server
cd $HOME/build/ext/test/w3c_tracecontext_test
./w3c_tracecontext_test &
cd $HOME/build/ext/test/w3c_tracecontext_http_test_server
./w3c_tracecontext_http_test_server &
- name: Checkout w3c/trace-context repo
uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion ext/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

add_subdirectory(http)
if(BUILD_W3CTRACECONTEXT_TEST)
add_subdirectory(w3c_tracecontext_test)
add_subdirectory(w3c_tracecontext_http_test_server)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

cc_binary(
name = "w3c_tracecontext_test",
name = "w3c_tracecontext_http_test_server",
srcs = [
"main.cc",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include)

add_executable(w3c_tracecontext_test main.cc)
add_executable(w3c_tracecontext_http_test_server main.cc)
target_link_libraries(
w3c_tracecontext_test
w3c_tracecontext_http_test_server
PRIVATE ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
${CURL_LIBRARIES} nlohmann_json::nlohmann_json)
if(nlohmann_json_clone)
add_dependencies(w3c_tracecontext_test nlohmann_json::nlohmann_json)
add_dependencies(w3c_tracecontext_http_test_server
nlohmann_json::nlohmann_json)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ instructions](https://github.com/w3c/trace-context/tree/master/test#implement-te
1: Build and start the test service endpoint:

```sh
./w3c_tracecontext_test
./w3c_tracecontext_http_test_server

Listening to http://localhost:30000/test
```

A custom port number for the test service to listen to can be specified:

```sh
./w3c_tracecontext_test 31339
./w3c_tracecontext_http_test_server 31339

Listening to http://localhost:31339/test
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void initTracer()
nostd::shared_ptr<trace_api::Tracer> get_tracer()
{
auto provider = trace_api::Provider::GetTracerProvider();
return provider->GetTracer("w3c_tracecontext_test");
return provider->GetTracer("w3c_tracecontext_http_test_server");
}

struct Uri
Expand Down