Skip to content

Commit a17aba0

Browse files
committed
fix: Windows build
1 parent 5c8d9d1 commit a17aba0

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/os_resource_detector.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@ ::opentelemetry::sdk::resource::Resource os_resource_detector::Detect()
3737
using ::opentelemetry::sdk::resource::SemanticConventions::kOsType;
3838
using ::opentelemetry::sdk::resource::SemanticConventions::kOsVersion;
3939
using ::opentelemetry::sdk::resource::SemanticConventions::kSchemaUrl;
40+
41+
using namespace ::opentelemetry::sdk::resource::SemanticConventions::HostArchValues;
42+
using namespace ::opentelemetry::sdk::resource::SemanticConventions::OsTypeValues;
4043
#else
4144
using ::opentelemetry::semconv::host::kHostArch;
4245
using ::opentelemetry::semconv::host::kHostName;
4346
using ::opentelemetry::semconv::kSchemaUrl;
4447
using ::opentelemetry::semconv::os::kOsType;
4548
using ::opentelemetry::semconv::os::kOsVersion;
49+
50+
using namespace ::opentelemetry::semconv::host::HostArchValues;
51+
using namespace ::opentelemetry::semconv::os::OsTypeValues;
4652
#endif
4753

4854
#ifndef _WIN32
@@ -62,15 +68,15 @@ ::opentelemetry::sdk::resource::Resource os_resource_detector::Detect()
6268
GetSystemInfo(&si);
6369
switch (si.wProcessorArchitecture) {
6470
case PROCESSOR_ARCHITECTURE_AMD64:
65-
attrs[kHostArch] = std::string(HostArchValues::kAmd64);
71+
attrs[kHostArch] = std::string(kAmd64);
6672
break;
6773

6874
case PROCESSOR_ARCHITECTURE_INTEL:
69-
attrs[kHostArch] = std::string(HostArchValues::kX86);
75+
attrs[kHostArch] = std::string(kX86);
7076
break;
7177

7278
case PROCESSOR_ARCHITECTURE_ARM64:
73-
attrs[kHostArch] = std::string(HostArchValues::kArm64);
79+
attrs[kHostArch] = std::string(kArm64);
7480
break;
7581

7682
default:
@@ -82,7 +88,7 @@ ::opentelemetry::sdk::resource::Resource os_resource_detector::Detect()
8288
attrs[kHostName] = convert(buf.data());
8389
}
8490

85-
attrs[kOsType] = std::string(OsTypeValues::kWindows);
91+
attrs[kOsType] = std::string(kWindows);
8692

8793
OSVERSIONINFO osvi{};
8894
osvi.dwOSVersionInfoSize = sizeof(osvi);

0 commit comments

Comments
 (0)