maint: update submodule to use HNY fork (#1)

* maint: update submodule to use fork * go mod tidy * update submodule to latest proto definitions * generate go files from updated proto definitions * run generate on an amd machine * use the latest build tool * don't change the otlp module name * remove unecessary import in go.mod * make sure make protobuf doesn't change the module name for otlp * try again --------- Co-authored-by: Yingrong Zhao <[email protected]> Co-authored-by: Yingrong Zhao <[email protected]>
honeycombio · Jul 1, 2024 · a9bd1b3 · a9bd1b3
1 parent 00414dc
commit a9bd1b3
Show file tree

Hide file tree

Showing 20 changed files with 2,816 additions and 1,661 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "opentelemetry-proto"]
 	path = opentelemetry-proto
-	url = https://github.com/open-telemetry/opentelemetry-proto
-	branch = v0.19.0
+	url = https://github.com/honeycombio/opentelemetry-proto
+	branch = main
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ PROTOBUF_GEN_DIR   := opentelemetry-proto-gen
 PROTOBUF_TEMP_DIR  := $(GEN_TEMP_DIR)/go
 PROTO_SOURCE_DIR   := $(GEN_TEMP_DIR)/proto
 SOURCE_PROTO_FILES := $(subst $(OTEL_PROTO_SUBMODULE),$(PROTO_SOURCE_DIR),$(SUBMODULE_PROTO_FILES))
-GO_MOD_ROOT		   := go.opentelemetry.io/proto
+GO_MOD_ROOT		   := github.com/honeycombio/opentelemetry-proto-go
 OTLP_OUTPUT_DIR    := otlp
 GO_VERSION         := 1.17
 
@@ -53,7 +53,7 @@ $(1)
 
 endef
 
-OTEL_DOCKER_PROTOBUF ?= otel/build-protobuf:0.11.0
+OTEL_DOCKER_PROTOBUF ?= otel/build-protobuf:0.24.0
 PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD} ${OTEL_DOCKER_PROTOBUF} --proto_path="$(PROTO_SOURCE_DIR)"
 
 .DEFAULT_GOAL := protobuf

diff --git a/go.sum b/go.sum
diff --git a/opentelemetry-proto b/opentelemetry-proto
diff --git a/otlp/collector/logs/v1/logs_service.pb.go b/otlp/collector/logs/v1/logs_service.pb.go
diff --git a/otlp/collector/logs/v1/logs_service.pb.gw.go b/otlp/collector/logs/v1/logs_service.pb.gw.go
diff --git a/otlp/collector/logs/v1/logs_service_grpc.pb.go b/otlp/collector/logs/v1/logs_service_grpc.pb.go
diff --git a/otlp/collector/metrics/v1/metrics_service.pb.go b/otlp/collector/metrics/v1/metrics_service.pb.go
diff --git a/otlp/collector/metrics/v1/metrics_service.pb.gw.go b/otlp/collector/metrics/v1/metrics_service.pb.gw.go
diff --git a/otlp/collector/metrics/v1/metrics_service_grpc.pb.go b/otlp/collector/metrics/v1/metrics_service_grpc.pb.go
diff --git a/otlp/collector/trace/v1/trace_service.pb.go b/otlp/collector/trace/v1/trace_service.pb.go
diff --git a/otlp/collector/trace/v1/trace_service.pb.gw.go b/otlp/collector/trace/v1/trace_service.pb.gw.go
diff --git a/otlp/collector/trace/v1/trace_service_grpc.pb.go b/otlp/collector/trace/v1/trace_service_grpc.pb.go
diff --git a/otlp/common/v1/common.pb.go b/otlp/common/v1/common.pb.go
diff --git a/otlp/go.mod b/otlp/go.mod
@@ -3,16 +3,16 @@ module github.com/honeycombio/opentelemetry-proto-go/otlp
 go 1.17
 
 require (
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2
-	go.opentelemetry.io/proto/otlp v0.19.0
-	google.golang.org/grpc v1.48.0
-	google.golang.org/protobuf v1.28.1
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
+	go.opentelemetry.io/proto/otlp v1.3.1
+	google.golang.org/grpc v1.64.0
+	google.golang.org/protobuf v1.34.2
 )
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
-	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
-	golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20220805133916-01dd62135a58 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
 )
+2 −1		.github/auto_assign.yml
+28 −0		.github/workflows/build-check.yaml
+2 −0		.gitignore
+22 −0		.markdown_link_check_config.json
+14 −0		.markdownlint.yaml
+78 −10		CHANGELOG.md
+35 −2		Makefile
+59 −34		README.md
+3 −8		RELEASING.md
+8 −0		docs/README.md
+19 −0		docs/design-goals.md
+ −		docs/img/otlp-client-server.png
+ −		docs/img/otlp-concurrent.png
+ −		docs/img/otlp-multi-destination.png
+ −		docs/img/otlp-request-response.png
+ −		docs/img/otlp-sequential.png
+99 −0		docs/requirements.md
+717 −0		docs/specification.md
+43 −0		examples/README.md
+101 −0		examples/logs.json
+107 −0		examples/metrics.json
+51 −0		examples/trace.json
+78 −0		opentelemetry/proto/collector/profiles/v1experimental/profiles_service.proto
+9 −0		opentelemetry/proto/collector/profiles/v1experimental/profiles_service_http.yaml
+2 −2		opentelemetry/proto/collector/trace/v1/trace_service_http.yaml
+14 −1		opentelemetry/proto/common/v1/common.proto
+44 −10		opentelemetry/proto/logs/v1/logs.proto
+248 −19		opentelemetry/proto/metrics/v1/metrics.proto
+386 −0		opentelemetry/proto/profiles/v1experimental/pprofextended.proto
+191 −0		opentelemetry/proto/profiles/v1experimental/profiles.proto
+89 −14		opentelemetry/proto/trace/v1/trace.proto
+1,375 −0		package-lock.json
+6 −0		package.json