diff --git a/.gitignore b/.gitignore index 3f6cead..38f85ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /lightstep-tracer-go-0.16.0.tar.gz +/lightstep-tracer-go-0.20.0.tar.gz diff --git a/0001-Convert-id-to-string-using-strconv.Itoa.patch b/0001-Convert-id-to-string-using-strconv.Itoa.patch new file mode 100644 index 0000000..54d7e08 --- /dev/null +++ b/0001-Convert-id-to-string-using-strconv.Itoa.patch @@ -0,0 +1,41 @@ +From 8e6b0d152fc26813c2ae7916624f51c139b06bc1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Wed, 29 Jul 2020 01:31:49 +0200 +Subject: [PATCH] Convert id to string using strconv.Itoa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://github.com/golang/go/issues/32479 + +Fix #257. + +Signed-off-by: Robert-André Mauchin +--- + test_utils_test.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test_utils_test.go b/test_utils_test.go +index 0e1b824..7d59e24 100644 +--- a/test_utils_test.go ++++ b/test_utils_test.go +@@ -4,6 +4,7 @@ import ( + "context" + "fmt" + "reflect" ++ "strconv" + + "github.com/lightstep/lightstep-tracer-common/golang/gogo/collectorpb" + cpbfakes "github.com/lightstep/lightstep-tracer-common/golang/gogo/collectorpb/collectorpbfakes" +@@ -24,7 +25,7 @@ func closeTestTracer(tracer opentracing.Tracer) { + + func startNSpans(n int, tracer opentracing.Tracer) { + for i := 0; i < n; i++ { +- tracer.StartSpan(string(i)).Finish() ++ tracer.StartSpan(strconv.Itoa(i)).Finish() + } + } + +-- +2.26.2 + diff --git a/golang-github-lightstep-tracer.spec b/golang-github-lightstep-tracer.spec index c9766a4..4f0473b 100644 --- a/golang-github-lightstep-tracer.spec +++ b/golang-github-lightstep-tracer.spec @@ -6,7 +6,7 @@ # https://github.com/lightstep/lightstep-tracer-go %global goipath github.com/lightstep/lightstep-tracer-go -Version: 0.16.0 +Version: 0.20.0 %gometa @@ -17,20 +17,27 @@ Package Lightstep implements the LightStep OpenTracing client for Go.} %global godocs examples CHANGELOG.md README.md Name: %{goname} -Release: 4%{?dist} +Release: 1%{?dist} Summary: LightStep distributed tracing library for Go License: MIT URL: %{gourl} Source0: %{gosource} +# Go 1.15: https://github.com/lightstep/lightstep-tracer-go/issues/257 +Patch0: 0001-Convert-id-to-string-using-strconv.Itoa.patch BuildRequires: golang(github.com/gogo/protobuf/proto) BuildRequires: golang(github.com/gogo/protobuf/types) BuildRequires: golang(github.com/lightstep/lightstep-tracer-common/golang/gogo/collectorpb) BuildRequires: golang(github.com/lightstep/lightstep-tracer-common/golang/gogo/lightsteppb) +BuildRequires: golang(github.com/lightstep/lightstep-tracer-common/golang/gogo/metricspb) BuildRequires: golang(github.com/opentracing/opentracing-go) BuildRequires: golang(github.com/opentracing/opentracing-go/ext) BuildRequires: golang(github.com/opentracing/opentracing-go/log) +BuildRequires: golang(github.com/shirou/gopsutil/cpu) +BuildRequires: golang(github.com/shirou/gopsutil/mem) +BuildRequires: golang(github.com/shirou/gopsutil/net) +BuildRequires: golang(github.com/shirou/gopsutil/process) BuildRequires: golang(go.opencensus.io/trace) BuildRequires: golang(google.golang.org/grpc) BuildRequires: golang(google.golang.org/grpc/credentials) @@ -50,6 +57,7 @@ BuildRequires: golang(github.com/onsi/gomega) %prep %goprep +%patch -p1 %install %gopkginstall @@ -62,6 +70,9 @@ BuildRequires: golang(github.com/onsi/gomega) %gopkgfiles %changelog +* Tue Jul 28 22:32:31 CEST 2020 Robert-André Mauchin - 0.20.0-1 +- Update to 0.20.0 + * Mon Jul 27 2020 Fedora Release Engineering - 0.16.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 350ddc9..8dcf243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lightstep-tracer-go-0.16.0.tar.gz) = 041cf770cbfcea6daa19deb7f26606a43231e9e9faf9a97f977007492ffd32455df4b14ba79452e04fe8b9fd22e89c367c5ca1cce3068a099dd261b27a9cbfdb +SHA512 (lightstep-tracer-go-0.20.0.tar.gz) = 4028953f109f30254d8040766354e950a50f9f440be245e71744dc18111668a27e94d69a5a96102a4d96d82ac11750956fd17e3ee8138f5f3a832dc1eb45ed17