oneapm_rpm 1.3.5 → 1.3.6.rc1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- OGNiMGEzMDI4NDdmZDY3MWM4Y2NjNjY2ZDgyMzU3ZDUxODNiNTc1MQ==
4
+ ZTNiNTJlODlmNmExOGM0MTU5MWY5YWYyMWJmNzBiMjJhNjkwOGZkMg==
5
5
  data.tar.gz: !binary |-
6
- NDc2NTlhNTJiOWU3MTNiYjdiNWRjYjg1MWE4MjIxYTY0MmZhNTIxNw==
6
+ YmRkODUxYTg0MjNiNWRkMzFkMjdjNGQ5MDkzOWM1MDk2ODQxMGQxMw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YjFlYjY3MzMyZmJjYzI5M2RhZTkyNTVhOTRkNTgyMjc5MDIyMGE2OTYwMmZm
10
- MWEwYjc0ZTAzN2MyZDFiOGQxNGRkNjA3NTM5NTkyNjUxZGNkMDRmMzM4ZTU5
11
- MDhlZWI0ODgyMjM2MmIxMGU1YjU4MTAzMDc1MTRmYmVkZWFlM2I=
9
+ Mzg4MzUzYmMxOWQ1N2UyMTg5OTRiNGM5NDBkODhiYjg2YjBiNTNjZDU3YmFm
10
+ MDIyYmEzZDU0NDYwMDc0MGY0MGFiYjQ4NjVkNGFmZjkyZGYzNTExYTgxMjEy
11
+ NGVmNTZlNTk4NTRiMmQzNjNmMjUzZTM4OWVmZmU5NjM4ZTM3MjQ=
12
12
  data.tar.gz: !binary |-
13
- YWEyNDI1MDAxYjNkMjNhYjIxMzE0Yzk0YTEzMDFjODFmYjBlY2EwODA2YWU0
14
- Mjg4NDc2YmE0ZmM0OTlhZDNiMGQ2NjVjYjI1NTA2NzE0ZGExNzEyM2QzYzk2
15
- N2VlZjUxZDVmZWU3NjU1NjE4YWRiYzczOThmZGRhZmYyYWFmNjI=
13
+ ODk3Yjc4ZDFkNWExMzQ5YTdmNTg0ZmIzZTUxOWI3YjRhOTU1ZTRkODFkYjY5
14
+ ZGRhOGJmM2NhOTc0ZGM4MDRlZDU1ZjMxMzRiNmRiNTNmNGQyODYwNzMzZTM2
15
+ YzQ5Y2Y4ZjMwNTQ0NDJiZGQ5YmMxMTBhNTBjN2IxYzgxMjExOGY=
@@ -9,10 +9,10 @@ module OneApm
9
9
  extend self
10
10
 
11
11
  API_ENDPOINT = 'api.endpoint'.freeze
12
- FORMAT_REGEX = /\(\/?\.:format\)/.freeze
12
+ FORMAT_REGEX = /\(\/?\.(:format|json)?\)/.freeze
13
13
  VERSION_REGEX = /:version(\/|$)/.freeze
14
14
  EMPTY_STRING = ''.freeze
15
- MIN_VERSION = VersionNumber.new("0.2.0")
15
+ MIN_VERSION = VersionNumber.new('0.2.0')
16
16
 
17
17
  def handle_transaction(endpoint, class_name)
18
18
  return unless endpoint && route = endpoint.route
@@ -27,16 +27,27 @@ module OneApm
27
27
  end
28
28
 
29
29
  def name_for_transaction(route, class_name)
30
- action_name = route.route_path.sub(FORMAT_REGEX, EMPTY_STRING)
31
- method_name = route.route_method
30
+ route_path, route_method, route_version = path_method_version_of(route)
31
+ action_name = route_path.sub(FORMAT_REGEX, EMPTY_STRING)
32
+ method_name = route_method
32
33
 
33
- if route.route_version
34
+ if route_version
34
35
  action_name = action_name.sub(VERSION_REGEX, EMPTY_STRING)
35
- "#{class_name}-#{route.route_version}#{action_name} (#{method_name})"
36
+ "#{class_name}-#{route_version}#{action_name} (#{method_name})"
36
37
  else
37
38
  "#{class_name}#{action_name} (#{method_name})"
38
39
  end
39
40
  end
41
+
42
+ if defined?(::Grape::VERSION) && VersionNumber.new(::Grape::VERSION) >= VersionNumber.new('0.16.0')
43
+ def path_method_version_of(route)
44
+ [route.path, route.request_method, route.version]
45
+ end
46
+ else
47
+ def path_method_version_of(route)
48
+ [route.route_path, route.route_method, route.route_version]
49
+ end
50
+ end
40
51
 
41
52
  def capture_params(endpoint)
42
53
  txn = Transaction.tl_current
@@ -5,9 +5,10 @@ module OneApm
5
5
 
6
6
  MAJOR = 1
7
7
  MINOR = 3
8
- TINY = 5
8
+ TINY = 6
9
+ TAG = 'rc1'
9
10
 
10
- STRING = [MAJOR, MINOR, TINY].compact.join('.')
11
+ STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
11
12
 
12
13
  end
13
14
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oneapm_rpm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.5
4
+ version: 1.3.6.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - oneapm
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-28 00:00:00.000000000 Z
11
+ date: 2016-05-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake