pyroscope 0.5.1-arm64-darwin → 0.5.3-arm64-darwin

data/lib/pyroscope.rb

@@ -2,13 +2,14 @@
 # frozen_string_literal: true
 
 require 'ffi'
+require 'json'
 
 module Pyroscope
   module Rust
     extend FFI::Library
     ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
     attach_function :initialize_logging, [:int], :bool
-    attach_function :initialize_agent, [:string, :string, :string, :int, :bool, :bool, :bool, :bool, :string, :string, :string], :bool
+    attach_function :initialize_agent, [:string, :string, :string, :string, :string, :int, :bool, :bool, :bool, :bool, :string, :string, :string, :string, :string], :bool
     attach_function :add_thread_tag, [:uint64, :string, :string], :bool
     attach_function :remove_thread_tag, [:uint64, :string, :string], :bool
     attach_function :add_global_tag, [:string, :string], :bool
@@ -37,6 +38,8 @@ module Pyroscope
     :app_name,
     :server_address,
     :auth_token,
+    :basic_auth_username,
+    :basic_auth_password,
     :log_level,
     :sample_rate,
     :detect_subprocesses,
@@ -47,6 +50,8 @@ module Pyroscope
     :compression,
     :report_encoding,
     :autoinstrument_rails,
+    :scope_org_id,
+    :http_headers,
   ) do
     def initialize(*)
       super
@@ -54,6 +59,8 @@ module Pyroscope
       self.application_name = ''
       self.server_address = 'http://localhost:4040'
       self.auth_token = ''
+      self.basic_auth_username = ''
+      self.basic_auth_password = ''
       self.sample_rate = 100
       self.detect_subprocesses = false
       self.oncpu = true
@@ -64,6 +71,8 @@ module Pyroscope
       self.compression = 'gzip'
       self.report_encoding = 'pprof'
       self.autoinstrument_rails = true
+      self.scope_org_id = ''
+      self.http_headers = {}
     end
   end
 
@@ -101,6 +110,8 @@ module Pyroscope
         @config.app_name || @config.application_name || "",
         @config.server_address || "",
         @config.auth_token || "",
+        @config.basic_auth_username || "",
+        @config.basic_auth_password || "",
         @config.sample_rate || 100,
         @config.detect_subprocesses || false,
         @config.oncpu || false,
@@ -108,7 +119,9 @@ module Pyroscope
         @config.report_thread_id || false,
         tags_to_string(@config.tags || {}),
         @config.compression || "",
-        @config.report_encoding || "pprof"
+        @config.report_encoding || "pprof",
+        @config.scope_org_id || "",
+        http_headers_to_json(@config.http_headers || {})
       )
     end
 
@@ -170,5 +183,10 @@ module Pyroscope
     def tags_to_string(tags)
       tags.map { |k, v| "#{k}=#{v}" }.join(',')
     end
+
+    def http_headers_to_json(http_headers)
+      JSON.dump(http_headers)
+    end
+
   end
 end

data/scripts/docker.sh

@@ -1,16 +1,23 @@
 #!/bin/bash
 set -ex
 
+if [ "${BUILD_ARCH}" != "manylinux2010_x86_64" ] && [ "${BUILD_ARCH}" != "manylinux2014_aarch64" ];
+then
+  echo set BUILD_ARCH to one of manylinux2010_x86_64 or manylinux2014_aarch64
+  exit 239
+fi
+
 BUILD_DIR="/work"
+MANYLINUX_PREFIX=pyroscope/rust_builder
 
 docker run \
         -w /work/pyroscope_ffi/ruby/elflib/rbspy \
         -v `pwd`:/work \
-        quay.io/pypa/${BUILD_ARCH} \
+        ${MANYLINUX_PREFIX}_${BUILD_ARCH} \
         sh manylinux.sh
 
 docker run \
         -w /work/pyroscope_ffi/ruby/elflib/thread_id \
         -v `pwd`:/work \
-        quay.io/pypa/${BUILD_ARCH} \
+        ${MANYLINUX_PREFIX}_${BUILD_ARCH} \
         sh manylinux.sh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: arm64-darwin
 authors:
 - Pyroscope Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -71,12 +71,14 @@ files:
 - elflib/thread_id/setup.cfg
 - elflib/thread_id/setup.py
 - elflib/thread_id/thread_id/__init__.py
+- ext/rbspy/Cargo.lock
 - ext/rbspy/Cargo.toml
 - ext/rbspy/Rakefile
 - ext/rbspy/build.rs
 - ext/rbspy/cbindgen.toml
 - ext/rbspy/extconf.rb
 - ext/rbspy/src/lib.rs
+- ext/thread_id/Cargo.lock
 - ext/thread_id/Cargo.toml
 - ext/thread_id/Rakefile
 - ext/thread_id/build.rs
@@ -114,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Pyroscope