Resolved some more warnings and missed try while git rebasing.

msiddhu · msiddhu · commit 7e969ee536c1 · 2024-07-07T18:22:38.000-04:00
diff --git a/exporters/ostream/test/ostream_log_test.cc b/exporters/ostream/test/ostream_log_test.cc
@@ -192,7 +192,7 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout)
       "  trace_flags        : 00\n",
       "  scope              : \n",
       "    name             : otel-cpp\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
+      "    version          : ", OPENTELEMETRY_SDK_VERSION, "\n",
       "    schema_url       : https://opentelemetry.io/schemas/1.15.0\n",
       "    attributes       : \n",
       "      scope.attr.key: scope.attr.value\n",
@@ -344,7 +344,7 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
       "    res1: [1,2,3]\n",
       "  attributes         : \n",
       "    attr1: [0,1,0]\n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -418,7 +418,7 @@ TEST(OStreamLogRecordExporter, IntegrationTest)
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 0\n"
+      "  event_id           : 0\n",
       "  event_name         : \n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
@@ -491,14 +491,14 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
       "    telemetry.sdk.name: opentelemetry\n",
       "    telemetry.sdk.language: cpp\n",
       "  attributes         : \n",
-      "  event_id           : 12345678\n"
+      "  event_id           : 12345678\n",
       "  event_name         : test_event_id\n",
       "  trace_id           : 00000000000000000000000000000000\n",
       "  span_id            : 0000000000000000\n",
       "  trace_flags        : 00\n",
       "  scope              : \n",
       "    name             : opentelelemtry_library\n",
-      "    version          : " OPENTELEMETRY_SDK_VERSION "\n",
+      "    version          : ", OPENTELEMETRY_SDK_VERSION, "\n",
       "    schema_url       : https://opentelemetry.io/schemas/1.11.0\n",
       "    attributes       : \n",
       "      scope.attr.key: 123\n",
diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc
@@ -434,6 +434,7 @@ static void ConvertListFieldToJson(nlohmann::json &value,
                                    const google::protobuf::FieldDescriptor *field_descriptor,
                                    const OtlpHttpClientOptions &options);
 
+// NOLINTBEGIN(misc-no-recursion)
 static void ConvertGenericMessageToJson(nlohmann::json &value,
                                         const google::protobuf::Message &message,
                                         const OtlpHttpClientOptions &options)
@@ -468,7 +469,6 @@ bool SerializeToHttpBody(http_client::Body &output, const google::protobuf::Mess
   return true;
 }
 
-// NOLINTBEGIN(misc-no-recursion)
 void ConvertGenericFieldToJson(nlohmann::json &value,
                                const google::protobuf::Message &message,
                                const google::protobuf::FieldDescriptor *field_descriptor,
@@ -655,8 +655,7 @@ void ConvertListFieldToJson(nlohmann::json &value,
   }
 }
 
-// NOLINTEND(misc-no-recursion) suppressing for performance as if implemented with stack needs
-// Dynamic memory allocation
+// NOLINTEND(misc-no-recursion) suppressing for performance, if implemented iterative process needs DMA
 
 }  // namespace
 
diff --git a/sdk/src/resource/resource_detector.cc b/sdk/src/resource/resource_detector.cc
@@ -24,6 +24,7 @@ const char *OTEL_SERVICE_NAME        = "OTEL_SERVICE_NAME";
 
 Resource OTELResourceDetector::Detect() noexcept
 {
+    try{
   std::string attributes_str, service_name;
 
   bool attributes_exists = opentelemetry::sdk::common::GetStringEnvironmentVariable(

Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,7 @@ static void ConvertListFieldToJson(nlohmann::json &value,`
`434`	`434`	`const google::protobuf::FieldDescriptor *field_descriptor,`
`435`	`435`	`const OtlpHttpClientOptions &options);`
`436`	`436`
	`437`	`+// NOLINTBEGIN(misc-no-recursion)`
`437`	`438`	`static void ConvertGenericMessageToJson(nlohmann::json &value,`
`438`	`439`	`const google::protobuf::Message &message,`
`439`	`440`	`const OtlpHttpClientOptions &options)`
`@@ -468,7 +469,6 @@ bool SerializeToHttpBody(http_client::Body &output, const google::protobuf::Mess`
`468`	`469`	`return true;`
`469`	`470`	`}`
`470`	`471`
`471`		`-// NOLINTBEGIN(misc-no-recursion)`
`472`	`472`	`void ConvertGenericFieldToJson(nlohmann::json &value,`
`473`	`473`	`const google::protobuf::Message &message,`
`474`	`474`	`const google::protobuf::FieldDescriptor *field_descriptor,`
`@@ -655,8 +655,7 @@ void ConvertListFieldToJson(nlohmann::json &value,`
`655`	`655`	`}`
`656`	`656`	`}`
`657`	`657`
`658`		`-// NOLINTEND(misc-no-recursion) suppressing for performance as if implemented with stack needs`
`659`		`-// Dynamic memory allocation`
	`658`	`+// NOLINTEND(misc-no-recursion) suppressing for performance, if implemented iterative process needs DMA`
`660`	`659`
`661`	`660`	`} // namespace`
`662`	`661`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ const char *OTEL_SERVICE_NAME = "OTEL_SERVICE_NAME";`
`24`	`24`
`25`	`25`	`Resource OTELResourceDetector::Detect() noexcept`
`26`	`26`	`{`
	`27`	`+ try{`
`27`	`28`	`std::string attributes_str, service_name;`
`28`	`29`
`29`	`30`	`bool attributes_exists = opentelemetry::sdk::common::GetStringEnvironmentVariable(`