Remove usage of gogoproto and generate the structs with pdatagen

.chloggen/rm-gogo-proto.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: pkg/pdata
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove usage of gogo proto and generate the structs with pdatagen
+
+# One or more tracking issues or pull requests related to the change
+issues: [14069]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

Makefile

@@ -176,95 +176,24 @@ ocb:
 	$(MAKE) -C cmd/builder config
 	$(MAKE) -C cmd/builder ocb
 
-# Definitions for ProtoBuf generation.
-
-# The source directory for OTLP ProtoBufs.
-OPENTELEMETRY_PROTO_SRC_DIR=pdata/internal/opentelemetry-proto
-
-# The branch matching the current version of the proto to use
-OPENTELEMETRY_PROTO_VERSION=v1.8.0
-
-# Find all .proto files.
-OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1development/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1development/*.proto))
-
-# Target directory to write generated files to.
-PROTO_TARGET_GEN_DIR=pdata/internal/data/protogen
-
-# Go package name to use for generated files.
-PROTO_PACKAGE=go.opentelemetry.io/collector/$(PROTO_TARGET_GEN_DIR)
-
-# Intermediate directory used during generation.
-PROTO_INTERMEDIATE_DIR=pdata/internal/.patched-otlp-proto
-
-DOCKERCMD ?= docker
-DOCKER_PROTOBUF ?= otel/build-protobuf:0.23.0
-PROTOC := $(DOCKERCMD) run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(PROTO_INTERMEDIATE_DIR) ${DOCKER_PROTOBUF} --proto_path=${PWD}
-PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf -I./
-
-# Cleanup temporary directory
-genproto-cleanup:
-	rm -Rf ${OPENTELEMETRY_PROTO_SRC_DIR}
-
-# Generate OTLP Protobuf Go files. This will place generated files in PROTO_TARGET_GEN_DIR.
-genproto: genproto-cleanup
-	mkdir -p ${OPENTELEMETRY_PROTO_SRC_DIR}
-	curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-proto/tarball/${OPENTELEMETRY_PROTO_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_PROTO_SRC_DIR}
-	# Call a sub-make to ensure OPENTELEMETRY_PROTO_FILES is populated
-	$(MAKE) genproto_sub
-	$(MAKE) genproto_internal
-	$(MAKE) fmt
-	$(MAKE) genproto-cleanup
-
-genproto_sub:
-	@echo Generating code for the following files:
-	@$(foreach file,$(OPENTELEMETRY_PROTO_FILES),$(call exec-command,echo $(file)))
-
-	@echo Delete intermediate directory.
-	@rm -rf $(PROTO_INTERMEDIATE_DIR)
-
-	@echo Copy .proto file to intermediate directory.
-	mkdir -p $(PROTO_INTERMEDIATE_DIR)/opentelemetry
-	cp -R $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/* $(PROTO_INTERMEDIATE_DIR)/opentelemetry
-
-	# Patch proto files. See proto_patch.sed for patching rules.
-	@echo Modify them in the intermediate directory.
-	$(foreach file,$(OPENTELEMETRY_PROTO_FILES),$(call exec-command,sed -f proto_patch.sed $(OPENTELEMETRY_PROTO_SRC_DIR)/$(file) > $(PROTO_INTERMEDIATE_DIR)/$(file)))
-
-	# HACK: Workaround for istio 1.15 / envoy 1.23.1 mistakenly emitting deprecated field.
-	# reserved 1000 -> repeated ScopeLogs deprecated_scope_logs = 1000;
-	sed 's/reserved 1000;/repeated ScopeLogs deprecated_scope_logs = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/logs/v1/logs.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/logs/v1/logs.proto
-	# reserved 1000 -> repeated ScopeMetrics deprecated_scope_metrics = 1000;
-	sed 's/reserved 1000;/repeated ScopeMetrics deprecated_scope_metrics = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/metrics/v1/metrics.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/metrics/v1/metrics.proto
-	# reserved 1000 -> repeated ScopeSpans deprecated_scope_spans = 1000;
-	sed 's/reserved 1000;/repeated ScopeSpans deprecated_scope_spans = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/trace/v1/trace.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/trace/v1/trace.proto
-
-
-	@echo Generate Go code from .proto files in intermediate directory.
-	$(foreach file,$(OPENTELEMETRY_PROTO_FILES),$(call exec-command,$(PROTOC) $(PROTO_INCLUDES) --gogofaster_out=plugins=grpc:./ $(file)))
-
-	@echo Move generated code to target directory.
-	mkdir -p $(PROTO_TARGET_GEN_DIR)
-	cp -R $(PROTO_INTERMEDIATE_DIR)/$(PROTO_PACKAGE)/* $(PROTO_TARGET_GEN_DIR)/
-	rm -rf $(PROTO_INTERMEDIATE_DIR)/go.opentelemetry.io
-
-	@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/*
-	@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/.* > /dev/null 2>&1 || true
-
-# Generate structs, functions and tests for pdata package. Must be used after any changes
-# to proto and after running `make genproto`
+# Generate structs, functions and tests for pdata package.
 genpdata:
 	cd internal/cmd/pdatagen && $(GOCMD) run main.go -C $(SRC_ROOT)
 	$(MAKE) -C pdata fmt
 
-INTERNAL_PROTO_SRC_DIRS := exporter/exporterhelper/internal/queue pdata/xpdata/request/internal
-INTERNAL_PROTO_FILES := $(foreach dir,$(INTERNAL_PROTO_SRC_DIRS),$(wildcard $(dir)/*.proto))
-INTERNAL_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 -I${PWD}/$(PROTO_INTERMEDIATE_DIR) --gogofaster_out=plugins=grpc,paths=source_relative:.
+DOCKERCMD ?= docker
+DOCKER_PROTOBUF ?= otel/build-protobuf:0.23.0
+
+PROTO_SRC_DIRS := exporter/exporterhelper/internal/queue
+PROTO_FILES := $(foreach dir,$(PROTO_SRC_DIRS),$(wildcard $(dir)/*.proto))
+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:.
 
-.PHONY: genproto_internal
-genproto_internal:
-	@echo "Generating Go code for internal proto files"
-	@echo "Found proto files: $(INTERNAL_PROTO_FILES)"
-	$(foreach file,$(INTERNAL_PROTO_FILES),$(call exec-command,$(INTERNAL_PROTOC) $(file)))
+.PHONY: genproto
+genproto:
+	@echo "Generating Go code for proto files"
+	@echo "Found proto files: $(PROTO_FILES)"
+	$(foreach file,$(PROTO_FILES),$(call exec-command,$(PROTOC) $(file)))
+	$(MAKE) fmt
 
 ALL_MOD_PATHS := "" $(ALL_MODULES:.%=%)
 

client/go.mod

@@ -11,20 +11,13 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.44.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.42.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
-	google.golang.org/grpc v1.76.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

cmd/mdatagen/go.mod

@@ -40,7 +40,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -70,7 +69,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/net v0.44.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
 	google.golang.org/grpc v1.76.0 // indirect