Skip to content

[CONFIGURATION] File configuration - semantic version #3629

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

Merged
marcalff merged 9 commits into from
Sep 26, 2025
Merged

[CONFIGURATION] File configuration - semantic version #3629

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a139690
[CONFIGURATION] File configuration - semantic version
marcalff Sep 7, 2025
4a37320
Merge branch 'main' into merge_config_semantic_version
ThomsonTan Sep 9, 2025
8b3cae1
Merge branch 'main' into merge_config_semantic_version
marcalff Sep 18, 2025
1621ae5
file format cleanup, only major and minor.
marcalff Sep 18, 2025
e78d9a2
Merge branch 'main' into merge_config_semantic_version
marcalff Sep 22, 2025
683a959
Merge branch 'main' into merge_config_semantic_version
marcalff Sep 23, 2025
73e60c4
Code review comments, make parser methods const.
marcalff Sep 26, 2025
cad19bc
Merge branch 'main' into merge_config_semantic_version
marcalff Sep 26, 2025
0b29e0e
Resolve merge issue
marcalff Sep 26, 2025
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
2 changes: 1 addition & 1 deletion examples/configuration/extensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

# The file format version
file_format: "0.1"
file_format: "1.0"

# Configure if the SDK is disabled or not. This is not required to be provided
# to ensure the SDK isn't disabled, the default value when this is not provided
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/kitchen-sink.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SDK CREATED
severity_text : DEBUG
body : body
resource :
telemetry.sdk.version: 1.22.0
telemetry.sdk.version: 1.23.0-dev
service.version: 1.0.0
double_array_key: [1.1,2.2]
double_key: 1.1
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_both.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_broken.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_composite_list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite_list: "tracecontext,baggage,b3,b3multi"
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_duplicates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_multi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_ottrace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_single.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_unknown.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/propagator_xray.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

propagator:
composite:
Expand Down
2 changes: 1 addition & 1 deletion functional/configuration/shelltests/sampler_jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

file_format: 1.0.0
file_format: "1.0"

tracer_provider:
processors:
Expand Down
331 changes: 330 additions & 1 deletion sdk/include/opentelemetry/sdk/configuration/configuration_parser.h
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include <cstddef>

#include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
#include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
#include "opentelemetry/version.h"
Expand All @@ -25,7 +23,7 @@ class IntegerAttributeValueConfiguration : public AttributeValueConfiguration
visitor->VisitInteger(this);
}

std::size_t value;
long long value;
};

} // namespace configuration
Expand Down
Loading
Loading