Skip to content

Commit a1778b9

Browse files
nikhilbhatia08nikhilbhatia08
committed
newline-fix
hello changes some changes
1 parent 4cebe35 commit a1778b9

File tree

12 files changed

+42
-19
lines changed

12 files changed

+42
-19
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ name: CI
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, nb ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, nb ]
8+
workflow_dispatch:
89

910
permissions:
1011
contents: read

‎.github/workflows/iwyu.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ name: include-what-you-use
33

44
on:
55
push:
6-
branches: [ main ]
6+
branches: [ main, nb ]
77
pull_request:
88
branches: [ main ]
9+
workflow_dispatch:
910

1011
permissions:
1112
contents: read

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ if(DEFINED OPENTELEMETRY_BUILD_DLL)
634634
endif()
635635

636636
add_subdirectory(api)
637+
add_subdirectory(resource_detectors)
637638

638639
if(WITH_OPENTRACING)
639640
add_subdirectory(opentracing-shim)

‎resource_detectors/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_library(opentelemetry_resource_detectors container.cc container_detector.cc)
5+
6+
set_target_properties(opentelemetry_resource_detectors
7+
PROPERTIES EXPORT_NAME resource_detectors)
8+
set_target_version(opentelemetry_resource_detectors)
9+
10+
target_link_libraries(opentelemetry_resource_detectors
11+
PUBLIC opentelemetry_common)
12+
13+
target_include_directories(
14+
opentelemetry_resource_detectors
15+
PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/resource_detectors/include>"
16+
PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/sdk/include>")
17+
18+
if(OPENTELEMETRY_INSTALL)
19+
opentelemetry_add_pkgconfig(
20+
resource_detectors "OpenTelemetry - Resource detectors"
21+
"Components for resource detection in the OpenTelemetry resource detectors."
22+
)
23+
endif()

sdk/src/resource/container.cc renamed to resource_detectors/container.cc

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

4-
#include "opentelemetry/sdk/resource/container_resource_detector.h"
4+
#include "opentelemetry/resource_detectors/container_resource_detector.h"
55

66
#include <fstream>
77
#include <regex>
@@ -44,4 +44,4 @@ std::string ExtractContainerIDFromLine(const std::string &line)
4444
}
4545
} // namespace resource
4646
} // namespace sdk
47-
OPENTELEMETRY_END_NAMESPACE
47+
OPENTELEMETRY_END_NAMESPACE

sdk/src/resource/container_detector.cc renamed to resource_detectors/container_detector.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include "opentelemetry/nostd/variant.h"
5-
#include "opentelemetry/sdk/resource/container_resource_detector.h"
5+
#include "opentelemetry/resource_detectors/container_resource_detector.h"
66
#include "opentelemetry/sdk/resource/resource.h"
77
#include "opentelemetry/sdk/resource/resource_detector.h"
88
#include "opentelemetry/semconv/incubating/container_attributes.h"
@@ -38,4 +38,4 @@ Resource ContainerResourceDetector::Detect() noexcept
3838

3939
} // namespace resource
4040
} // namespace sdk
41-
OPENTELEMETRY_END_NAMESPACE
41+
OPENTELEMETRY_END_NAMESPACE

sdk/include/opentelemetry/sdk/resource/container_resource_detector.h renamed to resource_detectors/include/opentelemetry/resource_detectors/container_resource_detector.h

File renamed without changes.

‎sdk/src/resource/CMakeLists.txt‎

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

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

76
set_target_properties(opentelemetry_resources PROPERTIES EXPORT_NAME resources)
87
set_target_version(opentelemetry_resources)

‎sdk/src/resource/resource.cc‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <utility>
77

88
#include "opentelemetry/nostd/variant.h"
9-
#include "opentelemetry/sdk/resource/container_resource_detector.h"
109
#include "opentelemetry/sdk/resource/resource.h"
1110
#include "opentelemetry/sdk/resource/resource_detector.h"
1211
#include "opentelemetry/sdk/version/version.h"
@@ -41,12 +40,9 @@ Resource Resource::Merge(const Resource &other) const noexcept
4140

4241
Resource Resource::Create(const ResourceAttributes &attributes, const std::string &schema_url)
4342
{
44-
static auto otel_resource = OTELResourceDetector().Detect();
45-
static auto container_resource = ContainerResourceDetector().Detect();
46-
auto resource = Resource::GetDefault()
47-
.Merge(otel_resource)
48-
.Merge(container_resource)
49-
.Merge(Resource{attributes, schema_url});
43+
static auto otel_resource = OTELResourceDetector().Detect();
44+
auto resource =
45+
Resource::GetDefault().Merge(otel_resource).Merge(Resource{attributes, schema_url});
5046

5147
if (resource.attributes_.find(semconv::service::kServiceName) == resource.attributes_.end())
5248
{

‎sdk/test/resource/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ cc_test(
99
tags = ["test"],
1010
deps = [
1111
"//api",
12+
"//resource_detectors",
1213
"//sdk/src/resource",
1314
"@com_google_googletest//:gtest_main",
1415
],

0 commit comments

Comments
 (0)