Skip to content

Commit 5710c40

Browse files
authored
Merge pull request #75 from DataDog/Watson1978/json-main-repo
Use JSON.generate instead of Yajl.dump
2 parents ef54cd6 + 3b48bf5 commit 5710c40

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

LICENSE-3rdparty.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Component,Origin,License
2-
plugin,github.com/brianmario/yajl-ruby,MIT
32
plugin,github.com/bundler/bundler,MIT
43
plugin,github.com/ruby/openssl,BSD-2-Clause
54
plugin,github.com/ruby/rake,MIT

fluent-plugin-datadog.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
2929
spec.add_development_dependency "bundler", "~> 2.1"
3030
spec.add_development_dependency "test-unit", '~> 3.1'
3131
spec.add_development_dependency "rake", "~> 12.0"
32-
spec.add_development_dependency "yajl-ruby", "~> 1.2"
3332
spec.add_development_dependency 'webmock', "~> 3.6.0"
3433

3534
spec.metadata = {

lib/fluent/plugin/out_datadog.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
require "socket"
77
require "openssl"
8-
require "yajl"
8+
require "json"
99
require "zlib"
1010
require "fluent/plugin/output"
1111

@@ -118,10 +118,10 @@ def format(tag, time, record)
118118
# is compatible with Time.at below.
119119
record = enrich_record(tag, time.to_f, record)
120120
if @use_http
121-
record = Yajl.dump(record)
121+
record = JSON.generate(record)
122122
else
123123
if @use_json
124-
record = "#{api_key} #{Yajl.dump(record)}"
124+
record = "#{api_key} #{JSON.generate(record)}"
125125
else
126126
record = "#{api_key} #{record}"
127127
end

0 commit comments

Comments
 (0)