Skip to content

Commit 2cfc69a

Browse files
committed
fix
1 parent f70fee9 commit 2cfc69a

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ Style/ClassVars:
3838
Style/FetchEnvVar:
3939
Enabled: false
4040

41+
Style/PercentLiteralDelimiters:
42+
Enabled: false
43+
4144
Style/StringConcatenation:
4245
Enabled: false
4346

test/fluent/plugin/test_out_otlp.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def server_request
3232
@@server_request
3333
end
3434

35-
def set_server_response_code(code)
35+
def server_response_code(code)
3636
@@server_response_code = code
3737
end
3838

@@ -141,7 +141,7 @@ def test_send_compressed_message
141141
end
142142

143143
def test_unrecoverable_error
144-
set_server_response_code(500)
144+
server_response_code(500)
145145
event = { "type" => "otlp_logs", "message" => TestData::JSON::LOGS }
146146

147147
d = create_driver
@@ -156,15 +156,15 @@ def test_unrecoverable_error
156156
end
157157

158158
def test_error_with_disabled_unrecoverable
159-
set_server_response_code(500)
159+
server_response_code(500)
160160
event = { "type" => "otlp_logs", "message" => TestData::JSON::LOGS }
161161

162-
d = create_driver(<<~CONFIG)
162+
d = create_driver(%[
163163
<http>
164164
endpoint "http://127.0.0.1:4318"
165165
error_response_as_unrecoverable false
166166
</http>
167-
CONFIG
167+
])
168168
d.run(default_tag: "otlp.test", shutdown: false) do
169169
d.feed(event)
170170
end
@@ -179,23 +179,23 @@ def test_write_with_retryable_response
179179
old_report_on_exception = Thread.report_on_exception
180180
Thread.report_on_exception = false # thread finished as invalid state since RetryableResponse raises.
181181

182-
set_server_response_code(503)
182+
server_response_code(503)
183183
event = { "type" => "otlp_logs", "message" => TestData::JSON::LOGS }
184184

185-
d = create_driver(<<~CONFIG)
185+
d = create_driver(%[
186186
<http>
187187
endpoint "http://127.0.0.1:4318"
188188
retryable_response_codes [503]
189189
</http>
190-
CONFIG
190+
])
191191

192192
assert_raise(Fluent::Plugin::OtlpOutput::RetryableResponse) do
193193
d.run(default_tag: "otlp.test", shutdown: false) do
194194
d.feed(event)
195195
end
196196
end
197197

198-
d.instance_shutdown(log: $log)
198+
d.instance_shutdown
199199
ensure
200200
Thread.report_on_exception = old_report_on_exception
201201
end

0 commit comments

Comments
 (0)