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

[repo] Fix conflicts caused by DS upgrade #4967

Merged
merged 8 commits into from
Oct 19, 2023

Conversation

CodeBlanch
Copy link
Member

@CodeBlanch CodeBlanch commented Oct 19, 2023

It looks like #4959 introduced some assembly conflicts:

https://github.com/open-telemetry/opentelemetry-dotnet/actions/runs/6554128228/job/17800577378#step:5:35

These were not caught by CI!

Phase 1 - Surface issues:

Phase 2 - Fixes:

@codecov
Copy link

codecov bot commented Oct 19, 2023

Codecov Report

Merging #4967 (ef6f838) into main (0f58eb1) will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4967      +/-   ##
==========================================
+ Coverage   83.30%   83.33%   +0.03%     
==========================================
  Files         295      295              
  Lines       12361    12361              
==========================================
+ Hits        10297    10301       +4     
+ Misses       2064     2060       -4     
Flag Coverage Δ
unittests 83.33% <ø> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 4 files with indirect coverage changes

@CodeBlanch CodeBlanch marked this pull request as ready for review October 19, 2023 19:25
@CodeBlanch CodeBlanch requested a review from a team October 19, 2023 19:25
@@ -1,6 +1,7 @@
<Project>
<ItemGroup>
<SolutionProjects Include="..\**\OpenTelemetry.Instrumentation*.csproj" />
<TestProjects Include="..\test\**\OpenTelemetry.Instrumentation*.csproj" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Why add this? Did you mean to update the instrumentation libraries CI workflow to use this InstrumentationLibraries.proj file to run tests?

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 updated the workflow to call dotnet test InstrumentationLibraries.proj --framework ${{matrix.version}} but then it fails when some projects don't have a specific target (some libraries don't target net462 for example) so I had to revert it. I left the test targets in InstrumentationLibraries.proj & OpenTelemetry.proj though because I thought it was nice to be able to do dotnet test [project_name].proj on the CLI for local things. But I can remove them if you want they aren't officially being called at the moment. My thinking is basically project files should define at least Restore, Build, and VSTest targets (that's what I'm doing over here on contrib).

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's fine to have them defined.

@utpilla utpilla merged commit 50d3af0 into open-telemetry:main Oct 19, 2023
@CodeBlanch CodeBlanch deleted the reference-conflict-fixes branch October 20, 2023 04:10
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