mirror of
https://github.com/astaxie/beego.git
synced 2024-11-25 20:51:29 +00:00
Merge pull request #4029 from flycash/feature/buildInfo
Add build info for prometheus
This commit is contained in:
commit
828b20163d
27
build_info.go
Normal file
27
build_info.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
// Copyright 2020 astaxie
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package beego
|
||||||
|
|
||||||
|
var (
|
||||||
|
BuildVersion string
|
||||||
|
BuildGitRevision string
|
||||||
|
BuildStatus string
|
||||||
|
BuildTag string
|
||||||
|
BuildTime string
|
||||||
|
|
||||||
|
GoVersion string
|
||||||
|
|
||||||
|
GitBranch string
|
||||||
|
)
|
@ -18,6 +18,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
@ -40,6 +41,8 @@ func PrometheusMiddleWare(next http.Handler) http.Handler {
|
|||||||
|
|
||||||
prometheus.MustRegister(summaryVec)
|
prometheus.MustRegister(summaryVec)
|
||||||
|
|
||||||
|
registerBuildInfo()
|
||||||
|
|
||||||
return http.HandlerFunc(func(writer http.ResponseWriter, q *http.Request) {
|
return http.HandlerFunc(func(writer http.ResponseWriter, q *http.Request) {
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
next.ServeHTTP(writer, q)
|
next.ServeHTTP(writer, q)
|
||||||
@ -48,6 +51,28 @@ func PrometheusMiddleWare(next http.Handler) http.Handler {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func registerBuildInfo() {
|
||||||
|
buildInfo := prometheus.NewGaugeVec(prometheus.GaugeOpts{
|
||||||
|
Name: "beego",
|
||||||
|
Subsystem: "build_info",
|
||||||
|
Help: "The building information",
|
||||||
|
ConstLabels: map[string]string{
|
||||||
|
"appname": beego.BConfig.AppName,
|
||||||
|
"build_version": beego.BuildVersion,
|
||||||
|
"build_revision": beego.BuildGitRevision,
|
||||||
|
"build_status": beego.BuildStatus,
|
||||||
|
"build_tag": beego.BuildTag,
|
||||||
|
"build_time": strings.Replace(beego.BuildTime, "--", " ", 1),
|
||||||
|
"go_version": beego.GoVersion,
|
||||||
|
"git_branch": beego.GitBranch,
|
||||||
|
"start_time": time.Now().Format("2006-01-02 15:04:05"),
|
||||||
|
},
|
||||||
|
}, []string{})
|
||||||
|
|
||||||
|
prometheus.MustRegister(buildInfo)
|
||||||
|
buildInfo.WithLabelValues().Set(1)
|
||||||
|
}
|
||||||
|
|
||||||
func report(dur time.Duration, writer http.ResponseWriter, q *http.Request, vec *prometheus.SummaryVec) {
|
func report(dur time.Duration, writer http.ResponseWriter, q *http.Request, vec *prometheus.SummaryVec) {
|
||||||
ctrl := beego.BeeApp.Handlers
|
ctrl := beego.BeeApp.Handlers
|
||||||
ctx := ctrl.GetContext()
|
ctx := ctrl.GetContext()
|
||||||
|
112
scripts/gobuild.sh
Executable file
112
scripts/gobuild.sh
Executable file
@ -0,0 +1,112 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# WARNING: DO NOT EDIT, THIS FILE IS PROBABLY A COPY
|
||||||
|
#
|
||||||
|
# The original version of this file is located in the https://github.com/istio/common-files repo.
|
||||||
|
# If you're looking at this file in a different repo and want to make a change, please go to the
|
||||||
|
# common-files repo, make the change there and check it in. Then come back to this repo and run
|
||||||
|
# "make update-common".
|
||||||
|
|
||||||
|
# Copyright Istio Authors. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
# This script builds and version stamps the output
|
||||||
|
|
||||||
|
# adatp to beego
|
||||||
|
|
||||||
|
VERBOSE=${VERBOSE:-"0"}
|
||||||
|
V=""
|
||||||
|
if [[ "${VERBOSE}" == "1" ]];then
|
||||||
|
V="-x"
|
||||||
|
set -x
|
||||||
|
fi
|
||||||
|
|
||||||
|
SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
OUT=${1:?"output path"}
|
||||||
|
shift
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BUILD_GOOS=${GOOS:-linux}
|
||||||
|
BUILD_GOARCH=${GOARCH:-amd64}
|
||||||
|
GOBINARY=${GOBINARY:-go}
|
||||||
|
GOPKG="$GOPATH/pkg"
|
||||||
|
BUILDINFO=${BUILDINFO:-""}
|
||||||
|
STATIC=${STATIC:-1}
|
||||||
|
LDFLAGS=${LDFLAGS:--extldflags -static}
|
||||||
|
GOBUILDFLAGS=${GOBUILDFLAGS:-""}
|
||||||
|
# Split GOBUILDFLAGS by spaces into an array called GOBUILDFLAGS_ARRAY.
|
||||||
|
IFS=' ' read -r -a GOBUILDFLAGS_ARRAY <<< "$GOBUILDFLAGS"
|
||||||
|
|
||||||
|
GCFLAGS=${GCFLAGS:-}
|
||||||
|
export CGO_ENABLED=0
|
||||||
|
|
||||||
|
if [[ "${STATIC}" != "1" ]];then
|
||||||
|
LDFLAGS=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# gather buildinfo if not already provided
|
||||||
|
# For a release build BUILDINFO should be produced
|
||||||
|
# at the beginning of the build and used throughout
|
||||||
|
if [[ -z ${BUILDINFO} ]];then
|
||||||
|
BUILDINFO=$(mktemp)
|
||||||
|
"${SCRIPTPATH}/report_build_info.sh" > "${BUILDINFO}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# BUILD LD_EXTRAFLAGS
|
||||||
|
LD_EXTRAFLAGS=""
|
||||||
|
|
||||||
|
while read -r line; do
|
||||||
|
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X ${line}"
|
||||||
|
done < "${BUILDINFO}"
|
||||||
|
|
||||||
|
# verify go version before build
|
||||||
|
# NB. this was copied verbatim from Kubernetes hack
|
||||||
|
minimum_go_version=go1.13 # supported patterns: go1.x, go1.x.x (x should be a number)
|
||||||
|
IFS=" " read -ra go_version <<< "$(${GOBINARY} version)"
|
||||||
|
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
|
||||||
|
echo "Warning: Detected that you are using an older version of the Go compiler. Beego requires ${minimum_go_version} or greater."
|
||||||
|
fi
|
||||||
|
|
||||||
|
CURRENT_BRANCH=$(git branch | grep '*')
|
||||||
|
CURRENT_BRANCH=${CURRENT_BRANCH:2}
|
||||||
|
|
||||||
|
BUILD_TIME=$(date +%Y-%m-%d--%T)
|
||||||
|
|
||||||
|
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.GoVersion=${go_version[2]:2}"
|
||||||
|
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.GitBranch=${CURRENT_BRANCH}"
|
||||||
|
LD_EXTRAFLAGS="${LD_EXTRAFLAGS} -X github.com/astaxie/beego.BuildTime=$BUILD_TIME"
|
||||||
|
|
||||||
|
OPTIMIZATION_FLAGS="-trimpath"
|
||||||
|
if [ "${DEBUG}" == "1" ]; then
|
||||||
|
OPTIMIZATION_FLAGS=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
echo "BUILD_GOARCH: $BUILD_GOARCH"
|
||||||
|
echo "GOPKG: $GOPKG"
|
||||||
|
echo "LD_EXTRAFLAGS: $LD_EXTRAFLAGS"
|
||||||
|
echo "GO_VERSION: ${go_version[2]}"
|
||||||
|
echo "BRANCH: $CURRENT_BRANCH"
|
||||||
|
echo "BUILD_TIME: $BUILD_TIME"
|
||||||
|
|
||||||
|
time GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} ${GOBINARY} build \
|
||||||
|
${V} "${GOBUILDFLAGS_ARRAY[@]}" ${GCFLAGS:+-gcflags "${GCFLAGS}"} \
|
||||||
|
-o "${OUT}" \
|
||||||
|
${OPTIMIZATION_FLAGS} \
|
||||||
|
-pkgdir="${GOPKG}/${BUILD_GOOS}_${BUILD_GOARCH}" \
|
||||||
|
-ldflags "${LDFLAGS} ${LD_EXTRAFLAGS}" "${@}"
|
52
scripts/report_build_info.sh
Executable file
52
scripts/report_build_info.sh
Executable file
@ -0,0 +1,52 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# WARNING: DO NOT EDIT, THIS FILE IS PROBABLY A COPY
|
||||||
|
#
|
||||||
|
# The original version of this file is located in the https://github.com/istio/common-files repo.
|
||||||
|
# If you're looking at this file in a different repo and want to make a change, please go to the
|
||||||
|
# common-files repo, make the change there and check it in. Then come back to this repo and run
|
||||||
|
# "make update-common".
|
||||||
|
|
||||||
|
# Copyright Istio Authors
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
# adapt to beego
|
||||||
|
|
||||||
|
if BUILD_GIT_REVISION=$(git rev-parse HEAD 2> /dev/null); then
|
||||||
|
if [[ -n "$(git status --porcelain 2>/dev/null)" ]]; then
|
||||||
|
BUILD_GIT_REVISION=${BUILD_GIT_REVISION}"-dirty"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
BUILD_GIT_REVISION=unknown
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for local changes
|
||||||
|
if git diff-index --quiet HEAD --; then
|
||||||
|
tree_status="Clean"
|
||||||
|
else
|
||||||
|
tree_status="Modified"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# security wanted VERSION='unknown'
|
||||||
|
VERSION="${BUILD_GIT_REVISION}"
|
||||||
|
if [[ -n ${BEEGO_VERSION} ]]; then
|
||||||
|
VERSION="${BEEGO_VERSION}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
GIT_DESCRIBE_TAG=$(git describe --tags)
|
||||||
|
|
||||||
|
echo "github.com/astaxie/beego.BuildVersion=${VERSION}"
|
||||||
|
echo "github.com/astaxie/beego.BuildGitRevision=${BUILD_GIT_REVISION}"
|
||||||
|
echo "github.com/astaxie/beego.BuildStatus=${tree_status}"
|
||||||
|
echo "github.com/astaxie/beego.BuildTag=${GIT_DESCRIBE_TAG}"
|
Loading…
Reference in New Issue
Block a user