atatus 1.3.0 → 1.4.0

data/lib/atatus/transport/serializers/transaction_serializer.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -9,7 +26,6 @@ module Atatus
           @context_serializer ||= ContextSerializer.new(config)
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(transaction)
           {
             transaction: {
@@ -22,6 +38,7 @@ module Atatus
               duration: ms(transaction.duration),
               timestamp: transaction.timestamp,
               sampled: transaction.sampled?,
+              sample_rate: transaction.sample_rate,
               context: context_serializer.build(transaction.context),
               span_count: {
                 started: transaction.started_spans,
@@ -30,7 +47,6 @@ module Atatus
             }
           }
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end

data/lib/atatus/transport/user_agent.rb

@@ -0,0 +1,48 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module Atatus
+  module Transport
+    # @api private
+    class UserAgent
+      def initialize(config)
+        @built = build(config)
+      end
+
+      def to_s
+        @built
+      end
+
+      private
+
+      def build(config)
+        metadata = Metadata.new(config)
+
+        [
+          "atatus-ruby/#{VERSION}",
+          HTTP::Request::USER_AGENT,
+          [
+            metadata.service.runtime.name,
+            metadata.service.runtime.version
+          ].join('/')
+        ].join(' ')
+      end
+    end
+  end
+end

data/lib/atatus/transport/worker.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -6,6 +23,14 @@ module Atatus
     class Worker
       include Logging
 
+      class << self
+        def adapter
+          @adapter ||= Connection
+        end
+
+        attr_writer :adapter
+      end
+
       # @api private
       class StopMessage; end
 
@@ -16,8 +41,7 @@ module Atatus
         config,
         queue,
         serializers:,
-        filters:,
-        conn_adapter: Connection
+        filters:
       )
         @config = config
         @queue = queue
@@ -25,13 +49,10 @@ module Atatus
         @serializers = serializers
         @filters = filters
 
-        metadata = serializers.serialize(Metadata.new(config))
-        @connection = conn_adapter.new(config, metadata)
+        @connection = self.class.adapter.new(config)
       end
 
       attr_reader :queue, :filters, :name, :connection, :serializers
-
-      # rubocop:disable Metrics/MethodLength
       def work_forever
         while (msg = queue.pop)
           case msg
@@ -47,7 +68,6 @@ module Atatus
         warn 'Worker died with exception: %s', e.inspect
         debug e.backtrace.join("\n")
       end
-      # rubocop:enable Metrics/MethodLength
 
       def process(resource)
         return unless (json = serialize_and_filter(resource))
@@ -57,6 +77,10 @@ module Atatus
       private
 
       def serialize_and_filter(resource)
+        if resource.respond_to?(:prepare_for_serialization!)
+          resource.prepare_for_serialization!
+        end
+
         serialized = serializers.serialize(resource)
 
         # if a filter returns nil, it means skip the event

data/lib/atatus/util.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
@@ -23,7 +40,7 @@ module Atatus
 
     def self.git_sha
       sha = `git rev-parse --verify HEAD 2>&1`.chomp
-      $? && $?.success? ? sha : nil
+      $?&.success? ? sha : nil
     end
 
     def self.hex_to_bits(str)

data/lib/atatus/util/inflector.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/util/lru_cache.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/util/throttle.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus

data/lib/atatus/version.rb

@@ -1,5 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module Atatus
-  VERSION = '1.3.0'
+  AGENT_NAME = 'Ruby'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atatus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Atatus
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email: success@atatus.com
 executables: []
 extensions: []
@@ -55,25 +55,16 @@ files:
 - LICENSE
 - LICENSE-THIRD-PARTY
 - README.md
-- Rakefile
 - atatus.gemspec
 - atatus.yml
-- bench/.gitignore
-- bench/app.rb
-- bench/benchmark.rb
-- bench/report.rb
-- bench/rubyprof.rb
-- bench/stackprof.rb
-- bin/build_docs
-- bin/console
-- bin/setup
-- bin/with_framework
 - lib/atatus.rb
 - lib/atatus/agent.rb
 - lib/atatus/central_config.rb
 - lib/atatus/central_config/cache_control.rb
+- lib/atatus/child_durations.rb
 - lib/atatus/collector/base.rb
 - lib/atatus/collector/builder.rb
+- lib/atatus/collector/hist.rb
 - lib/atatus/collector/layer.rb
 - lib/atatus/collector/transport.rb
 - lib/atatus/config.rb
@@ -81,6 +72,7 @@ files:
 - lib/atatus/config/duration.rb
 - lib/atatus/config/options.rb
 - lib/atatus/config/regexp_list.rb
+- lib/atatus/config/wildcard_pattern_list.rb
 - lib/atatus/context.rb
 - lib/atatus/context/request.rb
 - lib/atatus/context/request/socket.rb
@@ -93,6 +85,9 @@ files:
 - lib/atatus/error/exception.rb
 - lib/atatus/error/log.rb
 - lib/atatus/error_builder.rb
+- lib/atatus/grape.rb
+- lib/atatus/graphql.rb
+- lib/atatus/grpc.rb
 - lib/atatus/instrumenter.rb
 - lib/atatus/internal_error.rb
 - lib/atatus/logging.rb
