pyroscope 0.5.6-x86_64-linux → 0.5.8-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bfd6e4b81434d17850d793c927e89f211fdf570931bbfeed1bdaadc7e7ff75c
-  data.tar.gz: 4f26158284141c8cd37c299383406ebf254a8e63705ad81e7aa3637b20fc0038
+  metadata.gz: 28e448e1add6217b58e5a587c81f6a7f910b5195185a205097f3bcc885d6cb6c
+  data.tar.gz: b392cc9facde7b9477e48398dc746ab39663530fb6d3d25f7ea28ab09225bcc2
 SHA512:
-  metadata.gz: 0f35f685a58bd9a5a368a0030ddcffb46f5eb63d86d21616c994041096a5298d3897431dcb87541a161f73c45bad1e6a64ec86059870072fd8fa656a914a5d5b
-  data.tar.gz: 950364fb497ff639d34787f618003c408bad90f181e695629410d79ca6814c181948de2d7b73af0a411b42b7601b674680f157124e533a8fb2f57068fac650a4
+  metadata.gz: 3375f3fbd1ce0468b7cadb22f5bd3cee26ade2be85a531857aa27cb2f4c481c61f88a267b175da8cd93b30cdddbb1a34a0f0fd427d398b87b28783ca171092c7
+  data.tar.gz: 9bcbe5c38549b8671159df7c2ad63a6788e52119bc3bf52835decdd3f417a5c03fdfb80fd796712690dca6c68d93bddede6d95886ff49c505589e4c81b867dd0

data/ext/rbspy/Cargo.lock

@@ -1245,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "names"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
+checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
 dependencies = [
  "clap 3.2.23",
  "rand 0.8.5",
@@ -1462,16 +1462,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "prost"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
-dependencies = [
- "bytes",
- "prost-derive 0.10.1",
-]
-
 [[package]]
 name = "prost"
 version = "0.11.6"
@@ -1479,20 +1469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
 dependencies = [
  "bytes",
- "prost-derive 0.11.6",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
+ "prost-derive",
 ]
 
 [[package]]
@@ -1510,14 +1487,14 @@ dependencies = [
 
 [[package]]
 name = "pyroscope"
-version = "0.5.5"
+version = "0.5.6"
 dependencies = [
  "json",
  "libc",
  "libflate",
  "log",
  "names",
- "prost 0.10.4",
+ "prost",
  "reqwest",
  "thiserror",
  "url",
@@ -1651,7 +1628,7 @@ dependencies = [
  "memmap2",
  "nix 0.26.2",
  "proc-maps",
- "prost 0.11.6",
+ "prost",
  "rand 0.8.5",
  "rbspy-ruby-structs",
  "remoteprocess",

data/ext/rbspy/src/lib.rs

@@ -123,7 +123,7 @@ pub extern "C" fn initialize_agent(
     tags: *const c_char,
     compression: *const c_char,
     report_encoding: *const c_char,
-    scope_org_id: *const c_char,
+    tenant_id: *const c_char,
     http_headers_json: *const c_char,
 ) -> bool {
     // Initialize FFIKit
@@ -134,11 +134,16 @@ pub extern "C" fn initialize_agent(
         .unwrap()
         .to_string();
 
-    let server_address = unsafe { CStr::from_ptr(server_address) }
+    let mut server_address = unsafe { CStr::from_ptr(server_address) }
         .to_str()
         .unwrap()
         .to_string();
 
+    let adhoc_server_address = std::env::var("PYROSCOPE_ADHOC_SERVER_ADDRESS");
+    if let Ok(adhoc_server_address) = adhoc_server_address {
+        server_address = adhoc_server_address
+    }
+
     let auth_token = unsafe { CStr::from_ptr(auth_token) }
         .to_str()
         .unwrap()
@@ -169,7 +174,7 @@ pub extern "C" fn initialize_agent(
         .unwrap()
         .to_string();
 
-    let scope_org_id = unsafe { CStr::from_ptr(scope_org_id) }
+    let tenant_id = unsafe { CStr::from_ptr(tenant_id) }
         .to_str()
         .unwrap()
         .to_string();
@@ -209,8 +214,8 @@ pub extern "C" fn initialize_agent(
         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);
+    if tenant_id != "" {
+        agent_builder = agent_builder.tenant_id(tenant_id);
     }
 
     let http_headers = pyroscope::pyroscope::parse_http_headers_json(http_headers_json);

data/lib/pyroscope/version.rb

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

data/lib/pyroscope.rb

@@ -50,7 +50,7 @@ module Pyroscope
     :compression,
     :report_encoding,
     :autoinstrument_rails,
-    :scope_org_id,
+    :tenant_id,
     :http_headers,
   ) do
     def initialize(*)
@@ -71,7 +71,7 @@ module Pyroscope
       self.compression = 'gzip'
       self.report_encoding = 'pprof'
       self.autoinstrument_rails = true
-      self.scope_org_id = ''
+      self.tenant_id = ''
       self.http_headers = {}
     end
   end
@@ -120,7 +120,7 @@ module Pyroscope
         tags_to_string(@config.tags || {}),
         @config.compression || "",
         @config.report_encoding || "pprof",
-        @config.scope_org_id || "",
+        @config.tenant_id || "",
         http_headers_to_json(@config.http_headers || {})
       )
     end

metadata

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