Skip to content

api: fix go importpath for OT dep#15825

Merged
mattklein123 merged 2 commits intoenvoyproxy:mainfrom
snowp:fix-ot-dep
Apr 2, 2021
Merged

api: fix go importpath for OT dep#15825
mattklein123 merged 2 commits intoenvoyproxy:mainfrom
snowp:fix-ot-dep

Conversation

@snowp
Copy link
Copy Markdown
Contributor

@snowp snowp commented Apr 2, 2021

Fixes a few issues with the generated Go protobuf code:

a) the OT protos are not copied over, which means that their importpath
needs to reference a path where the go toolchain can pull the protos down.
The "logs" importpath was nonsensical and couldn't be resolved
b) Bunching several proto packages into one target did not work well
with the go package system. This splits the common protos out into its
own target so that it can reference a different importpath than the
other logs protos

Signed-off-by: Snow Pettersen snowp@lyft.com

Risk Level: Low, build only
Testing: Verified that go-control-plane builds with new protos
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a
Fixes #15817

Snow Pettersen added 2 commits April 2, 2021 13:25
Fixes a few issues with the generated Go protobuf code:

a) the OT protos are not copied over, which means that their importpath
needs to reference a path where it can pull the protos down from. The
"logs" importpath was nonsensical and couldn't be resolved
b) Bunching several proto packages into one target did not work well
with the go package system. This splits the common protos out into its
own target so that it can reference a different importpath than the
other logs protos

Signed-off-by: Snow Pettersen <snowp@lyft.com>
Signed-off-by: Snow Pettersen <snowp@lyft.com>
@repokitteh-read-only repokitteh-read-only bot added api deps Approval required for changes to Envoy's external dependencies labels Apr 2, 2021
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/envoy/.
API shepherd assignee is @mattklein123
CC @envoyproxy/api-watchers: FYI only for changes made to api/envoy/.
CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #15825 was opened by snowp.

see: more, trace.

@moderation
Copy link
Copy Markdown
Contributor

/lgtm deps

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Apr 2, 2021
@moderation
Copy link
Copy Markdown
Contributor

Changes how the deps are used but doesn't change the dep versions

@repokitteh-read-only repokitteh-read-only bot removed the api label Apr 2, 2021
@mattklein123 mattklein123 merged commit 8037370 into envoyproxy:main Apr 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Opentelemetry dependency incompatible with Go proto export

3 participants