apm_traceable-datadog 1.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788d76097be68d5120a95264b08b24e3db5ef7cac59d157ceedab1f21e91cdc9
-  data.tar.gz: a5027248fa0cd76a10bc72448b2026a0b4d298d5499c183a448a8efef334f62a
+  metadata.gz: 434d361660169a1d139481621475ad043b8a8828dfc911719d64e49303774a97
+  data.tar.gz: c1f4242e74d043f339ab9c49427886a6ec2df132da84f50119ac94a4efac6d42
 SHA512:
-  metadata.gz: 5af96721cf7ee16158f2dc0bf24400962ec763ab2bbad3ac50568ee113f8d377050c543f5e62d36d1b6ca673884af3c0b3a5913d43d3b6766dc1e039bcee713b
-  data.tar.gz: 36e3606b14fdd4cc6d18bfd2e966dad20659892a69904c4356a7077dcb387418f0591097b171a4198499cf35e28d86e042fa51535a80efefea62de5deeb02d3e
+  metadata.gz: 11b3d9676e80f2cc43db56cd26d91ee3d0962f47d3eae9d3e93de52a1992d928cd39a915bffc15e7387958bc5eb503b242f7d705733bdee3aa8649700eefcce2
+  data.tar.gz: 9f652bac5203ca069e69eb2bfbacf3009f95b3507defd035bc5213ac01f092873fc9791e162f93336b9aa298abe38b0f3ce3485f709dc8dbec2d7abdd8cd1449

data/Gemfile

@@ -9,4 +9,4 @@ gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
 gem 'rubocop', '~> 1.21'
 gem 'rubocop-rake', '~> 0.6.0'
-gem 'rubocop-rspec', '~> 2.24.0'
+gem 'rubocop-rspec', '~> 3.9'

data/lib/apm_traceable/adapters/datadog_adapter.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require 'active_support/inflector'
+require 'concurrent/map'
 require 'datadog/tracing'
 
 module ApmTraceable
   module Adapters
     # Datadogへトレース結果を送るためのアダプター
     class DatadogAdapter
+      RESOURCE_NAME_CACHE = Concurrent::Map.new
+      UNKNOWN_CLASS_NAME  = 'unknown_class'
+
       def initialize(service_name:)
         super()
 
@@ -26,8 +30,15 @@ module ApmTraceable
       attr_reader :service_name
 
       def resource_name(context_class)
-        # include 先のクラス名を利用して `admin.users_controller` のような文字列を作る
-        (context_class&.name || 'UnknownClass').underscore&.tr('/', '.')
+        key = context_class&.name
+
+        return UNKNOWN_CLASS_NAME unless key
+
+        # Concurrent::Mapを使い、既に生成済みのリソース名に関しては処理をスキップ
+        RESOURCE_NAME_CACHE.compute_if_absent(key) do
+          # include 先のクラス名を利用して `admin.users_controller` のような文字列を作る
+          key.underscore.tr('/', '.').freeze
+        end
       end
     end
   end

data/lib/apm_traceable/datadog/version.rb

@@ -2,6 +2,6 @@
 
 module ApmTraceable
   module Datadog
-    VERSION = '1.0.2'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: apm_traceable-datadog
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - kokuyouwind
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,19 +38,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: ddtrace
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: datadog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: APM Traceable gem Plugin for Datadog
 email:
 - kokuyouwind@gmail.com
@@ -66,7 +79,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- apm_traceable-datadog.gemspec
 - bin/console
 - bin/setup
 - lib/apm_traceable/adapters/datadog_adapter.rb
@@ -80,7 +92,6 @@ metadata:
   source_code_uri: https://github.com/kokuyouwind/apm_traceable-datadog
   changelog_uri: https://github.com/kokuyouwind/apm_traceable-datadog
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: APM Traceable gem Plugin for Datadog
 test_files: []

data/apm_traceable-datadog.gemspec

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/apm_traceable/datadog/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'apm_traceable-datadog'
-  spec.version = ApmTraceable::Datadog::VERSION
-  spec.authors = ['kokuyouwind']
-  spec.email = ['kokuyouwind@gmail.com']
-
-  spec.summary = 'APM Traceable gem Plugin for Datadog'
-  spec.description = 'APM Traceable gem Plugin for Datadog'
-  spec.homepage = 'https://github.com/kokuyouwind/apm_traceable-datadog'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.0.0'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/kokuyouwind/apm_traceable-datadog'
-  spec.metadata['changelog_uri'] = 'https://github.com/kokuyouwind/apm_traceable-datadog'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'activesupport', '>= 7.0.0'
-  spec.add_dependency 'apm_traceable', '>= 1.0.0'
-  spec.add_dependency 'ddtrace', '>= 1.14.0'
-  spec.metadata['rubygems_mfa_required'] = 'true'
-end