fix windows build

open-telemetry · Jul 26, 2021 · 125d9b5 · 125d9b5
1 parent 511d941
commit 125d9b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/exporters/otlp/test/otlp_grpc_exporter_test.cc b/exporters/otlp/test/otlp_grpc_exporter_test.cc
@@ -130,7 +130,7 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigSslCredentialsTest)
   EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
 }
 
-#ifndef NO_GETENV
+#  ifndef NO_GETENV
 // Test exporter configuration options with use_ssl_credentials
 TEST_F(OtlpGrpcExporterTestPeer, ConfigFromEnv)
 {
@@ -148,7 +148,7 @@ TEST_F(OtlpGrpcExporterTestPeer, ConfigFromEnv)
   EXPECT_EQ(GetOptions(exporter).use_ssl_credentials, true);
   EXPECT_EQ(GetOptions(exporter).endpoint, endpoint);
 }
-#endif
+#  endif
 
 }  // namespace otlp
 }  // namespace exporter

diff --git a/sdk/include/opentelemetry/sdk/common/env_variables.h b/sdk/include/opentelemetry/sdk/common/env_variables.h
@@ -21,7 +21,6 @@ inline const std::string GetEnvironmentVariable(const char *env_var_name)
   // avoid calling std::getenv which is deprecated in MSVC.
   size_t required_size = 0;
   getenv_s(&required_size, nullptr, 0, env_var_name);
-  const char *endpoint_from_env = nullptr;
   std::unique_ptr<char> endpoint_buffer;
   if (required_size > 0)
   {

diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc
@@ -176,21 +176,21 @@ TEST(ResourceTest, OtelResourceDetector)
     }
   }
   EXPECT_EQ(received_attributes.size(), expected_attributes.size());
-#if defined(_MSC_VER)
+#  if defined(_MSC_VER)
   putenv("OTEL_RESOURCE_ATTRIBUTES=");
-#else
+#  else
   unsetenv("OTEL_RESOURCE_ATTRIBUTES");
-#endif
+#  endif
 }
 
 TEST(ResourceTest, OtelResourceDetectorEmptyEnv)
 {
   std::map<std::string, std::string> expected_attributes = {};
-#if defined(_MSC_VER)
+#  if defined(_MSC_VER)
   putenv("OTEL_RESOURCE_ATTRIBUTES=");
-#else
+#  else
   unsetenv("OTEL_RESOURCE_ATTRIBUTES");
-#endif
+#  endif
   OTELResourceDetector detector;
   auto resource            = detector.Detect();
   auto received_attributes = resource.GetAttributes();