pyroscope 0.5.2 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df2aadb375817510148da8e0beb6c84f7e8dcf559880cead304769cd9064288
-  data.tar.gz: 1e5bebc0f191213f0094fde5d6d0e8d77a9bb4154af6a3bd6b3e1c0668eb93b5
+  metadata.gz: f09d48a6590ce6d6d1769b357d43838a9bf53fb650de63587dc88e21a4e5bdaa
+  data.tar.gz: e22bc8052b1860f411e739c2709964d5838001ebd78255427a54ff2904ee9db7
 SHA512:
-  metadata.gz: 936d218a6d14fad7f10a9363dffe23f4c4c79b80024f37175c2ec2320d7a4ef3c5c28efcf6cfcd124059edc269f40cd8b4340d698b4b5da8f129d6c1c9d77159
-  data.tar.gz: 2629463e69eee473fb92e42ae836127fe2410d7c8789c32364b993497b1d9a19d02c6bc79b89f4359261bd000849639108064bb007ce433bc2e0b49be632e239
+  metadata.gz: c449397e5319bd6be334f939d59513edbbb9464221a4b96498657f067e2ef33664cf20b00a24ae717a81adb16498ebb24a6f75ae1f7de141c4778250510415ca
+  data.tar.gz: 4b434d44f410272bd4b12c41bd02fd2f40f2469796f211e89f9d3b03ac0ead5f66fb7d2d9801bc67b1c2cba44ab1cb948e427f4887fef6f15056f9732cacc8a8

data/ext/rbspy/Cargo.lock

@@ -373,16 +373,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
@@ -636,21 +626,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -917,19 +892,6 @@ dependencies = [
  "tokio-rustls",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.53"
@@ -1085,6 +1047,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "json"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
+
 [[package]]
 name = "lazy_static"
 version = "0.1.16"
@@ -1285,24 +1253,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static 1.4.0",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nix"
 version = "0.25.1"
@@ -1394,51 +1344,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[package]]
-name = "openssl"
-version = "0.10.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "os_str_bytes"
 version = "6.4.1"
@@ -1488,12 +1393,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
 [[package]]
 name = "plain"
 version = "0.2.3"