@@ -104,25 +99,39 @@ files:
 - lib/atatus/metadata/system_info/hw_info.rb
 - lib/atatus/metadata/system_info/os_info.rb
 - lib/atatus/metrics.rb
-- lib/atatus/metrics/cpu_mem.rb
-- lib/atatus/metrics/vm.rb
+- lib/atatus/metrics/breakdown_set.rb
+- lib/atatus/metrics/cpu_mem_set.rb
+- lib/atatus/metrics/metric.rb
+- lib/atatus/metrics/set.rb
+- lib/atatus/metrics/span_scoped_set.rb
+- lib/atatus/metrics/transaction_set.rb
+- lib/atatus/metrics/vm_set.rb
 - lib/atatus/metricset.rb
 - lib/atatus/middleware.rb
 - lib/atatus/naively_hashable.rb
 - lib/atatus/normalizers.rb
-- lib/atatus/normalizers/action_controller.rb
-- lib/atatus/normalizers/action_mailer.rb
-- lib/atatus/normalizers/action_view.rb
-- lib/atatus/normalizers/active_record.rb
+- lib/atatus/normalizers/grape.rb
+- lib/atatus/normalizers/grape/endpoint_run.rb
+- lib/atatus/normalizers/rails.rb
+- lib/atatus/normalizers/rails/action_controller.rb
+- lib/atatus/normalizers/rails/action_mailer.rb
+- lib/atatus/normalizers/rails/action_view.rb
+- lib/atatus/normalizers/rails/active_record.rb
 - lib/atatus/opentracing.rb
 - lib/atatus/rails.rb
 - lib/atatus/railtie.rb
+- lib/atatus/resque.rb
+- lib/atatus/sinatra.rb
 - lib/atatus/span.rb
 - lib/atatus/span/context.rb
+- lib/atatus/span/context/db.rb
+- lib/atatus/span/context/destination.rb
+- lib/atatus/span/context/http.rb
 - lib/atatus/span_helpers.rb
 - lib/atatus/spies.rb
 - lib/atatus/spies/action_dispatch.rb
 - lib/atatus/spies/delayed_job.rb
+- lib/atatus/spies/dynamo_db.rb
 - lib/atatus/spies/elasticsearch.rb
 - lib/atatus/spies/faraday.rb
 - lib/atatus/spies/http.rb
@@ -131,23 +140,35 @@ files:
 - lib/atatus/spies/net_http.rb
 - lib/atatus/spies/rake.rb
 - lib/atatus/spies/redis.rb
+- lib/atatus/spies/resque.rb
 - lib/atatus/spies/sequel.rb
+- lib/atatus/spies/shoryuken.rb
 - lib/atatus/spies/sidekiq.rb
 - lib/atatus/spies/sinatra.rb
+- lib/atatus/spies/sneakers.rb
+- lib/atatus/spies/sucker_punch.rb
 - lib/atatus/spies/tilt.rb
+- lib/atatus/sql.rb
+- lib/atatus/sql/signature.rb
+- lib/atatus/sql/tokenizer.rb
+- lib/atatus/sql/tokens.rb
 - lib/atatus/sql_summarizer.rb
 - lib/atatus/stacktrace.rb
 - lib/atatus/stacktrace/frame.rb
 - lib/atatus/stacktrace_builder.rb
 - lib/atatus/subscriber.rb
 - lib/atatus/trace_context.rb
+- lib/atatus/trace_context/traceparent.rb
+- lib/atatus/trace_context/tracestate.rb
 - lib/atatus/transaction.rb
 - lib/atatus/transport/base.rb
 - lib/atatus/transport/connection.rb
 - lib/atatus/transport/connection/http.rb
 - lib/atatus/transport/connection/proxy_pipe.rb
 - lib/atatus/transport/filters.rb
+- lib/atatus/transport/filters/hash_sanitizer.rb
 - lib/atatus/transport/filters/secrets_filter.rb
+- lib/atatus/transport/headers.rb
 - lib/atatus/transport/serializers.rb
 - lib/atatus/transport/serializers/context_serializer.rb
 - lib/atatus/transport/serializers/error_serializer.rb
@@ -155,21 +176,20 @@ files:
 - lib/atatus/transport/serializers/metricset_serializer.rb
 - lib/atatus/transport/serializers/span_serializer.rb
 - lib/atatus/transport/serializers/transaction_serializer.rb
+- lib/atatus/transport/user_agent.rb
 - lib/atatus/transport/worker.rb
 - lib/atatus/util.rb
 - lib/atatus/util/inflector.rb
 - lib/atatus/util/lru_cache.rb
-- lib/atatus/util/prefixed_logger.rb
 - lib/atatus/util/throttle.rb
 - lib/atatus/version.rb
-- vendor/.gitkeep
 homepage: https://www.atatus.com
 licenses:
 - Atatus
 metadata:
   changelog_uri: https://docs.atatus.com/docs/release-notes/ruby.html
-  documentation_uri: https://docs.atatus.com/docs/application-monitoring/ruby-agent/rails.html
-post_install_message: 
+  documentation_uri: https://docs.atatus.com/docs/application-monitoring/ruby-agent/overview.html
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Atatus Ruby Agent
 test_files: []