From 77c30fc6b72d1508bd829e1ce6c75caa22342d3a Mon Sep 17 00:00:00 2001 From: Tolya Korniltsev Date: Fri, 16 Aug 2024 14:00:14 +0200 Subject: [PATCH] chore: update godeltaprof and examples (#3486) --- .../configure-client/language-sdks/dotnet.md | 6 +++--- .../configure-client/language-sdks/java.md | 4 ++-- .../dotnet/fast-slow/Dockerfile | 4 ++-- .../dotnet/fast-slow/musl.Dockerfile | 4 ++-- .../dotnet/rideshare/Dockerfile | 4 ++-- .../dotnet/rideshare/musl.Dockerfile | 4 ++-- .../dotnet/web-new/Dockerfile | 4 ++-- .../golang-push/rideshare/go.mod | 4 ++-- .../golang-push/rideshare/go.sum | 8 ++++---- .../golang-push/simple/go.mod | 4 ++-- .../golang-push/simple/go.sum | 7 ++++--- .../java/fib/Dockerfile | 2 +- .../java/rideshare/Dockerfile | 2 +- .../java/rideshare/build.gradle.kts | 2 +- .../java/simple/Dockerfile | 2 +- .../rideshare/django/app/requirements.txt | 2 +- .../python/rideshare/fastapi/Dockerfile | 2 +- .../python/simple/requirements.txt | 2 +- .../ruby/rideshare/Gemfile | 2 +- .../ruby/rideshare/Gemfile.lock | 12 +++++++----- .../ruby/rideshare_rails/Gemfile | 2 +- .../ruby/rideshare_rails/Gemfile.lock | 18 +++++++++++------- .../ruby/simple/Gemfile | 2 +- .../ruby/simple/Gemfile.lock | 12 +++++++----- go.mod | 2 +- go.sum | 5 ++--- 26 files changed, 65 insertions(+), 57 deletions(-) diff --git a/docs/sources/configure-client/language-sdks/dotnet.md b/docs/sources/configure-client/language-sdks/dotnet.md index dc626da665..668467d71f 100644 --- a/docs/sources/configure-client/language-sdks/dotnet.md +++ b/docs/sources/configure-client/language-sdks/dotnet.md @@ -44,13 +44,13 @@ The Pyroscope server can be a local server for development or a remote server fo 1. Obtain `Pyroscope.Profiler.Native.so` and `Pyroscope.Linux.ApiWrapper.x64.so` from the [latest tarball](https://github.com/pyroscope-io/pyroscope-dotnet/releases/): ```bash -curl -s -L https://github.com/grafana/pyroscope-dotnet/releases/download/v0.8.14-pyroscope/pyroscope.0.8.14-glibc-x86_64.tar.gz | tar xvz -C . +curl -s -L https://github.com/grafana/pyroscope-dotnet/releases/download/v0.8.19-pyroscope/pyroscope.0.8.19-glibc-x86_64.tar.gz | tar xvz -C . ``` Or copy them from the [latest docker image](https://hub.docker.com/r/pyroscope/pyroscope-dotnet/tags). We have `glibc` and `musl` versions: ```dockerfile -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ```` 2. Set the following required environment variables to enable profiler diff --git a/docs/sources/configure-client/language-sdks/java.md b/docs/sources/configure-client/language-sdks/java.md index a708215bfc..43c478b52a 100644 --- a/docs/sources/configure-client/language-sdks/java.md +++ b/docs/sources/configure-client/language-sdks/java.md @@ -51,12 +51,12 @@ First, add the Pyroscope dependency: io.pyroscope agent - 0.13.1 + 0.14.0 ``` ```gradle -implementation("io.pyroscope:agent:0.13.1") +implementation("io.pyroscope:agent:0.14.0") ``` {{< /code >}} diff --git a/examples/language-sdk-instrumentation/dotnet/fast-slow/Dockerfile b/examples/language-sdk-instrumentation/dotnet/fast-slow/Dockerfile index 659b978978..3babe9d89d 100644 --- a/examples/language-sdk-instrumentation/dotnet/fast-slow/Dockerfile +++ b/examples/language-sdk-instrumentation/dotnet/fast-slow/Dockerfile @@ -2,8 +2,8 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 WORKDIR /dotnet -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ADD example . diff --git a/examples/language-sdk-instrumentation/dotnet/fast-slow/musl.Dockerfile b/examples/language-sdk-instrumentation/dotnet/fast-slow/musl.Dockerfile index 6ae9fe8a5a..38bdebacbb 100644 --- a/examples/language-sdk-instrumentation/dotnet/fast-slow/musl.Dockerfile +++ b/examples/language-sdk-instrumentation/dotnet/fast-slow/musl.Dockerfile @@ -2,8 +2,8 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine WORKDIR /dotnet -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-musl /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-musl /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-musl /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-musl /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ADD example . diff --git a/examples/language-sdk-instrumentation/dotnet/rideshare/Dockerfile b/examples/language-sdk-instrumentation/dotnet/rideshare/Dockerfile index e7b8f0a9a1..49e1c7a723 100644 --- a/examples/language-sdk-instrumentation/dotnet/rideshare/Dockerfile +++ b/examples/language-sdk-instrumentation/dotnet/rideshare/Dockerfile @@ -2,8 +2,8 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 WORKDIR /dotnet -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ADD example . diff --git a/examples/language-sdk-instrumentation/dotnet/rideshare/musl.Dockerfile b/examples/language-sdk-instrumentation/dotnet/rideshare/musl.Dockerfile index 15e29b6f04..62aa1cff3a 100644 --- a/examples/language-sdk-instrumentation/dotnet/rideshare/musl.Dockerfile +++ b/examples/language-sdk-instrumentation/dotnet/rideshare/musl.Dockerfile @@ -2,8 +2,8 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine WORKDIR /dotnet -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-musl /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-musl /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-musl /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-musl /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ADD example . diff --git a/examples/language-sdk-instrumentation/dotnet/web-new/Dockerfile b/examples/language-sdk-instrumentation/dotnet/web-new/Dockerfile index d3e1774821..67b10e040d 100644 --- a/examples/language-sdk-instrumentation/dotnet/web-new/Dockerfile +++ b/examples/language-sdk-instrumentation/dotnet/web-new/Dockerfile @@ -3,8 +3,8 @@ FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/sdk:6.0 WORKDIR /dotnet -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so -COPY --from=pyroscope/pyroscope-dotnet:0.8.14-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Profiler.Native.so ./Pyroscope.Profiler.Native.so +COPY --from=pyroscope/pyroscope-dotnet:0.8.19-glibc /Pyroscope.Linux.ApiWrapper.x64.so ./Pyroscope.Linux.ApiWrapper.x64.so ADD example . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod b/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod index 2e28f44778..ed890136bd 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod +++ b/examples/language-sdk-instrumentation/golang-push/rideshare/go.mod @@ -22,9 +22,9 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect - github.com/klauspost/compress v1.17.4 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/go.sum b/examples/language-sdk-instrumentation/golang-push/rideshare/go.sum index 8d7a9b76d5..e7f6c92c13 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare/go.sum +++ b/examples/language-sdk-instrumentation/golang-push/rideshare/go.sum @@ -1390,8 +1390,8 @@ github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6 github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ= github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88= github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= @@ -1414,8 +1414,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/examples/language-sdk-instrumentation/golang-push/simple/go.mod b/examples/language-sdk-instrumentation/golang-push/simple/go.mod index d99f8bb778..32fec30699 100644 --- a/examples/language-sdk-instrumentation/golang-push/simple/go.mod +++ b/examples/language-sdk-instrumentation/golang-push/simple/go.mod @@ -5,6 +5,6 @@ go 1.17 require github.com/grafana/pyroscope-go v1.1.1 require ( - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect + github.com/klauspost/compress v1.17.8 // indirect ) diff --git a/examples/language-sdk-instrumentation/golang-push/simple/go.sum b/examples/language-sdk-instrumentation/golang-push/simple/go.sum index 210c61b491..613f4a39af 100644 --- a/examples/language-sdk-instrumentation/golang-push/simple/go.sum +++ b/examples/language-sdk-instrumentation/golang-push/simple/go.sum @@ -1,7 +1,8 @@ github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ= github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88= github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= diff --git a/examples/language-sdk-instrumentation/java/fib/Dockerfile b/examples/language-sdk-instrumentation/java/fib/Dockerfile index b919b0c2eb..c9db4cb127 100644 --- a/examples/language-sdk-instrumentation/java/fib/Dockerfile +++ b/examples/language-sdk-instrumentation/java/fib/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /opt/app RUN apt-get update && apt-get install ca-certificates -y && update-ca-certificates && apt-get install -y git -ADD https://github.com/grafana/pyroscope-java/releases/download/v0.13.1/pyroscope.jar /opt/app/pyroscope.jar +ADD https://github.com/grafana/pyroscope-java/releases/download/v0.14.0/pyroscope.jar /opt/app/pyroscope.jar COPY Main.java ./ diff --git a/examples/language-sdk-instrumentation/java/rideshare/Dockerfile b/examples/language-sdk-instrumentation/java/rideshare/Dockerfile index 79a7dcae2c..8088e822ca 100644 --- a/examples/language-sdk-instrumentation/java/rideshare/Dockerfile +++ b/examples/language-sdk-instrumentation/java/rideshare/Dockerfile @@ -37,6 +37,6 @@ COPY --from=builder /opt/app/build/libs/rideshare-1.0-SNAPSHOT.jar /opt/app/buil WORKDIR /opt/app -ADD https://github.com/grafana/pyroscope-java/releases/download/v0.13.1/pyroscope.jar /opt/app/pyroscope.jar +ADD https://github.com/grafana/pyroscope-java/releases/download/v0.14.0/pyroscope.jar /opt/app/pyroscope.jar CMD sh -c "exec java -Dserver.port=${RIDESHARE_LISTEN_PORT} -javaagent:pyroscope.jar -jar ./build/libs/rideshare-1.0-SNAPSHOT.jar" diff --git a/examples/language-sdk-instrumentation/java/rideshare/build.gradle.kts b/examples/language-sdk-instrumentation/java/rideshare/build.gradle.kts index c482284773..89717bef37 100644 --- a/examples/language-sdk-instrumentation/java/rideshare/build.gradle.kts +++ b/examples/language-sdk-instrumentation/java/rideshare/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } dependencies { - implementation("io.pyroscope:agent:0.13.1") + implementation("io.pyroscope:agent:0.14.0") implementation("org.springframework.boot:spring-boot-starter-web") testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") diff --git a/examples/language-sdk-instrumentation/java/simple/Dockerfile b/examples/language-sdk-instrumentation/java/simple/Dockerfile index e8d3960b70..f764a0ab42 100644 --- a/examples/language-sdk-instrumentation/java/simple/Dockerfile +++ b/examples/language-sdk-instrumentation/java/simple/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:11.0.11-jdk WORKDIR /opt/app -ADD https://github.com/grafana/pyroscope-java/releases/download/v0.13.1/pyroscope.jar /opt/app/pyroscope.jar +ADD https://github.com/grafana/pyroscope-java/releases/download/v0.14.0/pyroscope.jar /opt/app/pyroscope.jar COPY Main.java ./Main.java RUN javac Main.java diff --git a/examples/language-sdk-instrumentation/python/rideshare/django/app/requirements.txt b/examples/language-sdk-instrumentation/python/rideshare/django/app/requirements.txt index 4d956638c8..cbd3138c0c 100644 --- a/examples/language-sdk-instrumentation/python/rideshare/django/app/requirements.txt +++ b/examples/language-sdk-instrumentation/python/rideshare/django/app/requirements.txt @@ -2,4 +2,4 @@ Django==3.2.25 djangorestframework==3.12.4 gunicorn==20.1.0 psycopg2-binary==2.9.1 -pyroscope-io==0.8.6 +pyroscope-io==0.8.7 diff --git a/examples/language-sdk-instrumentation/python/rideshare/fastapi/Dockerfile b/examples/language-sdk-instrumentation/python/rideshare/fastapi/Dockerfile index 55c0e27984..3c5e2d0ac2 100644 --- a/examples/language-sdk-instrumentation/python/rideshare/fastapi/Dockerfile +++ b/examples/language-sdk-instrumentation/python/rideshare/fastapi/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.9 -RUN pip3 install fastapi pyroscope-io==0.8.6 uvicorn[standard] +RUN pip3 install fastapi pyroscope-io==0.8.7 uvicorn[standard] ENV FLASK_ENV=development ENV PYTHONUNBUFFERED=1 diff --git a/examples/language-sdk-instrumentation/python/simple/requirements.txt b/examples/language-sdk-instrumentation/python/simple/requirements.txt index 2b889cb104..ad747d4bd2 100644 --- a/examples/language-sdk-instrumentation/python/simple/requirements.txt +++ b/examples/language-sdk-instrumentation/python/simple/requirements.txt @@ -1 +1 @@ -pyroscope-io==0.8.6 +pyroscope-io==0.8.7 diff --git a/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile b/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile index 7a56c065ed..cb1b69c54e 100644 --- a/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile +++ b/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } # gem "rails" -gem 'pyroscope', '= 0.5.11' +gem 'pyroscope', '= 0.5.12' gem "sinatra", "~> 2.1" gem "thin", "~> 1.8" diff --git a/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile.lock b/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile.lock index c9a62c43d6..fec93dc0e4 100644 --- a/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile.lock +++ b/examples/language-sdk-instrumentation/ruby/rideshare/Gemfile.lock @@ -3,14 +3,16 @@ GEM specs: daemons (1.4.1) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - pyroscope (0.5.11-aarch64-linux) + pyroscope (0.5.12-aarch64-linux) ffi - pyroscope (0.5.11-arm64-darwin) + pyroscope (0.5.12-arm64-darwin) ffi - pyroscope (0.5.11-x86_64-linux) + pyroscope (0.5.12-x86_64-linux) ffi rack (2.2.8.1) rack-protection (2.2.4) @@ -33,7 +35,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - pyroscope (= 0.5.11) + pyroscope (= 0.5.12) sinatra (~> 2.1) thin (~> 1.8) diff --git a/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile b/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile index df050cd491..484dcba5c2 100644 --- a/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile +++ b/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile @@ -15,7 +15,7 @@ gem "sqlite3", "~> 1.4" # Use the Puma web server [https://github.com/puma/puma] gem "puma", "~> 5.6" -gem 'pyroscope', '= 0.5.11' +gem 'pyroscope', '= 0.5.12' gem "pyroscope-otel", "~> 0.1.1" gem 'opentelemetry-sdk', "~> 1.2.0" diff --git a/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile.lock b/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile.lock index f32bf752e7..da63ba210d 100644 --- a/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile.lock +++ b/examples/language-sdk-instrumentation/ruby/rideshare_rails/Gemfile.lock @@ -74,7 +74,11 @@ GEM irb (>= 1.5.0) reline (>= 0.3.1) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) i18n (1.14.1) @@ -172,15 +176,15 @@ GEM stringio puma (5.6.8) nio4r (~> 2.0) - pyroscope (0.5.11) + pyroscope (0.5.12) ffi - pyroscope (0.5.11-aarch64-linux) + pyroscope (0.5.12-aarch64-linux) ffi - pyroscope (0.5.11-arm64-darwin) + pyroscope (0.5.12-arm64-darwin) ffi - pyroscope (0.5.11-x86_64-darwin) + pyroscope (0.5.12-x86_64-darwin) ffi - pyroscope (0.5.11-x86_64-linux) + pyroscope (0.5.12-x86_64-linux) ffi pyroscope-otel (0.1.1) opentelemetry-api (~> 1.1.0) @@ -260,7 +264,7 @@ DEPENDENCIES opentelemetry-instrumentation-rails opentelemetry-sdk (~> 1.2.0) puma (~> 5.6) - pyroscope (= 0.5.11) + pyroscope (= 0.5.12) pyroscope-otel (~> 0.1.1) rails (~> 7.0.8) sprockets-rails diff --git a/examples/language-sdk-instrumentation/ruby/simple/Gemfile b/examples/language-sdk-instrumentation/ruby/simple/Gemfile index 4266da763e..d64da8dce1 100644 --- a/examples/language-sdk-instrumentation/ruby/simple/Gemfile +++ b/examples/language-sdk-instrumentation/ruby/simple/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'pyroscope', '= 0.5.11' +gem 'pyroscope', '= 0.5.12' diff --git a/examples/language-sdk-instrumentation/ruby/simple/Gemfile.lock b/examples/language-sdk-instrumentation/ruby/simple/Gemfile.lock index 690fcafcbb..06c80a5d56 100644 --- a/examples/language-sdk-instrumentation/ruby/simple/Gemfile.lock +++ b/examples/language-sdk-instrumentation/ruby/simple/Gemfile.lock @@ -1,12 +1,14 @@ GEM remote: https://rubygems.org/ specs: - ffi (1.16.3) - pyroscope (0.5.11-aarch64-linux) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + pyroscope (0.5.12-aarch64-linux) ffi - pyroscope (0.5.11-arm64-darwin) + pyroscope (0.5.12-arm64-darwin) ffi - pyroscope (0.5.11-x86_64-linux) + pyroscope (0.5.12-x86_64-linux) ffi PLATFORMS @@ -15,7 +17,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - pyroscope (= 0.5.11) + pyroscope (= 0.5.12) BUNDLED WITH 2.4.10 diff --git a/go.mod b/go.mod index f09e864612..52cfbdde70 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6 github.com/grafana/jfr-parser/pprof v0.0.0-20240228024232-8abcb81c304c github.com/grafana/pyroscope-go v1.0.3 - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 github.com/grafana/pyroscope/api v0.4.0 github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 diff --git a/go.sum b/go.sum index d19e05c369..3cffe035b9 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 h1:/NipyHnOmv github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/grafana/pyroscope-go v1.0.3 h1:8WWmItzLfg4m8G+j//ElSjMeMr88Y6Lvblar6qeTyKk= github.com/grafana/pyroscope-go v1.0.3/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA= github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= @@ -499,7 +499,6 @@ github.com/k0kubun/pp/v3 v3.2.0 h1:h33hNTZ9nVFNP3u2Fsgz8JXiF5JINoZfFq4SvKJwNcs= github.com/k0kubun/pp/v3 v3.2.0/go.mod h1:ODtJQbQcIRfAD3N+theGCV1m/CBxweERz2dapdz1EwA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=