Skip to content

Commit fceb857

Browse files
authored
Replace usage of gogo proto for persistent queue metadata (#14079)
~~Depends on #14078 Fixes #7095 Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 4e1018b commit fceb857

File tree

27 files changed

+177
-708
lines changed

27 files changed

+177
-708
lines changed

.chloggen/rm-completely-gogo.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: pkg/exporterhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Replace usage of gogo proto for persistent queue metadata
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14079]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ DOCKER_PROTOBUF ?= otel/build-protobuf:0.23.0
186186

187187
PROTO_SRC_DIRS := exporter/exporterhelper/internal/queue
188188
PROTO_FILES := $(foreach dir,$(PROTO_SRC_DIRS),$(wildcard $(dir)/*.proto))
189-
PROTOC := $(DOCKERCMD) run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD} -I/usr/include/github.com/gogo/protobuf --gogofaster_out=plugins=grpc,paths=source_relative:.
189+
PROTOC := $(DOCKERCMD) run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${DOCKER_PROTOBUF} --proto_path=${PWD} --go_out=plugins=grpc,paths=source_relative:.
190190

191191
.PHONY: genproto
192192
genproto:

cmd/otelcorecol/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ require (
4949
github.com/go-ole/go-ole v1.2.6 // indirect
5050
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5151
github.com/gobwas/glob v0.2.3 // indirect
52-
github.com/gogo/protobuf v1.3.2 // indirect
5352
github.com/golang/snappy v1.0.0 // indirect
5453
github.com/google/go-tpm v0.9.6 // indirect
5554
github.com/google/uuid v1.6.0 // indirect

cmd/otelcorecol/go.sum

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

exporter/debugexporter/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ require (
3030
github.com/go-logr/stdr v1.2.2 // indirect
3131
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3232
github.com/gobwas/glob v0.2.3 // indirect
33-
github.com/gogo/protobuf v1.3.2 // indirect
3433
github.com/google/uuid v1.6.0 // indirect
3534
github.com/hashicorp/go-version v1.7.0 // indirect
3635
github.com/json-iterator/go v1.1.12 // indirect

exporter/debugexporter/go.sum

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

exporter/exporterhelper/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.24.0
44

55
require (
66
github.com/cenkalti/backoff/v5 v5.0.3
7-
github.com/gogo/protobuf v1.3.2
87
github.com/stretchr/testify v1.11.1
98
go.opentelemetry.io/collector/client v1.44.0
109
go.opentelemetry.io/collector/component v1.44.0
@@ -34,6 +33,7 @@ require (
3433
go.uber.org/goleak v1.3.0
3534
go.uber.org/multierr v1.11.0
3635
go.uber.org/zap v1.27.0
36+
google.golang.org/protobuf v1.36.10
3737
)
3838

3939
require (
@@ -64,7 +64,6 @@ require (
6464
golang.org/x/sys v0.35.0 // indirect
6565
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
6666
google.golang.org/grpc v1.76.0 // indirect
67-
google.golang.org/protobuf v1.36.10 // indirect
6867
gopkg.in/yaml.v3 v3.0.1 // indirect
6968
)
7069

0 commit comments

Comments
 (0)