From b38bc3f2fcf26113bd0c9f84d310ebcbad42a287 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Mon, 10 May 2021 14:53:19 +0530 Subject: [PATCH] fix implicit char * conversion to bool --- exporters/ostream/test/ostream_log_test.cc | 2 +- exporters/ostream/test/ostream_span_test.cc | 8 ++-- sdk/src/resource/resource.cc | 7 +-- sdk/test/resource/resource_test.cc | 48 +++++++++++---------- sdk/test/trace/tracer_test.cc | 4 +- 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/exporters/ostream/test/ostream_log_test.cc b/exporters/ostream/test/ostream_log_test.cc index 9eb77bec12..e8cde135f8 100644 --- a/exporters/ostream/test/ostream_log_test.cc +++ b/exporters/ostream/test/ostream_log_test.cc @@ -150,7 +150,7 @@ TEST(OStreamLogExporter, LogWithStringAttributesToCerr) auto record = exporter->MakeRecordable(); // Set resources for this log record only of type - record->SetResource("key1", "val1"); + record->SetResource("key1", std::string("val1")); // Set attributes to this log record of type record->SetAttribute("a", true); diff --git a/exporters/ostream/test/ostream_span_test.cc b/exporters/ostream/test/ostream_span_test.cc index 6c7a7a1e89..4cbffe5d97 100644 --- a/exporters/ostream/test/ostream_span_test.cc +++ b/exporters/ostream/test/ostream_span_test.cc @@ -141,7 +141,7 @@ TEST(OStreamSpanExporter, PrintSpanWithAttribute) auto recordable = processor->MakeRecordable(); - recordable->SetAttribute("attr1", "string"); + recordable->SetAttribute("attr1", std::string("string")); processor->OnEnd(std::move(recordable)); @@ -218,8 +218,8 @@ TEST(OStreamSpanExporter, PrintSpanWithEvents) std::string next_str = std::to_string(next.time_since_epoch().count()); recordable->AddEvent("hello", now); - recordable->AddEvent("world", next, - common::KeyValueIterableView({{"attr1", "string"}})); + recordable->AddEvent( + "world", next, common::KeyValueIterableView({{"attr1", std::string("string")}})); processor->OnEnd(std::move(recordable)); @@ -292,7 +292,7 @@ TEST(OStreamSpanExporter, PrintSpanWithLinks) recordable->AddLink(span_context); recordable->AddLink(span_context2, - common::KeyValueIterableView({{"attr1", "string"}})); + common::KeyValueIterableView({{"attr1", std::string("string")}})); processor->OnEnd(std::move(recordable)); diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc index 40354b5b5d..0814962ff6 100644 --- a/sdk/src/resource/resource.cc +++ b/sdk/src/resource/resource.cc @@ -50,9 +50,10 @@ Resource &Resource::GetEmpty() Resource &Resource::GetDefault() { - static Resource default_resource({{kTelemetrySdkLanguage, "cpp"}, - {kTelemetrySdkName, "opentelemetry"}, - {kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION}}); + static Resource default_resource( + {{kTelemetrySdkLanguage, std::string("cpp")}, + {kTelemetrySdkName, std::string("opentelemetry")}, + {kTelemetrySdkVersion, std::string(OPENTELEMETRY_SDK_VERSION)}}); return default_resource; } diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc index 1f58ee2f9c..4aea2ba86c 100644 --- a/sdk/test/resource/resource_test.cc +++ b/sdk/test/resource/resource_test.cc @@ -27,16 +27,16 @@ TEST(ResourceTest, create_without_servicename) { opentelemetry::sdk::resource::ResourceAttributes expected_attributes = { - {"service", "backend"}, + {"service", std::string("backend")}, {"version", (uint32_t)1}, {"cost", 234.23}, - {"telemetry.sdk.language", "cpp"}, - {"telemetry.sdk.name", "opentelemetry"}, - {"telemetry.sdk.version", OPENTELEMETRY_SDK_VERSION}, - {"service.name", "unknown_service"}}; + {"telemetry.sdk.language", std::string("cpp")}, + {"telemetry.sdk.name", std::string("opentelemetry")}, + {"telemetry.sdk.version", std::string(OPENTELEMETRY_SDK_VERSION)}, + {"service.name", std::string("unknown_service")}}; opentelemetry::sdk::resource::ResourceAttributes attributes = { - {"service", "backend"}, {"version", (uint32_t)1}, {"cost", 234.23}}; + {"service", std::string("backend")}, {"version", (uint32_t)1}, {"cost", 234.23}}; auto resource = opentelemetry::sdk::resource::Resource::Create(attributes); auto received_attributes = resource.GetAttributes(); for (auto &e : received_attributes) @@ -61,13 +61,13 @@ TEST(ResourceTest, create_with_servicename) opentelemetry::sdk::resource::ResourceAttributes expected_attributes = { {"version", (uint32_t)1}, {"cost", 234.23}, - {"telemetry.sdk.language", "cpp"}, - {"telemetry.sdk.name", "opentelemetry"}, - {"telemetry.sdk.version", OPENTELEMETRY_SDK_VERSION}, - {"service.name", "backend"}, + {"telemetry.sdk.language", std::string("cpp")}, + {"telemetry.sdk.name", std::string("opentelemetry")}, + {"telemetry.sdk.version", std::string(OPENTELEMETRY_SDK_VERSION)}, + {"service.name", std::string("backend")}, }; opentelemetry::sdk::resource::ResourceAttributes attributes = { - {"service.name", "backend"}, {"version", (uint32_t)1}, {"cost", 234.23}}; + {"service.name", std::string("backend")}, {"version", (uint32_t)1}, {"cost", 234.23}}; auto resource = opentelemetry::sdk::resource::Resource::Create(attributes); auto received_attributes = resource.GetAttributes(); for (auto &e : received_attributes) @@ -92,10 +92,10 @@ TEST(ResourceTest, create_with_servicename) TEST(ResourceTest, create_with_emptyatrributes) { opentelemetry::sdk::resource::ResourceAttributes expected_attributes = { - {"telemetry.sdk.language", "cpp"}, - {"telemetry.sdk.name", "opentelemetry"}, - {"telemetry.sdk.version", OPENTELEMETRY_SDK_VERSION}, - {"service.name", "unknown_service"}, + {"telemetry.sdk.language", std::string("cpp")}, + {"telemetry.sdk.name", std::string("opentelemetry")}, + {"telemetry.sdk.version", std::string(OPENTELEMETRY_SDK_VERSION)}, + {"service.name", std::string("unknown_service")}, }; opentelemetry::sdk::resource::ResourceAttributes attributes = {}; auto resource = opentelemetry::sdk::resource::Resource::Create(attributes); @@ -112,11 +112,11 @@ TEST(ResourceTest, create_with_emptyatrributes) TEST(ResourceTest, Merge) { TestResource resource1( - opentelemetry::sdk::resource::ResourceAttributes({{"service", "backend"}})); + opentelemetry::sdk::resource::ResourceAttributes({{"service", std::string("backend")}})); TestResource resource2( - opentelemetry::sdk::resource::ResourceAttributes({{"host", "service-host"}})); - std::map expected_attributes = {{"service", "backend"}, - {"host", "service-host"}}; + opentelemetry::sdk::resource::ResourceAttributes({{"host", std::string("service-host")}})); + std::map expected_attributes = {{"service", std::string("backend")}, + {"host", std::string("service-host")}}; auto merged_resource = resource1.Merge(resource2); auto received_attributes = merged_resource.GetAttributes(); @@ -134,10 +134,12 @@ TEST(ResourceTest, Merge) TEST(ResourceTest, MergeEmptyString) { - TestResource resource1({{"service", "backend"}, {"host", "service-host"}}); - TestResource resource2({{"service", ""}, {"host", "another-service-host"}}); - std::map expected_attributes = {{"service", ""}, - {"host", "another-service-host"}}; + TestResource resource1( + {{"service", std::string("backend")}, {"host", std::string("service-host")}}); + TestResource resource2( + {{"service", std::string("")}, {"host", std::string("another-service-host")}}); + std::map expected_attributes = { + {"service", std::string("")}, {"host", std::string("another-service-host")}}; auto merged_resource = resource1.Merge(resource2); auto received_attributes = merged_resource.GetAttributes(); diff --git a/sdk/test/trace/tracer_test.cc b/sdk/test/trace/tracer_test.cc index e5775b812b..dfd60dac65 100644 --- a/sdk/test/trace/tracer_test.cc +++ b/sdk/test/trace/tracer_test.cc @@ -203,7 +203,7 @@ TEST(Tracer, StartSpanWithAttributes) // Start a span with all supported scalar attribute types. tracer - ->StartSpan("span 1", {{"attr1", "string"}, + ->StartSpan("span 1", {{"attr1", std::string("string")}, {"attr2", false}, {"attr1", 314159}, {"attr3", (unsigned int)314159}, @@ -212,7 +212,7 @@ TEST(Tracer, StartSpanWithAttributes) {"attr6", (int64_t)-20}, {"attr7", (uint64_t)20}, {"attr8", 3.1}, - {"attr9", "string"}}) + {"attr9", std::string("string")}}) ->End(); // Start a span with all supported array attribute types.