Skip to content

Commit

Permalink
Merging repos: 'dd-shared-components-dotnet' into 'dd-trace-dotnet'. (#…
Browse files Browse the repository at this point in the history
…1694)

This is the first of several self-contained PRs targeted at moving the Shared Code (as in _shared between the Tracer and the Profiler_) from [dd-shared-components-dotnet](https://github.com/DataDog/dd-shared-components-dotnet) into [dd-trace-dotnet](https://github.com/DataDog/dd-trace-dotnet).

For this PR, I created a branch `permanent/MoveFrom_dd-shared-components-dotnet` and moved all files from the `dd-shared-components-dotnet` into there, including their complete change history. The branch will remain permanently as a history record, and we will squash-merge this PR into the `master` branch. The files are all inside the `/shared` folder, so that they can be naturally merged into the planned joint directory structure.

In addition, this PR also makes the following small changes:

* Make whatever tweaks necessary so that _all_ the Shared Code projects build inside `dd-trace-dotnet`.
* Set up placeholder folders for the `/tracer` and the `/profiler` products to facilitate the directory refactoring in the subsequent PRs.
* Update ReadMe files to describe the changes.

Note that this PR keeps the directory structure within the `/shared` folder exactly as it was within the original repo. Subsequent changed will adjust this structure to joint conventions as required. This will require coordination with the profiler build configuration which makes some assumptions about the layout of the relevant folders.

This change is self-contained. It will not affect any existing Tracer components, and it will allow the overall repo merge project to proceed in several steps that can be validated independently.

This PR will be followed up with additional PR to address the following:

* Move Tracer-specific files into the `/tracer` folder.
* Ensure that changes contained to shared files that are not (yet) used by the Tracer do not require the Tracer CI validation to pass (this will be updated in the future if and when the Tracer uses more shared components)
* Joint build of components used by several products.
* Joint release package.
* Joint conventions for folder structure.
* Etc...
  • Loading branch information
macrogreg authored Aug 24, 2021
1 parent b4b1a37 commit 0aae062
Show file tree
Hide file tree
Showing 305 changed files with 63,967 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .EnlistmentRoot.marker
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Do not delete or move this file!
This file is required by the binary output placement logic for the entire repository defined in the Directory.Build.props.
Make sure you understand that logic before touching this file!
3 changes: 3 additions & 0 deletions .SourceRoot.marker
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Do not delete or move this file!
This file is required by the binary output placement logic for the entire repository defined in the Directory.Build.props.
Make sure you understand that logic before touching this file!
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@

# # C++ specific ignores:

# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a

# Executables
*.exe
*.out
*.app

# # .NET specific ignores:

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

Expand Down
8 changes: 6 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Datadog .NET Tracer for APM (dd-trace-dotnet)
Copyright 2017 Datadog, Inc.
Application Telemetry & Performance Monitoring Product Suite for .NET Applications
Datadog

(dd-trace-dotnet)

Copyright 2017-2021 Datadog, Inc.

This product includes software developed at Datadog (https://www.datadoghq.com/).
21 changes: 21 additions & 0 deletions profiler/README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# dd-trace-dotnet/profiler

This repo ([dd-trace-dotnet](https://github.com/DataDog/dd-trace-dotnet)) contains the sources for the client-side components of the Datadog product suite for Application Telemetry Collection and Application Performance Monitoring for .NET Applications.

This directory (`/profiler`) contains the source for the __Continuous Profiler for .NET__ product, which is a part of that product suite.

### Copyright

Copyright (c) 2017-2021 Datadog
[https://www.datadoghq.com](https://www.datadoghq.com/)

### License

See [license information](./LICENSE).

## Note

Currently, this directory is empty.
It is a placeholder for the Profiler sources, which will be available here in the future.
In the meantime, the Profiler is available as a private preview via [dd-continuous-profiler-dotnet](https://github.com/DataDog/dd-continuous-profiler-dotnet).

Loading

0 comments on commit 0aae062

Please sign in to comment.