Skip to content

Commit 0aae062

Browse files
authored
Merging repos: 'dd-shared-components-dotnet' into 'dd-trace-dotnet'. (DataDog#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...
1 parent b4b1a37 commit 0aae062

File tree

305 files changed

+63967
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+63967
-2
lines changed

.EnlistmentRoot.marker

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Do not delete or move this file!
2+
This file is required by the binary output placement logic for the entire repository defined in the Directory.Build.props.
3+
Make sure you understand that logic before touching this file!

.SourceRoot.marker

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Do not delete or move this file!
2+
This file is required by the binary output placement logic for the entire repository defined in the Directory.Build.props.
3+
Make sure you understand that logic before touching this file!

.gitignore

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
2+
# # C++ specific ignores:
3+
4+
# Prerequisites
5+
*.d
6+
7+
# Compiled Object files
8+
*.slo
9+
*.lo
10+
*.o
11+
*.obj
12+
13+
# Precompiled Headers
14+
*.gch
15+
*.pch
16+
17+
# Compiled Dynamic libraries
18+
*.so
19+
*.dylib
20+
*.dll
21+
22+
# Fortran module files
23+
*.mod
24+
*.smod
25+
26+
# Compiled Static libraries
27+
*.lai
28+
*.la
29+
*.a
30+
31+
# Executables
32+
*.exe
33+
*.out
34+
*.app
35+
36+
# # .NET specific ignores:
37+
138
## Ignore Visual Studio temporary files, build results, and
239
## files generated by popular Visual Studio add-ons.
340

NOTICE

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
Datadog .NET Tracer for APM (dd-trace-dotnet)
2-
Copyright 2017 Datadog, Inc.
1+
Application Telemetry & Performance Monitoring Product Suite for .NET Applications
2+
Datadog
3+
4+
(dd-trace-dotnet)
5+
6+
Copyright 2017-2021 Datadog, Inc.
37

48
This product includes software developed at Datadog (https://www.datadoghq.com/).

profiler/README.MD

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# dd-trace-dotnet/profiler
2+
3+
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.
4+
5+
This directory (`/profiler`) contains the source for the __Continuous Profiler for .NET__ product, which is a part of that product suite.
6+
7+
### Copyright
8+
9+
Copyright (c) 2017-2021 Datadog
10+
[https://www.datadoghq.com](https://www.datadoghq.com/)
11+
12+
### License
13+
14+
See [license information](./LICENSE).
15+
16+
## Note
17+
18+
Currently, this directory is empty.
19+
It is a placeholder for the Profiler sources, which will be available here in the future.
20+
In the meantime, the Profiler is available as a private preview via [dd-continuous-profiler-dotnet](https://github.com/DataDog/dd-continuous-profiler-dotnet).
21+

0 commit comments

Comments
 (0)