Skip to content

[pull] main from open-telemetry:main #548

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
merged 1 commit into from
Sep 27, 2025
Merged

[pull] main from open-telemetry:main #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/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
332 changes: 331 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