pyroscope 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ea91647ccd54e590f8a193206b56dbf2d369dbe6cbc305c3b49ef06eda74a6
-  data.tar.gz: 5f838faa81e92cf74cac6ab3f59560f2fce871ebff0e7f984d44b65f0a18d5d8
+  metadata.gz: 4f4d2d213f949dffb4933304f22e7a6af1ca02387ff0afafde8e830dc35c1add
+  data.tar.gz: 2ca02599cdce5a25e338e6d63640f39147ff42f8f6787b69bc624e7eaaf2a63c
 SHA512:
-  metadata.gz: bf691c26e269cdaacdc7eb922c49ea91f4eb30f6c8be0745e0bad1f7702c8bd90943cf979faf8f2733c9e6050b6db4756732d3e60bd75c21fcdb05a57a114551
-  data.tar.gz: 0553e687c173f255c70a583d7d61f0c43615b02ad8a28dd231fe04999eed540130800e09f98e767a052bf515e74f6d1e79d146ecf388ffd2883614dac5c29815
+  metadata.gz: 20aeb6507caba5e65653b6498af8a41553dd569c871d6a974de3fc4dac124e09aad058a019b48e0f7515bfcb4f6de9d9bf72581c8d91e4a6420cd62bba7cd97a
+  data.tar.gz: 9d14d59c0183d982c4051813667897f3840f47f83b8fe88702cd56c07e8e478bf44ca08d4b21695badfba4e7bb35da85e4455b540eda4f888a850517f83e0ea2

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    pyroscope (0.5.11)
+      ffi
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.16.3)
+    rake (13.2.0)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  pyroscope!
+  rake (~> 13.0)
+
+BUNDLED WITH
+   2.5.3

data/ext/rbspy/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rbspy"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "rbspy"
@@ -19,8 +19,3 @@ log = "0.4"
 [build-dependencies]
 cbindgen = "0.20.0"
 
-[profile.release]
-opt-level= "z"
-debug = false
-lto = true
-codegen-units = 1

data/ext/rbspy/include/rbspy.h

@@ -0,0 +1,43 @@
+/* Licensed under Apache-2.0 */
+
+#ifndef RBSPY_H_
+#define RBSPY_H_
+
+/* Generated with cbindgen:0.20.0 */
+
+/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+bool initialize_logging(uint32_t logging_level);
+
+bool initialize_agent(const char *application_name,
+                      const char *server_address,
+                      const char *auth_token,
+                      const char *basic_auth_user,
+                      const char *basic_auth_password,
+                      uint32_t sample_rate,
+                      bool detect_subprocesses,
+                      bool oncpu,
+                      bool report_pid,
+                      bool report_thread_id,
+                      const char *tags,
+                      const char *compression,
+                      const char *_report_encoding,
+                      const char *tenant_id,
+                      const char *http_headers_json);
+
+bool drop_agent(void);
+
+bool add_thread_tag(uint64_t thread_id, const char *key, const char *value);
+
+bool remove_thread_tag(uint64_t thread_id, const char *key, const char *value);
+
+bool add_global_tag(const char *key, const char *value);
+
+bool remove_global_tag(const char *key, const char *value);
+
+#endif /* RBSPY_H_ */

data/ext/rbspy/src/lib.rs

@@ -122,7 +122,7 @@ pub extern "C" fn initialize_agent(
     report_thread_id: bool,
     tags: *const c_char,
     compression: *const c_char,
-    report_encoding: *const c_char,
+    _report_encoding: *const c_char,
     tenant_id: *const c_char,
     http_headers_json: *const c_char,
 ) -> bool {
@@ -169,11 +169,6 @@ pub extern "C" fn initialize_agent(
         .unwrap()
         .to_string();
 
-    let report_encoding = unsafe { CStr::from_ptr(report_encoding) }
-        .to_str()
-        .unwrap()
-        .to_string();
-
     let tenant_id = unsafe { CStr::from_ptr(tenant_id) }
         .to_str()
         .unwrap()
@@ -185,8 +180,6 @@ pub extern "C" fn initialize_agent(
         .to_string();
 
     let compression = Compression::from_str(&compression_string);
-    let report_encoding = ReportEncoding::from_str(&report_encoding)
-        .unwrap_or(ReportEncoding::FOLDED);
 
     let pid = std::process::id();
 

data/ext/thread_id/Cargo.toml

@@ -2,7 +2,7 @@
 name = "thread_id"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 
 [lib]
 name = "thread_id"
@@ -13,9 +13,3 @@ libc = "*"
 
 [build-dependencies]
 cbindgen = "0.20.0"
-
-[profile.release]
-opt-level= "z"
-debug = false
-lto = true
-codegen-units = 1

data/ext/thread_id/include/thread_id.h

@@ -0,0 +1,17 @@
+/* Licensed under Apache-2.0 */
+
+#ifndef RBSPY_H_
+#define RBSPY_H_
+
+/* Generated with cbindgen:0.20.0 */
+
+/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+uint64_t thread_id(void);
+
+#endif /* RBSPY_H_ */

data/lib/pyroscope/version.rb

@@ -1,3 +1,3 @@
 module Pyroscope
-  VERSION = '0.5.10'.freeze
+  VERSION = '0.5.11'.freeze
 end

data/pyroscope.gemspec

@@ -31,8 +31,33 @@ Gem::Specification.new do |s|
       #(f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     #end
   #end
-  s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(\.|G|spec|Rakefile)/ }
-
+#   s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(\.|G|spec|Rakefile)/ }
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+#     "Makefile",
+    "README.md",
+#     "Rakefile",
+    "ext/rbspy/Cargo.toml",
+    "ext/rbspy/Rakefile",
+    "ext/rbspy/build.rs",
+    "ext/rbspy/cbindgen.toml",
+    "ext/rbspy/extconf.rb",
+    "ext/rbspy/include/rbspy.h",
+    "ext/rbspy/src/lib.rs",
+    "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/include/thread_id.h",
+    "ext/thread_id/src/lib.rs",
+    "lib/pyroscope.rb",
+    "lib/pyroscope/version.rb",
+    "pyroscope.gemspec",
+#     "scripts/tests/test.rb",
+  ]
   s.platform = Gem::Platform::RUBY
 
   s.required_ruby_version = ">= 1.9.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pyroscope
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Pyroscope Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,37 +62,27 @@ extensions:
 - ext/thread_id/extconf.rb
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
-- 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.lock
 - ext/rbspy/Cargo.toml
 - ext/rbspy/Rakefile
 - ext/rbspy/build.rs
 - ext/rbspy/cbindgen.toml
 - ext/rbspy/extconf.rb
+- ext/rbspy/include/rbspy.h
 - 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/include/thread_id.h
 - ext/thread_id/src/lib.rs
 - lib/pyroscope.rb
 - lib/pyroscope/version.rb
 - pyroscope.gemspec
-- scripts/docker.sh
-- scripts/tests/test.rb
 homepage: https://pyroscope.io
 licenses:
 - Apache-2.0

data/elflib/rbspy/manylinux.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-set -ex
-
-cargo --version
-
-# Build wheels
-# todo this one is deprecated, use "build" package
-/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

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

data/elflib/rbspy/setup.cfg

@@ -1,22 +0,0 @@
-[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

@@ -1,46 +0,0 @@
-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

@@ -1,19 +0,0 @@
-#!/bin/sh
-set -ex
-
-cargo --version
-
-# Build wheels
-# todo this one is deprecated, use "build" package
-/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

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

data/elflib/thread_id/setup.cfg

@@ -1,22 +0,0 @@
-[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

@@ -1,46 +0,0 @@
-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"],
-)