Skip to content

Commit bd915cc

Browse files
committed
Clean up Kafka DSM test mocks and improve skip helper usage
- Remove redundant global Kafka and ActiveSupport::Notifications mocks from data_streams_spec - Use skip_if_data_streams_not_supported helper instead of direct DDSketch check - Remove unnecessary require 'active_support/notifications' from patcher_spec - Tests use local test classes in let blocks, don't need global mocks
1 parent af81a12 commit bd915cc

File tree

2 files changed

+1
-56
lines changed

2 files changed

+1
-56
lines changed

spec/datadog/tracing/contrib/kafka/data_streams_spec.rb

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,6 @@
88
require 'datadog/tracing/contrib/kafka/integration'
99
require 'datadog/tracing/contrib/kafka/instrumentation/producer'
1010
require 'datadog/tracing/contrib/kafka/instrumentation/consumer'
11-
require 'datadog'
12-
module ActiveSupport
13-
module Notifications
14-
def self.subscribe(*_args)
15-
end
16-
end
17-
end
18-
19-
# Mock Kafka classes that we need
20-
module Kafka
21-
class Producer
22-
attr_accessor :pending_message_queue
23-
24-
def initialize
25-
@pending_message_queue = []
26-
end
27-
28-
def deliver_messages(**kwargs)
29-
result = {delivered_count: @pending_message_queue.size}
30-
@pending_message_queue.clear
31-
result
32-
end
33-
34-
def send_messages(messages, **kwargs)
35-
{sent_count: messages.size}
36-
end
37-
end
38-
39-
class Consumer
40-
def each_message(**kwargs)
41-
if block_given?
42-
yield OpenStruct.new(
43-
topic: 'test_topic',
44-
partition: 0,
45-
offset: 100,
46-
headers: {}
47-
)
48-
end
49-
end
50-
51-
def each_batch(**kwargs)
52-
if block_given?
53-
yield OpenStruct.new(
54-
topic: 'test_topic',
55-
partition: 0,
56-
messages: [
57-
OpenStruct.new(offset: 100, key: 'key1'),
58-
OpenStruct.new(offset: 101, key: 'key2')
59-
]
60-
)
61-
end
62-
end
63-
end
64-
end
6511

6612
RSpec.describe 'Kafka Data Streams instrumentation' do
6713
let(:configuration_options) { {} }
@@ -130,7 +76,7 @@ def deliver_messages(**kwargs)
13076

13177
describe 'checkpointing' do
13278
before do
133-
skip('DDSketch not available') unless Datadog::Core::DDSketch.supported?
79+
skip_if_data_streams_not_supported(self)
13480
end
13581

13682
let(:test_producer_class) do

spec/datadog/tracing/contrib/kafka/patcher_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
require 'ruby-kafka'
55
require 'active_support'
6-
require 'active_support/notifications'
76
require 'datadog'
87

98
RSpec.describe 'Kafka patcher' do

0 commit comments

Comments
 (0)