Skip to content

Commit f075c93

Browse files
changes for ci
1 parent 4bf2bfb commit f075c93

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

sdk/src/common/container.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33

44
#include "opentelemetry/sdk/common/container.h"
55

6-
#ifdef _MSC_VER
7-
# include <string.h>
8-
# define strcasecmp _stricmp
9-
#else
10-
# include <strings.h>
11-
#endif
12-
136
#include <fstream>
147
#include <regex>
158

sdk/src/resource/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cc_library(
1010
deps = [
1111
"//api",
1212
"//sdk:headers",
13-
"//sdk/src/common:env_variables",
1413
"//sdk/src/common:container",
14+
"//sdk/src/common:env_variables",
1515
],
1616
)

sdk/src/resource/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_library(opentelemetry_resources resource.cc resource_detector.cc container_detector.cc)
4+
add_library(opentelemetry_resources resource.cc resource_detector.cc
5+
container_detector.cc)
56

67
set_target_properties(opentelemetry_resources PROPERTIES EXPORT_NAME resources)
78
set_target_version(opentelemetry_resources)

sdk/src/resource/container_detector.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#include "opentelemetry/nostd/variant.h"
45
#include "opentelemetry/sdk/common/container.h"
56
#include "opentelemetry/sdk/resource/resource.h"
67
#include "opentelemetry/sdk/resource/resource_detector.h"
78
#include "opentelemetry/semconv/incubating/container_attributes.h"
89
#include "opentelemetry/version.h"
910

1011
#include <string>
12+
#include <unordered_map>
1113

1214
OPENTELEMETRY_BEGIN_NAMESPACE
1315
namespace sdk

sdk/src/resource/resource_detector.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
#include "opentelemetry/sdk/resource/resource_detector.h"
55
#include "opentelemetry/nostd/variant.h"
6-
#include "opentelemetry/sdk/common/container.h"
76
#include "opentelemetry/sdk/common/env_variables.h"
87
#include "opentelemetry/sdk/resource/resource.h"
9-
#include "opentelemetry/semconv/incubating/container_attributes.h"
108
#include "opentelemetry/semconv/service_attributes.h"
119
#include "opentelemetry/version.h"
1210

sdk/test/resource/resource_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <gtest/gtest.h>
55
#include <stdint.h>
6+
#include <cstdio>
67
#include <cstdlib>
78
#include <fstream>
89
#include <map>

0 commit comments

Comments
 (0)