Skip to content

Commit 94596c2

Browse files
authored
Merge branch 'main' into exp-histogram-improve
2 parents cf2b238 + 1933d4c commit 94596c2

File tree

6 files changed

+8
-30
lines changed

6 files changed

+8
-30
lines changed

api/opentelemetry-api.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
2424
['LICENSE', '.yardopts']
2525
spec.require_paths = ['lib']
2626
spec.required_ruby_version = '>= 3.1'
27+
spec.add_dependency 'logger'
2728

2829
spec.add_development_dependency 'benchmark-ipsa', '~> 0.2.0'
2930
spec.add_development_dependency 'bundler', '>= 1.17'

metrics_sdk/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History: opentelemetry-metrics-sdk
22

3+
### v0.11.1 / 2025-11-04
4+
5+
* FIXED: Do not log error when there are no metrics to export
6+
37
### v0.11.0 / 2025-10-28
48

59
* ADDED: Add logging about export status to Metrics SDK

metrics_sdk/lib/opentelemetry/sdk/metrics/export/periodic_metric_reader.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,7 @@ def export(timeout: nil)
130130
end
131131

132132
def report_result(result_code)
133-
if result_code == Export::SUCCESS
134-
OpenTelemetry.logger.debug 'Successfully exported metrics'
135-
else
136-
OpenTelemetry.handle_error(exception: ExportError.new('Unable to export metrics'))
137-
OpenTelemetry.logger.error("Result code: #{result_code}")
138-
end
133+
OpenTelemetry.logger.debug 'Successfully exported metrics' if result_code == Export::SUCCESS
139134
end
140135

141136
def lock(&block)

metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module OpenTelemetry
88
module SDK
99
module Metrics
1010
# Current OpenTelemetry metrics sdk version
11-
VERSION = '0.11.0'
11+
VERSION = '0.11.1'
1212
end
1313
end
1414
end

metrics_sdk/test/opentelemetry/sdk/metrics/export/periodic_metric_reader_test.rb

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
describe OpenTelemetry::SDK::Metrics::Export::PeriodicMetricReader do
1010
PeriodicMetricReader = OpenTelemetry::SDK::Metrics::Export::PeriodicMetricReader
1111
SUCCESS = OpenTelemetry::SDK::Metrics::Export::SUCCESS
12-
FAILURE = OpenTelemetry::SDK::Metrics::Export::FAILURE
13-
TIMEOUT = OpenTelemetry::SDK::Metrics::Export::TIMEOUT
1412

1513
class TestExporter
1614
def initialize(status_codes: nil)
@@ -35,27 +33,6 @@ def shutdown(timeout: nil) = SUCCESS
3533
def force_flush(timeout: nil) = SUCCESS
3634
end
3735

38-
describe 'exporter with failure' do
39-
let(:exporter) { TestExporter.new(status_codes: [FAILURE]) }
40-
let(:reader) { PeriodicMetricReader.new(exporter: exporter) }
41-
42-
it 'logs export failure as error' do
43-
mock_logger = Minitest::Mock.new
44-
mock_logger.expect(:error, nil, [/Unable to export metrics/])
45-
mock_logger.expect(:error, nil, [/Result code: 1/])
46-
47-
# Stub collect to return a non-empty array so export is actually called
48-
reader.stub(:collect, ['mock_metric']) do
49-
OpenTelemetry.stub(:logger, mock_logger) do
50-
reader.force_flush
51-
end
52-
end
53-
54-
reader.shutdown
55-
mock_logger.verify
56-
end
57-
end
58-
5936
describe 'succesful exporter' do
6037
let(:exporter) { TestExporter.new(status_codes: [SUCCESS]) }
6138
let(:reader) { PeriodicMetricReader.new(exporter: exporter) }

sdk/opentelemetry-sdk.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
2525
spec.require_paths = ['lib']
2626
spec.required_ruby_version = '>= 3.1'
2727

28+
spec.add_dependency 'logger'
2829
spec.add_dependency 'opentelemetry-api', '~> 1.1'
2930
spec.add_dependency 'opentelemetry-common', '~> 0.20'
3031
spec.add_dependency 'opentelemetry-registry', '~> 0.2'

0 commit comments

Comments
 (0)