Skip to content

Refactor folder locations#1530

Closed
andrewlock wants to merge 20 commits into
masterfrom
andrew/refactor/product-folders-rebase
Closed

Refactor folder locations#1530
andrewlock wants to merge 20 commits into
masterfrom
andrew/refactor/product-folders-rebase

Conversation

@andrewlock

@andrewlock andrewlock commented Jun 11, 2021

Copy link
Copy Markdown
Member

Primarily work done by @zacharycmontoya to move the src/test etc folders into a tracer sub-directory.

I just did the final pieces to fix minor CI issues, so Ill defer to Zach for details:

Changes

This PR moves almost all of the code related to development/test/build of the .NET Tracer into a /tracer directory to allow for better code partitioning when we add more products into the repo. File changes include:

  • Directories moved from / to /tracer/
    • build
    • samples
    • src
    • test
    • tools
  • Individual files moved from / to /tracer/
    • build.cmd
    • build.ps1
    • build.sh
    • build_in_docker.sh
    • integrations.json
    • stylecop.json
  • Intermediate artifact folders moved from /src/bin to /tracer/bin
    • windows-tracer-home
    • managed-publish

@DataDog/apm-dotnet

@andrewlock andrewlock requested a review from a team as a code owner June 11, 2021 13:48

@andrewlock andrewlock left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Clicked through about 1500 files and they all said "content is identical", and it builds, so LGTM! 👍

Comment thread .gitignore
Comment on lines +280 to +282
tracer/deploy/linux/
tracer/deploy/AzureAppServices/
!tracer/build/artifacts

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Are these actually required? I think they're probably left overs from an old build process?

@lucaspimentel lucaspimentel Jun 11, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

!tracer/build/artifacts seems correct, because there's a file there that we don't want to ignore. I'm guessing this was added because this line ignores folders named artifacts. Maybe the better fix is to remove both.

artifacts/

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Regarding deploy/, the wix project that builds the msi used to live there before we moved it in #973. I don't think we use deploy/AzureAppServices/, either. @colin-higgins may know better.

AbsolutePath MsBuildProject => RootDirectory / "Datadog.Trace.proj";

AbsolutePath OutputDirectory => RootDirectory / "bin";
AbsolutePath OutputDirectory => RootDirectory / "tracer" / "bin";

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

nit: we should probably extract RootDirectory / "tracer" to a property. Not for this PR, just a note!

@zacharycmontoya zacharycmontoya added the status:do-not-merge Work is done. Can review, but do not merge yet. label Jun 22, 2021
@zacharycmontoya

Copy link
Copy Markdown
Contributor

Closed via #1748

@andrewlock andrewlock deleted the andrew/refactor/product-folders-rebase branch September 10, 2021 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status:do-not-merge Work is done. Can review, but do not merge yet. type:refactor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants