Skip to content

Commit 6848aa1

Browse files
malkiamalkia
committed
fixes post merge
1 parent 72095a6 commit 6848aa1

File tree

14 files changed

+20
-15
lines changed

14 files changed

+20
-15
lines changed

‎sdk/include/opentelemetry/sdk/configuration/configuration_parser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
#include <memory>
77

8+
#include "opentelemetry/version.h"
89
#include "opentelemetry/sdk/configuration/configuration.h"
910
#include "opentelemetry/sdk/configuration/document_node.h"
10-
#include "opentelemetry/version.h"
1111

1212
OPENTELEMETRY_BEGIN_NAMESPACE
1313
namespace sdk
1414
{
1515
namespace configuration
1616
{
1717

18-
class ConfigurationParser
18+
class OPENTELEMETRY_EXPORT_TYPE ConfigurationParser
1919
{
2020
public:
2121
static std::unique_ptr<Configuration> Parse(std::unique_ptr<Document> doc);

‎sdk/include/opentelemetry/sdk/configuration/ryml_document.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
#include <ryml.hpp>
88
#include <string>
99

10+
#include "opentelemetry/version.h"
1011
#include "opentelemetry/sdk/configuration/document.h"
1112
#include "opentelemetry/sdk/configuration/document_node.h"
12-
#include "opentelemetry/version.h"
1313

1414
OPENTELEMETRY_BEGIN_NAMESPACE
1515
namespace sdk
1616
{
1717
namespace configuration
1818
{
1919

20-
class RymlDocument : public Document
20+
class OPENTELEMETRY_EXPORT_TYPE RymlDocument : public Document
2121
{
2222
public:
2323
static std::unique_ptr<Document> Parse(const std::string &source, const std::string &content);

‎sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
#include <ryml.hpp>
99
#include <string>
1010

11-
#include "opentelemetry/sdk/configuration/document_node.h"
1211
#include "opentelemetry/version.h"
12+
#include "opentelemetry/sdk/configuration/document_node.h"
1313

1414
OPENTELEMETRY_BEGIN_NAMESPACE
1515
namespace sdk
1616
{
1717
namespace configuration
1818
{
1919

20-
class RymlDocumentNode : public DocumentNode
20+
class OPENTELEMETRY_EXPORT_TYPE RymlDocumentNode : public DocumentNode
2121
{
2222
public:
2323
RymlDocumentNode(ryml::ConstNodeRef node, std::size_t depth) : node_(node), depth_(depth) {}
@@ -66,7 +66,7 @@ class RymlDocumentNode : public DocumentNode
6666
std::size_t depth_;
6767
};
6868

69-
class RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
69+
class OPENTELEMETRY_EXPORT_TYPE RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
7070
{
7171
public:
7272
RymlDocumentNodeConstIteratorImpl(ryml::ConstNodeRef parent,
@@ -89,7 +89,7 @@ class RymlDocumentNodeConstIteratorImpl : public DocumentNodeConstIteratorImpl
8989
std::size_t depth_;
9090
};
9191

92-
class RymlPropertiesNodeConstIteratorImpl : public PropertiesNodeConstIteratorImpl
92+
class OPENTELEMETRY_EXPORT_TYPE RymlPropertiesNodeConstIteratorImpl : public PropertiesNodeConstIteratorImpl
9393
{
9494
public:
9595
RymlPropertiesNodeConstIteratorImpl(ryml::ConstNodeRef parent,

‎sdk/include/opentelemetry/sdk/configuration/yaml_configuration_parser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
#include <memory>
77
#include <string>
88

9-
#include "opentelemetry/sdk/configuration/configuration.h"
109
#include "opentelemetry/version.h"
10+
#include "opentelemetry/sdk/configuration/configuration.h"
1111

1212
OPENTELEMETRY_BEGIN_NAMESPACE
1313
namespace sdk
1414
{
1515
namespace configuration
1616
{
1717

18-
class YamlConfigurationParser
18+
class OPENTELEMETRY_EXPORT_TYPE YamlConfigurationParser
1919
{
2020
public:
2121
static std::unique_ptr<Configuration> ParseFile(const std::string &filename);

‎sdk/src/configuration/configuration_parser.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <utility>
1111
#include <vector>
1212

13+
#include "opentelemetry/version.h"
1314
#include "opentelemetry/sdk/common/global_log_handler.h"
1415
#include "opentelemetry/sdk/configuration/aggregation_configuration.h"
1516
#include "opentelemetry/sdk/configuration/always_off_sampler_configuration.h"
@@ -91,7 +92,6 @@
9192
#include "opentelemetry/sdk/configuration/view_selector_configuration.h"
9293
#include "opentelemetry/sdk/configuration/view_stream_configuration.h"
9394
#include "opentelemetry/sdk/configuration/zipkin_span_exporter_configuration.h"
94-
#include "opentelemetry/version.h"
9595

9696
OPENTELEMETRY_BEGIN_NAMESPACE
9797
namespace sdk

‎sdk/src/configuration/document_node.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#include <cstdlib>
66
#include <string>
77

8+
#include "opentelemetry/version.h"
89
#include "opentelemetry/sdk/common/env_variables.h"
910
#include "opentelemetry/sdk/configuration/document_node.h"
1011
#include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
11-
#include "opentelemetry/version.h"
1212

1313
OPENTELEMETRY_BEGIN_NAMESPACE
1414
namespace sdk

‎sdk/src/configuration/ryml_document.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
#include <ryml_std.hpp>
99
#include <string>
1010

11+
#include "opentelemetry/version.h"
1112
#include "opentelemetry/sdk/common/global_log_handler.h"
1213
#include "opentelemetry/sdk/configuration/document.h"
1314
#include "opentelemetry/sdk/configuration/document_node.h"
1415
#include "opentelemetry/sdk/configuration/ryml_document.h"
1516
#include "opentelemetry/sdk/configuration/ryml_document_node.h"
16-
#include "opentelemetry/version.h"
1717

1818
OPENTELEMETRY_BEGIN_NAMESPACE
1919
namespace sdk

‎sdk/src/configuration/ryml_document_node.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#include <string>
99
#include <utility>
1010

11+
#include "opentelemetry/version.h"
1112
#include "opentelemetry/sdk/common/global_log_handler.h"
1213
#include "opentelemetry/sdk/configuration/document_node.h"
1314
#include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
1415
#include "opentelemetry/sdk/configuration/ryml_document_node.h"
15-
#include "opentelemetry/version.h"
1616

1717
// Local debug, do not use in production
1818
// #define WITH_DEBUG_NODE

‎sdk/src/configuration/yaml_configuration_parser.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
#include <string>
99
#include <utility>
1010

11+
#include "opentelemetry/version.h"
1112
#include "opentelemetry/sdk/common/env_variables.h"
1213
#include "opentelemetry/sdk/common/global_log_handler.h"
1314
#include "opentelemetry/sdk/configuration/configuration.h"
1415
#include "opentelemetry/sdk/configuration/configuration_parser.h"
1516
#include "opentelemetry/sdk/configuration/document.h"
1617
#include "opentelemetry/sdk/configuration/ryml_document.h"
1718
#include "opentelemetry/sdk/configuration/yaml_configuration_parser.h"
18-
#include "opentelemetry/version.h"
1919

2020
OPENTELEMETRY_BEGIN_NAMESPACE
2121
namespace sdk

‎sdk/test/configuration/yaml_logs_test.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <string>
88
#include <vector>
99

10+
#include "opentelemetry/version.h"
1011
#include "opentelemetry/sdk/configuration/batch_log_record_processor_configuration.h"
1112
#include "opentelemetry/sdk/configuration/configuration.h"
1213
#include "opentelemetry/sdk/configuration/headers_configuration.h"

0 commit comments

Comments
 (0)