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.

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

[otlp] update protobuf definitions to new location/version in datadog-agent repo #126

Merged
merged 11 commits into from
Jul 24, 2023

Conversation

truthbk
Copy link
Member

@truthbk truthbk commented Jul 20, 2023

What does this PR do?

Reopens #103

This PR updates the protobuf imports such that the new definitions in pkg/proto in the agent repository are used. This includes some changes due to the gogoproto nullable type being removed from the definitions.

Additionally, due to a chicken-egg problem, these changes are currently pointing to a WIP PR on the datadog-agent repository (PR to be posted soon). Unfortunately the current protobuf structure (definitions part of https://github.com/DataDog/datadog-agent) doesn't make it easy to make these updates.

Motivation

Refactor of protobuf definitions in https://github.com/DataDog/datadog-agent so that all definitions now live in pkg/proto as opposed to scattered all over the repository.

PLEASE DO NOT MERGE, until the datadog-agent counterpart is merged: DataDog/datadog-agent#10650. At that point we can update relevant references.

@truthbk truthbk requested a review from a team as a code owner July 20, 2023 12:17
@truthbk truthbk requested a review from IbraheemA July 20, 2023 12:17
@truthbk
Copy link
Member Author

truthbk commented Jul 21, 2023

The relevant https://github.com/DataDog/datadog-agent branch has been merged with PR DataDog/datadog-agent#10650, so I've gone ahead and pushed the update to go.mod and go.sum. We should now be good to merge this.

Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

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

Need make tidy

@songy23 songy23 added the breaking-change This PR introduces a Go API breaking change label Jul 24, 2023
@songy23 songy23 merged commit 337c954 into main Jul 24, 2023
@songy23 songy23 deleted the jaime/protorefactor branch July 24, 2023 14:41
@songy23 songy23 restored the jaime/protorefactor branch July 24, 2023 21:08
dmitryax pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Jul 26, 2023
…g changes (#24552)

**Description:**
Upgrade dependency versions of
`github.com/DataDog/opentelemetry-mapping-go` and
`github.com/DataDog/datadog-agent` and fix breaking changes in protobuf
(context: DataDog/datadog-agent#10650,
DataDog/opentelemetry-mapping-go#126).
dmitryax pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Aug 7, 2023
…g changes (#24674)

**Description:** 
Roll forward
#24552
with stable versions of dependencies.

> Upgrade dependency versions of
github.com/DataDog/opentelemetry-mapping-go and
github.com/DataDog/datadog-agent and fix breaking changes in protobuf
(context: DataDog/datadog-agent#10650,
DataDog/opentelemetry-mapping-go#126).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking-change This PR introduces a Go API breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants