Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split the otlp module into multiple submodules #183

Closed
wants to merge 18 commits into from
Closed

Split the otlp module into multiple submodules #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
46241e4
add crosslink
dmathieu Jul 23, 2024
9584eea
add go-mod-tidy
dmathieu Jul 23, 2024
150890b
create a new submodule for each proto package
dmathieu Jul 23, 2024
933e404
check crosslink and go mod tidy in CI
dmathieu Jul 23, 2024
6a4669f
run module-check on 1.21
dmathieu Jul 23, 2024
e852357
regenerate the go.mod too
dmathieu Jul 23, 2024
37b8b45
drop replace for current module
dmathieu Jul 23, 2024
0c4c1fb
root go module files now need to run crosslink and go-mod-tidy
dmathieu Jul 23, 2024
3b95824
remove toolchain directive
dmathieu Jul 23, 2024
cf4fbd1
run ci on 1.21
dmathieu Jul 23, 2024
031dbfa
remove trailing slash in mod init
dmathieu Jul 23, 2024
c333a10
no need for root go.mod and go.sum
dmathieu Jul 23, 2024
a88fd79
run crosslink on otlp folder only
dmathieu Jul 23, 2024
af857aa
drop trailing slach on dropreplace
dmathieu Jul 23, 2024
04ed317
regenerate everything
dmathieu Jul 23, 2024
4d89774
sort the expected otlp modules
dmathieu Jul 23, 2024
8cdf167
run go-mod-tidy before crosslink
dmathieu Jul 23, 2024
819e36b
regenerate dependabot
dmathieu Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 57 additions & 3 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /
directory: /internal/tools
labels:
- dependencies
- go
Expand All @@ -20,7 +20,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /internal/tools
directory: /otlp
labels:
- dependencies
- go
Expand All @@ -29,7 +29,61 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp
directory: /otlp/collector
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/common
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/logs
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/metrics
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/profiles
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/resource
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /otlp/trace
labels:
- dependencies
- go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gen-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: "~1.20.2"
go-version: "~1.21.12"
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true
- name: Generate
run: make clean protobuf
run: make clean protobuf gen-modules full-replace go-mod-tidy crosslink
- name: Check Clean Work Tree
run: make check-clean-work-tree
50 changes: 47 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,21 @@ PROTOBUF_VERSION := v1*
OTEL_PROTO_SUBMODULE := opentelemetry-proto
GEN_TEMP_DIR := gen
SUBMODULE_PROTO_FILES := $(wildcard $(OTEL_PROTO_SUBMODULE)/opentelemetry/proto/*/$(PROTOBUF_VERSION)/*.proto) $(wildcard $(OTEL_PROTO_SUBMODULE)/opentelemetry/proto/collector/*/$(PROTOBUF_VERSION)/*.proto)
ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)

ifeq ($(strip $(SUBMODULE_PROTO_FILES)),)
$(error Submodule at $(OTEL_PROTO_SUBMODULE) is not checked out, use "git submodule update --init")
endif

GO := go
GO_VERSION := 1.17
GO_MOD_ROOT := go.opentelemetry.io/proto
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))
OTLP_OUTPUT_DIR := otlp
OTLP_EXPECTED_MODULES := $(sort $(dir $(wildcard $(OTLP_OUTPUT_DIR)/*/)))

PROTOSLIM_SOURCE_DIR := $(GEN_TEMP_DIR)/slim/proto
SOURCE_PROTOSLIM_FILES := $(subst $(OTEL_PROTO_SUBMODULE),$(PROTOSLIM_SOURCE_DIR),$(SUBMODULE_PROTO_FILES))
Expand Down Expand Up @@ -80,8 +81,11 @@ $(TOOLS)/multimod: PACKAGE=go.opentelemetry.io/build-tools/multimod
DBOTCONF = $(TOOLS)/dbotconf
$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf

