appoptics_apm 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a652aaa478b98230f9f924d9b8aaf98c36d532dd078e66fe2f123c53d0b871e
-  data.tar.gz: dff2fd57dfab08035c3a3f0af29b9cf41ebf0df486fe5e2ce93db5fa9ecef306
+  metadata.gz: 6407eda7d31bb8fe541c0dc6295a82229c72a4fdcca5208f10cc30eae7c22d2c
+  data.tar.gz: 8dcfafc3e7bb8caf5c93afc6a54e5682cc9eea0dc790ec5a6334458b1b98107e
 SHA512:
-  metadata.gz: 187b9e776b1a976e12aa704cb8c1d894a8cd428b8e7702ed2871efd451d5d8127a7d02a1dd6461d87d3077c9348ec1334baaff5adc28e871ee67ae97d130632b
-  data.tar.gz: f7b555c14f9456c7a7a565003c48092104eed3c8f54d5c705e0abde35e33fc2e56748ddb7b6452729da5fa04dbad36c408f8fe9b2c58866261d3cecc9f532163
+  metadata.gz: e4f04e064600294fa39899f61fb153816c90bb5969fa1a9173ed65925e9f4e2f36e61670098fe5ecb7e18ddcf0995b9aac4150d1048510ae3127fe950e7bf52b
+  data.tar.gz: b33f037425f2b7d1d19cbd069456f75c28b97de0906b2a9950a2b1fa408771c083f8b5dc811480a0f9b60f21437ddd6e50ea37fd22fff3c36cb51bbb9782f057

data/.gitignore

@@ -1,35 +1,38 @@
-oboe*.gem
+*.code-workspace
+*.gem
 *.lock
