Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Increment the:
* [RELEASE] Bump main branch to 1.29.0-dev
[#4259](https://github.com/open-telemetry/opentelemetry-cpp/pull/4259)

* [CONFIGURATION] Programmatic configuration use case tests and fixes
[#4243](https://github.com/open-telemetry/opentelemetry-cpp/pull/4243)

* [API] Add `trace::GetSpanContext()` to read the active span's `SpanContext`
from a `Context` without the `DefaultSpan` allocation that
`GetSpan(context)->GetContext()` incurs, and use it at existing call sites.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class ConfiguredSdk
*/
void UnInstall();

opentelemetry::sdk::common::internal_log::LogLevel log_level;
opentelemetry::sdk::common::internal_log::LogLevel log_level{
opentelemetry::sdk::common::internal_log::LogLevel::Info};
opentelemetry::sdk::resource::Resource resource;
std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator;
Expand Down
35 changes: 25 additions & 10 deletions sdk/src/configuration/sdk_builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "opentelemetry/sdk/configuration/console_span_exporter_configuration.h"
#include "opentelemetry/sdk/configuration/double_array_attribute_value_configuration.h"
#include "opentelemetry/sdk/configuration/double_attribute_value_configuration.h"
#include "opentelemetry/sdk/configuration/exemplar_filter.h"
#include "opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h"
#include "opentelemetry/sdk/configuration/extension_log_record_exporter_builder.h"
#include "opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h"
Expand Down Expand Up @@ -143,7 +144,6 @@
#include "opentelemetry/sdk/logs/processor.h"
#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h"
#include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
#include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_options.h"
Expand Down Expand Up @@ -182,7 +182,7 @@
#include "src/common/wildcard_match.h"

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
# include "opentelemetry/sdk/configuration/exemplar_filter.h"
# include "opentelemetry/sdk/metrics/exemplar/filter_type.h"
#endif

OPENTELEMETRY_BEGIN_NAMESPACE
Expand Down Expand Up @@ -726,7 +726,8 @@ class AggregationConfigBuilder
aggregation_type = opentelemetry::sdk::metrics::AggregationType::kSum;
}

opentelemetry::sdk::metrics::AggregationType aggregation_type;
opentelemetry::sdk::metrics::AggregationType aggregation_type{
opentelemetry::sdk::metrics::AggregationType::kDefault};
std::unique_ptr<opentelemetry::sdk::metrics::AggregationConfig> aggregation_config;

private:
Expand Down Expand Up @@ -855,7 +856,15 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> SdkBuilder::CreateParentBase
std::unique_ptr<opentelemetry::sdk::trace::Sampler> local_parent_sampled_sdk;
std::unique_ptr<opentelemetry::sdk::trace::Sampler> local_parent_not_sampled_sdk;

auto root_sdk = SdkBuilder::CreateSampler(model->root);
std::unique_ptr<opentelemetry::sdk::trace::Sampler> root_sdk;
if (model->root)
{
root_sdk = SdkBuilder::CreateSampler(model->root);
}
else
{
root_sdk = opentelemetry::sdk::trace::AlwaysOnSamplerFactory::Create();
}

if (model->remote_parent_sampled != nullptr)
{
Expand Down Expand Up @@ -1057,11 +1066,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor> SdkBuilder::CreateBatc
opentelemetry::sdk::trace::BatchSpanProcessorOptions options;

options.schedule_delay_millis = std::chrono::milliseconds(model->schedule_delay);

#ifdef LATER
options.xxx = model->export_timeout;
#endif

options.export_timeout = std::chrono::milliseconds(model->export_timeout);
options.max_queue_size = model->max_queue_size;
options.max_export_batch_size = model->max_export_batch_size;

Expand Down Expand Up @@ -1161,6 +1166,12 @@ std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> SdkBuilder::CreateTra
{
sampler = CreateSampler(model->sampler);
}
else
{
// Spec default: parentbased_always_on
sampler = opentelemetry::sdk::trace::ParentBasedSamplerFactory::Create(
opentelemetry::sdk::trace::AlwaysOnSamplerFactory::Create());
}

std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> sdk_processors;

Expand Down Expand Up @@ -1683,7 +1694,10 @@ void SdkBuilder::AddView(

std::shared_ptr<opentelemetry::sdk::metrics::AggregationConfig> sdk_aggregation_config;

sdk_aggregation_config = CreateAggregationConfig(stream->aggregation, sdk_aggregation_type);
if (stream->aggregation)
{
sdk_aggregation_config = CreateAggregationConfig(stream->aggregation, sdk_aggregation_type);
}

std::unique_ptr<opentelemetry::sdk::metrics::AttributesProcessor> sdk_attribute_processor;

Expand Down Expand Up @@ -1890,6 +1904,7 @@ SdkBuilder::CreateBatchLogRecordProcessor(
opentelemetry::sdk::logs::BatchLogRecordProcessorOptions options;

options.schedule_delay_millis = std::chrono::milliseconds(model->schedule_delay);
options.export_timeout_millis = std::chrono::milliseconds(model->export_timeout);
options.max_queue_size = model->max_queue_size;
options.max_export_batch_size = model->max_export_batch_size;

Expand Down
42 changes: 41 additions & 1 deletion sdk/test/configuration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,48 @@ cc_test(
"sdk_builder_test.cc",
],
tags = [
"config",
"test",
],
deps = [
"//sdk:headers",
"//sdk/src/configuration",
"//sdk/src/logs",
"//sdk/src/metrics",
"//sdk/src/resource",
"//sdk/src/trace",
"@com_google_googletest//:gtest_main",
],
)

cc_test(
name = "configured_sdk_test",
srcs = [
"configured_sdk_test.cc",
],
tags = [
"config",
"test",
],
deps = [
"//sdk:headers",
"//sdk/src/configuration",
"//sdk/src/logs",
"//sdk/src/metrics",
"//sdk/src/resource",
"//sdk/src/trace",
"@com_google_googletest//:gtest_main",
],
)

cc_test(
name = "programmatic_configuration_test",
srcs = [
"programmatic_configuration_test.cc",
],
tags = [
"config",
"test",
"yaml",
],
deps = [
"//sdk:headers",
Expand Down
20 changes: 16 additions & 4 deletions sdk/test/configuration/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

foreach(testname sdk_builder_test configured_sdk_test
programmatic_configuration_test)
add_executable(${testname} "${testname}.cc")
target_link_libraries(
${testname} PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_configuration)
gtest_add_tests(
TARGET ${testname}
TEST_PREFIX config.
TEST_LIST ${testname})
endforeach()

foreach(
testname
sdk_builder_test
yaml_logs_test
yaml_metrics_test
yaml_propagator_test
Expand All @@ -12,10 +23,11 @@ foreach(
yaml_trace_test
yaml_distribution_test)
add_executable(${testname} "${testname}.cc")
target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} opentelemetry_configuration)
target_link_libraries(
${testname} PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_configuration)
gtest_add_tests(
TARGET ${testname}
TEST_PREFIX trace.
TEST_PREFIX yaml.
TEST_LIST ${testname})
endforeach()
Loading
Loading