Skip to content

Commit 1863fe7

Browse files
authored
[TEST] Rename w3c_tracecontext_test to w3c_tracecontext_http_test_server (open-telemetry#3132)
1 parent 24a523c commit 1863fe7

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,8 @@ jobs:
946946
CXX_STANDARD: '14'
947947
run: |
948948
./ci/do_ci.sh cmake.w3c.trace-context.build-server
949-
cd $HOME/build/ext/test/w3c_tracecontext_test
950-
./w3c_tracecontext_test &
949+
cd $HOME/build/ext/test/w3c_tracecontext_http_test_server
950+
./w3c_tracecontext_http_test_server &
951951
- name: Checkout w3c/trace-context repo
952952
uses: actions/checkout@v4
953953
with:

ext/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
add_subdirectory(http)
55
if(BUILD_W3CTRACECONTEXT_TEST)
6-
add_subdirectory(w3c_tracecontext_test)
6+
add_subdirectory(w3c_tracecontext_http_test_server)
77
endif()

ext/test/w3c_tracecontext_test/BUILD renamed to ext/test/w3c_tracecontext_http_test_server/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
cc_binary(
5-
name = "w3c_tracecontext_test",
5+
name = "w3c_tracecontext_http_test_server",
66
srcs = [
77
"main.cc",
88
],

ext/test/w3c_tracecontext_test/CMakeLists.txt renamed to ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

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

6-
add_executable(w3c_tracecontext_test main.cc)
6+
add_executable(w3c_tracecontext_http_test_server main.cc)
77
target_link_libraries(
8-
w3c_tracecontext_test
8+
w3c_tracecontext_http_test_server
99
PRIVATE ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
1010
opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
1111
${CURL_LIBRARIES} nlohmann_json::nlohmann_json)
1212
if(nlohmann_json_clone)
13-
add_dependencies(w3c_tracecontext_test nlohmann_json::nlohmann_json)
13+
add_dependencies(w3c_tracecontext_http_test_server
14+
nlohmann_json::nlohmann_json)
1415
endif()

ext/test/w3c_tracecontext_test/README.md renamed to ext/test/w3c_tracecontext_http_test_server/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ instructions](https://github.com/w3c/trace-context/tree/master/test#implement-te
1111
1: Build and start the test service endpoint:
1212

1313
```sh
14-
./w3c_tracecontext_test
14+
./w3c_tracecontext_http_test_server
1515

1616
Listening to http://localhost:30000/test
1717
```
1818

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

2121
```sh
22-
./w3c_tracecontext_test 31339
22+
./w3c_tracecontext_http_test_server 31339
2323

2424
Listening to http://localhost:31339/test
2525
```

ext/test/w3c_tracecontext_test/main.cc renamed to ext/test/w3c_tracecontext_http_test_server/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void initTracer()
9898
nostd::shared_ptr<trace_api::Tracer> get_tracer()
9999
{
100100
auto provider = trace_api::Provider::GetTracerProvider();
101-
return provider->GetTracer("w3c_tracecontext_test");
101+
return provider->GetTracer("w3c_tracecontext_http_test_server");
102102
}
103103

104104
struct Uri

0 commit comments

Comments
 (0)