Skip to content

Commit 5ac83a0

Browse files
committed
Fix schema
1 parent c18946d commit 5ac83a0

File tree

4 files changed

+26
-12
lines changed

4 files changed

+26
-12
lines changed

lib/datadog/core/telemetry/event.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,11 @@ def initialize(message:, level:)
354354

355355
def payload
356356
{
357-
message: @message,
358-
level: @level,
359-
# More optional fields to be added here...
357+
logs: [{
358+
message: @message,
359+
level: @level,
360+
# More optional fields to be added here...
361+
}]
360362
}
361363
end
362364
end

sig/datadog/core/telemetry/event.rbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module Datadog
7575

7676
def initialize: (message: String, level: Symbol) -> void
7777

78-
def payload: () -> { message: String, level: String }
78+
def payload: () -> { logs: [{ message: String, level: String }] }
7979
end
8080

8181
class Distributions < GenerateMetrics

spec/datadog/core/telemetry/event_spec.rb

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,26 +218,38 @@ def contain_configuration(*array)
218218
event = Datadog::Core::Telemetry::Event::Log.new(message: 'Hi', level: :error)
219219
expect(event.type).to eq('logs')
220220
expect(event.payload).to eq(
221-
message: 'Hi',
222-
level: 'ERROR'
221+
{
222+
logs: [
223+
message: 'Hi',
224+
level: 'ERROR'
225+
]
226+
}
223227
)
224228
end
225229

226230
it do
227231
event = Datadog::Core::Telemetry::Event::Log.new(message: 'Hi', level: :debug)
228232
expect(event.type).to eq('logs')
229233
expect(event.payload).to eq(
230-
message: 'Hi',
231-
level: 'DEBUG'
234+
{
235+
logs: [
236+
message: 'Hi',
237+
level: 'DEBUG'
238+
]
239+
}
232240
)
233241
end
234242

235243
it do
236244
event = Datadog::Core::Telemetry::Event::Log.new(message: 'Hi', level: :warn)
237245
expect(event.type).to eq('logs')
238246
expect(event.payload).to eq(
239-
message: 'Hi',
240-
level: 'WARN'
247+
{
248+
logs: [
249+
message: 'Hi',
250+
level: 'WARN'
251+
]
252+
}
241253
)
242254
end
243255

spec/datadog/core/telemetry/logging_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
telemetry = instance_double(Datadog::Core::Telemetry::Component)
1111
allow(Datadog.send(:components)).to receive(:telemetry).and_return(telemetry)
1212
expect(telemetry).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
13-
expect(event.payload).to include(message: 'RuntimeError', level: 'ERROR')
13+
expect(event.payload).to include(logs: [{ message: 'RuntimeError', level: 'ERROR' }])
1414
end
1515

1616
begin
@@ -26,7 +26,7 @@
2626
telemetry = instance_double(Datadog::Core::Telemetry::Component)
2727
allow(Datadog.send(:components)).to receive(:telemetry).and_return(telemetry)
2828
expect(telemetry).to receive(:log!).with(instance_of(Datadog::Core::Telemetry::Event::Log)) do |event|
29-
expect(event.payload).to include(message: /#<Class:/, level: 'ERROR')
29+
expect(event.payload).to include(logs: [{ message: /#<Class:/, level: 'ERROR' }])
3030
end
3131

3232
customer_exception = Class.new(StandardError)

0 commit comments

Comments
 (0)