diff --git a/Makefile b/Makefile index e3a70fc..99dea09 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ precommit: fmt vet lint build test examples .PHONY: impi impi: - @$(IMPI) --local trpc-system/go-opentelemetry --scheme stdThirdPartyLocal --skip example/trpc/protocol --skip opentelemetry/proto ./... + @$(IMPI) --local trpc-ecosystem/go-opentelemetry --scheme stdThirdPartyLocal --skip example/trpc/protocol --skip opentelemetry/proto ./... .PHONY: misspell misspell: @@ -83,5 +83,5 @@ examples: .PHONY: fmt fmt: gofmt -w -s . - goimports -w -local trpc-system/go-opentelemetry ./ + goimports -w -local trpc-ecosystem/go-opentelemetry ./ diff --git a/README.md b/README.md index 91aa10a..09cc622 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,20 @@ English | [中文](README.zh_CN.md) # Go SDK [![Go Reference](https://pkg.go.dev/badge/github.com/trpc-ecosystem/go-opentelemetry.svg)](https://pkg.go.dev/github.com/trpc-ecosystem/go-opentelemetry) -[![Go Report Card](https://goreportcard.com/badge/trpc.group/trpc-go/trpc-system/go-opentelemetry)](https://goreportcard.com/report/trpc.group/trpc-go/trpc-system/go-opentelemetry) +[![Go Report Card](https://goreportcard.com/badge/trpc.group/trpc-go/trpc-ecosystem/go-opentelemetry)](https://goreportcard.com/report/trpc.group/trpc-go/trpc-ecosystem/go-opentelemetry) [![LICENSE](https://img.shields.io/badge/license-Apache--2.0-green.svg)](https://github.com/trpc-ecosystem/go-opentelemetry/blob/main/LICENSE) [![Releases](https://img.shields.io/github/release/trpc-ecosystem/go-opentelemetry.svg?style=flat-square)](https://github.com/trpc-ecosystem/go-opentelemetry/releases) [![Tests](https://github.com/trpc-ecosystem/go-opentelemetry/actions/workflows/prc.yml/badge.svg)](https://github.com/trpc-ecosystem/go-opentelemetry/actions/workflows/prc.yml) [![Coverage](https://codecov.io/gh/trpc-ecosystem/go-opentelemetry/branch/main/graph/badge.svg)](https://app.codecov.io/gh/trpc-ecosystem/go-opentelemetry/tree/main) -## quickstart +## Quickstart -### 1. use trpctelemetry (recommended for tRPC) +### 1. Use trpctelemetry (recommended for tRPC) 1. import tRPC filter ```go -import _ "trpc-system/go-opentelemetry/oteltrpc" +import _ "trpc-ecosystem/go-opentelemetry/oteltrpc" ``` 2. modify tRPC config @@ -93,7 +93,7 @@ plugins: # method: # If not empty, it indicates that the error code exception only matches a specific method (regardless of whether it's a caller or callee). If empty, it applies to all methods. prometheus_push: # report to prometheus gateway enabled: false # default false, refer to https://prometheus.io/docs/practices/pushing/#should-i-be-using-the-pushgateway - # If you need to send a delete request to the push gateway after the program exits, add 'defer metric.DeletePrometheusPush()' after 'trpc.NewServer()' in the main() function. For more details, see https://trpc-system/go-opentelemetry#4-metrcs-plugin-configuration. + # If you need to send a delete request to the push gateway after the program exits, add 'defer metric.DeletePrometheusPush()' after 'trpc.NewServer()' in the main() function. For more details, see https://trpc-ecosystem/go-opentelemetry#4-metrcs-plugin-configuration. url: "" # e.g., http://1.1.1.1:4318 job: "reporter" # can't be empty, default: "reporter" interval: 60s # default 60 seconds @@ -140,7 +140,7 @@ plugins: enable_zpage: false # Default false, when enabled, the processor exports span locally and can be viewed at /debug/tracez ``` -3. metrics plugin setup +3. Metrics plugin setup default registered to etcd cluster, can be turned off. support prometheus gateway, require program sending delete request to push gateway before exit, add defer metric.DeletePrometheusPush() in main function, e.g., ```go @@ -148,8 +148,8 @@ package main import ( "trpc.group/trpc-go/trpc-go" - _ "trpc-system/go-opentelemetry/oteltrpc" - "trpc-system/go-opentelemetry/sdk/metric" + _ "trpc-ecosystem/go-opentelemetry/oteltrpc" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) func main() { @@ -160,6 +160,6 @@ func main() { ``` -### 2. use opentelemetry sdk +### 2.Use opentelemetry sdk If the framework used by the business does not implement a reporting plugin similar to trpc-go, you can also directly integrate with the OpenTelemetry SDK. For a reporting demo, please refer to the following: [example](./example)。 diff --git a/README.zh_CN.md b/README.zh_CN.md index 3d5bff1..2ca2996 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -9,7 +9,7 @@ 1. 匿名引入tRPC拦截器 ```go -import _ "trpc-system/go-opentelemetry/oteltrpc" +import _ "trpc-ecosystem/go-opentelemetry/oteltrpc" ``` 2. 修改tRPC框架配置文件 @@ -89,7 +89,7 @@ plugins: # method: # 不为空表示错误码特例仅匹配特定的(无论主被调) method, 为空表示所有 method. prometheus_push: # 上报指标到prometheus gateway enabled: false # 启用上报,默认关闭, 参见https://prometheus.io/docs/practices/pushing/#should-i-be-using-the-pushgateway - # 如需在程序退出后发送delete请求到push gateway,需在main()函数trpc.NewServer()之后添加defer metric.DeletePrometheusPush(),详见https://trpc-system/go-opentelemetry#4-metrcs插件配置 + # 如需在程序退出后发送delete请求到push gateway,需在main()函数trpc.NewServer()之后添加defer metric.DeletePrometheusPush(),详见https://trpc-ecosystem/go-opentelemetry#4-metrcs插件配置 url: "" # 上报地址, 如http://1.1.1.1:4318 job: "reporter" # 名称,不能为空,默认为reporter interval: 60s # 上报间隔,默认60秒 @@ -144,8 +144,8 @@ package main import ( "trpc.group/trpc-go/trpc-go" - _ "trpc-system/go-opentelemetry/oteltrpc" - "trpc-system/go-opentelemetry/sdk/metric" + _ "trpc-ecosystem/go-opentelemetry/oteltrpc" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) func main() { diff --git a/config/codes/code_mapping.go b/config/codes/code_mapping.go index eb2372c..3f1f96e 100644 --- a/config/codes/code_mapping.go +++ b/config/codes/code_mapping.go @@ -18,8 +18,8 @@ import ( "strconv" "sync/atomic" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" - "trpc-system/go-opentelemetry/sdk/remote" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" + "trpc-ecosystem/go-opentelemetry/sdk/remote" ) var ( diff --git a/config/codes/code_mapping_test.go b/config/codes/code_mapping_test.go index fc48e44..b3a3e36 100644 --- a/config/codes/code_mapping_test.go +++ b/config/codes/code_mapping_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" - "trpc-system/go-opentelemetry/sdk/remote" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" + "trpc-ecosystem/go-opentelemetry/sdk/remote" ) func TestCodeConverter_Map(t *testing.T) { diff --git a/config/config.go b/config/config.go index 37d517c..b6f4ebd 100644 --- a/config/config.go +++ b/config/config.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "trpc-system/go-opentelemetry" - "trpc-system/go-opentelemetry/api/log" - "trpc-system/go-opentelemetry/config/codes" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry" + "trpc-ecosystem/go-opentelemetry/api/log" + "trpc-ecosystem/go-opentelemetry/config/codes" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // Config opentelemetry trpc plugin config diff --git a/example/asyncexporterlog/README.md b/example/asyncexporterlog/README.md index f7a72c0..3717c1d 100644 --- a/example/asyncexporterlog/README.md +++ b/example/asyncexporterlog/README.md @@ -1,7 +1,7 @@ demo:使用asyncexporter上报日志 ```go -import "trpc-system/go-opentelemetry/exporter/asyncexporter" +import "trpc-ecosystem/go-opentelemetry/exporter/asyncexporter" func main() { //一定要在trpc.NewServer()以前使用 asyncexporter.Concurrency = 4 diff --git a/example/asyncexporterlog/go.mod b/example/asyncexporterlog/go.mod index 095819e..66ca891 100644 --- a/example/asyncexporterlog/go.mod +++ b/example/asyncexporterlog/go.mod @@ -1,13 +1,13 @@ -module trpc-system/go-opentelemetry/example/aysncexporterlog +module trpc-ecosystem/go-opentelemetry/example/aysncexporterlog go 1.18 -replace trpc-system/go-opentelemetry => ../../ +replace trpc-ecosystem/go-opentelemetry => ../../ require ( go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/zap v1.24.0 - trpc-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 ) require ( diff --git a/example/asyncexporterlog/main.go b/example/asyncexporterlog/main.go index a6d25c2..0e9a287 100644 --- a/example/asyncexporterlog/main.go +++ b/example/asyncexporterlog/main.go @@ -19,9 +19,9 @@ import ( "go.opentelemetry.io/otel/sdk/resource" "go.uber.org/zap" - "trpc-system/go-opentelemetry/api" - "trpc-system/go-opentelemetry/exporter/asyncexporter" - "trpc-system/go-opentelemetry/otelzap" + "trpc-ecosystem/go-opentelemetry/api" + "trpc-ecosystem/go-opentelemetry/exporter/asyncexporter" + "trpc-ecosystem/go-opentelemetry/otelzap" ) func main() { diff --git a/example/basic/go.mod b/example/basic/go.mod index 1689d80..f9945db 100644 --- a/example/basic/go.mod +++ b/example/basic/go.mod @@ -1,19 +1,18 @@ -module trpc-system/go-opentelemetry/example/basic +module trpc-ecosystem/go-opentelemetry/example/basic go 1.18 -replace trpc-system/go-opentelemetry => ../../ +replace trpc-ecosystem/go-opentelemetry => ../../ 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-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 ) 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 @@ -24,16 +23,7 @@ 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 6909e70..7bb556e 100644 --- a/example/basic/go.sum +++ b/example/basic/go.sum @@ -44,8 +44,6 @@ 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= @@ -229,36 +227,17 @@ 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/basic/main.go b/example/basic/main.go index c5f54e7..4f90390 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -23,10 +23,9 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" - "trpc-system/go-opentelemetry" - "trpc-system/go-opentelemetry/api" - apilog "trpc-system/go-opentelemetry/api/log" - ecotrace "trpc-system/go-opentelemetry/sdk/trace" + "trpc-ecosystem/go-opentelemetry/api" + apilog "trpc-ecosystem/go-opentelemetry/api/log" + ecotrace "trpc-ecosystem/go-opentelemetry/sdk/trace" ) var meter = otel.Meter("my_meter") diff --git a/example/log/go.mod b/example/log/go.mod index ba83330..5e67281 100644 --- a/example/log/go.mod +++ b/example/log/go.mod @@ -1,13 +1,13 @@ -module trpc-system/go-opentelemetry/example/log +module trpc-ecosystem/go-opentelemetry/example/log go 1.18 -replace trpc-system/go-opentelemetry => ../../ +replace trpc-ecosystem/go-opentelemetry => ../../ require ( go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/zap v1.24.0 - trpc-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 ) require ( diff --git a/example/log/main.go b/example/log/main.go index 064a68e..9476b27 100644 --- a/example/log/main.go +++ b/example/log/main.go @@ -19,9 +19,9 @@ import ( "go.opentelemetry.io/otel/sdk/resource" "go.uber.org/zap" - "trpc-system/go-opentelemetry/api" - otlplog "trpc-system/go-opentelemetry/exporter/otlp" - "trpc-system/go-opentelemetry/otelzap" + "trpc-ecosystem/go-opentelemetry/api" + otlplog "trpc-ecosystem/go-opentelemetry/exporter/otlp" + "trpc-ecosystem/go-opentelemetry/otelzap" ) func main() { diff --git a/example/metric/go.mod b/example/metric/go.mod index 7653589..000d56e 100644 --- a/example/metric/go.mod +++ b/example/metric/go.mod @@ -1,8 +1,8 @@ -module trpc-system/go-opentelemetry/example/metric +module trpc-ecosystem/go-opentelemetry/example/metric go 1.18 -replace trpc-system/go-opentelemetry => ../../ +replace trpc-ecosystem/go-opentelemetry => ../../ require ( github.com/prometheus/client_golang v1.12.1 @@ -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-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 ) require ( diff --git a/example/metric/prometheus/main.go b/example/metric/prometheus/main.go index 74004a6..524c317 100644 --- a/example/metric/prometheus/main.go +++ b/example/metric/prometheus/main.go @@ -25,7 +25,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" dto "github.com/prometheus/client_model/go" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) const addr = ":8999" diff --git a/example/trace/go.mod b/example/trace/go.mod index 48449ae..bb39699 100644 --- a/example/trace/go.mod +++ b/example/trace/go.mod @@ -1,19 +1,18 @@ -module trpc-system/go-opentelemetry/example/trace +module trpc-ecosystem/go-opentelemetry/example/trace go 1.18 -replace trpc-system/go-opentelemetry => ../../ +replace trpc-ecosystem/go-opentelemetry => ../../ 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-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 ) 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 @@ -25,15 +24,7 @@ require ( 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/trace/go.sum b/example/trace/go.sum index 6909e70..492d9bf 100644 --- a/example/trace/go.sum +++ b/example/trace/go.sum @@ -44,8 +44,6 @@ 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= @@ -233,32 +231,15 @@ go.opentelemetry.io/contrib/zpages v0.40.0 h1:BDLYzPHju8GRJH2V+0CtF4WF/sDnylZnsp 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/trace/main.go b/example/trace/main.go index ce9854e..c55234a 100644 --- a/example/trace/main.go +++ b/example/trace/main.go @@ -23,10 +23,9 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" - "trpc-system/go-opentelemetry" - apilog "trpc-system/go-opentelemetry/api/log" - "trpc-system/go-opentelemetry/pkg/zpage" - ecotrace "trpc-system/go-opentelemetry/sdk/trace" + apilog "trpc-ecosystem/go-opentelemetry/api/log" + "trpc-ecosystem/go-opentelemetry/pkg/zpage" + ecotrace "trpc-ecosystem/go-opentelemetry/sdk/trace" ) func main() { diff --git a/exporter/asyncexporter/exporter.go b/exporter/asyncexporter/exporter.go index e52cbf1..cd1f7fc 100644 --- a/exporter/asyncexporter/exporter.go +++ b/exporter/asyncexporter/exporter.go @@ -34,9 +34,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "trpc-system/go-opentelemetry/exporter/retry" - "trpc-system/go-opentelemetry/pkg/metrics" - "trpc-system/go-opentelemetry/sdk/log" + "trpc-ecosystem/go-opentelemetry/exporter/retry" + "trpc-ecosystem/go-opentelemetry/pkg/metrics" + "trpc-ecosystem/go-opentelemetry/sdk/log" ) var _ log.Exporter = (*Exporter)(nil) diff --git a/exporter/asyncexporter/options.go b/exporter/asyncexporter/options.go index 9b00a96..d4696ce 100644 --- a/exporter/asyncexporter/options.go +++ b/exporter/asyncexporter/options.go @@ -20,8 +20,8 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - "trpc-system/go-opentelemetry/api" - "trpc-system/go-opentelemetry/exporter/retry" + "trpc-ecosystem/go-opentelemetry/api" + "trpc-ecosystem/go-opentelemetry/exporter/retry" ) const ( diff --git a/exporter/otlp/exporter.go b/exporter/otlp/exporter.go index f1d9ce1..66c5e1a 100644 --- a/exporter/otlp/exporter.go +++ b/exporter/otlp/exporter.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "trpc-system/go-opentelemetry/exporter/retry" - "trpc-system/go-opentelemetry/sdk/log" + "trpc-ecosystem/go-opentelemetry/exporter/retry" + "trpc-ecosystem/go-opentelemetry/sdk/log" ) var _ log.Exporter = (*Exporter)(nil) diff --git a/exporter/otlp/options.go b/exporter/otlp/options.go index 1fafd87..3555266 100644 --- a/exporter/otlp/options.go +++ b/exporter/otlp/options.go @@ -23,8 +23,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" - "trpc-system/go-opentelemetry/api" - "trpc-system/go-opentelemetry/exporter/retry" + "trpc-ecosystem/go-opentelemetry/api" + "trpc-ecosystem/go-opentelemetry/exporter/retry" ) const ( diff --git a/go.mod b/go.mod index ff7a573..f06d675 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module trpc-system/go-opentelemetry +module trpc-ecosystem/go-opentelemetry go 1.18 diff --git a/opentelemetry.go b/opentelemetry.go index d3b8308..cdc5dc4 100644 --- a/opentelemetry.go +++ b/opentelemetry.go @@ -31,13 +31,13 @@ import ( apitrace "go.opentelemetry.io/otel/trace" "google.golang.org/grpc" - "trpc-system/go-opentelemetry/api" - apilog "trpc-system/go-opentelemetry/api/log" - ecosystemotlp "trpc-system/go-opentelemetry/exporter/otlp" - "trpc-system/go-opentelemetry/exporter/retry" - "trpc-system/go-opentelemetry/pkg/zpage" - sdklog "trpc-system/go-opentelemetry/sdk/log" - "trpc-system/go-opentelemetry/sdk/trace" + "trpc-ecosystem/go-opentelemetry/api" + apilog "trpc-ecosystem/go-opentelemetry/api/log" + ecosystemotlp "trpc-ecosystem/go-opentelemetry/exporter/otlp" + "trpc-ecosystem/go-opentelemetry/exporter/retry" + "trpc-ecosystem/go-opentelemetry/pkg/zpage" + sdklog "trpc-ecosystem/go-opentelemetry/sdk/log" + "trpc-ecosystem/go-opentelemetry/sdk/trace" _ "google.golang.org/grpc/encoding/gzip" // open gzip ) diff --git a/oteltrpc/codes/codes.go b/oteltrpc/codes/codes.go index 3c8cd7d..0528bfa 100644 --- a/oteltrpc/codes/codes.go +++ b/oteltrpc/codes/codes.go @@ -20,8 +20,8 @@ import ( "trpc.group/trpc-go/trpc-go/errs" - "trpc-system/go-opentelemetry/config/codes" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/config/codes" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // ConvertMetricsCodes converts codes to metric.CodeTypeMappingDescription diff --git a/oteltrpc/docs/benchmark.txt b/oteltrpc/docs/benchmark.txt index 024804b..f6196dd 100644 --- a/oteltrpc/docs/benchmark.txt +++ b/oteltrpc/docs/benchmark.txt @@ -1,15 +1,15 @@ goos: darwin goarch: arm64 -pkg: trpc-system/go-opentelemetry/oteltrpc/logs +pkg: trpc-ecosystem/go-opentelemetry/oteltrpc/logs BenchmarkSpanLogf10-10 27176132 221.1 ns/op 184 B/op 4 allocs/op BenchmarkSpanLogf1000-10 5548359 1109 ns/op 2217 B/op 5 allocs/op BenchmarkSpanLogf100000-10 78422 76683 ns/op 319966 B/op 7 allocs/op BenchmarkSpanLogf10000000-10 927 5990899 ns/op 30008967 B/op 9 allocs/op PASS -ok trpc-system/go-opentelemetry/oteltrpc/logs 27.235s +ok trpc-ecosystem/go-opentelemetry/oteltrpc/logs 27.235s goos: darwin goarch: arm64 -pkg: trpc-system/go-opentelemetry/oteltrpc/metrics/prometheus +pkg: trpc-ecosystem/go-opentelemetry/oteltrpc/metrics/prometheus BenchmarkSetGauge1010-10 19906334 293.8 ns/op 0 B/op 0 allocs/op BenchmarkSetGauge2020-10 6858799 876.7 ns/op 0 B/op 0 allocs/op BenchmarkSetGauge100100-10 396932 14661 ns/op 0 B/op 0 allocs/op @@ -44,10 +44,10 @@ BenchmarkPrometheusCounterVec_Inc-10 57738178 106.2 ns/op BenchmarkPrometheusCounterVec_CurreyInc-10 86660431 69.91 ns/op 0 B/op 0 allocs/op BenchmarkPrometheusCounterVec_WithInc-10 866953989 6.992 ns/op 0 B/op 0 allocs/op PASS -ok trpc-system/go-opentelemetry/oteltrpc/metrics/prometheus 167.837s +ok trpc-ecosystem/go-opentelemetry/oteltrpc/metrics/prometheus 167.837s goos: darwin goarch: arm64 -pkg: trpc-system/go-opentelemetry/oteltrpc/traces +pkg: trpc-ecosystem/go-opentelemetry/oteltrpc/traces BenchmarkServerFilter_DisableTraceBody-10 3111814 1941 ns/op 2304 B/op 37 allocs/op BenchmarkServerFilter1024-10 989672 6048 ns/op 6727 B/op 69 allocs/op BenchmarkServerFilter10240-10 306673 19339 ns/op 37091 B/op 69 allocs/op @@ -68,4 +68,4 @@ BenchmarkProtoMarshalCompactTextString-10 11662436 514.6 ns/op BenchmarkProtoMarshalPb-10 46439448 131.0 ns/op 32 B/op 1 allocs/op BenchmarkProtoSize-10 183052398 32.88 ns/op 0 B/op 0 allocs/op PASS -ok trpc-system/go-opentelemetry/oteltrpc/traces 129.916s +ok trpc-ecosystem/go-opentelemetry/oteltrpc/traces 129.916s diff --git a/oteltrpc/example/greeter/go.mod b/oteltrpc/example/greeter/go.mod index fd2cd92..161b866 100644 --- a/oteltrpc/example/greeter/go.mod +++ b/oteltrpc/example/greeter/go.mod @@ -1,9 +1,9 @@ -module trpc-system/go-opentelemetry/oteltrpc/example/greeter +module trpc-ecosystem/go-opentelemetry/oteltrpc/example/greeter go 1.18 require ( - trpc-system/go-opentelemetry/oteltrpc v1.0.0 + trpc-ecosystem/go-opentelemetry/oteltrpc v1.0.0 trpc.group/trpc-go/trpc-go v1.0.0 ) @@ -82,12 +82,12 @@ require ( google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - trpc-system/go-opentelemetry v1.0.0 // indirect + trpc-ecosystem/go-opentelemetry v1.0.0 // indirect trpc.group/trpc-go/tnet v0.0.0-20230810071536-9d05338021cf // indirect trpc.group/trpc/trpc-protocol/pb/go/trpc v0.0.0-20230803031059-de4168eb5952 // indirect ) replace ( - trpc-system/go-opentelemetry => ../../../ - trpc-system/go-opentelemetry/oteltrpc => ../../ + trpc-ecosystem/go-opentelemetry => ../../../ + trpc-ecosystem/go-opentelemetry/oteltrpc => ../../ ) diff --git a/oteltrpc/example/greeter/main.go b/oteltrpc/example/greeter/main.go index 6b39408..c538173 100644 --- a/oteltrpc/example/greeter/main.go +++ b/oteltrpc/example/greeter/main.go @@ -19,7 +19,7 @@ import ( "trpc.group/trpc-go/trpc-go" pb "trpc.group/trpc-go/trpc-go/testdata/trpc/helloworld" - _ "trpc-system/go-opentelemetry/oteltrpc" // trpctelemetry + _ "trpc-ecosystem/go-opentelemetry/oteltrpc" // trpctelemetry ) // GreeterServerImpl greeter service implement diff --git a/oteltrpc/go.mod b/oteltrpc/go.mod index ace07eb..766cacb 100644 --- a/oteltrpc/go.mod +++ b/oteltrpc/go.mod @@ -1,4 +1,4 @@ -module trpc-system/go-opentelemetry/oteltrpc +module trpc-ecosystem/go-opentelemetry/oteltrpc go 1.18 @@ -22,7 +22,7 @@ require ( google.golang.org/protobuf v1.30.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - trpc-system/go-opentelemetry v1.0.0 + trpc-ecosystem/go-opentelemetry v1.0.0 trpc.group/trpc-go/trpc-go v1.0.0 ) @@ -89,4 +89,4 @@ require ( trpc.group/trpc/trpc-protocol/pb/go/trpc v0.0.0-20230803031059-de4168eb5952 // indirect ) -replace trpc-system/go-opentelemetry => ../ +replace trpc-ecosystem/go-opentelemetry => ../ diff --git a/oteltrpc/logs/README.md b/oteltrpc/logs/README.md index 4ca6f41..7aa5ee4 100644 --- a/oteltrpc/logs/README.md +++ b/oteltrpc/logs/README.md @@ -21,7 +21,7 @@ plugins: * You can increase the queue_size. If your drop rate is 2000/s, then you should adjust the queue_size to >=2048+2000 * Modify the code to start multi-channel reporting * ```go - import "trpc-system/go-opentelemetry/exporter/asyncexporter" + import "trpc-ecosystem/go-opentelemetry/exporter/asyncexporter" func main() { asyncexporter.Concurrency = 3 diff --git a/oteltrpc/logs/README_cn.md b/oteltrpc/logs/README_cn.md index 1a918b6..ef2bec7 100644 --- a/oteltrpc/logs/README_cn.md +++ b/oteltrpc/logs/README_cn.md @@ -21,7 +21,7 @@ plugins: * 可以调大queue_size。假如你的drop量是2000/s,那么你应该把queue_size调整到 >=2048+2000 * 修改代码启动多通道上报 * ```go - import "trpc-system/go-opentelemetry/exporter/asyncexporter" + import "trpc-ecosystem/go-opentelemetry/exporter/asyncexporter" func main() { asyncexporter.Concurrency = 3 diff --git a/oteltrpc/logs/filter.go b/oteltrpc/logs/filter.go index d302694..9d80081 100644 --- a/oteltrpc/logs/filter.go +++ b/oteltrpc/logs/filter.go @@ -23,8 +23,8 @@ import ( "trpc.group/trpc-go/trpc-go/errs" "trpc.group/trpc-go/trpc-go/filter" - apilog "trpc-system/go-opentelemetry/api/log" - "trpc-system/go-opentelemetry/oteltrpc/semconv" + apilog "trpc-ecosystem/go-opentelemetry/api/log" + "trpc-ecosystem/go-opentelemetry/oteltrpc/semconv" ) var ( diff --git a/oteltrpc/logs/log/trpc_log.go b/oteltrpc/logs/log/trpc_log.go index 7edeba9..269634b 100644 --- a/oteltrpc/logs/log/trpc_log.go +++ b/oteltrpc/logs/log/trpc_log.go @@ -14,7 +14,7 @@ package log import ( - "trpc-system/go-opentelemetry/oteltrpc/logs" + "trpc-ecosystem/go-opentelemetry/oteltrpc/logs" ) var ( diff --git a/oteltrpc/logs/recovery.go b/oteltrpc/logs/recovery.go index 8a7bf2b..4252dac 100644 --- a/oteltrpc/logs/recovery.go +++ b/oteltrpc/logs/recovery.go @@ -22,8 +22,8 @@ import ( "trpc.group/trpc-go/trpc-go/filter" "trpc.group/trpc-go/trpc-go/log" - "trpc-system/go-opentelemetry/pkg/stack" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/pkg/stack" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // RecoveryHandler recovery diff --git a/oteltrpc/logs/writer.go b/oteltrpc/logs/writer.go index ec356c3..6216876 100644 --- a/oteltrpc/logs/writer.go +++ b/oteltrpc/logs/writer.go @@ -32,16 +32,16 @@ import ( "trpc.group/trpc-go/trpc-go/log" "trpc.group/trpc-go/trpc-go/plugin" - "trpc-system/go-opentelemetry" - "trpc-system/go-opentelemetry/api" - logtps "trpc-system/go-opentelemetry/api/log" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/exporter/asyncexporter" - otlplog "trpc-system/go-opentelemetry/exporter/otlp" - "trpc-system/go-opentelemetry/oteltrpc/consts" - otelprometheus "trpc-system/go-opentelemetry/oteltrpc/metrics/prometheus" - "trpc-system/go-opentelemetry/otelzap" - sdklog "trpc-system/go-opentelemetry/sdk/log" + "trpc-ecosystem/go-opentelemetry" + "trpc-ecosystem/go-opentelemetry/api" + logtps "trpc-ecosystem/go-opentelemetry/api/log" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/exporter/asyncexporter" + otlplog "trpc-ecosystem/go-opentelemetry/exporter/otlp" + "trpc-ecosystem/go-opentelemetry/oteltrpc/consts" + otelprometheus "trpc-ecosystem/go-opentelemetry/oteltrpc/metrics/prometheus" + "trpc-ecosystem/go-opentelemetry/otelzap" + sdklog "trpc-ecosystem/go-opentelemetry/sdk/log" ) const ( diff --git a/oteltrpc/metrics/prometheus/filter.go b/oteltrpc/metrics/prometheus/filter.go index 9282f01..26d3bcd 100644 --- a/oteltrpc/metrics/prometheus/filter.go +++ b/oteltrpc/metrics/prometheus/filter.go @@ -25,8 +25,8 @@ import ( "trpc.group/trpc-go/trpc-go/filter" "trpc.group/trpc-go/trpc-go/http" - trpccodes "trpc-system/go-opentelemetry/oteltrpc/codes" - "trpc-system/go-opentelemetry/sdk/metric" + trpccodes "trpc-ecosystem/go-opentelemetry/oteltrpc/codes" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // ServerFilter with prometheus metric diff --git a/oteltrpc/metrics/prometheus/stream_filter.go b/oteltrpc/metrics/prometheus/stream_filter.go index e0cc54b..034f794 100644 --- a/oteltrpc/metrics/prometheus/stream_filter.go +++ b/oteltrpc/metrics/prometheus/stream_filter.go @@ -21,8 +21,8 @@ import ( "trpc.group/trpc-go/trpc-go/client" "trpc.group/trpc-go/trpc-go/server" - trpccodes "trpc-system/go-opentelemetry/oteltrpc/codes" - "trpc-system/go-opentelemetry/sdk/metric" + trpccodes "trpc-ecosystem/go-opentelemetry/oteltrpc/codes" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) const systemName = "trpc" diff --git a/oteltrpc/metrics/prometheus/stream_filter_test.go b/oteltrpc/metrics/prometheus/stream_filter_test.go index 98d18be..101ed84 100644 --- a/oteltrpc/metrics/prometheus/stream_filter_test.go +++ b/oteltrpc/metrics/prometheus/stream_filter_test.go @@ -36,8 +36,8 @@ import ( "trpc.group/trpc-go/trpc-go/errs" "trpc.group/trpc-go/trpc-go/server" - pb "trpc-system/go-opentelemetry/oteltrpc/example/testproto" - "trpc-system/go-opentelemetry/sdk/metric" + pb "trpc-ecosystem/go-opentelemetry/oteltrpc/example/testproto" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) var ( diff --git a/oteltrpc/metrics/prometheus/trpc_admin.go b/oteltrpc/metrics/prometheus/trpc_admin.go index f470e1b..971b8ed 100644 --- a/oteltrpc/metrics/prometheus/trpc_admin.go +++ b/oteltrpc/metrics/prometheus/trpc_admin.go @@ -25,9 +25,9 @@ import ( "trpc.group/trpc-go/trpc-go/admin" "trpc.group/trpc-go/trpc-go/log" - "trpc-system/go-opentelemetry/api" - oteladmin "trpc-system/go-opentelemetry/pkg/admin" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/api" + oteladmin "trpc-ecosystem/go-opentelemetry/pkg/admin" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // Setup . diff --git a/oteltrpc/metrics/prometheus/trpc_metric.go b/oteltrpc/metrics/prometheus/trpc_metric.go index d3d4a5c..6cf0194 100644 --- a/oteltrpc/metrics/prometheus/trpc_metric.go +++ b/oteltrpc/metrics/prometheus/trpc_metric.go @@ -30,7 +30,7 @@ import ( "trpc.group/trpc-go/trpc-go/log" "trpc.group/trpc-go/trpc-go/metrics" - "trpc-system/go-opentelemetry/oteltrpc/consts" + "trpc-ecosystem/go-opentelemetry/oteltrpc/consts" ) func initSink() { @@ -50,7 +50,6 @@ func initSink() { // 2023-03-28 update: the style of trpc metrics api multi-dimension metrics is multi-value, Prometheus is single-value. // when mapping to Prometheus, use record.metric[*].name as metric name, not unique. // Therefor, use record.name + record.metric[*].name as metric name, but it will break the panel. -// (https://trpc-system/go-opentelemetry/issues/107) // report case 1: // metrics.ReportMultiDimensionMetricsX( // diff --git a/oteltrpc/metrics/prometheus/trpc_metric_test.go b/oteltrpc/metrics/prometheus/trpc_metric_test.go index 4c74872..14880ac 100644 --- a/oteltrpc/metrics/prometheus/trpc_metric_test.go +++ b/oteltrpc/metrics/prometheus/trpc_metric_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "trpc.group/trpc-go/trpc-go/metrics" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) func TestSink_Report(t *testing.T) { diff --git a/oteltrpc/oteltrpc.go b/oteltrpc/oteltrpc.go index 94fd0a5..2786850 100644 --- a/oteltrpc/oteltrpc.go +++ b/oteltrpc/oteltrpc.go @@ -34,18 +34,18 @@ import ( "trpc.group/trpc-go/trpc-go/filter" "trpc.group/trpc-go/trpc-go/plugin" - "trpc-system/go-opentelemetry" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/config/codes" - trpccodes "trpc-system/go-opentelemetry/oteltrpc/codes" - "trpc-system/go-opentelemetry/oteltrpc/consts" - "trpc-system/go-opentelemetry/oteltrpc/logs" - "trpc-system/go-opentelemetry/oteltrpc/metrics/prometheus" - "trpc-system/go-opentelemetry/oteltrpc/traces" - "trpc-system/go-opentelemetry/pkg/zpage" - "trpc-system/go-opentelemetry/sdk/metric" - "trpc-system/go-opentelemetry/sdk/remote" - ecosystemtrace "trpc-system/go-opentelemetry/sdk/trace" + "trpc-ecosystem/go-opentelemetry" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/config/codes" + trpccodes "trpc-ecosystem/go-opentelemetry/oteltrpc/codes" + "trpc-ecosystem/go-opentelemetry/oteltrpc/consts" + "trpc-ecosystem/go-opentelemetry/oteltrpc/logs" + "trpc-ecosystem/go-opentelemetry/oteltrpc/metrics/prometheus" + "trpc-ecosystem/go-opentelemetry/oteltrpc/traces" + "trpc-ecosystem/go-opentelemetry/pkg/zpage" + "trpc-ecosystem/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/sdk/remote" + ecosystemtrace "trpc-ecosystem/go-opentelemetry/sdk/trace" ) func init() { diff --git a/oteltrpc/oteltrpc_test.go b/oteltrpc/oteltrpc_test.go index 59b4995..27a70a7 100644 --- a/oteltrpc/oteltrpc_test.go +++ b/oteltrpc/oteltrpc_test.go @@ -23,9 +23,9 @@ import ( "trpc.group/trpc-go/trpc-go/plugin" pb "trpc.group/trpc-go/trpc-go/testdata/trpc/helloworld" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/oteltrpc/consts" - ecosystemtrace "trpc-system/go-opentelemetry/sdk/trace" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/oteltrpc/consts" + ecosystemtrace "trpc-ecosystem/go-opentelemetry/sdk/trace" ) // language: yaml diff --git a/oteltrpc/semconv/keyvalue.go b/oteltrpc/semconv/keyvalue.go index d54b3f6..61521bc 100644 --- a/oteltrpc/semconv/keyvalue.go +++ b/oteltrpc/semconv/keyvalue.go @@ -22,7 +22,7 @@ import ( "trpc.group/trpc-go/trpc-go" - tpsapi "trpc-system/go-opentelemetry/api" + tpsapi "trpc-ecosystem/go-opentelemetry/api" ) const ( diff --git a/oteltrpc/traces/benchmark_test.go b/oteltrpc/traces/benchmark_test.go index b45a36c..96c0fc7 100644 --- a/oteltrpc/traces/benchmark_test.go +++ b/oteltrpc/traces/benchmark_test.go @@ -22,7 +22,7 @@ import ( "trpc.group/trpc-go/trpc-go/log" pb "trpc.group/trpc-go/trpc-go/testdata/trpc/helloworld" - "trpc-system/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/config" ) var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") diff --git a/oteltrpc/traces/default_handlers.go b/oteltrpc/traces/default_handlers.go index b31bce0..67571f2 100644 --- a/oteltrpc/traces/default_handlers.go +++ b/oteltrpc/traces/default_handlers.go @@ -21,8 +21,8 @@ import ( "trpc.group/trpc-go/trpc-go/codec" - tpsapi "trpc-system/go-opentelemetry/api" - sdktrace "trpc-system/go-opentelemetry/sdk/trace" + tpsapi "trpc-ecosystem/go-opentelemetry/api" + sdktrace "trpc-ecosystem/go-opentelemetry/sdk/trace" ) // DefaultTraceAttributesFunc can be set by user diff --git a/oteltrpc/traces/filter.go b/oteltrpc/traces/filter.go index 086cb0c..d3e5b7d 100644 --- a/oteltrpc/traces/filter.go +++ b/oteltrpc/traces/filter.go @@ -35,14 +35,14 @@ import ( "trpc.group/trpc-go/trpc-go/filter" "trpc.group/trpc-go/trpc-go/log" - "trpc-system/go-opentelemetry/api" - "trpc-system/go-opentelemetry/config" - ecocodes "trpc-system/go-opentelemetry/config/codes" - trpccodes "trpc-system/go-opentelemetry/oteltrpc/codes" - "trpc-system/go-opentelemetry/oteltrpc/logs" - trpcsemconv "trpc-system/go-opentelemetry/oteltrpc/semconv" - oteladmin "trpc-system/go-opentelemetry/pkg/admin" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/api" + "trpc-ecosystem/go-opentelemetry/config" + ecocodes "trpc-ecosystem/go-opentelemetry/config/codes" + trpccodes "trpc-ecosystem/go-opentelemetry/oteltrpc/codes" + "trpc-ecosystem/go-opentelemetry/oteltrpc/logs" + trpcsemconv "trpc-ecosystem/go-opentelemetry/oteltrpc/semconv" + oteladmin "trpc-ecosystem/go-opentelemetry/pkg/admin" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) var ( diff --git a/oteltrpc/traces/filter_test.go b/oteltrpc/traces/filter_test.go index bf60f7f..de0200d 100644 --- a/oteltrpc/traces/filter_test.go +++ b/oteltrpc/traces/filter_test.go @@ -29,9 +29,9 @@ import ( "trpc.group/trpc-go/trpc-go/log" pb "trpc.group/trpc-go/trpc-go/testdata/trpc/helloworld" - "trpc-system/go-opentelemetry/api" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/oteltrpc/codes" + "trpc-ecosystem/go-opentelemetry/api" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/oteltrpc/codes" ) // BenchmarkServerFilter diff --git a/oteltrpc/traces/log.go b/oteltrpc/traces/log.go index a13494d..d54bfd4 100644 --- a/oteltrpc/traces/log.go +++ b/oteltrpc/traces/log.go @@ -19,8 +19,8 @@ import ( "trpc.group/trpc-go/trpc-go/log" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/oteltrpc/logs" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/oteltrpc/logs" ) // doFlowLog diff --git a/oteltrpc/traces/log_test.go b/oteltrpc/traces/log_test.go index ecf4f9c..6da3d70 100644 --- a/oteltrpc/traces/log_test.go +++ b/oteltrpc/traces/log_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "trpc.group/trpc-go/trpc-go/log" - "trpc-system/go-opentelemetry/config" - "trpc-system/go-opentelemetry/oteltrpc/logs" + "trpc-ecosystem/go-opentelemetry/config" + "trpc-ecosystem/go-opentelemetry/oteltrpc/logs" ) func Test_doFlowLog(t *testing.T) { diff --git a/oteltrpc/traces/trace.go b/oteltrpc/traces/trace.go index 2152396..194b644 100644 --- a/oteltrpc/traces/trace.go +++ b/oteltrpc/traces/trace.go @@ -26,7 +26,7 @@ import ( "trpc.group/trpc-go/trpc-go/log" "trpc.group/trpc-go/trpc-go/plugin" - "trpc-system/go-opentelemetry/oteltrpc/metrics/prometheus" + "trpc-ecosystem/go-opentelemetry/oteltrpc/metrics/prometheus" ) const ( diff --git a/otelzap/writer.go b/otelzap/writer.go index a2a03d3..5683b4a 100644 --- a/otelzap/writer.go +++ b/otelzap/writer.go @@ -30,8 +30,8 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" - "trpc-system/go-opentelemetry/pkg/metrics" - sdklog "trpc-system/go-opentelemetry/sdk/log" + "trpc-ecosystem/go-opentelemetry/pkg/metrics" + sdklog "trpc-ecosystem/go-opentelemetry/sdk/log" ) const ( diff --git a/otelzap/zap.go b/otelzap/zap.go index 8e79d77..dee713b 100644 --- a/otelzap/zap.go +++ b/otelzap/zap.go @@ -31,8 +31,8 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/proto" - apilog "trpc-system/go-opentelemetry/api/log" - sdklog "trpc-system/go-opentelemetry/sdk/log" + apilog "trpc-ecosystem/go-opentelemetry/api/log" + sdklog "trpc-ecosystem/go-opentelemetry/sdk/log" ) var _ zapcore.Encoder = (*encoder)(nil) diff --git a/otelzap/zap_benchmark_test.go b/otelzap/zap_benchmark_test.go index 1b0dd59..59b9627 100644 --- a/otelzap/zap_benchmark_test.go +++ b/otelzap/zap_benchmark_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - sdklog "trpc-system/go-opentelemetry/sdk/log" + sdklog "trpc-ecosystem/go-opentelemetry/sdk/log" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/admin/admin.go b/pkg/admin/admin.go index 3271af9..939cbc6 100644 --- a/pkg/admin/admin.go +++ b/pkg/admin/admin.go @@ -18,8 +18,8 @@ import ( "net/http" "net/http/pprof" - "trpc-system/go-opentelemetry/pkg/zpage" - "trpc-system/go-opentelemetry/sdk/metric" + "trpc-ecosystem/go-opentelemetry/pkg/zpage" + "trpc-ecosystem/go-opentelemetry/sdk/metric" ) // Server is admin server, wrap http.Server diff --git a/pkg/debug/README.md b/pkg/debug/README.md index 3ae410d..cff5527 100644 --- a/pkg/debug/README.md +++ b/pkg/debug/README.md @@ -1,4 +1,4 @@ -#Debug +# Debug The debug module mainly facilitates users to debug exceptions. It currently supports printing specific fields for invalid utf-8 errors. It will later support printing of dyeing data, remote error code mapping configuration and other capabilities. When using it, you can set the environment variable OTEL_SDK_DEBUG to support opening multiple debuggers in combination. The supported debuggers are as follows: diff --git a/pkg/protocol/opentelemetry-ext/proto/operation/operation.proto b/pkg/protocol/opentelemetry-ext/proto/operation/operation.proto index 0433417..b681e83 100644 --- a/pkg/protocol/opentelemetry-ext/proto/operation/operation.proto +++ b/pkg/protocol/opentelemetry-ext/proto/operation/operation.proto @@ -15,7 +15,7 @@ syntax = "proto3"; package opentelemetry.ext.proto.operation; -option go_package = "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation"; +option go_package = "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation"; message Operation { string version = 1; diff --git a/pkg/protocol/opentelemetry-ext/proto/sampler/sampler.proto b/pkg/protocol/opentelemetry-ext/proto/sampler/sampler.proto index 142052b..1752130 100644 --- a/pkg/protocol/opentelemetry-ext/proto/sampler/sampler.proto +++ b/pkg/protocol/opentelemetry-ext/proto/sampler/sampler.proto @@ -15,7 +15,7 @@ syntax = "proto3"; package opentelemetry.ext.proto.sampler; -option go_package = "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler"; +option go_package = "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler"; message KeyValues { string key = 1; diff --git a/pkg/runtime/total_cpu_linux.go b/pkg/runtime/total_cpu_linux.go index e941345..841cfae 100644 --- a/pkg/runtime/total_cpu_linux.go +++ b/pkg/runtime/total_cpu_linux.go @@ -19,7 +19,7 @@ package runtime import ( "runtime" - "trpc-system/go-opentelemetry/pkg/cgroups" + "trpc-ecosystem/go-opentelemetry/pkg/cgroups" ) // CPUQuota returns the CPU quota applied with the CPU cgroup controller. diff --git a/pkg/runtime/total_memory_linux.go b/pkg/runtime/total_memory_linux.go index 3ed3c2e..f94ad35 100644 --- a/pkg/runtime/total_memory_linux.go +++ b/pkg/runtime/total_memory_linux.go @@ -20,8 +20,8 @@ import ( procmeminfo "github.com/guillermo/go.procmeminfo" "github.com/shirou/gopsutil/v3/mem" - cgroups "trpc-system/go-opentelemetry/pkg/cgroups" - cgroupsv2 "trpc-system/go-opentelemetry/pkg/cgroups/cgroupsv2" + cgroups "trpc-ecosystem/go-opentelemetry/pkg/cgroups" + cgroupsv2 "trpc-ecosystem/go-opentelemetry/pkg/cgroups/cgroupsv2" ) // MemoryQuota returns total available memory. diff --git a/sdk/log/batch_processor.go b/sdk/log/batch_processor.go index 96a5d8e..819ddf5 100644 --- a/sdk/log/batch_processor.go +++ b/sdk/log/batch_processor.go @@ -23,8 +23,8 @@ import ( logsproto "go.opentelemetry.io/proto/otlp/logs/v1" "google.golang.org/protobuf/proto" - "trpc-system/go-opentelemetry/pkg/debug" - "trpc-system/go-opentelemetry/pkg/metrics" + "trpc-ecosystem/go-opentelemetry/pkg/debug" + "trpc-ecosystem/go-opentelemetry/pkg/metrics" ) const ( diff --git a/sdk/log/logger.go b/sdk/log/logger.go index e6425f7..89959c2 100644 --- a/sdk/log/logger.go +++ b/sdk/log/logger.go @@ -24,7 +24,7 @@ import ( logsproto "go.opentelemetry.io/proto/otlp/logs/v1" resourceproto "go.opentelemetry.io/proto/otlp/resource/v1" - "trpc-system/go-opentelemetry/api/log" + "trpc-ecosystem/go-opentelemetry/api/log" ) var _ log.Logger = (*Logger)(nil) diff --git a/sdk/metric/config.go b/sdk/metric/config.go index f8d5db5..60a1111 100644 --- a/sdk/metric/config.go +++ b/sdk/metric/config.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "trpc-system/go-opentelemetry/sdk/remote" + "trpc-ecosystem/go-opentelemetry/sdk/remote" ) // Config metric config diff --git a/sdk/metric/metadata_metrics.go b/sdk/metric/metadata_metrics.go index 14f799f..b556dea 100644 --- a/sdk/metric/metadata_metrics.go +++ b/sdk/metric/metadata_metrics.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel" - opentelemetry "trpc-system/go-opentelemetry" + opentelemetry "trpc-ecosystem/go-opentelemetry" ) var ( diff --git a/sdk/metric/opentelemetry_registry.go b/sdk/metric/opentelemetry_registry.go index 8e14927..68bc11d 100644 --- a/sdk/metric/opentelemetry_registry.go +++ b/sdk/metric/opentelemetry_registry.go @@ -14,7 +14,7 @@ package metric import ( - "trpc-system/go-opentelemetry/sdk/metric/internal/registry" + "trpc-ecosystem/go-opentelemetry/sdk/metric/internal/registry" ) type Registry = registry.Registry diff --git a/sdk/metric/process_metrics.go b/sdk/metric/process_metrics.go index 8d9a3c8..1dc4661 100644 --- a/sdk/metric/process_metrics.go +++ b/sdk/metric/process_metrics.go @@ -16,7 +16,7 @@ package metric import ( "github.com/prometheus/client_golang/prometheus" - pkgruntime "trpc-system/go-opentelemetry/pkg/runtime" + pkgruntime "trpc-ecosystem/go-opentelemetry/pkg/runtime" ) var ( diff --git a/sdk/metric/rpc_client_reporter.go b/sdk/metric/rpc_client_reporter.go index 858b680..9b456fb 100644 --- a/sdk/metric/rpc_client_reporter.go +++ b/sdk/metric/rpc_client_reporter.go @@ -20,7 +20,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/trace" - "trpc-system/go-opentelemetry/config/codes" + "trpc-ecosystem/go-opentelemetry/config/codes" ) // ClientReporter ... diff --git a/sdk/metric/rpc_codes.go b/sdk/metric/rpc_codes.go index 81caeca..6dbf515 100644 --- a/sdk/metric/rpc_codes.go +++ b/sdk/metric/rpc_codes.go @@ -14,7 +14,7 @@ package metric import ( - "trpc-system/go-opentelemetry/config/codes" + "trpc-ecosystem/go-opentelemetry/config/codes" ) type Code = codes.Code diff --git a/sdk/metric/rpc_server_reporter.go b/sdk/metric/rpc_server_reporter.go index 7c6875c..5d94038 100644 --- a/sdk/metric/rpc_server_reporter.go +++ b/sdk/metric/rpc_server_reporter.go @@ -20,7 +20,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/trace" - "trpc-system/go-opentelemetry/config/codes" + "trpc-ecosystem/go-opentelemetry/config/codes" ) // ServerReporter server metrics reporter diff --git a/sdk/metric/setup.go b/sdk/metric/setup.go index 4ded7cd..45faad9 100644 --- a/sdk/metric/setup.go +++ b/sdk/metric/setup.go @@ -24,9 +24,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/push" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" - "trpc-system/go-opentelemetry/sdk/metric/internal/registry" - "trpc-system/go-opentelemetry/sdk/remote" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" + "trpc-ecosystem/go-opentelemetry/sdk/metric/internal/registry" + "trpc-ecosystem/go-opentelemetry/sdk/remote" ) // Setup setup metrics diff --git a/sdk/metric/setup_test.go b/sdk/metric/setup_test.go index e7dbd60..e2e70ed 100644 --- a/sdk/metric/setup_test.go +++ b/sdk/metric/setup_test.go @@ -32,8 +32,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" - "trpc-system/go-opentelemetry/sdk/remote" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" + "trpc-ecosystem/go-opentelemetry/sdk/remote" ) func TestWithConfigurator(t *testing.T) { diff --git a/sdk/remote/configurator.go b/sdk/remote/configurator.go index 530b727..d94ef65 100644 --- a/sdk/remote/configurator.go +++ b/sdk/remote/configurator.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/operation" ) // ConfigApplyFunc ... diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go index 0664ab5..fa1ed5a 100644 --- a/sdk/trace/batch_span_processor.go +++ b/sdk/trace/batch_span_processor.go @@ -24,8 +24,8 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" - "trpc-system/go-opentelemetry/pkg/debug" - "trpc-system/go-opentelemetry/pkg/metrics" + "trpc-ecosystem/go-opentelemetry/pkg/debug" + "trpc-ecosystem/go-opentelemetry/pkg/metrics" ) // Defaults for BatchSpanProcessorOptions. diff --git a/sdk/trace/deferred_sample_processor.go b/sdk/trace/deferred_sample_processor.go index 95b1e68..4e0c163 100644 --- a/sdk/trace/deferred_sample_processor.go +++ b/sdk/trace/deferred_sample_processor.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/otel/codes" sdktrace "go.opentelemetry.io/otel/sdk/trace" - "trpc-system/go-opentelemetry/pkg/metrics" + "trpc-ecosystem/go-opentelemetry/pkg/metrics" ) var _ sdktrace.SpanProcessor = (*DeferredSampleProcessor)(nil) diff --git a/sdk/trace/dyeing_sampler.go b/sdk/trace/dyeing_sampler.go index a547ecf..46ae2f1 100644 --- a/sdk/trace/dyeing_sampler.go +++ b/sdk/trace/dyeing_sampler.go @@ -30,7 +30,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler" ) const ( diff --git a/sdk/trace/dyeing_sampler_test.go b/sdk/trace/dyeing_sampler_test.go index 861f58f..4d84240 100644 --- a/sdk/trace/dyeing_sampler_test.go +++ b/sdk/trace/dyeing_sampler_test.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/otel/sdk/trace" - "trpc-system/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler" + "trpc-ecosystem/go-opentelemetry/pkg/protocol/opentelemetry-ext/proto/sampler" ) func TestSampler_shouldSample(t *testing.T) {