CROSSLINK = $(TOOLS)/crosslink
$(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/build-tools/crosslink

.PHONY: tools
tools: $(DBOTCONF) $(MULTIMOD)
tools: $(DBOTCONF) $(MULTIMOD) $(CROSSLINK)

.PHONY: protobuf
protobuf: protobuf-source gen-otlp-protobuf copy-otlp-protobuf gen-otlp-protobuf-slim copy-otlp-protobuf-slim
Expand Down Expand Up @@ -131,13 +135,22 @@ copy-otlp-protobuf:
rm -rf ./$(OTLP_OUTPUT_DIR)/*/
@rsync -a $(PROTOBUF_TEMP_DIR)/go.opentelemetry.io/proto/otlp/ ./$(OTLP_OUTPUT_DIR)
cd ./$(OTLP_OUTPUT_DIR) && go mod tidy

.PHONY: gen-otlp-protobuf-slim
gen-otlp-protobuf-slim: $(SOURCE_PROTOSLIM_FILES)
rm -rf ./$(PROTOBUF_TEMP_DIR)
mkdir -p ./$(PROTOBUF_TEMP_DIR)
$(foreach file,$(SOURCE_PROTOSLIM_FILES),$(call exec-command,$(PROTOC_SLIM) $(PROTO_INCLUDES) --go_out=./$(PROTOBUF_TEMP_DIR) $(file)))

.PHONY: gen-modules
gen-modules: $(OTLP_EXPECTED_MODULES:%=gen-modules/%)
gen-modules/%: DIR=$*
gen-modules/%:
@echo "Initializing module in $(DIR)" \
&& cd $(DIR) \
&& rm -f go.mod go.sum \
&& $(GO) mod init go.opentelemetry.io/proto/$(DIR:/=)

.PHONY: copy-otlp-protobuf-slim
copy-otlp-protobuf-slim:
rm -rf $(OTLPSLIM_OUTPUT_DIR)/*/
Expand All @@ -158,6 +171,29 @@ check-clean-work-tree:
exit 1; \
fi

.PHONY: crosslink
crosslink: $(CROSSLINK)
@echo "Executing crosslink"
$(CROSSLINK) --root=$(shell pwd)/otlp --prune

.PHONY: full-replace
full-replace: $(OTLP_EXPECTED_MODULES:%=full-replace/%)
full-replace/%: DIR=$*
full-replace/%:
@echo "$(GO) mod replace all $(DIR)" \
&& cd $(DIR) \
&& $(GO) mod edit \
-replace go.opentelemetry.io/proto/otlp/collector=../collector \
-replace go.opentelemetry.io/proto/otlp/common=../common \
-replace go.opentelemetry.io/proto/otlp/logs=../logs \
-replace go.opentelemetry.io/proto/otlp/metrics=../metrics \
-replace go.opentelemetry.io/proto/otlp/profiles=../profiles \
-replace go.opentelemetry.io/proto/otlp/resource=../resource \
-replace go.opentelemetry.io/proto/otlp/trace=../trace \
-replace go.opentelemetry.io/proto/otlp=../ \
&& $(GO) mod edit -dropreplace go.opentelemetry.io/proto/$(DIR:/=)


DEPENDABOT_CONFIG = .github/dependabot.yml
.PHONY: dependabot-check
dependabot-check: | $(DBOTCONF)
Expand All @@ -167,6 +203,14 @@ dependabot-check: | $(DBOTCONF)
dependabot-generate: | $(DBOTCONF)
@$(DBOTCONF) generate > $(DEPENDABOT_CONFIG)

.PHONY: go-mod-tidy
go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%)
go-mod-tidy/%: DIR=$*
go-mod-tidy/%:
@echo "$(GO) mod tidy in $(DIR)" \
&& cd $(DIR) \
&& $(GO) mod tidy -compat=1.21

# Releasing

.PHONY: submodule-version
Expand Down
3 changes: 0 additions & 3 deletions go.mod
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module go.opentelemetry.io/proto/internal/tools
go 1.16

require (
go.opentelemetry.io/build-tools/crosslink v0.14.0
go.opentelemetry.io/build-tools/dbotconf v0.14.0
go.opentelemetry.io/build-tools/multimod v0.14.0
)
10 changes: 10 additions & 0 deletions internal/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1806,6 +1806,9 @@ github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRah
github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
Expand Down Expand Up @@ -1950,6 +1953,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/build-tools v0.14.0 h1:fcnriXRUVpnVIFXtdlc1fTn9g+YRxzOV0xhw4nN919c=
go.opentelemetry.io/build-tools v0.14.0/go.mod h1:pxTqOr0uL/0s9+xnpuKTAhmVFDssF3O4UUUuWKQqThE=
go.opentelemetry.io/build-tools/crosslink v0.14.0 h1:yxCsELb3A81W4p8RSDjPSg9WcCTkM3+X+tYUzaaJ3uU=
go.opentelemetry.io/build-tools/crosslink v0.14.0/go.mod h1:QJ+E5i4+CCg40jlOYQsfBq4lVe2cKCyhftEXDsqNlhg=
go.opentelemetry.io/build-tools/dbotconf v0.14.0 h1:sVIUBttMR7FwkZpcY/HvnfMupAe/K0XIuCYFgAmfYHA=
go.opentelemetry.io/build-tools/dbotconf v0.14.0/go.mod h1:jZADCRzN6h/DE3Ov9H5bFoOZDm55w/M2jSVkZGsZlbo=
go.opentelemetry.io/build-tools/multimod v0.14.0 h1:AaM06mlSga3IaCj6eM+Kg9tei062qsU6Z+x6ENmfBWI=
Expand Down Expand Up @@ -1987,13 +1992,18 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/arch v0.1.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Expand Down
1 change: 1 addition & 0 deletions internal/tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package tools // import "go.opentelemetry.io/proto/internal/tools"

