This repository has been archived by the owner on Aug 30, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to OpenTracing 1.5.0; Support build on Windows (#115)
* Fix Build Under Windows ( #112) * Move to OpenTracing 1.5.0 that builds under Windows * Change link of OpenTracing to dynamic. With Static linking of OpenTracing, we end up with multi definition of OT Symbols. This is not acceptable especially for the OT Global Tracer * Fix OS specificities ** Networking API ** Windows headers * Fix some tests with random behavior that failed on Windows * Fix some MSVC specific compilation * Add appveyor build file. * Update Hunter version. Signed-off-by: FR-MUREX-COM\mchaikhadouaihy <[email protected]> * Enable compilation against Windows 8.1 SDK The definition of `inet_ntop` for older Windows SDK versions, such as 8.1, does not declare the `pAddr` argument as `const`. Because of this we need to cast away the constness first. Despite the argument not being declared as const the function should not be touching it, hence this should be safe. Signed-off-by: Fredrik Appelros <[email protected]> * Fix nlohmann_json dependency The `package_deps` list is used to iterate over all dependencies in the package config file and run `find_package` on each of them. This should be using the package name (`nlohmann_json`) and not the target name (`nlohmann_json::nlohmann_json`). Signed-off-by: Fredrik Appelros <[email protected]> * Avoid redefinition of NOMINMAX Only define `NOMINMAX` if it has not already been defined to avoid redefinition warnings. Signed-off-by: Fredrik Appelros <[email protected]> * Add Appveyor badge and debug builds. Signed-off-by: FR-MUREX-COM\mchaikhadouaihy <[email protected]> * Add TODO with the related issues for Tracer.testTracer test. Signed-off-by: FR-MUREX-COM\mchaikhadouaihy <[email protected]>
- Loading branch information
1 parent
a472fba
commit fec4327
Showing
63 changed files
with
799 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| version: '{build}' | ||
|
|
||
| image: Visual Studio 2017 | ||
|
|
||
| init: | ||
| - cmd: git config --global core.autocrlf true | ||
|
|
||
| platform: | ||
| - x64 | ||
|
|
||
| configuration: | ||
| - Debug | ||
|
|
||
| before_build: | ||
| - cmake -H. -Bbuild -A%PLATFORM% -DBUILD_TESTING=ON | ||
|
|
||
| build: | ||
| project: build\jaegertracing.sln | ||
| parallel: true | ||
| verbosity: normal | ||
|
|
||
| test_script: | ||
| - ps: | | ||
| cd build | ||
| ctest -V -C $env:configuration --timeout 600 --output-on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (c) 2019 Uber Technologies, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #ifndef JAEGERTRACING_COMPILERS_H | ||
| #define JAEGERTRACING_COMPILERS_H | ||
|
|
||
| #ifdef _MSC_VER | ||
|
|
||
| #pragma warning(push) | ||
| #pragma warning(disable : 4251) | ||
| #pragma warning(disable : 4275) | ||
|
|
||
| // Define NOMINMAX to inhibit definition of Macros min(a,b) and max(a,b) in | ||
| // windows.h | ||
| #ifndef NOMINMAX | ||
| #define NOMINMAX | ||
| #endif | ||
|
|
||
| #endif // _MSC_VER | ||
|
|
||
| #endif // JAEGERTRACING_COMPILERS_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright (c) 2019 Uber Technologies, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "jaegertracing/thrift-gen/BaggageRestrictionManager.h" | ||
| #include "jaegertracing/thrift-gen/sampling_types.h" | ||
|
|
||
| namespace jaegertracing { | ||
|
|
||
| // trivial constructors of BaggageRestrictionManager thrift generated code are not generated by MSVC | ||
| #ifdef _MSC_VER | ||
|
|
||
| namespace thrift { | ||
|
|
||
| BaggageRestrictionManager_getBaggageRestrictions_args:: | ||
| BaggageRestrictionManager_getBaggageRestrictions_args( | ||
| const BaggageRestrictionManager_getBaggageRestrictions_args& that) | ||
| : serviceName(that.serviceName) | ||
| { | ||
| } | ||
|
|
||
| BaggageRestrictionManager_getBaggageRestrictions_args& | ||
| BaggageRestrictionManager_getBaggageRestrictions_args:: | ||
| operator=(const BaggageRestrictionManager_getBaggageRestrictions_args& that) | ||
| { | ||
| this->serviceName = that.serviceName; | ||
| return *this; | ||
| } | ||
|
|
||
| BaggageRestrictionManager_getBaggageRestrictions_result:: | ||
| BaggageRestrictionManager_getBaggageRestrictions_result( | ||
| const BaggageRestrictionManager_getBaggageRestrictions_result& that) | ||
| : success(that.success) | ||
| , __isset(that.__isset) | ||
| { | ||
| } | ||
| BaggageRestrictionManager_getBaggageRestrictions_result& | ||
| BaggageRestrictionManager_getBaggageRestrictions_result:: | ||
| operator=(const BaggageRestrictionManager_getBaggageRestrictions_result& that) | ||
| { | ||
| this->success = that.success; | ||
| return *this; | ||
| } | ||
|
|
||
| } // namespace thrift | ||
|
|
||
| #endif // MSVC | ||
|
|
||
| namespace sampling_manager { | ||
| namespace thrift { | ||
|
|
||
| const std::map<int, const char*>& samplingStrategyType_VALUES_TO_NAMES() | ||
| { | ||
| return _SamplingStrategyType_VALUES_TO_NAMES; | ||
| } | ||
|
|
||
| } // namespace thrift | ||
| } // namespace sampling_manager | ||
| } // namespace jaegertracing |
Oops, something went wrong.