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

[chore] Update leaf module versions to commits with pseudo version dependencies #11509

Merged
merged 1 commit into from
Oct 22, 2024

Conversation

evan-bradley
Copy link
Contributor

@evan-bradley evan-bradley commented Oct 22, 2024

Description

Say we have three modules, A, B, and C, with dependencies C->B->A. If we are on commit 1, and make a new commit, 2, where we change the dependencies such that the go.mod files read C@2->B@1->A@1, we will still get a failure, because at commit 1 we had not yet made the changes necessary to properly resolve these modules. Specifically, at commit 2 we have B@1->A@#, where A@# is not externally-resolvable.

We therefore need to make a new commit 3, where we can have C@2->B@2->A@2, and at commit 2 all modules are externally-resolvable.

This PR is a necessary update to #11503.

When running make update-otel in contrib, I am seeing the following errors:

go: downloading go.opentelemetry.io/collector/connector/connectortest v0.0.0-20241021181817-007f06b7c4a8
go: go.opentelemetry.io/collector/pipeline/[email protected]: reading go.opentelemetry.io/collector/pipeline/pipelineprofiles/go.mod at revision pipeline/pipelineprofiles/v0.111.0: unknown revision pipeline/pipelineprofiles/v0.111.0

connectortest has an indirect dependency on pipelineprofiles, and at commit 007f06b7c4a8 pipelineprofiles is versioned at v0.111.0. The latest commit, 403c782d50c6, will version it at 007f06b7c4a8. Since pipelineprofiles has no dependencies, this will not result in any issues.

…pendencies

Say we have three modules, A, B, and C, with dependencies C->B->A. If we are on commit 1, and make a new commit, 2, where we change the dependencies such that the go.mod files read C@2->B@1->A@1, we will still get a failure, because at commit 1 we had not yet made the changes necessary to properly resolve these modules. Specifically, at commit 2 we have B@1->A@*, where A@* is not externally-resolvable.

We therefore need to make a new commit 3, where we can have C@2->B@2->A@2, and at commit 2 all modules are externally-resolvable.
@evan-bradley evan-bradley requested a review from a team as a code owner October 22, 2024 12:33
Copy link

codecov bot commented Oct 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.38%. Comparing base (403c782) to head (28afa11).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #11509   +/-   ##
=======================================
  Coverage   91.38%   91.38%           
=======================================
  Files         433      433           
  Lines       23659    23659           
=======================================
  Hits        21620    21620           
  Misses       1663     1663           
  Partials      376      376           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mx-psi mx-psi merged commit 11767fe into open-telemetry:main Oct 22, 2024
49 checks passed
@github-actions github-actions bot added this to the next release milestone Oct 22, 2024
evan-bradley added a commit to evan-bradley/opentelemetry-collector that referenced this pull request Oct 22, 2024
mx-psi pushed a commit that referenced this pull request Oct 22, 2024
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Covers the same case as
#11509
bogdandrutu pushed a commit that referenced this pull request Nov 13, 2024
#### Description

