From dc5aa25ff1319c32fd8311e2a686acfa13b379f1 Mon Sep 17 00:00:00 2001 From: Dmitry Filimonov Date: Wed, 16 Dec 2020 22:27:15 -0800 Subject: [PATCH] petethepig/pyroscope -> pyroscope-io/pyroscope, Dockerfile --- .github/workflows/release.yml | 6 +- Dockerfile | 82 ++++++++++++++++++++++++ Makefile | 45 ++++++++++--- cmd/pyroscope/main.go | 4 +- conf/server.yml | 0 go.mod | 2 +- go.sum | 32 --------- package.json | 2 +- pkg/agent/agent.go | 6 +- pkg/agent/controller.go | 8 +-- pkg/agent/gospy/gospy.go | 2 +- pkg/agent/pyspy/pyspy.go | 2 +- pkg/agent/rbspy/rbspy.go | 2 +- pkg/agent/selfprofile.go | 4 +- pkg/agent/session.go | 10 +-- pkg/agent/upstream/direct/direct.go | 8 +-- pkg/agent/upstream/remote/remote.go | 4 +- pkg/agent/upstream/upstream.go | 2 +- pkg/build/build.go | 2 +- pkg/cli/cli.go | 22 +++---- pkg/config/config.go | 3 +- pkg/convert/cli.go | 6 +- pkg/convert/parser.go | 2 +- pkg/exec/cli.go | 6 +- pkg/server/controller.go | 6 +- pkg/server/ingest.go | 8 +-- pkg/server/render.go | 6 +- pkg/storage/dict/dict.go | 2 +- pkg/storage/dict/dict_suite_test.go | 2 +- pkg/storage/dict/serialize.go | 2 +- pkg/storage/dict/trie.go | 2 +- pkg/storage/dimension/serialization.go | 2 +- pkg/storage/key.go | 2 +- pkg/storage/labels/labels.go | 2 +- pkg/storage/segment/overlap_test.go | 2 +- pkg/storage/segment/relationship_test.go | 2 +- pkg/storage/segment/segment_test.go | 4 +- pkg/storage/segment/serialization.go | 2 +- pkg/storage/storage.go | 16 ++--- pkg/storage/storage_suite_test.go | 2 +- pkg/storage/storage_test.go | 6 +- pkg/storage/tree/serialize.go | 4 +- pkg/storage/tree/serialize_test.go | 2 +- pkg/storage/tree/svg.go | 4 +- pkg/storage/tree/tree.go | 2 +- pkg/storage/tree/v3trie_suite_test.go | 2 +- pkg/structs/transporttrie/merge.go | 2 +- pkg/structs/transporttrie/serialize.go | 2 +- pkg/structs/transporttrie/trie_test.go | 2 +- pkg/testing/tmpdir.go | 2 +- pkg/util/debug/disk.go | 2 +- pkg/util/debug/ram.go | 2 +- scripts/generate-build-flags.sh | 10 +-- scripts/webpack/webpack.js | 2 +- webapp/javascript/components/Footer.tsx | 2 +- 55 files changed, 223 insertions(+), 147 deletions(-) create mode 100644 Dockerfile create mode 100644 conf/server.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f012a3eda9..d3b7a43d32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: run: mkdir build - name: Build - run: go build -o build/pyroscope ./cmd/pyroscope + run: make build-release - name: List Assets run: ls build/ @@ -76,10 +76,10 @@ jobs: run: "sudo gem install fpm" - name: Create rpm package - run: "fpm -s dir -t rpm -n pyroscope --iteration ${{ steps.iteration.outputs.iteration }} --architecture x86_64 -v ${GITHUB_REF#refs/*/v} --description 'pyroscope is continuous profiling software' -p ${{ steps.rpm_name.outputs.rpm_name }} ./package-build" + run: "fpm -s dir -t rpm -n pyroscope --iteration ${{ steps.iteration.outputs.iteration }} --architecture x86_64 -v ${GITHUB_REF#refs/*/v} --description 'pyroscope is open source continuous profiling software' -p ${{ steps.rpm_name.outputs.rpm_name }} ./package-build" - name: Create deb package - run: "fpm -s dir -t deb -n pyroscope --iteration ${{ steps.iteration.outputs.iteration }} --architecture x86_64 -v ${GITHUB_REF#refs/*/v} --description 'pyroscope is continuous profiling software' -p ${{ steps.rpm_name.outputs.deb_name }} ./package-build" + run: "fpm -s dir -t deb -n pyroscope --iteration ${{ steps.iteration.outputs.iteration }} --architecture x86_64 -v ${GITHUB_REF#refs/*/v} --description 'pyroscope is open source continuous profiling software' -p ${{ steps.deb_name.outputs.deb_name }} ./package-build" - name: Archive Assets run: tar czf ${{ steps.file_name.outputs.file_name }} build/* diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..458721396e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,82 @@ +# assets build + +FROM --platform=$BUILDPLATFORM node:14.15.1-alpine3.12 as js-builder + +RUN apk add --no-cache make + +WORKDIR /opt/pyroscope + +COPY package.json package-lock.json .babelrc Makefile ./ +COPY scripts ./scripts +COPY webapp ./webapp + +# RUN make assets +RUN echo 1 + +# go build + +FROM --platform=$BUILDPLATFORM golang:1.15.1-alpine3.12 as go-builder + +RUN apk add --no-cache make git zstd gcc g++ libc-dev musl-dev + +WORKDIR /opt/pyroscope + +ENV ENABLED_SPIES none + +COPY --from=js-builder /opt/pyroscope/webapp/public ./webapp/public +COPY pkg ./pkg +COPY cmd ./cmd +COPY tools ./tools +COPY scripts ./scripts +COPY go.mod go.sum pyroscope.go ./ +COPY Makefile ./ + +RUN EMBEDDED_ASSETS_DEPS="" make build-release + +# final image + +FROM alpine:3.12 + +LABEL maintainer="Pyroscope team " + +ARG PS_UID="472" +ARG PS_GID="0" + +ENV PATH="/opt/pyroscope/bin:$PATH" \ + PS_PATHS_CONFIG="/etc/pyroscope/" \ + PS_PATHS_DATA="/var/lib/pyroscope" \ + PS_PATHS_HOME="/opt/pyroscope" \ + PS_PATHS_LOGS="/var/log/pyroscope" + +WORKDIR $PS_PATHS_HOME + +RUN apk add --no-cache ca-certificates bash tzdata && \ + apk add --no-cache openssl musl-utils + +COPY conf ./conf + +RUN if [ ! $(getent group "$PS_GID") ]; then \ + addgroup -S -g $PS_GID pyroscope; \ + fi + +RUN export PS_GID_NAME=$(getent group $PS_GID | cut -d':' -f1) && \ + mkdir -p "$PS_PATHS_HOME/.aws" && \ + adduser -S -u $PS_UID -G "$PS_GID_NAME" pyroscope && \ + mkdir -p "$PS_PATHS_LOGS" \ + "$PS_PATHS_CONFIG" \ + "$PS_PATHS_DATA" \ + && \ + mv "$PS_PATHS_HOME/conf/server.yml" "$PS_PATHS_CONFIG" && \ + chown -R "pyroscope:$PS_GID_NAME" \ + "$PS_PATHS_DATA" \ + "$PS_PATHS_HOME" \ + "$PS_PATHS_LOGS" \ + "$PS_PATHS_CONFIG" \ + && \ + chmod -R 777 "$PS_PATHS_DATA" "$PS_PATHS_HOME" "$PS_PATHS_LOGS" "$PS_PATHS_CONFIG" + +COPY --from=go-builder /opt/pyroscope/bin/pyroscope ./bin/pyroscope + +USER pyroscope +EXPOSE 8080/tcp +ENTRYPOINT [ "/opt/pyroscope/bin/pyroscope", "server" ] diff --git a/Makefile b/Makefile index 0e2e09eaab..89844965fc 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,16 @@ GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) GOBUILD=go build -trimpath ENABLED_SPIES ?= "rbspy,pyspy" +EMBEDDED_ASSETS_DEPS ?= "assets" EMBEDDED_ASSETS ?= "" +DOCKER_ARCHES ?= "linux/amd64,linux/arm64" GODEBUG=asyncpreemptoff=1 +DOCKER_TAG ?= "dev" + +ifndef $(GOPATH) + GOPATH=$(shell go env GOPATH) + export GOPATH +endif .PHONY: all all: build @@ -47,14 +55,6 @@ assets: install-web-dependencies assets-watch: install-web-dependencies $(shell yarn bin webpack) --config scripts/webpack/webpack.js --watch -.PHONY: embedded-assets -embedded-assets: assets - pkger -o pkg/controller - -.PHONY: build-release -build-release: embedded-assets - EMBEDDED_ASSETS=true $(MAKE) build - .PHONY: lint lint: revive -config revive.toml -formatter stylish ./... @@ -77,7 +77,7 @@ dev: .PHONY: godoc godoc: - sleep 5 && open http://localhost:8090/pkg/github.com/petethepig/pyroscope/ & + sleep 5 && open http://localhost:8090/pkg/github.com/pyroscope-io/pyroscope/ & godoc -http :8090 .PHONY: go-deps-graph @@ -92,3 +92,30 @@ clean: .PHONY: update-contributors update-contributors: $(shell yarn bin contributor-faces) . + +# Release-related tasks: + +.PHONY: embedded-assets +embedded-assets: install-dev-tools $(EMBEDDED_ASSETS_DEPS) + pkger -o pkg/server + +.PHONY: build-release +build-release: embedded-assets + EMBEDDED_ASSETS=true $(MAKE) build + +.PHONY: docker-build +docker-build: + docker build . + +.PHONY: docker-build-x-setup +docker-build-x-setup: + docker buildx create --use + +.PHONY: docker-build-all-arches +docker-build-all-arches: + docker buildx build \ + --tag pyroscope/pyroscope:$(DOCKER_TAG) \ + --push \ + --platform $(DOCKER_ARCHES) \ + . + diff --git a/cmd/pyroscope/main.go b/cmd/pyroscope/main.go index c613816523..ed6b498c98 100644 --- a/cmd/pyroscope/main.go +++ b/cmd/pyroscope/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/petethepig/pyroscope/pkg/cli" - "github.com/petethepig/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/cli" + "github.com/pyroscope-io/pyroscope/pkg/config" log "github.com/sirupsen/logrus" ) diff --git a/conf/server.yml b/conf/server.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/go.mod b/go.mod index 287f678c68..675bc4812b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/petethepig/pyroscope +module github.com/pyroscope-io/pyroscope go 1.14 diff --git a/go.sum b/go.sum index 01941d65e8..e76bf7b4a6 100644 --- a/go.sum +++ b/go.sum @@ -5,7 +5,6 @@ github.com/DataDog/zstd v1.4.1 h1:3oxKN3wbHibqx897utPC2LTQU4J+IHWWJO+glkAkpFM= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 h1:WWB576BN5zNSZc/M9d/10pqEx5VHNhaQ/yOVAkmj5Yo= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= @@ -19,15 +18,12 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cosmtrek/air v1.21.2 h1:PwChdKs3qlSkKucKwwC04daw5eoy4SVgiEBQiHX5L9A= github.com/cosmtrek/air v1.21.2/go.mod h1:5EsgUqrBIHlW2ghNoevwPBEG1FQvF5XNulikjPte538= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -50,9 +46,7 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= @@ -84,7 +78,6 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= @@ -97,11 +90,9 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iancoleman/strcase v0.1.2 h1:gnomlvw9tnV3ITTAxzKSgTF+8kFWcU/f+TgttpXGz1U= github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200715173712-053cf528c12f h1:nTaA/z8mev5oJv1dNSbu8Pwvu5CJyBZKwDvHpr9FZ4I= github.com/ianlancetaylor/demangle v0.0.0-20200715173712-053cf528c12f/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -111,7 +102,6 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx github.com/kisielk/godepgraph v0.0.0-20190626013829-57a7e4a651a9 h1:ZkWH0x1yafBo+Y2WdGGdszlJrMreMXWl7/dqpEkwsIk= github.com/kisielk/godepgraph v0.0.0-20190626013829-57a7e4a651a9/go.mod h1:Gb5YEgxqiSSVrXKWQxDcKoCM94NO5QAwOwTaVmIUAMI= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -120,25 +110,21 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kyoh86/richgo v0.3.3 h1:fW7ygWNMg1INcX3Yoha9v1C5nYlvd/IodJUf0Batz6Q= github.com/kyoh86/richgo v0.3.3/go.mod h1:S65jllVRxBm59fqIXfCa3cPxQYRT9u9v45EPQVeuoH0= -github.com/kyoh86/xdg v0.0.0-20171007020617-d28e4c5d7b81 h1:C2Yb5TxdHWrtWXdf+j8xWW4QQu8lXuxtj1UOK816dpA= github.com/kyoh86/xdg v0.0.0-20171007020617-d28e4c5d7b81/go.mod h1:Z5mDqe0fxyxn3W2yTxsBAOQqIrXADQIh02wrTnaRM38= github.com/kyoh86/xdg v1.2.0 h1:CERuT/ShdTDj+A2UaX3hQ3mOV369+Sj+wyn2nIRIIkI= github.com/kyoh86/xdg v1.2.0/go.mod h1:/mg8zwu1+qe76oTFUBnyS7rJzk7LLC0VGEzJyJ19DHs= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= -github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.0-20170925054904-a5cdd64afdee/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -152,7 +138,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= @@ -168,7 +153,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= @@ -176,7 +160,6 @@ github.com/peterbourgon/ff v1.7.0 h1:hknvTgsh90jNBIjPq7xeq32Y9AmSbpXvjrFW4sJwW+A github.com/peterbourgon/ff v1.7.0/go.mod h1:/KKxnU5cBj4w21jEMj4Rway/kslRP6XAOHh7CH8AyAM= github.com/peterbourgon/ff/v3 v3.0.0 h1:eQzEmNahuOjQXfuegsKQTSTDbf4dNvr/eNLrmJhiH7M= github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -201,19 +184,15 @@ github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/wacul/ptr v0.0.0-20170209030335-91632201dfc8 h1:js9Z9dWq50Ttu4D1YRqgS1gkSgRfpKp+rMza4io7qNw= github.com/wacul/ptr v0.0.0-20170209030335-91632201dfc8/go.mod h1:BD0gjsZrCwtoR+yWDB9v2hQ8STlq9tT84qKfa+3txOc= github.com/wacul/ptr v1.0.0 h1:FIKu08Wx0YUIf9MNsfF62OCmBSmz5A1Tk65zWhOIL/I= github.com/wacul/ptr v1.0.0/go.mod h1:BD0gjsZrCwtoR+yWDB9v2hQ8STlq9tT84qKfa+3txOc= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -234,7 +213,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -262,14 +240,11 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -279,22 +254,18 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200225230052-807dcd883420 h1:4RJNOV+2rLxMEfr6QIpC7GEv9MjD6ApGXTCLrNF9+eA= golang.org/x/tools v0.0.0-20200225230052-807dcd883420/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb h1:z5+u0pkAUPUWd3taoTialQ2JAMo4Wo1Z3L25U4ZV9r0= golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -306,7 +277,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= @@ -320,14 +290,12 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc= honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY= diff --git a/package.json b/package.json index 5afde37185..f95bcb6930 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "name": "pyroscope", "version": "0.0.1", - "repository": "github:petethepig/pyroscope", + "repository": "github:pyroscope-io/pyroscope", "scripts": { "dev": "webpack --progress --colors --config scripts/webpack/webpack.dev.js" }, diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index 9008dfcf1a..8edcc51543 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -5,9 +5,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/petethepig/pyroscope/pkg/agent/csock" - "github.com/petethepig/pyroscope/pkg/agent/upstream/remote" - "github.com/petethepig/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/agent/csock" + "github.com/pyroscope-io/pyroscope/pkg/agent/upstream/remote" + "github.com/pyroscope-io/pyroscope/pkg/config" ) type Agent struct { diff --git a/pkg/agent/controller.go b/pkg/agent/controller.go index 262e75d62d..ec75f8f2e4 100644 --- a/pkg/agent/controller.go +++ b/pkg/agent/controller.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/petethepig/pyroscope/pkg/agent/csock" - "github.com/petethepig/pyroscope/pkg/agent/upstream" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/util/id" + "github.com/pyroscope-io/pyroscope/pkg/agent/csock" + "github.com/pyroscope-io/pyroscope/pkg/agent/upstream" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/util/id" ) type Controller struct { diff --git a/pkg/agent/gospy/gospy.go b/pkg/agent/gospy/gospy.go index 481493f2a3..c9320f8445 100644 --- a/pkg/agent/gospy/gospy.go +++ b/pkg/agent/gospy/gospy.go @@ -4,7 +4,7 @@ import ( "runtime" "strings" - "github.com/petethepig/pyroscope/pkg/agent/spy" + "github.com/pyroscope-io/pyroscope/pkg/agent/spy" ) // TODO: make this configurable diff --git a/pkg/agent/pyspy/pyspy.go b/pkg/agent/pyspy/pyspy.go index 8359277419..763493d02c 100644 --- a/pkg/agent/pyspy/pyspy.go +++ b/pkg/agent/pyspy/pyspy.go @@ -10,7 +10,7 @@ import ( "fmt" "unsafe" - "github.com/petethepig/pyroscope/pkg/agent/spy" + "github.com/pyroscope-io/pyroscope/pkg/agent/spy" ) // TODO: make this configurable diff --git a/pkg/agent/rbspy/rbspy.go b/pkg/agent/rbspy/rbspy.go index c2f6622a85..a590e1190a 100644 --- a/pkg/agent/rbspy/rbspy.go +++ b/pkg/agent/rbspy/rbspy.go @@ -10,7 +10,7 @@ import ( "fmt" "unsafe" - "github.com/petethepig/pyroscope/pkg/agent/spy" + "github.com/pyroscope-io/pyroscope/pkg/agent/spy" ) // TODO: make this configurable diff --git a/pkg/agent/selfprofile.go b/pkg/agent/selfprofile.go index a40af3964b..00682d9909 100644 --- a/pkg/agent/selfprofile.go +++ b/pkg/agent/selfprofile.go @@ -1,8 +1,8 @@ package agent import ( - "github.com/petethepig/pyroscope/pkg/agent/upstream" - "github.com/petethepig/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/agent/upstream" + "github.com/pyroscope-io/pyroscope/pkg/config" ) func SelfProfile(cfg *config.Config, u upstream.Upstream, name string) { diff --git a/pkg/agent/session.go b/pkg/agent/session.go index 9b728ee8d2..a69363c8b0 100644 --- a/pkg/agent/session.go +++ b/pkg/agent/session.go @@ -5,14 +5,14 @@ import ( // revive:disable:blank-imports Depending on configuration these packages may or may not be used. // That's why we do a blank import here and then packages themselves register with the rest of the code. - _ "github.com/petethepig/pyroscope/pkg/agent/gospy" - _ "github.com/petethepig/pyroscope/pkg/agent/pyspy" - _ "github.com/petethepig/pyroscope/pkg/agent/rbspy" + _ "github.com/pyroscope-io/pyroscope/pkg/agent/gospy" + _ "github.com/pyroscope-io/pyroscope/pkg/agent/pyspy" + _ "github.com/pyroscope-io/pyroscope/pkg/agent/rbspy" // revive:enable:blank-imports - "github.com/petethepig/pyroscope/pkg/agent/spy" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/agent/spy" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" ) type profileSession struct { diff --git a/pkg/agent/upstream/direct/direct.go b/pkg/agent/upstream/direct/direct.go index 3c1d75df83..46f8dd6a7f 100644 --- a/pkg/agent/upstream/direct/direct.go +++ b/pkg/agent/upstream/direct/direct.go @@ -7,10 +7,10 @@ import ( "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/storage" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/storage" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" ) type uploadJob struct { diff --git a/pkg/agent/upstream/remote/remote.go b/pkg/agent/upstream/remote/remote.go index 096fcd24c6..6be815f1c3 100644 --- a/pkg/agent/upstream/remote/remote.go +++ b/pkg/agent/upstream/remote/remote.go @@ -10,8 +10,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" ) type uploadJob struct { diff --git a/pkg/agent/upstream/upstream.go b/pkg/agent/upstream/upstream.go index 92c1241aea..04b76585ec 100644 --- a/pkg/agent/upstream/upstream.go +++ b/pkg/agent/upstream/upstream.go @@ -3,7 +3,7 @@ package upstream import ( "time" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" ) type Upstream interface { diff --git a/pkg/build/build.go b/pkg/build/build.go index 2e9bb84a0b..3f472c41f8 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/petethepig/pyroscope/pkg/agent/spy" + "github.com/pyroscope-io/pyroscope/pkg/agent/spy" ) var ( diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go index 87a9f3aa5a..ed89aa2dea 100644 --- a/pkg/cli/cli.go +++ b/pkg/cli/cli.go @@ -10,16 +10,16 @@ import ( "strings" "time" - "github.com/petethepig/pyroscope/pkg/agent" - "github.com/petethepig/pyroscope/pkg/agent/upstream/direct" - "github.com/petethepig/pyroscope/pkg/build" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/convert" - "github.com/petethepig/pyroscope/pkg/exec" - "github.com/petethepig/pyroscope/pkg/server" - "github.com/petethepig/pyroscope/pkg/storage" - "github.com/petethepig/pyroscope/pkg/util/atexit" - "github.com/petethepig/pyroscope/pkg/util/debug" + "github.com/pyroscope-io/pyroscope/pkg/agent" + "github.com/pyroscope-io/pyroscope/pkg/agent/upstream/direct" + "github.com/pyroscope-io/pyroscope/pkg/build" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/convert" + "github.com/pyroscope-io/pyroscope/pkg/exec" + "github.com/pyroscope-io/pyroscope/pkg/server" + "github.com/pyroscope-io/pyroscope/pkg/storage" + "github.com/pyroscope-io/pyroscope/pkg/util/atexit" + "github.com/pyroscope-io/pyroscope/pkg/util/debug" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" @@ -221,8 +221,8 @@ func startServer(cfg *config.Config) { go agent.SelfProfile(cfg, u, "pyroscope.server.cpu{}") atexit.Register(func() { s.Close() }) c := server.New(cfg, s) + log.Info("starting HTTP server") c.Start() - time.Sleep(time.Second) } func printRAMUsage() { diff --git a/pkg/config/config.go b/pkg/config/config.go index a2f9900ae0..8bb67f7f13 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -20,11 +20,10 @@ type Agent struct { // AgentCMD []string AgentSpyName string `desc:"name of the spy you want to use"` // TODO: add options AgentPID int `def:"-1" desc:"pid of the process you want to spy on"` - AgentControlSocket string `def:"/var/run/pyroscope/agent.sock" desc:"path to a UNIX socket file"` UpstreamAddress string `def:"http://localhost:8080" desc:"address of the pyroscope server"` UpstreamThreads int `def:"4"` UpstreamRequestTimeout time.Duration `def:"10s"` - UNIXSocketPath string `def:"/tmp/pyroscope-socket"` + UNIXSocketPath string `def:"/var/run/pyroscope-agent.sock" desc:"path to a UNIX socket file"` } type Server struct { diff --git a/pkg/convert/cli.go b/pkg/convert/cli.go index e217104b9b..653bf5813e 100644 --- a/pkg/convert/cli.go +++ b/pkg/convert/cli.go @@ -5,9 +5,9 @@ import ( "log" "os" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" "github.com/sirupsen/logrus" ) diff --git a/pkg/convert/parser.go b/pkg/convert/parser.go index 3815a45cc7..286778844b 100644 --- a/pkg/convert/parser.go +++ b/pkg/convert/parser.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "github.com/petethepig/pyroscope/pkg/structs/transporttrie" + "github.com/pyroscope-io/pyroscope/pkg/structs/transporttrie" ) // format is a Serialized trie (see transporttrie.Serialize implementation) diff --git a/pkg/exec/cli.go b/pkg/exec/cli.go index fe22f3a842..282ef218dd 100644 --- a/pkg/exec/cli.go +++ b/pkg/exec/cli.go @@ -5,9 +5,9 @@ import ( "os" "os/exec" - "github.com/petethepig/pyroscope/pkg/agent" - "github.com/petethepig/pyroscope/pkg/agent/upstream/remote" - "github.com/petethepig/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/agent" + "github.com/pyroscope-io/pyroscope/pkg/agent/upstream/remote" + "github.com/pyroscope-io/pyroscope/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/pkg/server/controller.go b/pkg/server/controller.go index 89198e1fe6..7d9cb36588 100644 --- a/pkg/server/controller.go +++ b/pkg/server/controller.go @@ -8,9 +8,9 @@ import ( _ "net/http/pprof" "github.com/markbates/pkger" - "github.com/petethepig/pyroscope/pkg/build" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/storage" + "github.com/pyroscope-io/pyroscope/pkg/build" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/storage" log "github.com/sirupsen/logrus" ) diff --git a/pkg/server/ingest.go b/pkg/server/ingest.go index ba0b11021b..0910dace22 100644 --- a/pkg/server/ingest.go +++ b/pkg/server/ingest.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "github.com/petethepig/pyroscope/pkg/convert" - "github.com/petethepig/pyroscope/pkg/storage" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/util/attime" + "github.com/pyroscope-io/pyroscope/pkg/convert" + "github.com/pyroscope-io/pyroscope/pkg/storage" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/util/attime" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) diff --git a/pkg/server/render.go b/pkg/server/render.go index a869fdc80d..4e84820756 100644 --- a/pkg/server/render.go +++ b/pkg/server/render.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/petethepig/pyroscope/pkg/storage" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/util/attime" + "github.com/pyroscope-io/pyroscope/pkg/storage" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/util/attime" log "github.com/sirupsen/logrus" ) diff --git a/pkg/storage/dict/dict.go b/pkg/storage/dict/dict.go index ee18665c1d..3705351bcb 100644 --- a/pkg/storage/dict/dict.go +++ b/pkg/storage/dict/dict.go @@ -4,7 +4,7 @@ import ( "bytes" "sync" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) type Key []byte diff --git a/pkg/storage/dict/dict_suite_test.go b/pkg/storage/dict/dict_suite_test.go index bbec02213e..27a6078c7a 100644 --- a/pkg/storage/dict/dict_suite_test.go +++ b/pkg/storage/dict/dict_suite_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - testing2 "github.com/petethepig/pyroscope/pkg/testing" + testing2 "github.com/pyroscope-io/pyroscope/pkg/testing" ) func TestTdict(t *testing.T) { diff --git a/pkg/storage/dict/serialize.go b/pkg/storage/dict/serialize.go index 6550e84b79..5e1cec525f 100644 --- a/pkg/storage/dict/serialize.go +++ b/pkg/storage/dict/serialize.go @@ -5,7 +5,7 @@ import ( "bytes" "io" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) func (t *Dict) Serialize(w io.Writer) error { diff --git a/pkg/storage/dict/trie.go b/pkg/storage/dict/trie.go index 116c3c53a1..6b753c60be 100644 --- a/pkg/storage/dict/trie.go +++ b/pkg/storage/dict/trie.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) // this implementation is a copy of another trie implementation in this repo diff --git a/pkg/storage/dimension/serialization.go b/pkg/storage/dimension/serialization.go index 2c90047b64..ffe31b763b 100644 --- a/pkg/storage/dimension/serialization.go +++ b/pkg/storage/dimension/serialization.go @@ -5,7 +5,7 @@ import ( "bytes" "io" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) func (s *Dimension) Serialize(w io.Writer) error { diff --git a/pkg/storage/key.go b/pkg/storage/key.go index 3b878b728f..a2e410ff0a 100644 --- a/pkg/storage/key.go +++ b/pkg/storage/key.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/petethepig/pyroscope/pkg/structs/sortedmap" + "github.com/pyroscope-io/pyroscope/pkg/structs/sortedmap" "github.com/spaolacci/murmur3" ) diff --git a/pkg/storage/labels/labels.go b/pkg/storage/labels/labels.go index 74dc4d36b5..860ae20fb0 100644 --- a/pkg/storage/labels/labels.go +++ b/pkg/storage/labels/labels.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/dgraph-io/badger/v2" - "github.com/petethepig/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/config" ) type Labels struct { diff --git a/pkg/storage/segment/overlap_test.go b/pkg/storage/segment/overlap_test.go index 91bee49388..e221992170 100644 --- a/pkg/storage/segment/overlap_test.go +++ b/pkg/storage/segment/overlap_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/petethepig/pyroscope/pkg/testing" + "github.com/pyroscope-io/pyroscope/pkg/testing" ) // relationship overlap read overlap write diff --git a/pkg/storage/segment/relationship_test.go b/pkg/storage/segment/relationship_test.go index c92f7440c0..6b6461fb0d 100644 --- a/pkg/storage/segment/relationship_test.go +++ b/pkg/storage/segment/relationship_test.go @@ -3,7 +3,7 @@ package segment import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/petethepig/pyroscope/pkg/testing" + "github.com/pyroscope-io/pyroscope/pkg/testing" ) // relationship overlap read overlap write diff --git a/pkg/storage/segment/segment_test.go b/pkg/storage/segment/segment_test.go index 8c29d5fef1..55ecade9f5 100644 --- a/pkg/storage/segment/segment_test.go +++ b/pkg/storage/segment/segment_test.go @@ -13,8 +13,8 @@ import ( "github.com/davecgh/go-spew/spew" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/petethepig/pyroscope/pkg/structs/merge" - "github.com/petethepig/pyroscope/pkg/testing" + "github.com/pyroscope-io/pyroscope/pkg/structs/merge" + "github.com/pyroscope-io/pyroscope/pkg/testing" ) func getTries(s *Segment, st, et time.Time) []merge.Merger { diff --git a/pkg/storage/segment/serialization.go b/pkg/storage/segment/serialization.go index 07e47a4639..d5fae5ac76 100644 --- a/pkg/storage/segment/serialization.go +++ b/pkg/storage/segment/serialization.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) func (s *Segment) Serialize(w io.Writer) error { diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 5a328ac8c3..ea97827690 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -11,14 +11,14 @@ import ( "github.com/dgraph-io/badger/v2" "github.com/dgraph-io/badger/v2/options" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/storage/cache" - "github.com/petethepig/pyroscope/pkg/storage/dict" - "github.com/petethepig/pyroscope/pkg/storage/dimension" - "github.com/petethepig/pyroscope/pkg/storage/labels" - "github.com/petethepig/pyroscope/pkg/storage/segment" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/structs/merge" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/storage/cache" + "github.com/pyroscope-io/pyroscope/pkg/storage/dict" + "github.com/pyroscope-io/pyroscope/pkg/storage/dimension" + "github.com/pyroscope-io/pyroscope/pkg/storage/labels" + "github.com/pyroscope-io/pyroscope/pkg/storage/segment" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/structs/merge" "github.com/sirupsen/logrus" ) diff --git a/pkg/storage/storage_suite_test.go b/pkg/storage/storage_suite_test.go index 00618c83cc..3b0af7518c 100644 --- a/pkg/storage/storage_suite_test.go +++ b/pkg/storage/storage_suite_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - testing2 "github.com/petethepig/pyroscope/pkg/testing" + testing2 "github.com/pyroscope-io/pyroscope/pkg/testing" ) func TestStorage(t *testing.T) { diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 8bc687df94..0ea1ca5503 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -3,9 +3,9 @@ package storage import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/petethepig/pyroscope/pkg/config" - "github.com/petethepig/pyroscope/pkg/storage/tree" - "github.com/petethepig/pyroscope/pkg/testing" + "github.com/pyroscope-io/pyroscope/pkg/config" + "github.com/pyroscope-io/pyroscope/pkg/storage/tree" + "github.com/pyroscope-io/pyroscope/pkg/testing" ) // 21:22:08 air | (time.Duration) 10s, diff --git a/pkg/storage/tree/serialize.go b/pkg/storage/tree/serialize.go index 1acdb34d6f..6d98350d92 100644 --- a/pkg/storage/tree/serialize.go +++ b/pkg/storage/tree/serialize.go @@ -6,8 +6,8 @@ import ( "encoding/base64" "io" - "github.com/petethepig/pyroscope/pkg/storage/dict" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/storage/dict" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) func (t *Tree) Serialize(d *dict.Dict, maxNodes int, w io.Writer) error { diff --git a/pkg/storage/tree/serialize_test.go b/pkg/storage/tree/serialize_test.go index 25acfde76b..b5bcf261ad 100644 --- a/pkg/storage/tree/serialize_test.go +++ b/pkg/storage/tree/serialize_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/petethepig/pyroscope/pkg/storage/dict" + "github.com/pyroscope-io/pyroscope/pkg/storage/dict" log "github.com/sirupsen/logrus" ) diff --git a/pkg/storage/tree/svg.go b/pkg/storage/tree/svg.go index 2d91705ab4..59992055d1 100644 --- a/pkg/storage/tree/svg.go +++ b/pkg/storage/tree/svg.go @@ -5,8 +5,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/petethepig/pyroscope/pkg/structs/cappedarr" - "github.com/petethepig/pyroscope/pkg/svg" + "github.com/pyroscope-io/pyroscope/pkg/structs/cappedarr" + "github.com/pyroscope-io/pyroscope/pkg/svg" ) func (tn2 *treeNode) svg(w io.Writer, maxDepth, minVal uint64, totalCum float64, width int) { diff --git a/pkg/storage/tree/tree.go b/pkg/storage/tree/tree.go index ad9f8f4ae2..0f6ee43049 100644 --- a/pkg/storage/tree/tree.go +++ b/pkg/storage/tree/tree.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/petethepig/pyroscope/pkg/structs/merge" + "github.com/pyroscope-io/pyroscope/pkg/structs/merge" ) type jsonableSlice []byte diff --git a/pkg/storage/tree/v3trie_suite_test.go b/pkg/storage/tree/v3trie_suite_test.go index 774a10589f..f63a37ebca 100644 --- a/pkg/storage/tree/v3trie_suite_test.go +++ b/pkg/storage/tree/v3trie_suite_test.go @@ -6,7 +6,7 @@ import ( "testing" - testing2 "github.com/petethepig/pyroscope/pkg/testing" + testing2 "github.com/pyroscope-io/pyroscope/pkg/testing" ) func TestTree(t *testing.T) { diff --git a/pkg/structs/transporttrie/merge.go b/pkg/structs/transporttrie/merge.go index e870ffb0fa..47c81e8d1a 100644 --- a/pkg/structs/transporttrie/merge.go +++ b/pkg/structs/transporttrie/merge.go @@ -1,6 +1,6 @@ package transporttrie -import "github.com/petethepig/pyroscope/pkg/structs/merge" +import "github.com/pyroscope-io/pyroscope/pkg/structs/merge" func (dstTrie *Trie) Merge(srcTrieI merge.Merger) { srcTrie := srcTrieI.(*Trie) diff --git a/pkg/structs/transporttrie/serialize.go b/pkg/structs/transporttrie/serialize.go index fd46281ac5..af8210d3bb 100644 --- a/pkg/structs/transporttrie/serialize.go +++ b/pkg/structs/transporttrie/serialize.go @@ -5,7 +5,7 @@ import ( "bytes" "io" - "github.com/petethepig/pyroscope/pkg/util/varint" + "github.com/pyroscope-io/pyroscope/pkg/util/varint" ) func (t *Trie) Serialize(w io.Writer) error { diff --git a/pkg/structs/transporttrie/trie_test.go b/pkg/structs/transporttrie/trie_test.go index 2b8f747f85..608101293c 100644 --- a/pkg/structs/transporttrie/trie_test.go +++ b/pkg/structs/transporttrie/trie_test.go @@ -5,7 +5,7 @@ import ( "fmt" "math/rand" - "github.com/petethepig/pyroscope/pkg/structs/merge" + "github.com/pyroscope-io/pyroscope/pkg/structs/merge" log "github.com/sirupsen/logrus" . "github.com/onsi/ginkgo" diff --git a/pkg/testing/tmpdir.go b/pkg/testing/tmpdir.go index f454c11700..8e5734a127 100644 --- a/pkg/testing/tmpdir.go +++ b/pkg/testing/tmpdir.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/onsi/ginkgo" - "github.com/petethepig/pyroscope/pkg/util/bytesize" + "github.com/pyroscope-io/pyroscope/pkg/util/bytesize" ) func DirStats(path string) (directories int, files int, size bytesize.ByteSize) { diff --git a/pkg/util/debug/disk.go b/pkg/util/debug/disk.go index 9be59ed99f..adeda91084 100644 --- a/pkg/util/debug/disk.go +++ b/pkg/util/debug/disk.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/petethepig/pyroscope/pkg/util/bytesize" + "github.com/pyroscope-io/pyroscope/pkg/util/bytesize" "github.com/sirupsen/logrus" ) diff --git a/pkg/util/debug/ram.go b/pkg/util/debug/ram.go index 2f3f8cc043..52fb078830 100644 --- a/pkg/util/debug/ram.go +++ b/pkg/util/debug/ram.go @@ -4,7 +4,7 @@ import ( "runtime" "strconv" - "github.com/petethepig/pyroscope/pkg/util/bytesize" + "github.com/pyroscope-io/pyroscope/pkg/util/bytesize" "github.com/sirupsen/logrus" ) diff --git a/scripts/generate-build-flags.sh b/scripts/generate-build-flags.sh index 5b76132b96..055cf5f047 100755 --- a/scripts/generate-build-flags.sh +++ b/scripts/generate-build-flags.sh @@ -7,10 +7,10 @@ GIT_SHA="$( (git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head GIT_DIRTY="$(git diff --no-ext-diff 2> /dev/null | wc -l)" CURRENT_TIME="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" -echo "-X github.com/petethepig/pyroscope/pkg/build.Version=$GIT_TAG" -echo "-X github.com/petethepig/pyroscope/pkg/build.GitSHA=$GIT_SHA" -echo "-X github.com/petethepig/pyroscope/pkg/build.GitDirtyStr=$(echo $GIT_DIRTY)" -echo "-X github.com/petethepig/pyroscope/pkg/build.Time=$CURRENT_TIME" +echo "-X github.com/pyroscope-io/pyroscope/pkg/build.Version=$GIT_TAG" +echo "-X github.com/pyroscope-io/pyroscope/pkg/build.GitSHA=$GIT_SHA" +echo "-X github.com/pyroscope-io/pyroscope/pkg/build.GitDirtyStr=$(echo $GIT_DIRTY)" +echo "-X github.com/pyroscope-io/pyroscope/pkg/build.Time=$CURRENT_TIME" if [ "$1" = "true" ]; then - echo "-X github.com/petethepig/pyroscope/pkg/build.UseEmbeddedAssetsStr=true" + echo "-X github.com/pyroscope-io/pyroscope/pkg/build.UseEmbeddedAssetsStr=true" fi diff --git a/scripts/webpack/webpack.js b/scripts/webpack/webpack.js index 8061245539..a1f2b997c3 100644 --- a/scripts/webpack/webpack.js +++ b/scripts/webpack/webpack.js @@ -166,7 +166,7 @@ module.exports = (env = {}) => { BUILD_FLAGS: JSON.stringify(buildFlags), }), new CleanWebpackPlugin({ - cleanStaleWebpackAssets: false + // cleanStaleWebpackAssets: false }), new HtmlWebpackPlugin({ filename: path.resolve(__dirname, '../../webapp/public/index.html'), diff --git a/webapp/javascript/components/Footer.tsx b/webapp/javascript/components/Footer.tsx index 9889546d2c..36044c4931 100644 --- a/webapp/javascript/components/Footer.tsx +++ b/webapp/javascript/components/Footer.tsx @@ -16,7 +16,7 @@ class Footer extends React.Component { } render() { - // let flags = BUILD_FLAGS.split("\n").map(x => x.replace("-X github.com/petethepig/pyroscope/pkg/build.", "")); + // let flags = BUILD_FLAGS.split("\n").map(x => x.replace("-X github.com/pyroscope-io/pyroscope/pkg/build.", "")); // console.log(flags); return
© Pyroscope {copyrightYears(START_YEAR, new Date().getFullYear())}