pyroscope_beta 0.2.0-x86_64-linux → 0.2.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec743f7959ad8b78fb8b943d69234262a2e9ebf327a0a11058e712f90877b80
-  data.tar.gz: f2573016238b9ef10a3dab0cad12a91e691a7e8841a613f74c0edb0e4b084247
+  metadata.gz: 6ccf9727c5185ebd79ec4a3e1b699ac40ce589b8919aec71bdfceaf9faa69e3a
+  data.tar.gz: b94d146c4177ee10d6ae3ae421540d6b6a34f9037d76d6d671d581c4857ef54e
 SHA512:
-  metadata.gz: a75731d0a54f8cca67221de682d44a1cc260daeab49efb659126cbd71d1de3ae76b911de5154cd68cd8aec78f60ff7a7b1d10209081d7e29ad36925a6bfaa2bc
-  data.tar.gz: 88fdd672d6c518f959b11d222adb81112a2e6e0c2665604bb67441b43128cf86e73621eec60ba56abe8bddf5334d6e3c8a7c9fa97f23e8cbe4bc79584ea63824
+  metadata.gz: 72473e4b6464dd002b0d5d698d844ef8887f1fbb16e91e5d7a12a748c3efe1a2ecf231f3f56ce5f0978fc266d65e049eca50442a50312805213db1a66dce51d0
+  data.tar.gz: ecc1077338f7193a9a79de530b5c8b59059c528e083b799909aa2095b0696c3f7ab9ebbfe8d979930b33aaf0651a21890c0d3c4cf0481c51caad1c92afe4b663