import (
_ "go.opentelemetry.io/build-tools/crosslink"
_ "go.opentelemetry.io/build-tools/dbotconf"
_ "go.opentelemetry.io/build-tools/multimod"
)
35 changes: 35 additions & 0 deletions otlp/collector/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module go.opentelemetry.io/proto/otlp/collector

go 1.21.12

replace go.opentelemetry.io/proto/otlp/common => ../common

replace go.opentelemetry.io/proto/otlp/logs => ../logs

replace go.opentelemetry.io/proto/otlp/metrics => ../metrics

replace go.opentelemetry.io/proto/otlp/profiles => ../profiles

replace go.opentelemetry.io/proto/otlp/resource => ../resource

replace go.opentelemetry.io/proto/otlp/trace => ../trace

require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
go.opentelemetry.io/proto/otlp/logs v0.0.0-00010101000000-000000000000
go.opentelemetry.io/proto/otlp/metrics v0.0.0-00010101000000-000000000000
go.opentelemetry.io/proto/otlp/profiles v0.0.0-00010101000000-000000000000
go.opentelemetry.io/proto/otlp/trace v0.0.0-00010101000000-000000000000
google.golang.org/grpc v1.65.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The OTLP HTTP exporters are depending on go.opentelemetry.io/proto/otlp/collector.
E.g. from otlptracehttp: https://github.com/open-telemetry/opentelemetry-go/blob/d4b5396f848504859ba50946e4724b84b71b36a5/exporters/otlp/otlptrace/otlptracehttp/client.go#L128
Therefore all actual OTLP exporters will still depend on google.golang.org/grpc and it will not help with solving open-telemetry/opentelemetry-go#2579.

Copy link
Member

@pellared pellared Jul 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the possible solutions are:

  1. solving otlp*http modules import grpc opentelemetry-go#2579 (comment) in google.golang.org/protobuf (so that slim would work without issues) (mentioned also here)
  2. in go.opentelemetry.io/proto/otlp/collector split protobuf messages and gRPC services code from into separate packages and modules (this would be a path more aligned with current proposal)

Personally, I would be in favor of trying the option 1 first.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PS. This was my first idea when I was trying to fix open-telemetry/opentelemetry-go#2579. And I created slim because of #183 (comment). At that point of time I was totally not aware of https://protobuf.dev/reference/go/faq/#namespace-conflict.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right about the need for the collector even in HTTP, sorry.
I'll need to investigate more, but this PR, alongside a new collectorslim module which only includes the collector slim, and reuses the other data types may solve our registration issue?

Copy link
Member

@pellared pellared Jul 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this PR, alongside a new collectorslim module which only includes the collector slim, and reuses the other data types may solve our registration issue?

It could solve the issue. Probably this would require more post-processing after protoc code generation.

However, I would be more in favor of checking if it is possible to solve somehow https://protobuf.dev/reference/go/faq/#namespace-conflict. Then we could simply use the slim modules in OTLP HTTP exporters. Moreover, it can also help others dealing with the namespace conflict.

google.golang.org/protobuf v1.34.2
)

require (
go.opentelemetry.io/proto/otlp/common v0.0.0-00010101000000-000000000000 // indirect
go.opentelemetry.io/proto/otlp/resource v0.0.0-00010101000000-000000000000 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
)
18 changes: 18 additions & 0 deletions otlp/collector/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
5 changes: 5 additions & 0 deletions otlp/common/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module go.opentelemetry.io/proto/otlp/common

go 1.21.12

require google.golang.org/protobuf v1.34.2
6 changes: 6 additions & 0 deletions otlp/common/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
16 changes: 1 addition & 15 deletions otlp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
module go.opentelemetry.io/proto/otlp

go 1.17

require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
)

require (
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
)
go 1.21.12
Loading
Loading