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

[manifests] Remove unnecessary replaces #90

Merged
merged 3 commits into from
Mar 21, 2022

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Mar 21, 2022

Description: Remove replace directives that are no longer necessary.

They were added by @svrakitin in #62, but can now be removed according to #62 (comment)

@mx-psi mx-psi marked this pull request as ready for review March 21, 2022 14:01
@mx-psi mx-psi requested review from a team and dashpole March 21, 2022 14:01
@mx-psi
Copy link
Member Author

mx-psi commented Mar 21, 2022

I would feel more comfortable if we had #85 first before this, but in principle it should be safe

- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.47.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.47.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.47.0
- github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5
Copy link
Member

Choose a reason for hiding this comment

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

What do you think about requiring replaces to be justified? Like, why should this one on gnostic be kept?

Copy link
Member Author

Choose a reason for hiding this comment

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

That makes sense to me, I think for gnostic it was copied from here https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/459a4bc12e5d538a175dd20a9c0319241c9e1a96/go.mod#L791-L792 but from reading the issue google/gnostic#262 I think we can also remove it, both here and in contrib

Copy link
Member Author

Choose a reason for hiding this comment

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

I was wrong, it's still needed. I added a comment to document it

@jpkrohling jpkrohling merged commit 30dec30 into open-telemetry:main Mar 21, 2022
@mx-psi mx-psi deleted the mx-psi/remove-replaces branch March 22, 2022 08:21
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.

2 participants