Cleanup

Author: marcalff

exporters/otlp/src/otlp_http_span_builder.cc

@@ -5,7 +5,6 @@
 #include <memory>
 #include <string>
 
-#include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_span_builder.h"

sdk/include/opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h

@@ -36,7 +36,7 @@ class OtlpHttpLogRecordExporterConfiguration : public LogRecordExporterConfigura
   std::string headers_list;
   std::string compression;
   size_t timeout{0};
-  enum_otlp_http_encoding encoding;
+  enum_otlp_http_encoding encoding{protobuf};
 };
 
 }  // namespace configuration

sdk/include/opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h

@@ -36,7 +36,7 @@ class OtlpHttpSpanExporterConfiguration : public SpanExporterConfiguration
   std::string headers_list;
   std::string compression;
   size_t timeout{0};
-  enum_otlp_http_encoding encoding;
+  enum_otlp_http_encoding encoding{protobuf};
 };
 
 }  // namespace configuration

sdk/src/configuration/configuration_factory.cc

@@ -1326,21 +1326,74 @@ static std::unique_ptr<AttributesConfiguration> ParseAttributesConfiguration(
 
   OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME");
 
-  // Schema has changed
-#ifdef NEVER
-  for (auto it = node->begin_properties(); it != node->end_properties(); ++it)
+  std::unique_ptr<DocumentNode> attribute_name_value;
+  std::unique_ptr<DocumentNode> name_child;
+  std::unique_ptr<DocumentNode> value_child;
+  std::unique_ptr<DocumentNode> type_child;
+  std::string name;
+  std::string value;
+  std::string type;
+
+  for (auto it = node->begin(); it != node->end(); ++it)
   {
-    std::string name                    = it.Name();
-    std::unique_ptr<DocumentNode> child = it.Value();
-    std::string string_value            = child->AsString();
+    attribute_name_value = *it;
 
-    OTEL_INTERNAL_LOG_DEBUG(
-        "ParseAttributesConfiguration() name = " << name << ", value = " << string_value);
+    name_child  = attribute_name_value->GetRequiredChildNode("name");
+    value_child = attribute_name_value->GetRequiredChildNode("value");
+    type_child  = attribute_name_value->GetChildNode("type");
 
-    std::pair<std::string, std::string> entry(name, string_value);
-    model->kv_map.insert(entry);
+    name  = name_child->AsString();
+    value = value_child->AsString();
+    if (type_child)
+    {
+      type = type_child->AsString();
+    }
+    else
+    {
+      type = "string";
+    }
+
+    if (type == "string")
+    {
+      OTEL_INTERNAL_LOG_DEBUG("ParseAttributesConfiguration() name = " << name
+                                                                       << ", value = " << value);
+      std::pair<std::string, std::string> entry(name, value);
+      model->kv_map.insert(entry);
+    }
+    else if (type == "bool")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: bool");
+    }
+    else if (type == "int")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: int");
+    }
+    else if (type == "double")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: double");
+    }
+    else if (type == "string_array")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: string_array");
+    }
+    else if (type == "bool_array")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: bool_array");
+    }
+    else if (type == "int_array")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: int_array");
+    }
+    else if (type == "double_array")
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: FIXME: double_array");
+    }
+    else
+    {
+      OTEL_INTERNAL_LOG_ERROR("ParseAttributesConfiguration: unknown type " << type);
+      throw InvalidSchemaException("Illegal attribute type");
+    }
   }
-#endif
 
   return model;
 }

sdk/test/configuration/yaml_resource_test.cc

@@ -50,8 +50,9 @@ file_format: xx.yy
   ASSERT_EQ(config->resource->attributes->kv_map.size(), 0);
 }
 
-TEST(YamlResource, some_attributes)
+TEST(YamlResource, some_attributes_0_10)
 {
+  // This is the old 0.10 format, must fail
   std::string yaml = R"(
 file_format: xx.yy
 resource:
@@ -60,6 +61,23 @@ file_format: xx.yy
     bar: "5678"
 )";
 
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(YamlResource, some_attributes_0_30)
+{
+  // This is the new 0.30 format, must pass
+  std::string yaml = R"(
+file_format: xx.yy
+resource:
+  attributes:
+   - name: foo
+     value: "1234"
+   - name: bar
+     value: "5678"
+)";
+
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
   ASSERT_NE(config->resource, nullptr);
@@ -97,8 +115,9 @@ file_format: xx.yy
   ASSERT_EQ(config->resource->attributes_list, "foo=1234,bar=5678");
 }
 
-TEST(YamlResource, both)
+TEST(YamlResource, both_0_10)
 {
+  // This is the old 0.10 format, must fail
   std::string yaml = R"(
 file_format: xx.yy
 resource:
@@ -108,6 +127,24 @@ file_format: xx.yy
   attributes_list: "foo=aaaa,bar=bbbb"
 )";
 
+  auto config = DoParse(yaml);
+  ASSERT_EQ(config, nullptr);
+}
+
+TEST(YamlResource, both_0_30)
+{
+  // This is the new 0.30 format, must pass
+  std::string yaml = R"(
+file_format: xx.yy
+resource:
+  attributes:
+   - name: foo
+     value: "1234"
+   - name: bar
+     value: "5678"
+  attributes_list: "foo=aaaa,bar=bbbb"
+)";
+
   auto config = DoParse(yaml);
   ASSERT_NE(config, nullptr);
   ASSERT_NE(config->resource, nullptr);