Skip to content

Commit 09ab6dd

Browse files
committed
Merge after ParentBasedSampler fix
1 parent 98010cf commit 09ab6dd

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

functional/configuration/shelltests/kitchen-sink.test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ $ otel_configuration_check --yaml shelltests/kitchen-sink.yaml | egrep -v "(obse
55
>
66
MODEL PARSED
77
[WARNING] attribute_limits not supported, ignoring
8-
[ERROR] CreateTracerProvider: FIXME-CONFIG (IdGenerator)
9-
[ERROR] CreateParentBasedSampler: FIXME-SDK, missing param in parent factory
10-
[ERROR] CreateAttributesProcessor() FIXME-SDK IncludeExclude
8+
[WARNING] IncludeExclude attribute processor not supported, ignoring
119
[WARNING] [Periodic Exporting Metric Reader] Invalid configuration: export_timeout_millis_ should be less than export_interval_millis_, using default values
1210
[WARNING] [Periodic Exporting Metric Reader] Invalid configuration: export_timeout_millis_ should be less than export_interval_millis_, using default values
1311
[WARNING] [Periodic Exporting Metric Reader] Invalid configuration: export_timeout_millis_ should be less than export_interval_millis_, using default values

functional/configuration/shelltests/sampler_jaeger.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ $ otel_configuration_check --yaml shelltests/sampler_jaeger.yaml
55
>
66
[ERROR] JaegerRemoteSamplerConfiguration: FIXME
77
MODEL PARSED
8-
[ERROR] CreateTracerProvider: FIXME-CONFIG (IdGenerator)
98
[ERROR] [Configured Sdk] builder failed with exception: JaegerRemoteSampler not supported
109
FAILED TO CREATE SDK
1110
>= 2

sdk/src/configuration/sdk_builder.cc

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -764,10 +764,19 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> SdkBuilder::CreateParentBase
764764
local_parent_not_sampled_sdk = opentelemetry::sdk::trace::AlwaysOffSamplerFactory::Create();
765765
}
766766

767-
// FIXME-SDK: https://github.com/open-telemetry/opentelemetry-cpp/issues/3545
768-
OTEL_INTERNAL_LOG_ERROR("CreateParentBasedSampler: FIXME-SDK, missing param in parent factory");
769-
std::shared_ptr<opentelemetry::sdk::trace::Sampler> delegate_sampler = std::move(root_sdk);
770-
sdk = opentelemetry::sdk::trace::ParentBasedSamplerFactory::Create(delegate_sampler);
767+
std::shared_ptr<opentelemetry::sdk::trace::Sampler> shared_root = std::move(root_sdk);
768+
std::shared_ptr<opentelemetry::sdk::trace::Sampler> shared_remote_parent_sampled =
769+
std::move(remote_parent_sampled_sdk);
770+
std::shared_ptr<opentelemetry::sdk::trace::Sampler> shared_remote_parent_not_sampled =
771+
std::move(remote_parent_not_sampled_sdk);
772+
std::shared_ptr<opentelemetry::sdk::trace::Sampler> shared_local_parent_sampled =
773+
std::move(local_parent_sampled_sdk);
774+
std::shared_ptr<opentelemetry::sdk::trace::Sampler> shared_local_parent_not_sampled =
775+
std::move(local_parent_not_sampled_sdk);
776+
777+
sdk = opentelemetry::sdk::trace::ParentBasedSamplerFactory::Create(
778+
shared_root, shared_remote_parent_sampled, shared_remote_parent_not_sampled,
779+
shared_local_parent_sampled, shared_local_parent_not_sampled);
771780

772781
return sdk;
773782
}
@@ -1009,7 +1018,7 @@ std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> SdkBuilder::CreateTra
10091018
std::unique_ptr<opentelemetry::sdk::trace::TracerProvider> sdk;
10101019

10111020
// FIXME-CONFIG: https://github.com/open-telemetry/opentelemetry-configuration/issues/70
1012-
OTEL_INTERNAL_LOG_ERROR("CreateTracerProvider: FIXME-CONFIG (IdGenerator)");
1021+
// FIXME-CONFIG: Add support for IdGenerator
10131022

10141023
std::unique_ptr<opentelemetry::sdk::trace::Sampler> sampler;
10151024

@@ -1366,7 +1375,7 @@ SdkBuilder::CreateAttributesProcessor(
13661375

13671376
// FIXME-SDK: https://github.com/open-telemetry/opentelemetry-cpp/issues/3546
13681377
// FIXME-SDK: Need a subclass of AttributesProcessor for IncludeExclude
1369-
OTEL_INTERNAL_LOG_ERROR("CreateAttributesProcessor() FIXME-SDK IncludeExclude");
1378+
OTEL_INTERNAL_LOG_WARN("IncludeExclude attribute processor not supported, ignoring");
13701379

13711380
return sdk;
13721381
}
@@ -1701,7 +1710,7 @@ void SdkBuilder::SetResource(
17011710
{
17021711
// FIXME-SDK: https://github.com/open-telemetry/opentelemetry-cpp/issues/3548
17031712
// FIXME-SDK: Implement resource detectors
1704-
OTEL_INTERNAL_LOG_ERROR("SdkBuilder::SetResource: FIXME-SDK detectors");
1713+
OTEL_INTERNAL_LOG_WARN("resource detectors not supported, ignoring");
17051714
}
17061715

17071716
auto sdk_resource =

0 commit comments

Comments
 (0)