-
Notifications
You must be signed in to change notification settings - Fork 500
[CONFIGURATION] File configuration - misc model #3504
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
59d6a3b
[CONFIGURATION] File configuration - misc model
marcalff 6efd4e5
Merge branch 'main' into merge_config_misc_model
marcalff a20b0b9
Refresh code from PR #2518, to fix review comments.
marcalff 3916a60
Code review comments, enum naming
marcalff 4245bf9
Merge branch 'main' into merge_config_misc_model
marcalff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
sdk/include/opentelemetry/sdk/configuration/attribute_limits_configuration.h
This file contains hidden or 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,27 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <cstddef> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/opentelemetry_configuration.json | ||
// YAML-NODE: AttributeLimits | ||
class AttributeLimitsConfiguration | ||
{ | ||
public: | ||
std::size_t attribute_value_length_limit; | ||
std::size_t attribute_count_limit; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
28 changes: 28 additions & 0 deletions
28
sdk/include/opentelemetry/sdk/configuration/attributes_configuration.h
This file contains hidden or 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,28 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <map> | ||
#include <string> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/resource.json | ||
// YAML-NODE: AttributeNameValue | ||
// FIXME: Name/Value/Type | ||
class AttributesConfiguration | ||
{ | ||
public: | ||
std::map<std::string, std::string> kv_map; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
29 changes: 29 additions & 0 deletions
29
sdk/include/opentelemetry/sdk/configuration/detectors_configuration.h
This file contains hidden or 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,29 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <map> | ||
marcalff marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
#include <memory> | ||
|
||
#include "opentelemetry/sdk/configuration/string_array_configuration.h" | ||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/resource.json | ||
// YAML-NODE: Detectors | ||
class DetectorsConfiguration | ||
{ | ||
public: | ||
std::unique_ptr<StringArrayConfiguration> included; | ||
std::unique_ptr<StringArrayConfiguration> excluded; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
25 changes: 25 additions & 0 deletions
25
sdk/include/opentelemetry/sdk/configuration/headers_configuration.h
This file contains hidden or 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 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <map> | ||
#include <string> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
class HeadersConfiguration | ||
{ | ||
public: | ||
std::map<std::string, std::string> kv_map; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
24 changes: 24 additions & 0 deletions
24
sdk/include/opentelemetry/sdk/configuration/otlp_http_encoding.h
This file contains hidden or 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,24 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <cstdint> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
enum enum_otlp_http_encoding : std::uint8_t | ||
marcalff marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
{ | ||
protobuf, | ||
json | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
27 changes: 27 additions & 0 deletions
27
sdk/include/opentelemetry/sdk/configuration/propagator_configuration.h
This file contains hidden or 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,27 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <string> | ||
#include <vector> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/propagator.json | ||
// YAML-NODE: Propagator | ||
class PropagatorConfiguration | ||
{ | ||
public: | ||
std::vector<std::string> composite; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
32 changes: 32 additions & 0 deletions
32
sdk/include/opentelemetry/sdk/configuration/resource_configuration.h
This file contains hidden or 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,32 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <memory> | ||
#include <string> | ||
|
||
#include "opentelemetry/sdk/configuration/attributes_configuration.h" | ||
#include "opentelemetry/sdk/configuration/detectors_configuration.h" | ||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/resource.json | ||
// YAML-NODE: Resource | ||
class ResourceConfiguration | ||
{ | ||
public: | ||
std::unique_ptr<AttributesConfiguration> attributes; | ||
std::unique_ptr<DetectorsConfiguration> detectors; | ||
std::string schema_url; | ||
std::string attributes_list; | ||
marcalff marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
29 changes: 29 additions & 0 deletions
29
sdk/include/opentelemetry/sdk/configuration/string_array_configuration.h
This file contains hidden or 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,29 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
#pragma once | ||
|
||
#include <map> | ||
marcalff marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
#include <string> | ||
#include <vector> | ||
|
||
#include "opentelemetry/version.h" | ||
|
||
OPENTELEMETRY_BEGIN_NAMESPACE | ||
namespace sdk | ||
{ | ||
namespace configuration | ||
{ | ||
|
||
// YAML-SCHEMA: schema/common.json | ||
// YAML-NODE: included | ||
// YAML-NODE: excluded | ||
class StringArrayConfiguration | ||
{ | ||
public: | ||
std::vector<std::string> string_array; | ||
}; | ||
|
||
} // namespace configuration | ||
} // namespace sdk | ||
OPENTELEMETRY_END_NAMESPACE |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.