elastic-apm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8a85fd85634ae33591a952d1a9833d6b2a7e828b36a366c5811f5d9116e901
-  data.tar.gz: 1bf462f1c2d14b015a2b52fc3dd510fad3fa642a14eb4b16f1aecca293bd25f7
+  metadata.gz: e445ae7019c027e5e0b9e18aeb36b6bb646c650175d32389dee1cfafe2a274bc
+  data.tar.gz: d5868c15d2844076b6abea3ce55c90e10183cfba812116bc95293a26f09dfad5
 SHA512:
-  metadata.gz: 530ecf5853ada4749b8c7f0e14a1faa7bd37a5af3221082f3b00bca1f078a8c49e1fa55543f97183709207f5021a946333f8f7ccc91842781602fb1139418781
-  data.tar.gz: 57c299275b25b447378a3c73352082f171f75805183ed00f7ac2ba4ad7cbf2fe6a78dc1c5e4627ee40a7241177b8413f190d624e2a3b175a87446e66c68472a3
+  metadata.gz: 77fe20eda7fe120cbe7a4ff6b295cc5e5229a3f08be1373c9a4b5196a9dd355d48932acc157999ce1f4e8af777938054412bb3de9af2cd6bcf4ddca23058e8d4
+  data.tar.gz: a3c1627c60684229f7aae7379910d8ef21799ed7e05923e86cca819d7a77f4c85a43f31c003713dcafd84694d60fd474f084d7329ebaae0330a7f43c27c3508b

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+
+## 1.0.1 (2018-07-30)
+
+### Fixed
+
+- Fixed internal LRU cache to be threadsafe ([#178](https://github.com/elastic/apm-agent-ruby/pulls/178))
+
 ## 1.0.0 (2018-06-29)
 
 ### Added

data/README.md

@@ -5,21 +5,7 @@
 
 The official Rubygem for [Elastic][] [APM][].
 
-**🚧 NB:** The current version of the agent is `1.0.0.beta1`. This means we're really close to `1.0.0`. The API is stable and the only remaining thing to do is testing. Thank you if you've already been testing the agent!
-
-To test the prerelease:
-
-```sh
-gem install elastic-apm --pre
-```
-
-or in your `Gemfile`:
-
-```ruby
-gem 'elastic-apm', '~> 1.0.0.beta1'
-```
-
-💡 We'd love to get feedback and information about you setup – please answer this [☑ short survey](https://goo.gl/forms/LQktvn4rkLWBNSWy1).
+💡 We'd love to get feedback and information about your setup – please answer this [☑ short survey](https://goo.gl/forms/LQktvn4rkLWBNSWy1).
 
 ---
 

data/bench/benchmark.rb

@@ -51,7 +51,7 @@ def do_bench(transaction_count: 10, **config)
   end
 end
 
-transaction_count = Integer(ARGV.shift || 10)
+transaction_count = Integer(ARGV.shift || 10_000)
 
 banner 'Default settings'
 do_bench transaction_count: transaction_count

data/bench/report.rb

@@ -12,6 +12,20 @@ ELASTICSEARCH_URL = ENV.fetch('CLOUD_ADDR') { '' }.chomp
 if ELASTICSEARCH_URL == ''
   puts 'ELASTICSEARCH_URL missing, exiting ...'
   exit 1
+else
+  # debug
+  # puts ELASTICSEARCH_URL.gsub(/:[^\/]+(.*)@/) { |m| ":#{Array.new(m.length - 2).map { '*' }.join}@" }
+end
+
+CONN = Faraday.new(url: ELASTICSEARCH_URL) do |f|
+  # f.response :logger
+  f.adapter Faraday.default_adapter
+end
+
+healthcheck = CONN.get('/microbenchmark*/_search')
+if healthcheck.status != 200
+  puts healthcheck.body.to_s
+  exit 1
 end
 
 input = STDIN.read.split("\n")
@@ -22,6 +36,8 @@ counts = input.grep(/^Count: /).map { |a| a.gsub(/^Count: /, '').to_i }
 averages = input.grep(/^avg/).map { |a| a.match(/\((.+)\)/)[1].to_f }
 
 git_sha, git_date, git_msg = `git log -n 1 --pretty="format:%H|||%ai|||%s"`.split('|||')
+git_date ||= Time.new.iso8601
+git_branch = `git branch | grep '\*' | awk '{print $2}'`
 platform = Gem::Platform.local
 
 payloads = titles.zip(averages, counts).map do |(title, avg, count)|
@@ -33,6 +49,7 @@ payloads = titles.zip(averages, counts).map do |(title, avg, count)|
     'git.commit' => git_sha,
     'git.date' => Time.parse(git_date).iso8601,
     'git.subject' => git_msg,
+    'git.branch' => git_branch,
     hostname: `hostname`.chomp,
     engine: RUBY_ENGINE,
     arch: platform.cpu,
@@ -43,11 +60,6 @@ end
 
 puts '=== Reporting to ES'
 
-CONN = Faraday.new(url: ELASTICSEARCH_URL) do |f|
-  f.response :logger
-  f.adapter Faraday.default_adapter
-end
-
 payloads.each do |payload|
   result = CONN.post('/benchmark-ruby/_doc') do |req|
     req.headers['Content-Type'] = 'application/json'

data/lib/elastic_apm/util/lru_cache.rb

@@ -7,27 +7,22 @@ module ElasticAPM
       def initialize(max_size = 512, &block)
         @max_size = max_size
         @data = Hash.new(&block)
-        @missing_key_block = block
+        @mutex = Mutex.new
       end
 
       def [](key)
-        found = true
-        value = @data.delete(key) { found = false }
-
-        if found
-          @data[key] = value
-        else
-          @missing_key_block && @missing_key_block.call(self, key)
+        @mutex.synchronize do
+          val = @data[key]
+          return unless val
+          add(key, val)
+          val
         end
       end
 
       def []=(key, val)
-        @data.delete(key)
-        @data[key] = val
-
-        return unless @data.length > @max_size
-
-        @data.delete(@data.first[0])
+        @mutex.synchronize do
+          add(key, val)
+        end
       end
 
       def length
@@ -37,6 +32,17 @@ module ElasticAPM
       def to_a
         @data.to_a
       end
+
+      private
+
+      def add(key, val)
+        @data.delete(key)
+        @data[key] = val
+
+        return unless @data.length > @max_size
+
+        @data.delete(@data.first[0])
+      end
     end
   end
 end

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby