Skip to content

Commit 9ad0877

Browse files
authored
in_opentelemetry: use String for record keys (#6)
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent f7548af commit 9ad0877

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

lib/fluent/plugin/in_opentelemetry.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ def start
5959
http_handler = Opentelemetry::HttpInputHandler.new
6060
http_server_create_http_server(:in_opentelemetry_http_server, addr: @http_config.bind, port: @http_config.port, logger: log) do |serv|
6161
serv.post("/v1/logs") do |req|
62-
http_handler.logs(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_LOGS, message: record }) }
62+
http_handler.logs(req) { |record| router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_LOGS, "message" => record }) }
6363
end
6464
serv.post("/v1/metrics") do |req|
65-
http_handler.metrics(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_METRICS, message: record }) }
65+
http_handler.metrics(req) { |record| router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_METRICS, "message" => record }) }
6666
end
6767
serv.post("/v1/traces") do |req|
68-
http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record }) }
68+
http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_TRACES, "message" => record }) }
6969
end
7070
end
7171
end
@@ -75,13 +75,13 @@ def start
7575
grpc_handler = Opentelemetry::GrpcInputHandler.new(@grpc_config, log)
7676
grpc_handler.run(
7777
logs: lambda { |record|
78-
router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_LOGS, message: record })
78+
router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_LOGS, "message" => record })
7979
},
8080
metrics: lambda { |record|
81-
router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_METRICS, message: record })
81+
router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_METRICS, "message" => record })
8282
},
8383
traces: lambda { |record|
84-
router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record })
84+
router.emit(@tag, Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_TRACES, "message" => record })
8585
}
8686
)
8787
end

test/fluent/plugin/test_in_opentelemetry.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def test_receive_json(data)
154154
post_json(data[:request_path], data[:request_data])
155155
end
156156

157-
expected_events = [["opentelemetry.test", @event_time, { type: data[:record_type], message: data[:record_data] }]]
157+
expected_events = [["opentelemetry.test", @event_time, { "type" => data[:record_type], "message" => data[:record_data] }]]
158158
assert_equal(200, res.status)
159159
assert_equal(expected_events, d.events)
160160
end
@@ -165,7 +165,7 @@ def test_receive_compressed_json
165165
post_json("/v1/logs", compress(TestData::JSON::LOGS), headers: { "Content-Encoding" => "gzip" })
166166
end
167167

168-
expected_events = [["opentelemetry.test", @event_time, { type: "opentelemetry_logs", message: TestData::JSON::LOGS }]]
168+
expected_events = [["opentelemetry.test", @event_time, { "type" => "opentelemetry_logs", "message" => TestData::JSON::LOGS }]]
169169
assert_equal(200, res.status)
170170
assert_equal(expected_events, d.events)
171171
end
@@ -203,7 +203,7 @@ def test_receive_protocol_buffers(data)
203203
post_protobuf(data[:request_path], data[:request_data])
204204
end
205205

206-
expected_events = [["opentelemetry.test", @event_time, { type: data[:record_type], message: data[:record_data] }]]
206+
expected_events = [["opentelemetry.test", @event_time, { "type" => data[:record_type], "message" => data[:record_data] }]]
207207
assert_equal(200, res.status)
208208
assert_equal(expected_events, d.events)
209209
end
@@ -214,7 +214,7 @@ def test_receive_compressed_protocol_buffers
214214
post_protobuf("/v1/logs", compress(TestData::ProtocolBuffers::LOGS), headers: { "Content-Encoding" => "gzip" })
215215
end
216216

217-
expected_events = [["opentelemetry.test", @event_time, { type: "opentelemetry_logs", message: TestData::JSON::LOGS }]]
217+
expected_events = [["opentelemetry.test", @event_time, { "type" => "opentelemetry_logs", "message" => TestData::JSON::LOGS }]]
218218
assert_equal(200, res.status)
219219
assert_equal(expected_events, d.events)
220220
end
@@ -270,7 +270,7 @@ def test_https_receive_json
270270
post_https_json("/v1/logs", TestData::JSON::LOGS)
271271
end
272272

273-
expected_events = [["opentelemetry.test", @event_time, { type: "opentelemetry_logs", message: TestData::JSON::LOGS }]]
273+
expected_events = [["opentelemetry.test", @event_time, { "type" => "opentelemetry_logs", "message" => TestData::JSON::LOGS }]]
274274
assert_equal(200, res.status)
275275
assert_equal(expected_events, d.events)
276276
end
@@ -281,7 +281,7 @@ def test_https_receive_protocol_buffers
281281
post_https_protobuf("/v1/logs", TestData::ProtocolBuffers::LOGS)
282282
end
283283

284-
expected_events = [["opentelemetry.test", @event_time, { type: "opentelemetry_logs", message: TestData::JSON::LOGS }]]
284+
expected_events = [["opentelemetry.test", @event_time, { "type" => "opentelemetry_logs", "message" => TestData::JSON::LOGS }]]
285285
assert_equal(200, res.status)
286286
assert_equal(expected_events, d.events)
287287
end

0 commit comments

Comments
 (0)