queue_classic_plus 4.0.0.alpha10 → 4.0.0.alpha12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e8dfec194b5946e629568f8fc73041f0a9f546b737ab2926446cfa0bffe854
-  data.tar.gz: e45cbfdd17b764c9569f554ac989e3ab03948a237265f53605aba8032be28bd1
+  metadata.gz: 53bcc9820afd73035eac622633277005186232b40cee67736b6e7365dc00ccee
+  data.tar.gz: cfcb45c257cc50fdbeca8dd594aba7b0387ad6e210f7a1a314022488aae885cf
 SHA512:
-  metadata.gz: 6380f8e7aaacae04565c0d1ed2a6b0bb5a9257709f803efd015914a032d1aa35cf4757c4dee8c7639bf9ec03e92df8352a08dddd0ab1f53ccf85d18c7fa77685
-  data.tar.gz: eefd27dce5e3f9e6a5a1c33a5b6572890a29142b2acf9b65dc2802a125b6fa173dedd48e0f216f61f9384bfa10cf13651d6173b8ca1a0d07e4ad66f4201a3ea1
+  metadata.gz: 9bbd716d0c1a11645745f4929543bac35220db15e9bd76baf9677643cb5f66138ed7cc1a9c040d0bcfa91b57bb9afb84042339759e1a687c2bcdff805e14861e
+  data.tar.gz: ec310250c95292616e98e894ece699f6dc10adb7824684d0cfd209f56146c4b49f3d7ee32a37763a52947af7af8c05a7c0568a20327db22936ffe7f3328771ca

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: cimg/ruby:3.0.3
+      - image: cimg/ruby:3.2.0
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -27,7 +27,7 @@ jobs:
 
   push_to_rubygems:
     docker:
-      - image: cimg/ruby:3.0.3
+      - image: cimg/ruby:3.2.0
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -47,6 +47,21 @@ jobs:
             gem build queue_classic_plus
             gem push queue_classic_plus-*.gem
 
+  update_jira:
+    docker:
+      - image: alpine:3.8
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_TOKEN
+    steps:
+      - run:
+          name: Install dependencies
+          command: apk add --no-cache bash curl git openssh
+      - checkout
+      - run:
+          name: Update JIRA
+          command: .circleci/update-jira.sh
+
 workflows:
   version: 2
   gem_release:
@@ -65,3 +80,10 @@ workflows:
                 - /^v.*/
           context:
             - DockerHub
+            - RubyGems
+      - update_jira:
+          context:
+            - DockerHub
+            - update-jira-webhook
+          requires:
+            - push_to_rubygems

data/.circleci/update-jira.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Use JIRA automation webhooks to move issues to SHIPPED:
+# https://support.atlassian.com/jira-software-cloud/docs/automation-triggers/#Automationtriggers-Incomingwebhook
+
+git log --max-count=50 --pretty=format:'%s' | grep -Eo '^\w+-[0-9]+' | sort -u | while read i; do
+  curl -X POST "$UPDATE_JIRA_WEBHOOK_URL?issue=$i"
+done

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem "queue_classic_matchers", github: 'rainforestapp/queue_classic_matchers'
 gem 'pry'
+gem 'dry-configurable'
 
 group :development do
   gem "guard-rspec", require: false

data/lib/queue_classic_plus/datadog.rb

@@ -1,9 +1,23 @@
 # frozen_string_literal: true
 
+require 'dry-configurable'
+
 module QueueClassicDatadog
+  extend Dry::Configurable
+
+  setting :dd_service
+
   def _perform(*args)
-    Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
-      super
+    service_name = QueueClassicDatadog.config.dd_service || 'qc.job'
+
+    if Gem.loaded_specs['ddtrace'].version >= Gem::Version.new('1')
+      Datadog::Tracing.trace('qc.job', service: service_name, resource: "#{name}#perform") do |_|
+        super
+      end
+    else
+      Datadog.tracer.trace('qc.job', service_name: 'qc.job', resource: "#{name}#perform") do |_|
+        super
+      end
     end
   end
 

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha10'.freeze
+  VERSION = '4.0.0.alpha12'.freeze
 end

data/spec/datadog_spec.rb

@@ -10,9 +10,23 @@ describe 'requiring queue_classic_plus/new_relic' do
 
   it 'adds Datadog profiling support' do
     require 'queue_classic_plus/datadog'
-    expect(Datadog.tracer).to receive(:trace).with(
-      'qc.job', service_name: 'qc.job', resource: 'FunkyName#perform'
+    expect(Datadog::Tracing).to receive(:trace).with(
+      'qc.job', service: 'qc.job', resource: 'FunkyName#perform'
     )
     subject
   end
+
+  context "when service name is configured" do
+    let(:configured_service_name) { "configured_service_name" }
+
+    it "traces using the service name" do
+      require 'queue_classic_plus/datadog'
+      QueueClassicDatadog.config.dd_service = configured_service_name
+
+      expect(Datadog::Tracing).to receive(:trace).with(
+        'qc.job', service: configured_service_name, resource: 'FunkyName#perform'
+      )
+      subject
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha10
+  version: 4.0.0.alpha12
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic
@@ -92,6 +92,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".circleci/update-jira.sh"
 - ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Useful extras for Queue Classic