datadog-queue-bus 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a6175afd834e209f14ee348e5240be85778076d6bd64c680fa17e95e80f142
-  data.tar.gz: e53de70efd6c0f20594996d9ec4ac58882eb7f544b88d65270bc8c2b0ef75476
+  metadata.gz: 3ae76c2ba3427f338d85658cdde7b8d29adadcd9c7969f28bb2664b60db78011
+  data.tar.gz: caf809805ead76cc0bbdc091b28f5fd744e633dd9395d44ece7815c73eae385a
 SHA512:
-  metadata.gz: f12b7f475b4f23b3db949023360bf80b964c6c7d1382c2812bb72d96867ec3bcdf13bfd8b09e1e1eb91bb5bff7446252bfbd1934d776c4f0edbd34a928d5263c
-  data.tar.gz: 425cc91c71b90d94a24ef983afe57aa40569bd8fc467e0242c317b755e452d3d7dbf774db24b8f9e757ce0dbcfdca5151c75db64ae1b75e8487940a58e23796b
+  metadata.gz: c4ff40b46826c17a26f9e32808c2592643d312039cf7b90bb98aaf122de477f9a9f77eecd1a3940250722f0e059b5f3b926e304d07593d73fdb778b1d6a47a5a
+  data.tar.gz: c8d07d52ec537ba9b1b7bf42ba56da32830b2bbd3929bd5fa51344dc0133c23a49d6e2f3da85a8d548ea6ee5aeddae07c1cc65b4c7eeac1355f07f34a5a23d88

data/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.0]
+- Support for dynamic service names by setting `DatadogQueueBus.service_name` to a Callable
+
 ## [2.0.0]
 - Replaces ddtrace with the updated `datadog` gem
 

data/README.md

@@ -32,6 +32,18 @@ To override the default service name (which will be `queue-bus` if not set):
 DatadogQueueBus.service_name = 'my-queue-bus-service'
 ```
 
+You can also set the service name to a Callable that accepts the attributes hash and returns a String, granting you flexibility to monitor larger installations as separate services:
+
+```ruby
+DatadogQueueBus.service_name = ->(attrs) do
+    if attrs['bus_rider_app_key'].nil? || attrs['bus_rider_app_key'].empty?
+      'default-queue-bus-service'
+    else
+        "#{attrs['bus_rider_app_key']}-queue-bus-service"
+    end
+ end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/datadog-queue-bus.rb

@@ -9,6 +9,7 @@ require 'datadog_queue_bus/middleware'
 module DatadogQueueBus
   class << self
     # Sets the service_name that will be used when reporting queue-bus spans.
+    # Set this to a String, or to a Callable that accepts an attributes hash and returns a String.
     attr_writer :service_name
 
     # Returns the service name that is used when reporting queue-bus spans.

data/lib/datadog_queue_bus/middleware.rb

@@ -13,9 +13,15 @@ module DatadogQueueBus
       resource += " event=#{event_type}" if event_type
       resource += " sub=#{sub_key}" if sub_key
 
+      service_name = if DatadogQueueBus.service_name.respond_to?(:call)
+                      DatadogQueueBus.service_name.call(attrs)
+                    else
+                      DatadogQueueBus.service_name
+                    end
+
       # def trace(name, continue_from: nil, **span_options, &block)
       Datadog::Tracing.trace('queue-bus.worker',
-                             service: DatadogQueueBus.service_name,
+                             service: service_name,
                              resource: resource) do |span|
         attrs.keys.grep(/^bus_/).each do |key|
           span.set_tag("queue-bus.#{key}", attrs[key])

data/lib/datadog_queue_bus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogQueueBus
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/datadog_queue_bus/middleware_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe DatadogQueueBus::Middleware do
     subject.call(attrs)
   end
 
-  context 'with a service name' do
+  context 'with a static service name' do
     let(:name) { rand.to_s }
 
     before do
@@ -35,6 +35,22 @@ RSpec.describe DatadogQueueBus::Middleware do
     end
   end
 
+  context 'with a dynamic service name' do
+    let(:name) { rand.to_s }
+    let(:service_name) { ->(attrs) { name } }
+
+    before do
+      DatadogQueueBus.service_name = service_name
+    end
+
+    it 'sends the service name' do
+      expect(tracer)
+        .to receive(:trace)
+        .with('queue-bus.worker', hash_including(service: name))
+      subject.call(attrs)
+    end
+  end
+
   context 'with an event type' do
     let(:attrs) do
       super().merge('bus_event_type' => 'my_event')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datadog-queue-bus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - kbacha
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -127,7 +126,6 @@ homepage: https://github.com/queue-bus/datadog-queue-bus
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Datadog APM integration for queue-bus
 test_files: