Skip to content

Commit

Permalink
Update readme (#2249)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rperry2174 authored Aug 14, 2023
1 parent 5a6f926 commit 9e3082c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

On 2023-03-15, [Grafana Labs acquired Pyroscope](https://grafana.com/blog/2023/03/15/pyroscope-grafana-phlare-join-for-oss-continuous-profiling/).

The teams and codebases of both [Grafana Phlare](https://github.com/grafana/phlare) and [Pyroscope](https://github.com/pyroscope-io/pyroscope) are **merging into [Grafana Pyroscope](https://github.com/grafana/pyroscope)**. This branch *next* reflects the currect developent of Grafana Pyroscope and all enhancement/fixes should be merged into it.
The teams and codebases [Grafana Phlare](https://github.com/grafana/phlare) and Pyroscope have **merged into Grafana Pyroscope**. The *next* branch reflects the current and ongoing developent of Grafana Pyroscope and all enhancement/fixes will and should be merged into it.

Grafana Pyroscope is a new project. It will take some time to merge codebases and get to the first release.
We plan to release Pyroscope 1.0 in the near future (by mid-September 2023) -- thanks for your patience!

Feel free to use the information from the original Pyroscope project until that time, which can still be found the `main` branch.

Expand All @@ -33,8 +33,7 @@ Grafana Pyroscope is an open source continuous profiling platform. It will help
* Understand the call tree of your application
* Auto-instrument your code to link profiling data to traces


## 🔥 [Pyroscope Live Demo](https://demo.pyroscope.io/?name=hotrod.python.frontend%7B%7D) 🔥
## 🔥 [Pyroscope Live Demo](https://demo.pyroscope.io/) 🔥

[![Pyroscope GIF Demo](https://user-images.githubusercontent.com/23323466/143324845-16ff72df-231e-412d-bd0a-38ef2e09cba8.gif)](https://demo.pyroscope.io/)

Expand Down

0 comments on commit 9e3082c

Please sign in to comment.