data/elflib/rbspy/manylinux.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+# Install tooling
+#yum -y -q install wget gcc libffi-devel openssl-devel
+
+# Install Rust
+#curl https://sh.rustup.rs -sSf | sh -s -- -y
+#export PATH=~/.cargo/bin:$PATH
+
+# Build wheels
+#/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+
+# Audit wheels
+#for wheel in dist/*.whl; do
+  #auditwheel repair $wheel -w dist/
+  #rm $wheel
+#done
+
+# Extract wheels
+for wheel in dist/*.whl; do
+    /opt/python/cp37-cp37m/bin/wheel unpack $wheel -d wheelhouse
+done

data/elflib/rbspy/pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "milksnakex>=0.1.6"
+]
+build-backend = "setuptools.build_meta"

data/elflib/rbspy/setup.cfg

@@ -0,0 +1,22 @@
+[metadata]
+name = rbspy 
+version= 1.0.0
+description = Fake wheel to generate audtiwheel libs
+url = https://proscope.io
+maintainer = Abid Omar 
+maintainer_email = contact@pyroscope.io 
+license = Apache 2.0
+classifiers =
+    Intended Audience :: Developers
+project_urls =
+    Documentation = https://proscope.io
+    Bug Tracker = https://proscope.io
+    Discussions = https://proscope.io
+    Changelog = https://proscope.io
+
+[options]
+packages = find:
+install_requires =
+    milksnakex>=0.1.6
+include_package_data = True
+zip_safe = False

data/elflib/rbspy/setup.py

@@ -0,0 +1,46 @@
+import os
+import sys
+from setuptools import find_packages, setup
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+
+os.chdir(SCRIPT_DIR)
+
+# print script_dir
+print(SCRIPT_DIR)
+
+LIB_DIR = str(SCRIPT_DIR / "../../ext/rbspy")
+
+def build_native(spec):
+    # Step 1: build the rust library
+    build = spec.add_external_build(
+        cmd=['cargo', 'build', '--release'],
+        path=LIB_DIR
+    )
+
+    def find_dylib():
+        cargo_target = os.environ.get('CARGO_BUILD_TARGET')
+        if cargo_target:
+            in_path = 'target/%s/release' % (cargo_target)
+        else:
+            in_path = 'target/release'
+        return build.find_dylib('rbspy', in_path=in_path)
+
+    # Step 2: package the compiled library
+    rtld_flags = ["NOW"]
+    if sys.platform == "darwin":
+        rtld_flags.append("NODELETE")
+
+    spec.add_cffi_module(module_path='rbspy._native',
+            dylib=find_dylib,
+            header_filename=lambda:
+            build.find_header('rbspy.h',in_path='include'),
+            rtld_flags=rtld_flags,
+    )
+
+setup(
+    platforms="any",
+    milksnake_tasks=[build_native],
+    setup_requires=["milksnakex>=0.1.6"],
+)

data/elflib/thread_id/manylinux.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+# Install tooling
+#yum -y -q install wget gcc libffi-devel openssl-devel
+
+# Install Rust
+#curl https://sh.rustup.rs -sSf | sh -s -- -y
+#export PATH=~/.cargo/bin:$PATH
+
+# Build wheels
+#/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+
+# Audit wheels
+#for wheel in dist/*.whl; do
+  #auditwheel repair $wheel -w dist/
+  #rm $wheel
+#done
+
+# Extract wheels
+for wheel in dist/*.whl; do
+    /opt/python/cp37-cp37m/bin/wheel unpack $wheel -d wheelhouse
+done

data/elflib/thread_id/pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "milksnakex>=0.1.6"
+]
+build-backend = "setuptools.build_meta"

data/elflib/thread_id/setup.cfg

@@ -0,0 +1,22 @@
+[metadata]
+name = thread_id 
+version= 1.0.0
+description = Fake wheel to generate audtiwheel libs
+url = https://proscope.io
+maintainer = Abid Omar 
+maintainer_email = contact@pyroscope.io 
+license = Apache 2.0
+classifiers =
+    Intended Audience :: Developers
+project_urls =
+    Documentation = https://proscope.io
+    Bug Tracker = https://proscope.io
+    Discussions = https://proscope.io
+    Changelog = https://proscope.io
+
+[options]
+packages = find:
+install_requires =
+    milksnakex>=0.1.6
+include_package_data = True
+zip_safe = False

data/elflib/thread_id/setup.py

@@ -0,0 +1,46 @@
+import os
+import sys
+from setuptools import find_packages, setup
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+
+os.chdir(SCRIPT_DIR)
+
+# print script_dir
+print(SCRIPT_DIR)
+
+LIB_DIR = str(SCRIPT_DIR / "../../ext/thread_id")
+
+def build_native(spec):
+    # Step 1: build the rust library
+    build = spec.add_external_build(
+        cmd=['cargo', 'build', '--release'],
+        path=LIB_DIR
+    )
+
+    def find_dylib():
+        cargo_target = os.environ.get('CARGO_BUILD_TARGET')
+        if cargo_target:
+            in_path = 'target/%s/release' % (cargo_target)
+        else:
+            in_path = 'target/release'
+        return build.find_dylib('thread_id', in_path=in_path)
+
+    # Step 2: package the compiled library
+    rtld_flags = ["NOW"]
+    if sys.platform == "darwin":
+        rtld_flags.append("NODELETE")
+
+    spec.add_cffi_module(module_path='thread_id._native',
+            dylib=find_dylib,
+            header_filename=lambda:
+            build.find_header('thread_id.h',in_path='include'),
+            rtld_flags=rtld_flags,
+    )
+
+setup(
+    platforms="any",
+    milksnake_tasks=[build_native],
+    setup_requires=["milksnakex>=0.1.6"],
+)

data/ext/rbspy/Cargo.toml

@@ -13,3 +13,12 @@ pyroscope_rbspy = { version = "0.2" }
 
 [patch.crates-io]
 read-process-memory = {git = "https://github.com/omarabid/read-process-memory.git", branch = "0.1.4-fix"}
+
+[build-dependencies]
+cbindgen = "0.20.0"
+
+[profile.release]
+opt-level= "z"
+debug = false
+lto = true
+codegen-units = 1

data/ext/rbspy/build.rs

@@ -0,0 +1,12 @@
+extern crate cbindgen;
+
+use cbindgen::Config;
+
+fn main() {
+    let bindings = {
+        let crate_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+        let config = Config::from_file("cbindgen.toml").unwrap();
+        cbindgen::generate_with_config(&crate_dir, config).unwrap()
+    };
+    bindings.write_to_file("include/rbspy.h");
+}

data/ext/rbspy/cbindgen.toml

@@ -0,0 +1,22 @@
+# The language to output bindings in
+language = "C"
+documentation_style = "C"
+
+style = "type"
+
+# An optional name to use as an include guard
+include_guard = "RBSPY_H_"
+# include a comment with the version of cbindgen used to generate the file
+include_version = true
+
+# An optional string of text to output at the beginning of the generated file
+header = "/* Licensed under Apache-2.0 */"
+autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */"
+
+braces = "SameLine"
+tab_width = 2
+line_length = 80
+
+[parse]
+# Do not parse dependent crates
+parse_deps = false

