Skip to content

Commit ec14e07

Browse files
committed
Add method documentation, update comments
Add resource documentation for configurator. Update comments for resource constants. Simplify resource merging in auto detector.
1 parent 09aa570 commit ec14e07

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

resource-detectors/lib/opentelemetry/resource/detectors/auto_detector.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ module AutoDetector
1616
].freeze
1717

1818
def detect
19-
resources = DETECTORS.map(&:detect)
20-
resources.reduce(OpenTelemetry::SDK::Resources::Resource.create) do |accumulated, detected|
21-
accumulated.merge(detected)
22-
end
19+
DETECTORS.map(&:detect).reduce(:merge)
2320
end
2421
end
2522
end

sdk/lib/opentelemetry/sdk/configurator.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ def logger
3434
@logger ||= Logger.new(STDOUT)
3535
end
3636

37+
# Accepts a resource object that is merged with the default telemetry sdk
38+
# resource. The use of this method is optional, and is provided as means
39+
# to add additional resource information.
40+
#
41+
# @param [Resource] new_resource The resource to be merged
3742
def resource=(new_resource)
3843
@resource = @resource.merge(new_resource)
3944
end

sdk/lib/opentelemetry/sdk/resources/constants.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module Constants
2828
# The name of the telemetry library.
2929
name: 'telemetry.sdk.name',
3030

31-
# The language of telemetry library and of the code instrumented with it.
31+
# The language of the telemetry library and of the code instrumented with it.
3232
language: 'telemetry.sdk.language',
3333

3434
# The version string of the telemetry library

0 commit comments

Comments
 (0)