From 8f9025aa9325133759be3a92f7b327cd99d3b6ac Mon Sep 17 00:00:00 2001 From: wineguo Date: Fri, 22 Mar 2024 21:06:20 +0800 Subject: [PATCH] otel: release v1.0.2 to remove all the references to v1.0.0 --- CHANGELOG.md | 10 +++++++--- config/config.go | 2 +- example/asyncexporterlog/go.mod | 2 +- example/basic/go.mod | 12 +++++++++++- example/basic/go.sum | 21 +++++++++++++++++++++ example/log/go.mod | 2 +- example/metric/go.mod | 2 +- example/trace/go.mod | 2 +- oteltrpc/example/greeter/go.mod | 4 ++-- oteltrpc/go.mod | 4 +--- oteltrpc/logs/writer.go | 2 +- oteltrpc/oteltrpc.go | 2 +- 12 files changed, 49 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db24f6c..06827de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,12 @@ -## [1.0.0](https://trpc.group/trpc-go/go-opentelemetry/v1.0.0) (2023-10-20) - +## [1.0.2](https://trpc.group/trpc-go/go-opentelemetry/v1.0.2) (2024-03-22) ### Features -- release v1.0.0 +- release v1.0.2 to remove all the references to v1.0.0 ## [1.0.1](https://trpc.group/trpc-go/go-opentelemetry/v1.0.1) (2023-11-09) ### Features - release new version to fix invalid proxy cache + +## [1.0.0](https://trpc.group/trpc-go/go-opentelemetry/v1.0.0) (2023-10-20) + +### Features +- release v1.0.0 diff --git a/config/config.go b/config/config.go index 80dbea2..be887c6 100644 --- a/config/config.go +++ b/config/config.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "trpc.group/trpc-go/trpc-opentelemetry" + opentelemetry "trpc.group/trpc-go/trpc-opentelemetry" "trpc.group/trpc-go/trpc-opentelemetry/api/log" "trpc.group/trpc-go/trpc-opentelemetry/config/codes" "trpc.group/trpc-go/trpc-opentelemetry/sdk/metric" diff --git a/example/asyncexporterlog/go.mod b/example/asyncexporterlog/go.mod index 4204aba..fe29b73 100644 --- a/example/asyncexporterlog/go.mod +++ b/example/asyncexporterlog/go.mod @@ -7,7 +7,7 @@ replace trpc.group/trpc-go/trpc-opentelemetry => ../../ require ( go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/zap v1.24.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( diff --git a/example/basic/go.mod b/example/basic/go.mod index 7ac4065..f2ac25b 100644 --- a/example/basic/go.mod +++ b/example/basic/go.mod @@ -8,11 +8,12 @@ require ( go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -23,7 +24,16 @@ require ( github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect + go.opentelemetry.io/contrib/zpages v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sys v0.8.0 // indirect diff --git a/example/basic/go.sum b/example/basic/go.sum index 7bb556e..6909e70 100644 --- a/example/basic/go.sum +++ b/example/basic/go.sum @@ -44,6 +44,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -227,17 +229,36 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/contrib/zpages v0.40.0 h1:BDLYzPHju8GRJH2V+0CtF4WF/sDnylZnspShMMnhyhw= +go.opentelemetry.io/contrib/zpages v0.40.0/go.mod h1:hKOEjOa1AA8kbqQRWR5gSj4WrjWjHQMFv5jeRGDgVRM= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+Fizi7lTM2UefJ1TO347fSRcwmIsUAaZmYmIGBRAo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 h1:IZXpCEtI7BbX01DRQEWTGDkvjMB6hEhiEZXS+eg2YqY= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= +go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= +go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/example/log/go.mod b/example/log/go.mod index 1c3fb10..346b345 100644 --- a/example/log/go.mod +++ b/example/log/go.mod @@ -7,7 +7,7 @@ replace trpc.group/trpc-go/trpc-opentelemetry => ../../ require ( go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/zap v1.24.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( diff --git a/example/metric/go.mod b/example/metric/go.mod index 7bd8e40..b128003 100644 --- a/example/metric/go.mod +++ b/example/metric/go.mod @@ -11,7 +11,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 go.opentelemetry.io/otel/metric v1.16.0 go.opentelemetry.io/otel/sdk/metric v0.39.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( diff --git a/example/trace/go.mod b/example/trace/go.mod index 7b744fc..2c5d2a3 100644 --- a/example/trace/go.mod +++ b/example/trace/go.mod @@ -8,7 +8,7 @@ require ( go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( diff --git a/oteltrpc/example/greeter/go.mod b/oteltrpc/example/greeter/go.mod index 919c6f6..b8ac8bd 100644 --- a/oteltrpc/example/greeter/go.mod +++ b/oteltrpc/example/greeter/go.mod @@ -9,7 +9,7 @@ replace ( require ( trpc.group/trpc-go/trpc-go v1.0.0 - trpc.group/trpc-go/trpc-opentelemetry/oteltrpc v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry/oteltrpc v1.0.1 ) require ( @@ -88,6 +88,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect trpc.group/trpc-go/tnet v0.0.0-20230810071536-9d05338021cf // indirect - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 // indirect + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 // indirect trpc.group/trpc/trpc-protocol/pb/go/trpc v0.0.0-20230803031059-de4168eb5952 // indirect ) diff --git a/oteltrpc/go.mod b/oteltrpc/go.mod index f2e35bc..9e20f61 100644 --- a/oteltrpc/go.mod +++ b/oteltrpc/go.mod @@ -2,8 +2,6 @@ module trpc.group/trpc-go/trpc-opentelemetry/oteltrpc go 1.18 -replace trpc.group/trpc-go/trpc-opentelemetry v1.0.0 => ../ - require ( github.com/golang/protobuf v1.5.3 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 @@ -25,7 +23,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 trpc.group/trpc-go/trpc-go v1.0.0 - trpc.group/trpc-go/trpc-opentelemetry v1.0.0 + trpc.group/trpc-go/trpc-opentelemetry v1.0.1 ) require ( diff --git a/oteltrpc/logs/writer.go b/oteltrpc/logs/writer.go index 78280a1..ce3533a 100644 --- a/oteltrpc/logs/writer.go +++ b/oteltrpc/logs/writer.go @@ -32,7 +32,7 @@ import ( "trpc.group/trpc-go/trpc-go/log" "trpc.group/trpc-go/trpc-go/plugin" - "trpc.group/trpc-go/trpc-opentelemetry" + opentelemetry "trpc.group/trpc-go/trpc-opentelemetry" "trpc.group/trpc-go/trpc-opentelemetry/api" logtps "trpc.group/trpc-go/trpc-opentelemetry/api/log" diff --git a/oteltrpc/oteltrpc.go b/oteltrpc/oteltrpc.go index b7de934..bf9fb80 100644 --- a/oteltrpc/oteltrpc.go +++ b/oteltrpc/oteltrpc.go @@ -34,7 +34,7 @@ import ( "trpc.group/trpc-go/trpc-go/filter" "trpc.group/trpc-go/trpc-go/plugin" - "trpc.group/trpc-go/trpc-opentelemetry" + opentelemetry "trpc.group/trpc-go/trpc-opentelemetry" "trpc.group/trpc-go/trpc-opentelemetry/config" "trpc.group/trpc-go/trpc-opentelemetry/config/codes"