Skip to content

Commit 932d281

Browse files
authored
Merge branch 'main' into elb-access-logs
2 parents d53c5f6 + d015fb5 commit 932d281

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

cmd/telemetrygen/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
go.opentelemetry.io/otel/sdk/log/logtest v0.13.0
2222
go.opentelemetry.io/otel/sdk/metric v1.37.0
2323
go.opentelemetry.io/otel/trace v1.37.0
24-
go.opentelemetry.io/proto/otlp v1.7.0
24+
go.opentelemetry.io/proto/otlp v1.7.1
2525
go.uber.org/goleak v1.3.0
2626
go.uber.org/zap v1.27.0
2727
golang.org/x/time v0.12.0
@@ -44,11 +44,11 @@ require (
4444
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
4545
go.opentelemetry.io/otel/metric v1.37.0 // indirect
4646
go.uber.org/multierr v1.11.0 // indirect
47-
golang.org/x/net v0.41.0 // indirect
48-
golang.org/x/sys v0.33.0 // indirect
49-
golang.org/x/text v0.26.0 // indirect
50-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
51-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
47+
golang.org/x/net v0.42.0 // indirect
48+
golang.org/x/sys v0.34.0 // indirect
49+
golang.org/x/text v0.27.0 // indirect
50+
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // 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: 12 additions & 12 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ require (
8989
go.opentelemetry.io/otel/sdk/log/logtest v0.13.0 // indirect
9090
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
9191
go.opentelemetry.io/otel/trace v1.37.0 // indirect
92-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
92+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
9393
go.uber.org/multierr v1.11.0 // indirect
9494
go.uber.org/zap v1.27.0 // indirect
9595
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -98,8 +98,8 @@ require (
9898
golang.org/x/sys v0.34.0 // indirect
9999
golang.org/x/text v0.27.0 // indirect
100100
golang.org/x/time v0.12.0 // indirect
101-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
102-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
101+
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
103103
google.golang.org/grpc v1.74.2 // indirect
104104
google.golang.org/protobuf v1.36.6 // indirect
105105
gopkg.in/yaml.v3 v3.0.1 // indirect

cmd/telemetrygen/internal/e2etest/go.sum

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

0 commit comments

Comments
 (0)