Skip to content

Commit a4ef9e5

Browse files
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents fb63ec2 + f75599e commit a4ef9e5

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

cmd/telemetrygen/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
go.opentelemetry.io/otel/sdk/log v0.11.0
2222
go.opentelemetry.io/otel/sdk/metric v1.35.0
2323
go.opentelemetry.io/otel/trace v1.35.0
24-
go.opentelemetry.io/proto/otlp v1.5.0
24+
go.opentelemetry.io/proto/otlp v1.6.0
2525
go.uber.org/goleak v1.3.0
2626
go.uber.org/zap v1.27.0
2727
golang.org/x/time v0.11.0
@@ -35,7 +35,7 @@ require (
3535
github.com/go-logr/stdr v1.2.2 // indirect
3636
github.com/gogo/protobuf v1.3.2 // indirect
3737
github.com/google/uuid v1.6.0 // indirect
38-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
38+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
3939
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4040
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -47,8 +47,8 @@ require (
4747
golang.org/x/net v0.39.0 // indirect
4848
golang.org/x/sys v0.32.0 // indirect
4949
golang.org/x/text v0.24.0 // indirect
50-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
51-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
50+
google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
5252
google.golang.org/protobuf v1.36.6 // indirect
5353
gopkg.in/yaml.v3 v3.0.1 // indirect
5454
)

cmd/telemetrygen/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/telemetrygen/internal/e2etest/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/golang/snappy v1.0.0 // indirect
2727
github.com/google/go-tpm v0.9.3 // indirect
2828
github.com/google/uuid v1.6.0 // indirect
29-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
29+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
3030
github.com/hashicorp/go-version v1.7.0 // indirect
3131
github.com/json-iterator/go v1.1.12 // indirect
3232
github.com/klauspost/compress v1.18.0 // indirect
@@ -88,16 +88,16 @@ require (
8888
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
8989
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
9090
go.opentelemetry.io/otel/trace v1.35.0 // indirect
91-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
91+
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
9292
go.uber.org/multierr v1.11.0 // indirect
9393
go.uber.org/zap v1.27.0 // indirect
9494
golang.org/x/crypto v0.37.0 // indirect
9595
golang.org/x/net v0.39.0 // indirect
9696
golang.org/x/sys v0.32.0 // indirect
9797
golang.org/x/text v0.24.0 // indirect
9898
golang.org/x/time v0.11.0 // indirect
99-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34 // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
101101
google.golang.org/grpc v1.72.0 // indirect
102102
google.golang.org/protobuf v1.36.6 // indirect
103103
gopkg.in/yaml.v3 v3.0.1 // indirect

cmd/telemetrygen/internal/e2etest/go.sum

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/tencentcloudlogserviceexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.125.0
77
github.com/pierrec/lz4 v2.6.1+incompatible
88
github.com/stretchr/testify v1.10.0
9-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1157
9+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1158
1010
go.opentelemetry.io/collector/component v1.31.1-0.20250505152726-56c7da210783
1111
go.opentelemetry.io/collector/component/componenttest v0.125.1-0.20250505155216-829157cef7bb
1212
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783

exporter/tencentcloudlogserviceexporter/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)