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.

Sign up for GitHub

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

remove recordable header from CMake install rules for exporters #923

Merged
merged 2 commits into from
Jul 26, 2021
Merged

remove recordable header from CMake install rules for exporters #923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5340e0c
remove recordable header from installable
lalitb Jul 25, 2021
adb7308
Merge branch 'main' into remove-recordable-header
lalitb Jul 26, 2021
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
3 changes: 2 additions & 1 deletion exporters/elasticsearch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ install(
DIRECTORY include/opentelemetry/exporters/elasticsearch
DESTINATION include/opentelemetry/exporters/
FILES_MATCHING
PATTERN "*.h")
PATTERN "*.h"
PATTERN "es_log_recordable.h" EXCLUDE)

if(BUILD_TESTING)
add_executable(es_log_exporter_test test/es_log_exporter_test.cc)
Expand Down
3 changes: 2 additions & 1 deletion exporters/jaeger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ install(
DIRECTORY include/opentelemetry/exporters/jaeger
DESTINATION include/opentelemetry/exporters/
FILES_MATCHING
PATTERN "*.h")
PATTERN "*.h"
PATTERN "recordable.h" EXCLUDE)

if(BUILD_TESTING)
add_executable(jaeger_recordable_test test/jaeger_recordable_test.cc)
Expand Down
3 changes: 2 additions & 1 deletion exporters/otlp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ install(
DIRECTORY include/opentelemetry/exporters/otlp
DESTINATION include/opentelemetry/exporters/
FILES_MATCHING
PATTERN "*.h")
PATTERN "*.h"
PATTERN "otlp_recordable.h" EXCLUDE)

if(BUILD_TESTING)
add_executable(otlp_recordable_test test/otlp_recordable_test.cc)
Expand Down
3 changes: 2 additions & 1 deletion exporters/zipkin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ install(
DIRECTORY include/opentelemetry/exporters/zipkin
DESTINATION include/opentelemetry/exporters/
FILES_MATCHING
PATTERN "*.h")
PATTERN "*.h"
PATTERN "recordable.h" EXCLUDE)

if(BUILD_TESTING)
add_executable(zipkin_recordable_test test/zipkin_recordable_test.cc)
Expand Down
6 changes: 0 additions & 6 deletions exporters/zipkin/include/opentelemetry/exporters/zipkin/recordable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ namespace zipkin
{
using ZipkinSpan = nlohmann::json;

enum class TransportFormat
{
kJson,
kProtobuf
};

class Recordable final : public sdk::trace::Recordable
{
public:
Expand Down
7 changes: 6 additions & 1 deletion exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include "opentelemetry/exporters/zipkin/recordable.h"
#include "opentelemetry/ext/http/client/http_client_factory.h"
#include "opentelemetry/ext/http/common/url_parser.h"
#include "opentelemetry/sdk/trace/exporter.h"
Expand Down Expand Up @@ -41,6 +40,12 @@ inline const std::string GetDefaultZipkinEndpoint()
return std::string{endpoint_from_env ? endpoint_from_env : kZipkinEndpointDefault};
}

enum class TransportFormat
{
kJson,
kProtobuf
};

/**
* Struct to hold Zipkin exporter options.
*/
Expand Down