@@ -1611,8 +1510,9 @@ dependencies = [
 
 [[package]]
 name = "pyroscope"
-version = "0.5.4"
+version = "0.5.5"
 dependencies = [
+ "json",
  "libc",
  "libflate",
  "log",
@@ -1626,7 +1526,7 @@ dependencies = [
 
 [[package]]
 name = "pyroscope_rbspy"
-version = "0.2.3"
+version = "0.2.5"
 dependencies = [
  "anyhow",
  "inferno",
@@ -1725,6 +1625,7 @@ dependencies = [
  "cbindgen",
  "ffikit",
  "inferno",
+ "log",
  "pretty_env_logger",
  "pyroscope",
  "pyroscope_rbspy",
@@ -1875,29 +1776,26 @@ dependencies = [
  "http-body",
  "hyper",
  "hyper-rustls",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "rustls",
- "rustls-native-certs",
  "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -1978,18 +1876,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.2"
@@ -2005,15 +1891,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -2056,29 +1933,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.16"
@@ -2359,16 +2213,6 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.23.4"
@@ -2485,12 +2329,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -2623,6 +2461,15 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
 [[package]]
 name = "which"
 version = "4.4.0"

data/ext/rbspy/Cargo.toml

@@ -14,6 +14,7 @@ pyroscope_rbspy = { path = "../../../../pyroscope_backends/pyroscope_rbspy" }
 ffikit = { path = "../../../ffikit" }
 pretty_env_logger = "0.4.0"
 inferno = "=0.11.14"
+log = "0.4"
 
 [build-dependencies]
 cbindgen = "0.20.0"

data/ext/rbspy/src/lib.rs

@@ -8,10 +8,14 @@ use std::str::FromStr;
 use ffikit::Signal;
 use pyroscope_rbspy::{rbspy_backend, RbspyConfig};
 
+use pyroscope;
 use pyroscope::{pyroscope::Compression, PyroscopeAgent};
 use pyroscope::backend::{Report, StackFrame, Tag};
 use pyroscope::pyroscope::ReportEncoding;
 
+const LOG_TAG: &str = "Pyroscope::rbspy::ffi";
+
+
 pub fn transform_report(report: Report) -> Report {
     let cwd = env::current_dir().unwrap();
     let cwd = cwd.to_str().unwrap_or("");
@@ -106,10 +110,21 @@ pub extern "C" fn initialize_logging(logging_level: u32) -> bool {
 
 #[no_mangle]
 pub extern "C" fn initialize_agent(
-    application_name: *const c_char, server_address: *const c_char, auth_token: *const c_char,
-    sample_rate: u32, detect_subprocesses: bool, oncpu: bool, report_pid: bool,
-    report_thread_id: bool, tags: *const c_char, compression: *const c_char,
-    report_encoding: *const c_char
+    application_name: *const c_char,
+    server_address: *const c_char,
+    auth_token: *const c_char,
+    basic_auth_user: *const c_char,
+    basic_auth_password: *const c_char,
+    sample_rate: u32,
+    detect_subprocesses: bool,
+    oncpu: bool,
+    report_pid: bool,
+    report_thread_id: bool,
+    tags: *const c_char,
+    compression: *const c_char,
+    report_encoding: *const c_char,
+    scope_org_id: *const c_char,
+    http_headers_json: *const c_char,
 ) -> bool {
     // Initialize FFIKit
     let recv = ffikit::initialize_ffi().unwrap();
@@ -129,6 +144,16 @@ pub extern "C" fn initialize_agent(
         .unwrap()
         .to_string();
 
+    let basic_auth_user = unsafe { CStr::from_ptr(basic_auth_user) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
+    let basic_auth_password = unsafe { CStr::from_ptr(basic_auth_password) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
     let tags_string = unsafe { CStr::from_ptr(tags) }
         .to_str()
         .unwrap()
@@ -144,6 +169,16 @@ pub extern "C" fn initialize_agent(
         .unwrap()
         .to_string();
 
+    let scope_org_id = unsafe { CStr::from_ptr(scope_org_id) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
+    let http_headers_json = unsafe { CStr::from_ptr(http_headers_json) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
     let compression = Compression::from_str(&compression_string);
     let report_encoding = ReportEncoding::from_str(&report_encoding)
         .unwrap_or(ReportEncoding::FOLDED);
@@ -170,6 +205,30 @@ pub extern "C" fn initialize_agent(
 
     if auth_token != "" {
         agent_builder = agent_builder.auth_token(auth_token);
+    } else if basic_auth_user != "" && basic_auth_password != "" {
+        agent_builder = agent_builder.basic_auth(basic_auth_user, basic_auth_password);
+    }
+
+    if scope_org_id != "" {
+        agent_builder = agent_builder.scope_org_id(scope_org_id);
+    }
+
+    let http_headers = pyroscope::pyroscope::parse_http_headers_json(http_headers_json);
+    match http_headers {
+        Ok(http_headers) => {
+            agent_builder = agent_builder.http_headers(http_headers);
+        }
+        Err(e) => {
+            match e {
+                pyroscope::PyroscopeError::Json(e) => {
+                    log::error!(target: LOG_TAG, "parse_http_headers_json error {}", e);
+                }
+                pyroscope::PyroscopeError::AdHoc(e) => {
+                    log::error!(target: LOG_TAG, "parse_http_headers_json {}", e);
+                }
+                _ => {}
+            }
+        }
     }
 
     if let Ok(compression) = compression {

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.6'.freeze
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.6
 platform: ruby
 authors:
 - Pyroscope Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi