Skip to content

Commit 740a5ff

Browse files
xuan-cao-swixuan-cao-swi
authored
chore: update for rubocop 1.84.1 (#2036)
1 parent b2ddd49 commit 740a5ff

File tree

5 files changed

+76
-78
lines changed

5 files changed

+76
-78
lines changed

‎exporter/otlp-common/lib/opentelemetry/exporter/otlp/common.rb‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,25 @@ def as_encoded_etsr(span_data)
4646
def as_etsr(span_data)
4747
Opentelemetry::Proto::Collector::Trace::V1::ExportTraceServiceRequest.new(
4848
resource_spans: span_data
49-
.group_by(&:resource)
50-
.map do |resource, span_datas|
51-
Opentelemetry::Proto::Trace::V1::ResourceSpans.new(
52-
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
53-
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
54-
),
55-
scope_spans: span_datas
56-
.group_by(&:instrumentation_scope)
57-
.map do |il, sds|
58-
Opentelemetry::Proto::Trace::V1::ScopeSpans.new(
59-
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
60-
name: il.name,
61-
version: il.version
62-
),
63-
spans: sds.map { |sd| as_otlp_span(sd) }
64-
)
65-
end
66-
)
67-
end
49+
.group_by(&:resource)
50+
.map do |resource, span_datas|
51+
Opentelemetry::Proto::Trace::V1::ResourceSpans.new(
52+
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
53+
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
54+
),
55+
scope_spans: span_datas
56+
.group_by(&:instrumentation_scope)
57+
.map do |il, sds|
58+
Opentelemetry::Proto::Trace::V1::ScopeSpans.new(
59+
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
60+
name: il.name,
61+
version: il.version
62+
),
63+
spans: sds.map { |sd| as_otlp_span(sd) }
64+
)
65+
end
66+
)
67+
end
6868
)
6969
end
7070

‎exporter/otlp-logs/lib/opentelemetry/exporter/otlp/logs/logs_exporter.rb‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -273,25 +273,25 @@ def encode(log_record_data) # rubocop:disable Metrics/MethodLength, Metrics/Cycl
273273
Opentelemetry::Proto::Collector::Logs::V1::ExportLogsServiceRequest.encode(
274274
Opentelemetry::Proto::Collector::Logs::V1::ExportLogsServiceRequest.new(
275275
resource_logs: log_record_data
276-
.group_by(&:resource)
277-
.map do |resource, log_record_datas|
278-
Opentelemetry::Proto::Logs::V1::ResourceLogs.new(
279-
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
280-
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
281-
),
282-
scope_logs: log_record_datas
283-
.group_by(&:instrumentation_scope)
284-
.map do |il, lrd|
285-
Opentelemetry::Proto::Logs::V1::ScopeLogs.new(
286-
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
287-
name: il.name,
288-
version: il.version
289-
),
290-
log_records: lrd.map { |lr| as_otlp_log_record(lr) }
291-
)
292-
end
293-
)
294-
end
276+
.group_by(&:resource)
277+
.map do |resource, log_record_datas|
278+
Opentelemetry::Proto::Logs::V1::ResourceLogs.new(
279+
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
280+
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
281+
),
282+
scope_logs: log_record_datas
283+
.group_by(&:instrumentation_scope)
284+
.map do |il, lrd|
285+
Opentelemetry::Proto::Logs::V1::ScopeLogs.new(
286+
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
287+
name: il.name,
288+
version: il.version
289+
),
290+
log_records: lrd.map { |lr| as_otlp_log_record(lr) }
291+
)
292+
end
293+
)
294+
end
295295
)
296296
)
297297
rescue StandardError => e

