Skip to content

Commit 7e96eb5

Browse files
vmihailencovmihailenco
committed
chore: update OpenTelemetry
1 parent 9aead46 commit 7e96eb5

18 files changed

Lines changed: 2387 additions & 477 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v1.6.0
4+
5+
- Updated OpenTelemetry to
6+
[v1.6.0](https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.6.0).
7+
38
## v1.5.0
49

510
- Updated OpenTelemetry to

‎Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PACKAGE_DIRS := $(shell find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; | sort)
1+
PACKAGE_DIRS := $(shell find . -mindepth 1 -type f -name 'go.mod' -exec dirname {} \; | sort)
22

33
test:
44
go test ./...
@@ -12,10 +12,9 @@ fmt:
1212
goimports -w -local github.com/uptrace/uptrace-go ./
1313

1414
go_mod_tidy:
15-
cd uptrace && go get -u && go mod tidy
1615
set -e; for dir in $(PACKAGE_DIRS); do \
1716
echo "go mod tidy in $${dir}"; \
1817
(cd "$${dir}" && \
19-
go get -u && \
20-
go mod tidy); \
18+
go get -u ./... && \
19+
go mod tidy -compat=1.17); \
2120
done

‎example/basic/go.mod‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@ go 1.17
44

55
replace github.com/uptrace/uptrace-go => ../..
66

7+
exclude go.opentelemetry.io/proto/otlp v0.15.0
8+
79
require (
810
github.com/uptrace/uptrace-go v1.5.0
9-
go.opentelemetry.io/otel v1.5.0
11+
go.opentelemetry.io/otel v1.6.1
1012
)
1113

1214
require (
1315
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
1416
github.com/go-logr/logr v1.2.3 // indirect
1517
github.com/go-logr/stdr v1.2.2 // indirect
1618
github.com/golang/protobuf v1.5.2 // indirect
17-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
18-
go.opentelemetry.io/contrib/instrumentation/runtime v0.30.0 // indirect
19-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.5.0 // indirect
20-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.27.0 // indirect
21-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.27.0 // indirect
22-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.5.0 // indirect
23-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.5.0 // indirect
24-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.5.0 // indirect
25-
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
26-
go.opentelemetry.io/otel/metric v0.27.0 // indirect
27-
go.opentelemetry.io/otel/sdk v1.5.0 // indirect
28-
go.opentelemetry.io/otel/sdk/metric v0.27.0 // indirect
29-
go.opentelemetry.io/otel/trace v1.5.0 // indirect
30-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
31-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
32-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
19+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 // indirect
20+
go.opentelemetry.io/contrib/instrumentation/runtime v0.31.0 // indirect
21+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 // indirect
22+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.28.0 // indirect
23+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.28.0 // indirect
24+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1 // indirect
25+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1 // indirect
26+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.1 // indirect
27+
go.opentelemetry.io/otel/metric v0.28.0 // indirect
28+
go.opentelemetry.io/otel/sdk v1.6.1 // indirect
29+
go.opentelemetry.io/otel/sdk/metric v0.28.0 // indirect
30+
go.opentelemetry.io/otel/trace v1.6.1 // indirect
31+
go.opentelemetry.io/proto/otlp v0.14.0 // indirect
32+
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
33+
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect
3334
golang.org/x/text v0.3.7 // indirect
34-
google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
35+
google.golang.org/genproto v0.0.0-20220328180837-c47567c462d1 // indirect
3536
google.golang.org/grpc v1.45.0 // indirect
36-
google.golang.org/protobuf v1.27.1 // indirect
37+
google.golang.org/protobuf v1.28.0 // indirect
3738
)

‎example/basic/go.sum‎

Lines changed: 315 additions & 47 deletions
Large diffs are not rendered by default.

‎example/metrics/go.mod‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,35 @@ go 1.17
44

55
replace github.com/uptrace/uptrace-go => ../..
66

7+
exclude go.opentelemetry.io/proto/otlp v0.15.0
8+
79
require (
810
github.com/uptrace/uptrace-go v1.5.0
9-
go.opentelemetry.io/otel v1.5.0
10-
go.opentelemetry.io/otel/metric v0.27.0
11+
go.opentelemetry.io/otel v1.6.1
12+
go.opentelemetry.io/otel/metric v0.28.0
1113
)
1214

1315
require (
1416
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
1517
github.com/go-logr/logr v1.2.3 // indirect
1618
github.com/go-logr/stdr v1.2.2 // indirect
1719
github.com/golang/protobuf v1.5.2 // indirect
18-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
19-
go.opentelemetry.io/contrib/instrumentation/runtime v0.30.0 // indirect
20-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.5.0 // indirect
21-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.27.0 // indirect
22-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.27.0 // indirect
23-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.5.0 // indirect
24-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.5.0 // indirect
25-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.5.0 // indirect
26-
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
27-
go.opentelemetry.io/otel/sdk v1.5.0 // indirect
28-
go.opentelemetry.io/otel/sdk/metric v0.27.0 // indirect
29-
go.opentelemetry.io/otel/trace v1.5.0 // indirect
30-
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
31-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
32-
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
20+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 // indirect
21+
go.opentelemetry.io/contrib/instrumentation/runtime v0.31.0 // indirect
22+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1 // indirect
23+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.28.0 // indirect
24+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.28.0 // indirect
25+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1 // indirect
26+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1 // indirect
27+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.1 // indirect
28+
go.opentelemetry.io/otel/sdk v1.6.1 // indirect
29+
go.opentelemetry.io/otel/sdk/metric v0.28.0 // indirect
30+
go.opentelemetry.io/otel/trace v1.6.1 // indirect
31+
go.opentelemetry.io/proto/otlp v0.14.0 // indirect
32+
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
33+
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect
3334
golang.org/x/text v0.3.7 // indirect
34-
google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
35+
google.golang.org/genproto v0.0.0-20220328180837-c47567c462d1 // indirect
3536
google.golang.org/grpc v1.45.0 // indirect
36-
google.golang.org/protobuf v1.27.1 // indirect
37+
google.golang.org/protobuf v1.28.0 // indirect
3738
)

0 commit comments

Comments
 (0)