From b78e62fdc9dcc3d3ec53f5743ca7212df9c5ee04 Mon Sep 17 00:00:00 2001 From: "Y.Matsuda" Date: Mon, 13 Jan 2025 11:22:21 +0900 Subject: [PATCH 1/2] fix: resolve Style/RedundantCurrentDirectoryInPath rubocop errors in instrumentation generator --- .instrumentation_generator/templates/lib/entrypoint.rb | 2 +- .../templates/lib/instrumentation.rb.tt | 2 +- .../templates/lib/instrumentation/instrumentation_name.rb.tt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.instrumentation_generator/templates/lib/entrypoint.rb b/.instrumentation_generator/templates/lib/entrypoint.rb index baceb3cb76..c034f140f8 100644 --- a/.instrumentation_generator/templates/lib/entrypoint.rb +++ b/.instrumentation_generator/templates/lib/entrypoint.rb @@ -4,4 +4,4 @@ # # SPDX-License-Identifier: Apache-2.0 -require_relative './opentelemetry/instrumentation' +require_relative 'opentelemetry/instrumentation' diff --git a/.instrumentation_generator/templates/lib/instrumentation.rb.tt b/.instrumentation_generator/templates/lib/instrumentation.rb.tt index 24e7fac143..1d4a93aef1 100644 --- a/.instrumentation_generator/templates/lib/instrumentation.rb.tt +++ b/.instrumentation_generator/templates/lib/instrumentation.rb.tt @@ -16,4 +16,4 @@ module OpenTelemetry end end -require_relative './instrumentation/<%= instrumentation_name %>' +require_relative 'instrumentation/<%= instrumentation_name %>' diff --git a/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt b/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt index 155e9b1f05..4fa47e7ec2 100644 --- a/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt +++ b/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt @@ -15,5 +15,5 @@ module OpenTelemetry end end -require_relative './<%= instrumentation_name %>/instrumentation' -require_relative './<%= instrumentation_name %>/version' +require_relative '<%= instrumentation_name %>/instrumentation' +require_relative '<%= instrumentation_name %>/version' From b0f5e5b143dc5a81e833c3d86a976e22f8694c2c Mon Sep 17 00:00:00 2001 From: "Y.Matsuda" Date: Mon, 13 Jan 2025 11:28:39 +0900 Subject: [PATCH 2/2] fix: resolve Layout/TrailingEmptyLines rubocop errors in instrumentation generator --- .instrumentation_generator/templates/Appraisals | 1 - 1 file changed, 1 deletion(-) diff --git a/.instrumentation_generator/templates/Appraisals b/.instrumentation_generator/templates/Appraisals index 0ee9909623..8c24e16b1b 100644 --- a/.instrumentation_generator/templates/Appraisals +++ b/.instrumentation_generator/templates/Appraisals @@ -13,4 +13,3 @@ # appraise 'rack-2.0' do # gem 'rack', '2.0.8' # end -