pyroscope 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09d48a6590ce6d6d1769b357d43838a9bf53fb650de63587dc88e21a4e5bdaa
-  data.tar.gz: e22bc8052b1860f411e739c2709964d5838001ebd78255427a54ff2904ee9db7
+  metadata.gz: aa5b103d57c5f1ecde2cc07e9cebec2ad312fbc7da697d8558ba9608745929d6
+  data.tar.gz: 7b9b97e1487ef0ce171db6c20124de9dab7bbf160ffb8f0b62605cd600156aa6
 SHA512:
-  metadata.gz: c449397e5319bd6be334f939d59513edbbb9464221a4b96498657f067e2ef33664cf20b00a24ae717a81adb16498ebb24a6f75ae1f7de141c4778250510415ca
-  data.tar.gz: 4b434d44f410272bd4b12c41bd02fd2f40f2469796f211e89f9d3b03ac0ead5f66fb7d2d9801bc67b1c2cba44ab1cb948e427f4887fef6f15056f9732cacc8a8
+  metadata.gz: 3508c99d9d280a280c8df178e43d36962fe8fc99c757c2a20aac6af349ee35bf0b3dd8981e3c4c67a08c7ceab1f09d73b020bc0e036392b9ddd822f76dd2c01d
+  data.tar.gz: 3bd5e6a31d7a877f361e63c8c9b21a0de04cefdf668d45ab3d214bd76caea75dbcb347f1954c3c9a6db1d527994b465e1296f0afc050fc3c745dee062e24c872

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: ruby
 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