More functional tests

marcalff · marcalff · commit b2185eea6416 · 2025-07-19T23:39:37.000+02:00
diff --git a/functional/configuration/main.cc b/functional/configuration/main.cc
@@ -2,13 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <memory>
 #include <string>
 
+// #include <memory>
+
 #include "opentelemetry/exporters/ostream/console_log_record_builder.h"
 #include "opentelemetry/exporters/ostream/console_push_metric_builder.h"
 #include "opentelemetry/exporters/ostream/console_span_builder.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/configuration/configuration.h"
 #include "opentelemetry/sdk/configuration/configured_sdk.h"
@@ -180,7 +184,7 @@ void InitOtel(const std::string &config_file)
 
   sdk = opentelemetry::sdk::configuration::ConfiguredSdk::Create(registry, model);
 
-  if (model != nullptr)
+  if (sdk != nullptr)
   {
     fprintf(stdout, "SDK CREATED\n");
   }
diff --git a/functional/configuration/shelltests/propagator_broken.test b/functional/configuration/shelltests/propagator_broken.test
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_broken.yaml
+>
+[ERROR] [Yaml Configuration Parser] Parse failed with exception: Illegal composite child 2, properties count: 3
+FAILED TO PARSE MODEL
+>= 1
diff --git a/functional/configuration/shelltests/propagator_broken.yaml b/functional/configuration/shelltests/propagator_broken.yaml
@@ -0,0 +1,13 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    # This is ok (child 1)
+    - tracecontext:
+    # This is broken (child 2)
+    - tracecontext:
+      foo:
+      bar:
diff --git a/functional/configuration/shelltests/propagator_multi.test b/functional/configuration/shelltests/propagator_multi.test
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_multi.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0
diff --git a/functional/configuration/shelltests/propagator_multi.yaml b/functional/configuration/shelltests/propagator_multi.yaml
@@ -0,0 +1,11 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    - tracecontext:
+    - baggage:
+    - b3:
+    - b3multi:
diff --git a/functional/configuration/shelltests/propagator_ottrace.test b/functional/configuration/shelltests/propagator_ottrace.test
@@ -0,0 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_ottrace.yaml
+>
+MODEL PARSED
+[ERROR] [Configured Sdk] builder failed with exception: CreateTextMapPropagator() no builder for ottrace
+FAILED TO CREATE SDK
+>= 2
diff --git a/functional/configuration/shelltests/propagator_ottrace.yaml b/functional/configuration/shelltests/propagator_ottrace.yaml
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    - ottrace:
diff --git a/functional/configuration/shelltests/propagator_single.test b/functional/configuration/shelltests/propagator_single.test
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_single.yaml
+>
+MODEL PARSED
+SDK CREATED
+>= 0
diff --git a/functional/configuration/shelltests/propagator_single.yaml b/functional/configuration/shelltests/propagator_single.yaml
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    - tracecontext:
diff --git a/functional/configuration/shelltests/propagator_unknown.test b/functional/configuration/shelltests/propagator_unknown.test
@@ -0,0 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_unknown.yaml
+>
+MODEL PARSED
+[ERROR] [Configured Sdk] builder failed with exception: CreateTextMapPropagator() no builder for never_hear_of_this_one
+FAILED TO CREATE SDK
+>= 2
diff --git a/functional/configuration/shelltests/propagator_unknown.yaml b/functional/configuration/shelltests/propagator_unknown.yaml
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    - never_hear_of_this_one:
diff --git a/functional/configuration/shelltests/propagator_xray.test b/functional/configuration/shelltests/propagator_xray.test
@@ -0,0 +1,9 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+$ otel_configuration_check --yaml shelltests/propagator_xray.yaml
+>
+MODEL PARSED
+[ERROR] [Configured Sdk] builder failed with exception: CreateTextMapPropagator() no builder for xray
+FAILED TO CREATE SDK
+>= 2
diff --git a/functional/configuration/shelltests/propagator_xray.yaml b/functional/configuration/shelltests/propagator_xray.yaml
@@ -0,0 +1,8 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+file_format: 0.0
+
+propagator:
+  composite:
+    - xray:
diff --git a/sdk/include/opentelemetry/sdk/configuration/propagator_configuration.h b/sdk/include/opentelemetry/sdk/configuration/propagator_configuration.h
@@ -20,6 +20,7 @@ class PropagatorConfiguration
 {
 public:
   std::vector<std::string> composite;
+  std::string composite_list;
 };
 
 }  // namespace configuration
diff --git a/sdk/src/configuration/configuration_parser.cc b/sdk/src/configuration/configuration_parser.cc
@@ -1032,16 +1032,37 @@ static std::unique_ptr<PropagatorConfiguration> ParsePropagatorConfiguration(
 
   std::unique_ptr<DocumentNode> child;
   child = node->GetRequiredChildNode("composite");
+  std::string name;
+  int num_child = 0;
 
   for (auto it = child->begin(); it != child->end(); ++it)
   {
+    // This is an entry in the composite array
     std::unique_ptr<DocumentNode> element(*it);
+    num_child++;
+    int count = 0;
+
+    // Find out its name, we expect an object with a unique property.
+    for (auto it2 = element->begin_properties(); it2 != element->end_properties(); ++it2)
+    {
+      name = it2.Name();
+      count++;
+    }
 
-    std::string name = element->AsString();
+    if (count != 1)
+    {
+      std::string message("Illegal composite child ");
+      message.append(std::to_string(num_child));
+      message.append(", properties count: ");
+      message.append(std::to_string(count));
+      throw InvalidSchemaException(message);
+    }
 
     model->composite.push_back(name);
   }
 
+  model->composite_list = node->GetString("composite_list", "");
+
   return model;
 }
 
diff --git a/sdk/src/configuration/sdk_builder.cc b/sdk/src/configuration/sdk_builder.cc