My previous PR (#11615) which made `component/componenttest` into its
own module tagged it as `v0.113.0` in the requirements of other modules.
This works locally because of the `replace` statements, but since the
module was never _actually_ released as v0.113.0, this causes issues in
contrib (cf. #11509 and #11511).

This PR updates those requirements to use a pseudo-version pointing at a
recent commit on main, which should be properly externally resolvable.

#### Link to tracking issue
None.

#### Testing
I removed the `replace` statements for `componenttest`, ran `make
gotidy`, which allowed `make otelcorecol` to run successfully. Not sure
if this is a thorough enough test however. Once this PR is merged, I
will try `make update-otel [...]` on contrib with the appropriate commit
ID to check that the issue is resolved.
djaglowski pushed a commit to djaglowski/opentelemetry-collector that referenced this pull request Nov 21, 2024
…pendencies (open-telemetry#11509)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Say we have three modules, A, B, and C, with dependencies C->B->A. If we
are on commit 1, and make a new commit, 2, where we change the
dependencies such that the go.mod files read C@2->B@1->A@1, we will
still get a failure, because at commit 1 we had not yet made the changes
necessary to properly resolve these modules. Specifically, at commit 2
we have B@1->A@#, where A@# is not externally-resolvable.

We therefore need to make a new commit 3, where we can have
C@2->B@2->A@2, and at commit 2 all modules are externally-resolvable.

This PR is a necessary update to
open-telemetry#11503.

When running `make update-otel` in contrib, I am seeing the following
errors:

```
go: downloading go.opentelemetry.io/collector/connector/connectortest v0.0.0-20241021181817-007f06b7c4a8
go: go.opentelemetry.io/collector/pipeline/[email protected]: reading go.opentelemetry.io/collector/pipeline/pipelineprofiles/go.mod at revision pipeline/pipelineprofiles/v0.111.0: unknown revision pipeline/pipelineprofiles/v0.111.0
```

connectortest has an indirect dependency on pipelineprofiles, and at
commit `007f06b7c4a8` pipelineprofiles is versioned at v0.111.0. The
latest commit, `403c782d50c6`, will version it at `007f06b7c4a8`. Since
pipelineprofiles has no dependencies, this will not result in any
issues.
djaglowski pushed a commit to djaglowski/opentelemetry-collector that referenced this pull request Nov 21, 2024
…try#11512)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Covers the same case as
open-telemetry#11509
djaglowski pushed a commit to djaglowski/opentelemetry-collector that referenced this pull request Nov 21, 2024
…y#11668)

#### Description

My previous PR (open-telemetry#11615) which made `component/componenttest` into its
own module tagged it as `v0.113.0` in the requirements of other modules.
This works locally because of the `replace` statements, but since the
module was never _actually_ released as v0.113.0, this causes issues in
contrib (cf. open-telemetry#11509 and open-telemetry#11511).

This PR updates those requirements to use a pseudo-version pointing at a
recent commit on main, which should be properly externally resolvable.

#### Link to tracking issue
None.

#### Testing
I removed the `replace` statements for `componenttest`, ran `make
gotidy`, which allowed `make otelcorecol` to run successfully. Not sure
if this is a thorough enough test however. Once this PR is merged, I
will try `make update-otel [...]` on contrib with the appropriate commit
ID to check that the issue is resolved.
HongChenTW pushed a commit to HongChenTW/opentelemetry-collector that referenced this pull request Dec 19, 2024
…pendencies (open-telemetry#11509)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Say we have three modules, A, B, and C, with dependencies C->B->A. If we
are on commit 1, and make a new commit, 2, where we change the
dependencies such that the go.mod files read C@2->B@1->A@1, we will
still get a failure, because at commit 1 we had not yet made the changes
necessary to properly resolve these modules. Specifically, at commit 2
we have B@1->A@#, where A@# is not externally-resolvable.

We therefore need to make a new commit 3, where we can have
C@2->B@2->A@2, and at commit 2 all modules are externally-resolvable.

This PR is a necessary update to
open-telemetry#11503.

When running `make update-otel` in contrib, I am seeing the following
errors:

```
go: downloading go.opentelemetry.io/collector/connector/connectortest v0.0.0-20241021181817-007f06b7c4a8
go: go.opentelemetry.io/collector/pipeline/[email protected]: reading go.opentelemetry.io/collector/pipeline/pipelineprofiles/go.mod at revision pipeline/pipelineprofiles/v0.111.0: unknown revision pipeline/pipelineprofiles/v0.111.0
```

connectortest has an indirect dependency on pipelineprofiles, and at
commit `007f06b7c4a8` pipelineprofiles is versioned at v0.111.0. The
latest commit, `403c782d50c6`, will version it at `007f06b7c4a8`. Since
pipelineprofiles has no dependencies, this will not result in any
issues.
HongChenTW pushed a commit to HongChenTW/opentelemetry-collector that referenced this pull request Dec 19, 2024
…try#11512)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Covers the same case as
open-telemetry#11509
HongChenTW pushed a commit to HongChenTW/opentelemetry-collector that referenced this pull request Dec 19, 2024
…y#11668)

#### Description

My previous PR (open-telemetry#11615) which made `component/componenttest` into its
own module tagged it as `v0.113.0` in the requirements of other modules.
This works locally because of the `replace` statements, but since the
module was never _actually_ released as v0.113.0, this causes issues in
contrib (cf. open-telemetry#11509 and open-telemetry#11511).

This PR updates those requirements to use a pseudo-version pointing at a
recent commit on main, which should be properly externally resolvable.

#### Link to tracking issue
None.

#### Testing
I removed the `replace` statements for `componenttest`, ran `make
gotidy`, which allowed `make otelcorecol` to run successfully. Not sure
if this is a thorough enough test however. Once this PR is merged, I
will try `make update-otel [...]` on contrib with the appropriate commit
ID to check that the issue is resolved.
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.

3 participants