‎exporter/otlp-metrics/lib/opentelemetry/exporter/otlp/metrics/metrics_exporter.rb‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,25 +187,25 @@ def encode(metrics_data)
187187
Opentelemetry::Proto::Collector::Metrics::V1::ExportMetricsServiceRequest.encode(
188188
Opentelemetry::Proto::Collector::Metrics::V1::ExportMetricsServiceRequest.new(
189189
resource_metrics: metrics_data
190-
.group_by(&:resource)
191-
.map do |resource, scope_metrics|
192-
Opentelemetry::Proto::Metrics::V1::ResourceMetrics.new(
193-
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
194-
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
195-
),
196-
scope_metrics: scope_metrics
197-
.group_by(&:instrumentation_scope)
198-
.map do |instrumentation_scope, metrics|
199-
Opentelemetry::Proto::Metrics::V1::ScopeMetrics.new(
200-
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
201-
name: instrumentation_scope.name,
202-
version: instrumentation_scope.version
203-
),
204-
metrics: metrics.map { |sd| as_otlp_metrics(sd) }
205-
)
206-
end
207-
)
208-
end
190+
.group_by(&:resource)
191+
.map do |resource, scope_metrics|
192+
Opentelemetry::Proto::Metrics::V1::ResourceMetrics.new(
193+
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
194+
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
195+
),
196+
scope_metrics: scope_metrics
197+
.group_by(&:instrumentation_scope)
198+
.map do |instrumentation_scope, metrics|
199+
Opentelemetry::Proto::Metrics::V1::ScopeMetrics.new(
200+
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
201+
name: instrumentation_scope.name,
202+
version: instrumentation_scope.version
203+
),
204+
metrics: metrics.map { |sd| as_otlp_metrics(sd) }
205+
)
206+
end
207+
)
208+
end
209209
)
210210
)
211211
rescue StandardError => e

‎exporter/otlp/lib/opentelemetry/exporter/otlp/exporter.rb‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -299,25 +299,25 @@ def encode(span_data) # rubocop:disable Metrics/MethodLength, Metrics/Cyclomatic
299299
Opentelemetry::Proto::Collector::Trace::V1::ExportTraceServiceRequest.encode(
300300
Opentelemetry::Proto::Collector::Trace::V1::ExportTraceServiceRequest.new(
301301
resource_spans: span_data
302-
.group_by(&:resource)
303-
.map do |resource, span_datas|
304-
Opentelemetry::Proto::Trace::V1::ResourceSpans.new(
305-
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
306-
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
307-
),
308-
scope_spans: span_datas
309-
.group_by(&:instrumentation_scope)
310-
.map do |il, sds|
311-
Opentelemetry::Proto::Trace::V1::ScopeSpans.new(
312-
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
313-
name: il.name,
314-
version: il.version
315-
),
316-
spans: sds.map { |sd| as_otlp_span(sd) }
317-
)
318-
end
319-
)
320-
end
302+
.group_by(&:resource)
303+
.map do |resource, span_datas|
304+
Opentelemetry::Proto::Trace::V1::ResourceSpans.new(
305+
resource: Opentelemetry::Proto::Resource::V1::Resource.new(
306+
attributes: resource.attribute_enumerator.map { |key, value| as_otlp_key_value(key, value) }
307+
),
308+
scope_spans: span_datas
309+
.group_by(&:instrumentation_scope)
310+
.map do |il, sds|
311+
Opentelemetry::Proto::Trace::V1::ScopeSpans.new(
312+
scope: Opentelemetry::Proto::Common::V1::InstrumentationScope.new(
313+
name: il.name,
314+
version: il.version
315+
),
316+
spans: sds.map { |sd| as_otlp_span(sd) }
317+
)
318+
end
319+
)
320+
end
321321
)
322322
)
323323
rescue StandardError => e

‎logs_sdk/test/opentelemetry/sdk/logs/export/batch_log_record_processor_test.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
require 'test_helper'
88

9-
# rubocop:disable Lint/ConstantDefinitionInBlock, Style/Documentation
109
describe OpenTelemetry::SDK::Logs::Export::BatchLogRecordProcessor do
1110
BatchLogRecordProcessor = OpenTelemetry::SDK::Logs::Export::BatchLogRecordProcessor
1211
SUCCESS = OpenTelemetry::SDK::Logs::Export::SUCCESS
@@ -545,4 +544,3 @@ def shutdown(timeout: nil)
545544
end
546545
end
547546
end
548-
# rubocop:enable Lint/ConstantDefinitionInBlock, Style/Documentation

0 commit comments

Comments
 (0)