data/ext/rbspy/src/lib.rs

@@ -36,17 +36,24 @@ fn signalpass() -> &'static SignalPass {
 
 #[no_mangle]
 pub extern "C" fn initialize_agent(
-    application_name: *const c_char, server_address: *const c_char, sample_rate: u32,
-    detect_subprocesses: bool, tags: *const c_char,
+    application_name: *const c_char, server_address: *const c_char, auth_token: *const c_char,
+    sample_rate: u32, detect_subprocesses: bool, tags: *const c_char,
 ) -> bool {
     let application_name = unsafe { CStr::from_ptr(application_name) }
         .to_str()
         .unwrap()
         .to_string();
+
     let server_address = unsafe { CStr::from_ptr(server_address) }
         .to_str()
         .unwrap()
         .to_string();
+
+    let auth_token = unsafe { CStr::from_ptr(auth_token) }
+        .to_str()
+        .unwrap()
+        .to_string();
+
     let tags_string = unsafe { CStr::from_ptr(tags) }
         .to_str()
         .unwrap()
@@ -65,11 +72,16 @@ pub extern "C" fn initialize_agent(
         let tags_ref = tags_string.as_str();
         let tags = string_to_tags(tags_ref);
         let rbspy = rbspy_backend(rbspy_config);
-        let agent = PyroscopeAgent::builder(server_address, application_name)
+
+        let mut agent_builder = PyroscopeAgent::builder(server_address, application_name)
             .backend(rbspy)
-            .tags(tags)
-            .build()
-            .unwrap();
+            .tags(tags);
+
+        if auth_token != "" {
+            agent_builder = agent_builder.auth_token(auth_token);
+        }
+
+        let agent = agent_builder.build().unwrap();
 
         let agent_running = agent.start().unwrap();
 

data/ext/thread_id/Cargo.toml

@@ -9,3 +9,12 @@ crate-type = ["cdylib"]
 
 [dependencies]
 libc = "*"
+
+[build-dependencies]
+cbindgen = "0.20.0"
+
+[profile.release]
+opt-level= "z"
+debug = false
+lto = true
+codegen-units = 1

data/ext/thread_id/build.rs

@@ -0,0 +1,12 @@
+extern crate cbindgen;
+
+use cbindgen::Config;
+
+fn main() {
+    let bindings = {
+        let crate_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+        let config = Config::from_file("cbindgen.toml").unwrap();
+        cbindgen::generate_with_config(&crate_dir, config).unwrap()
+    };
+    bindings.write_to_file("include/thread_id.h");
+}

data/ext/thread_id/cbindgen.toml

@@ -0,0 +1,22 @@
+# The language to output bindings in
+language = "C"
+documentation_style = "C"
+
+style = "type"
+
+# An optional name to use as an include guard
+include_guard = "RBSPY_H_"
+# include a comment with the version of cbindgen used to generate the file
+include_version = true
+
+# An optional string of text to output at the beginning of the generated file
+header = "/* Licensed under Apache-2.0 */"
+autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */"
+
+braces = "SameLine"
+tab_width = 2
+line_length = 80
+
+[parse]
+# Do not parse dependent crates
+parse_deps = false

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/pyroscope_beta.rb

@@ -1,24 +1,27 @@
 require 'ffi'
-require 'fiddle'
-
-$libm = Fiddle.dlopen(File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}")
-
 
 module Rust
   extend FFI::Library
   ffi_lib File.expand_path(File.dirname(__FILE__)) + "/rbspy/rbspy.#{RbConfig::CONFIG["DLEXT"]}"
-  attach_function :initialize_agent, [:string, :string, :int, :bool, :string], :bool
+  attach_function :initialize_agent, [:string, :string, :string, :int, :bool, :string], :bool
   attach_function :add_tag, [:uint64, :string, :string], :bool
   attach_function :remove_tag, [:uint64, :string, :string], :bool
   attach_function :drop_agent, [], :bool
 end
 
+module Utils
+     extend FFI::Library
+     ffi_lib File.expand_path(File.dirname(__FILE__)) + "/thread_id/thread_id.#{RbConfig::CONFIG["DLEXT"]}"
+     attach_function :thread_id, [], :uint64
+end
+
 module Pyroscope
-  Config = Struct.new(:application_name, :server_address, :sample_rate, :detect_subprocesses, :log_level, :tags) do
+  Config = Struct.new(:application_name, :server_address, :auth_token, :sample_rate, :detect_subprocesses, :log_level, :tags) do
     def initialize(*)
       super
       self.application_name ||= ''
       self.server_address ||= 'http://localhost:4040'
+      self.auth_token ||= ''
       self.sample_rate ||= 100
       self.detect_subprocesses ||= true
       self.log_level ||= 'info'
@@ -36,6 +39,7 @@ module Pyroscope
       Rust.initialize_agent(
         @config.application_name,
         @config.server_address,
+        @config.auth_token,
         @config.sample_rate,
         @config.detect_subprocesses,
         tags_to_string(@config.tags)
@@ -66,8 +70,7 @@ end
 
 # get thread id
 def thread_id
-  thread_id = Fiddle::Function.new($libm['thread_id'], [], Fiddle::TYPE_LONG_LONG)
-  thread_id.call
+  return Utils.thread_id()
 end
 
 # add tags

data/pyroscope.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/rbspy/extconf.rb', 'ext/thread_id/extconf.rb']
 
   s.add_dependency 'ffi'
-  s.add_dependency 'fiddle'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake', '~> 13.0'

data/scripts/docker.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+BUILD_DIR="/work"
+
+docker run \
+        -w /work/pyroscope_ffi/ruby/elflib/rbspy \
+        -v `pwd`:/work \
+        quay.io/pypa/${BUILD_ARCH} \
+        sh manylinux.sh
+
+docker run \
+        -w /work/pyroscope_ffi/ruby/elflib/thread_id \
+        -v `pwd`:/work \
+        quay.io/pypa/${BUILD_ARCH} \
+        sh manylinux.sh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope_beta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: x86_64-linux
 authors:
 - Pyroscope Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,21 +61,43 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- ext/rbspy/Cargo.lock
+- elflib/rbspy/manylinux.sh
+- elflib/rbspy/pyproject.toml
+- elflib/rbspy/rbspy/__init__.py
+- elflib/rbspy/setup.cfg
+- elflib/rbspy/setup.py
+- elflib/thread_id/manylinux.sh
+- elflib/thread_id/pyproject.toml
+- elflib/thread_id/setup.cfg
+- elflib/thread_id/setup.py
+- elflib/thread_id/thread_id/__init__.py
 - 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
+- ext/thread_id/cbindgen.toml
 - ext/thread_id/extconf.rb
 - ext/thread_id/src/lib.rs
 - lib/pyroscope/version.rb
 - lib/pyroscope_beta.rb
+- lib/rbspy.libs/libcom_err-f79b9776.so.2.1
+- lib/rbspy.libs/libcrypto-142cf8a3.so.1.0.1e
+- lib/rbspy.libs/libgssapi_krb5-bb73e344.so.2.2
+- lib/rbspy.libs/libk5crypto-ab4ddf4c.so.3.1
+- lib/rbspy.libs/libkeyutils-68db41cc.so.1.3
+- lib/rbspy.libs/libkrb5-7e4170ab.so.3.3
+- lib/rbspy.libs/libkrb5support-2ce1fd50.so.0.1
+- lib/rbspy.libs/libselinux-d72a37e2.so.1
+- lib/rbspy.libs/libssl-09014658.so.1.0.1e
 - lib/rbspy/rbspy.so
 - lib/thread_id/thread_id.so
 - pyroscope.gemspec
+- scripts/docker.sh
 homepage: https://pyroscope.io
 licenses:
 - Apache-2.0