-gemfiles/*.lock
-.ruby-version
-*~
 *.swp
+*.vscode
+*~
+.*byebug*
+.bundle
 .env
-lib/oboe_metal.so
+.github
+.irb_history
+.irbrc
+.ruby-version
+.travis
+.vagrant
+.yardoc
+builds
+coverage
+config
+doc
+ext/oboe_metal/*.o
 ext/oboe_metal/Makefile
+ext/oboe_metal/lib/liboboe*so*
 ext/oboe_metal/mkmf.log
 ext/oboe_metal/oboe_metal.so
 ext/oboe_metal/oboe_noop.so
-ext/oboe_metal/*.o
-ext/oboe_metal/lib/liboboe*so*
+ext/oboe_metal/src/bson/*
 ext/oboe_metal/src/oboe.h
 ext/oboe_metal/src/oboe.hpp
 ext/oboe_metal/src/oboe_debug.h
 ext/oboe_metal/src/oboe_wrap.cxx
-ext/oboe_metal/src/bson/*
-log/
-.vagrant
-gemfiles/.bundle
-swig*
-*.gem
-.yardoc
-coverage
-doc
-.*byebug*
 gemfiles/vendor*
+lib/rb_appoptics_apm.so
+lib/oboe_metal.so
+log
+oboe*.gem
 scrap*
-.irbrc
-*.code-workspace
-.irb_history
-.bundle/
-/builds/
+swig*

data/.travis.yml

@@ -96,6 +96,7 @@ before_script:
 #  - export APPOPTICS_TOKEN_BUCKET_CAPACITY=1000
 #  - export APPOPTICS_TOKEN_BUCKET_RATE=1000
   - export APPOPTICS_FROM_S3=true
+  - export OBOE_VERSION=10.0.0
 
 #  - bundle update --jobs=3 --retry=3
   - ./.travis/bundle.sh

data/lib/appoptics_apm/noop/context.rb

@@ -10,8 +10,6 @@ module AppOpticsAPM
     # noop version of :toString
     # toString would return the current context (xtrace) as string
     #
-    # the noop version returns an empty string
-    #
     def self.toString
       '2B0000000000000000000000000000000000000000000000000000000000'
     end
@@ -23,4 +21,4 @@ module AppOpticsAPM
 
     end
   end
-end
+end

data/lib/appoptics_apm/sdk/current_trace.rb

@@ -37,14 +37,10 @@ module AppOpticsAPM
         attr_reader :id
 
         def initialize
-          if AppOpticsAPM::Config[:log_traceId] == :never
-            @id = '0000000000000000000000000000000000000000-0'
-          else
-            @xtrace = AppOpticsAPM::Context.toString
-            task_id = AppOpticsAPM::XTrace.task_id(@xtrace)
-            sampled = AppOpticsAPM::XTrace.sampled?(@xtrace)
-            @id = "#{task_id}-#{sampled ? 1 : 0}"
-          end
+          @xtrace = AppOpticsAPM::Context.toString
+          task_id = AppOpticsAPM::XTrace.task_id(@xtrace)
+          sampled = AppOpticsAPM::XTrace.sampled?(@xtrace)
+          @id = "#{task_id}-#{sampled ? 1 : 0}"
         end
 
         # for_log returns a string in the format 'traceId=<current_trace.id>' or ''.
@@ -78,4 +74,4 @@ module AppOpticsAPM
 
     extend CurrentTrace
   end
-end
+end

data/lib/appoptics_apm/test.rb

@@ -53,8 +53,8 @@ module AppOpticsAPM
       def set_postgresql_env
         if ENV.key?('TRAVIS_PSQL_PASS')
           ENV['DATABASE_URL'] = "postgresql://postgres:#{ENV['TRAVIS_PSQL_PASS']}@127.0.0.1:5432/travis_ci_test"
-        elsif ENV.key?('DOCKER_PSQL_PASS')
-          ENV['DATABASE_URL'] = "postgresql://docker:#{ENV['DOCKER_PSQL_PASS']}@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
+        elsif ENV.key?('POSTGRES_USER')
+          ENV['DATABASE_URL'] = "postgresql://#{ENV['POSTGRES_USER']}@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
           # ENV['DATABASE_URL'] = "postgresql://postgres@#{ENV['PSQL_HOST']}:5432/travis_ci_test"
         else
           ENV['DATABASE_URL'] = 'postgresql://postgres@127.0.0.1:5432/travis_ci_test'

data/lib/appoptics_apm/version.rb

@@ -8,7 +8,7 @@ module AppOpticsAPM
   module Version
     MAJOR = 4 # breaking,
     MINOR = 12 # feature,
-    PATCH = 0 # fix => BFF
+    PATCH = 1 # fix => BFF
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appoptics_apm
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Maia Engeli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,20 +30,20 @@ dependencies:
   name: no_proxy_fix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: 'Automatic tracing and metrics for Ruby applications. Get started at
@@ -70,11 +70,9 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- app/assets/config/manifest.js
 - appoptics_apm.gemspec
 - bin/appoptics_apm_config
 - examples/sdk_examples.rb
-- ext/.vscode/launch.json
 - ext/oboe_metal/README.md
 - ext/oboe_metal/extconf.rb
 - ext/oboe_metal/lib/.keep
@@ -82,7 +80,6 @@ files:
 - ext/oboe_metal/src/VERSION
 - ext/oboe_metal/src/bson/bson.h
 - ext/oboe_metal/src/bson/platform_hacks.h
-- ext/oboe_metal/src/function_profiler.hpp
 - ext/oboe_metal/src/oboe.h
 - ext/oboe_metal/src/oboe.hpp
 - ext/oboe_metal/src/oboe_debug.h
@@ -171,7 +168,6 @@ files:
 - lib/oboe_metal.rb
 - lib/rails/generators/appoptics_apm/install_generator.rb
 - lib/rails/generators/appoptics_apm/templates/appoptics_apm_initializer.rb
-- lib/rb_appoptics_apm.so
 - yardoc_frontpage.md
 homepage: https://www.appoptics.com/
 licenses:
@@ -196,7 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: AppOptics APM performance instrumentation gem for Ruby

data/app/assets/config/manifest.js

@@ -1 +0,0 @@
-{}

data/ext/.vscode/launch.json

@@ -1,20 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "(lldb) Launch",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "enter program name, for example ${workspaceFolder}/a.out",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "lldb"
-        }
-    ]
-}

data/ext/oboe_metal/src/function_profiler.hpp

@@ -1,160 +0,0 @@
-// function_profiler C++11 per-thread function profling
-// https://git.the-pluc.net/function_profiler.git/
-// Version 0.3
-//
-// Copyright (C) 2015, 2016 Pierre-Luc Perrier <pluc@the-pluc.net>
-//
-// Licensed 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.
-
-#ifndef function_profiler_h
-#define function_profiler_h
-
-#ifdef FP_ENABLE
-
-#include <boost/chrono.hpp>
-
-#include <cstdio> // std::printf
-#include <ios>    // std::hex
-#include <string> // std::string
-#include <thread> // std::this_thread::get_id
-#include <iostream>
-#include <iomanip>
-
-namespace fp {
-
-// Main structure used to collect data
-struct collector {
-  // Clocks
-  using thread_clock = boost::chrono::thread_clock;
-  using thread_time_point = thread_clock::time_point;
-  using thread_accumulator = boost::chrono::duration<uint_least64_t, thread_clock::period>;
-
-  using steady_clock = boost::chrono::steady_clock;
-  using steady_time_point = steady_clock::time_point;
-  using steady_accumulator = boost::chrono::duration<uint_least64_t, steady_clock::period>;
-
-  // The duration we use for the report
-  using report_duration = boost::chrono::duration<double, boost::milli>;
-
-  collector() = delete;
-  collector(const std::string &name)
-    : m_thread_last{thread_clock::now()},
-      m_steady_last{steady_clock::now()},
-      m_count{0},
-      m_thread_accumulator{0},
-      m_steady_accumulator{0},
-      m_last_report{steady_clock::now()}
-  {
-    std::ostringstream os;
-    // os << "[FP] " << std::hex << std::this_thread::get_id() << " " << name << " #%-7lu %8.5F %8.5F %11.4F %11.4F\n";
-    os << std::setfill (' ') << std::setw(22) << name << "  " << std::hex << std::this_thread::get_id() << "\t#%-7lu\t%4.5F\t%4.5F\t%6.4F\t%6.4F\n";
-    m_fmt = os.str();
-  }
-
-  // We also report upon destruction. Note: this is probably a bad
-  // idea.
-  ~collector() noexcept
-  {
-    report();
-  }
-
-  inline void start() noexcept
-  {
-    m_thread_last = thread_clock::now();
-    m_steady_last = steady_clock::now();
-  }
-
-  inline void stop()
-  {
-    ++m_count;
-
-    {
-      const auto now = thread_clock::now();
-      m_thread_accumulator += now - m_thread_last;
-      m_thread_last = std::move(now);
-    }
-    {
-      const auto now = steady_clock::now();
-      m_steady_accumulator += now - m_steady_last;
-      m_steady_last = std::move(now);
-    }
-
-    // Check if we need to report current stats
-    if (m_steady_last - m_last_report > report_interval) {
-      m_last_report = m_steady_last;
-      report();
-    }
-  }
-
-private:
-  inline void report() const
-  {
-    if (m_count == 0) return;
-    const auto thread_ms = report_duration{m_thread_accumulator}.count();
-    const auto steady_ms = report_duration{m_steady_accumulator}.count();
-    std::printf(m_fmt.c_str(), m_count, steady_ms / m_count, thread_ms / m_count, steady_ms, thread_ms);
-  }
-
-private:
-  static constexpr auto report_interval = boost::chrono::seconds{1};
-
-  thread_time_point m_thread_last;         // Last thread clock time point
-  steady_time_point m_steady_last;         // Last steady clock time point
-  uint_least64_t m_count;                  // Number of samples
-  thread_accumulator m_thread_accumulator; // Total thread clock duration
-  steady_accumulator m_steady_accumulator; // Total steady clock duration
-  steady_time_point m_last_report;         // Last report
-  std::string m_fmt;                       // Format used for reporting
-};
-
-// RAII structure responsible to update a collector
-struct scoped_profiler {
-public:
-  scoped_profiler(collector &collector_) : m_collector{collector_}
-  {
-    m_collector.start();
-  }
-
-  ~scoped_profiler()
-  {
-    m_collector.stop();
-  }
-
-  scoped_profiler() = delete;
-  scoped_profiler(const scoped_profiler &) = delete;
-  scoped_profiler(scoped_profiler &&) = delete;
-
-  scoped_profiler &operator=(const scoped_profiler &) = delete;
-  scoped_profiler &operator=(scoped_profiler &&) = delete;
-
-private:
-  collector &m_collector;
-};
-
-// constexpr boost::chrono::seconds collector::report_interval;
-
-} // namespace fp
-
-// Note: __func__ is not a preprocessor macro, it's a 'function-local
-// predefined variable' (char *), hence we don't expand it.
-#define PROFILE_FUNCTION()                                                                                             \
-  thread_local fp::collector fp_info_fp{__func__};                                                                     \
-  fp::scoped_profiler fp_scoped_profiler_fp{fp_info_fp};
-
-#else // !FB_ENABLE
-
-#define PROFILE_FUNCTION() static_cast<void>(0);
-
-#endif // FB_ENABLE
-
-#endif // function_profiler_h