fluent-plugin-newrelic 0.2.7 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0773cd3e502a6dd497014062c8be8403f514c77bea25616ffd6fbf90fad30287
4
- data.tar.gz: 86dbe19317eaf443f5dda768c863dac741ddf78667b36a5f391c9454041334f5
3
+ metadata.gz: 87b63e728e6200ed540cd79312f282f37e61cae7a6882431f27cc88e193dbaf8
4
+ data.tar.gz: 2a14f80ae306fc788cedfd9e7ca5e0bea336689e2f7b1be03ce6795776322db9
5
5
  SHA512:
6
- metadata.gz: 4b0349c68cf61dcf9bd0199d90ab537b7d12a272f506df873795f23c19485302bf1f7fbcdbbc444b091742f70d6cc261281550bd971c803c905dd6d5b41d4707
7
- data.tar.gz: 109fd9f8727729ae92ef5702267e195838b358e99d107fdb547d21f5edc42a0c2eacff36a6a9f9ec1e9e34defc4e864a91d9f9ad49b9b1ad01d889e292267699
6
+ metadata.gz: 5278a2cc7cebd0fe819192efcb401a4c2c420ab652bf4f7bccfc2db872c85bb0758027185b073fb21e96cbe98bcfcac163964f6b00a2a879a6bdee1864908f6c
7
+ data.tar.gz: d6bc99a34a7f632862a68a13fdcefbca68cf279dfc7f13dd04adce27c51274a8311b694ec506832b3c35f02095fdbacdb4a499f086707248552c65ec9f61f2e3
@@ -17,7 +17,6 @@ require 'fluent/plugin/output'
17
17
  require 'net/http'
18
18
  require 'uri'
19
19
  require 'zlib'
20
- require 'json'
21
20
  require 'newrelic-fluentd-output/version'
22
21
 
23
22
  module Fluent
@@ -65,21 +64,16 @@ module Fluent
65
64
  def package_record(record, timestamp)
66
65
  packaged = {
67
66
  'timestamp' => timestamp,
68
- 'attributes' => {}
67
+ # non-intrinsic attributes get put into 'attributes'
68
+ 'attributes' => record
69
69
  }
70
70
 
71
+ # intrinsic attributes go at the top level
71
72
  if record.has_key?('message')
72
- message = record['message']
73
- packaged['attributes'] = packaged['attributes'].merge(maybe_parse_json(message))
74
- end
75
-
76
- record.each do |key, value|
77
- if key == 'message'
78
- packaged['message'] = record['message']
79
- else
80
- packaged['attributes'][key] = record[key]
81
- end
73
+ packaged['message'] = record['message']
74
+ packaged['attributes'].delete('message')
82
75
  end
76
+
83
77
  packaged
84
78
  end
85
79
 
@@ -144,24 +138,6 @@ module Fluent
144
138
  http.request(request)
145
139
  end
146
140
 
147
- def maybe_parse_message_json(record)
148
- if record.has_key?('message')
149
- message = record['message']
150
- record = record.merge(maybe_parse_json(message))
151
- end
152
- record
153
- end
154
-
155
- def maybe_parse_json(message)
156
- begin
157
- parsed = JSON.parse(message)
158
- if Hash === parsed
159
- return parsed
160
- end
161
- rescue JSON::ParserError
162
- end
163
- return {}
164
- end
165
141
  end
166
142
  end
167
143
  end
@@ -1,3 +1,3 @@
1
1
  module NewrelicFluentdOutput
2
- VERSION = "0.2.7"
2
+ VERSION = "0.2.8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-newrelic
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7
4
+ version: 0.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - New Relic Logging Team