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] Use pseudo-versions to require componenttest #11668

Merged

Conversation

jade-guiton-dd
Copy link
Contributor

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.

@jade-guiton-dd jade-guiton-dd requested a review from a team as a code owner November 13, 2024 10:31
Copy link

codecov bot commented Nov 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.59%. Comparing base (9c4c007) to head (2528d3f).
Report is 15 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #11668   +/-   ##
=======================================
  Coverage   91.58%   91.59%           
=======================================
  Files         440      440           
  Lines       23765    23755   -10     
=======================================
- Hits        21766    21759    -7     
+ Misses       1627     1625    -2     
+ Partials      372      371    -1     

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

@jade-guiton-dd jade-guiton-dd changed the title Use pseudo-versions to require componenttest [chore] Use pseudo-versions to require componenttest Nov 13, 2024
@songy23 songy23 added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Nov 13, 2024
@bogdandrutu bogdandrutu merged commit 115568a into open-telemetry:main Nov 13, 2024
65 of 66 checks passed
@github-actions github-actions bot added this to the next release milestone Nov 13, 2024
bogdandrutu pushed a commit that referenced this pull request Nov 15, 2024
#### Description

Now that the PR to split `extensiontest` into its own module (#11629)
has landed, we can import the new module in an externally-resolvable way
using the pseudo-version corresponding to the merge commit, similar to
what I did for `componenttest` (#11668). After the next release
(0.114.0), we will be able to use that version number instead for
internal imports.
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.
djaglowski pushed a commit to djaglowski/opentelemetry-collector that referenced this pull request Nov 21, 2024
…y#11677)

#### Description

Now that the PR to split `extensiontest` into its own module (open-telemetry#11629)
has landed, we can import the new module in an externally-resolvable way
using the pseudo-version corresponding to the merge commit, similar to
what I did for `componenttest` (open-telemetry#11668). After the next release
(0.114.0), we will be able to use that version number instead for
internal imports.
bogdandrutu pushed a commit that referenced this pull request Nov 21, 2024
#### Description
Now that #11705 has been merged, splitting the `extension/auth/authtest`
package into a separate module, this PR updates imports of the new
module to an externally resolvable pseudo-version based on the merge
commit (f2e05b5). (See #11668 for context on why this two-step process
is necessary.)

#### Link to tracking issue
Resolves #11465
@jade-guiton-dd jade-guiton-dd deleted the componenttest-pseudover branch November 27, 2024 13:37
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.
HongChenTW pushed a commit to HongChenTW/opentelemetry-collector that referenced this pull request Dec 19, 2024
…y#11677)

#### Description

Now that the PR to split `extensiontest` into its own module (open-telemetry#11629)
has landed, we can import the new module in an externally-resolvable way
using the pseudo-version corresponding to the merge commit, similar to
what I did for `componenttest` (open-telemetry#11668). After the next release
(0.114.0), we will be able to use that version number instead for
internal imports.
HongChenTW pushed a commit to HongChenTW/opentelemetry-collector that referenced this pull request Dec 19, 2024
#### Description
Now that open-telemetry#11705 has been merged, splitting the `extension/auth/authtest`
package into a separate module, this PR updates imports of the new
module to an externally resolvable pseudo-version based on the merge
commit (f2e05b5). (See open-telemetry#11668 for context on why this two-step process
is necessary.)

#### Link to tracking issue
Resolves open-telemetry#11465
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants