Skip to content

Commit 49bec12

Browse files
andrewarditoKaylyn
and
Kaylyn
authored
Andrew.ardito/updates (#7492)
* updates to in-app instructions callout * updates to in-app instructions callout * fixed link * Delete gradle-wrapper.properties * Delete gradlew * Delete gradlew.bat Co-authored-by: Kaylyn <[email protected]>
1 parent af389ad commit 49bec12

File tree

9 files changed

+460
-452
lines changed

9 files changed

+460
-452
lines changed

content/en/tracing/setup/cpp.md

+11-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@ further_reading:
2121

2222
## Getting Started
2323

24-
To begin tracing applications written in any language, first [install and configure the Datadog Agent][3].
24+
If you already have a Datadog account you can find [step-by-step instructions][3] in our in-app guides for either host-based or container-based set ups.
2525

26-
Compile against [OpenTracing-cpp][4].
26+
Otherwise, to begin tracing applications written in any language, first [install and configure the Datadog Agent][4].
27+
28+
Compile against [OpenTracing-cpp][5].
2729

2830
## Compatibility
2931

30-
`dd-opentracing-cpp` requires C++14 to build, but if you use [dynamic loading](#dynamic-loading) then you are instead only limited by OpenTracing's requirement for [C++11 or later][5].
32+
`dd-opentracing-cpp` requires C++14 to build, but if you use [dynamic loading](#dynamic-loading) then you are instead only limited by OpenTracing's requirement for [C++11 or later][6].
3133

32-
Supported platforms include Linux and Mac. If you need Windows support, [contact Datadog support][6].
34+
Supported platforms include Linux and Mac. If you need Windows support, [contact Datadog support][7].
3335

3436
## Installation
3537

@@ -181,7 +183,8 @@ Configure your application level tracers to submit traces to a custom Agent host
181183

182184
[1]: /tracing/setup/envoy/
183185
[2]: /tracing/setup/nginx/
184-
[3]: /tracing/send_traces/
185-
[4]: https://github.com/opentracing/opentracing-cpp
186-
[5]: https://github.com/opentracing/opentracing-cpp/#cc98
187-
[6]: /help/
186+
[3]: https://app.datadoghq.com/apm/install
187+
[4]: /tracing/send_traces/
188+
[5]: https://github.com/opentracing/opentracing-cpp
189+
[6]: https://github.com/opentracing/opentracing-cpp/#cc98
190+
[7]: /help/

content/en/tracing/setup/dotnet-core.md

+18-17
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ further_reading:
2323

2424
## Getting Started
2525

26-
<div class="alert alert-info">If you already have a Datadog account you can find step-by-step instructions in our in-app guides for <a href="https://app.datadoghq.com/apm/docs?architecture=host-based&language=net" target="_blank">host-based</a> and <a href="https://app.datadoghq.com/apm/docs?architecture=container-based&language=net" target="_blank">container-based</a> set ups.</div>
26+
If you already have a Datadog account you can find [step-by-step instructions][1] in our in-app guides for either host-based or container-based set ups.
2727

28-
To begin tracing applications written in any language, first [install and configure the Datadog Agent][1]. The .NET Tracer runs in-process to instrument your applications and sends traces from your application to the Agent.
28+
Otherwise, to begin tracing applications written in any language, first [install and configure the Datadog Agent][2]. The .NET Tracer runs in-process to instrument your applications and sends traces from your application to the Agent.
2929

3030
**Note**: The .NET Tracer supports all .NET-based languages (C#, F#, Visual Basic, etc).
3131

@@ -40,11 +40,11 @@ Automatic instrumentation captures:
4040
- Unhandled exceptions, including stacktraces if available
4141
- A total count of traces (e.g. web requests) flowing through the system
4242

43-
The .NET Tracer supports automatic instrumentation on .NET Core 2.1, 3.0, and 3.1. It also supports [.NET Framework][2].
43+
The .NET Tracer supports automatic instrumentation on .NET Core 2.1, 3.0, and 3.1. It also supports [.NET Framework][3].
4444

45-
**Note:** The .NET Tracer works on .NET Core 2.0, 2.2, and 3.0, but these versions reached their end of life and are no longer supported by Microsoft. See [Microsoft's support policy][3] for more details. We recommend using the latest patch version of .NET Core 2.1 or 3.1.
45+
**Note:** The .NET Tracer works on .NET Core 2.0, 2.2, and 3.0, but these versions reached their end of life and are no longer supported by Microsoft. See [Microsoft's support policy][4] for more details. We recommend using the latest patch version of .NET Core 2.1 or 3.1.
4646

47-
**Note:** Older versions of .NET Core on Linux/x64 have JIT compiler bugs that can cause applications to throw exceptions when using automatic instrumentation. If your application is running on .NET Core 2.0, 2.1.0-2.1.11, or 2.2.0-2.2.5, we strongly recommend you update your .NET Core runtime. If you cannot update, you may need to set the environment variable `DD_CLR_DISABLE_OPTIMIZATIONS=true` to work around the issue. See [DataDog/dd-trace-dotnet/issues/302][4] for more details.
47+
**Note:** Older versions of .NET Core on Linux/x64 have JIT compiler bugs that can cause applications to throw exceptions when using automatic instrumentation. If your application is running on .NET Core 2.0, 2.1.0-2.1.11, or 2.2.0-2.2.5, we strongly recommend you update your .NET Core runtime. If you cannot update, you may need to set the environment variable `DD_CLR_DISABLE_OPTIMIZATIONS=true` to work around the issue. See [DataDog/dd-trace-dotnet/issues/302][5] for more details.
4848

4949
### Installation
5050

@@ -215,13 +215,13 @@ The .NET Tracer can instrument the following libraries automatically:
215215

216216
**Note:** The ADO.NET integration instruments calls made through the `DbCommand` abstract class or the `IDbCommand` interface, regardless of the underlying implementation. It also instruments direct calls to `SqlCommand`.
217217

218-
Don’t see your desired frameworks? Datadog is continually adding additional support. [Check with the Datadog team][5] for help.
218+
Don’t see your desired frameworks? Datadog is continually adding additional support. [Check with the Datadog team][6] for help.
219219

220220
## Manual Instrumentation
221221

222-
To manually instrument your code, add the `Datadog.Trace` [NuGet package][6] to your application. In your code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
222+
To manually instrument your code, add the `Datadog.Trace` [NuGet package][7] to your application. In your code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
223223

224-
For more details on manual instrumentation and custom tagging, see [Manual instrumentation documentation][7].
224+
For more details on manual instrumentation and custom tagging, see [Manual instrumentation documentation][8].
225225

226226
Manual instrumentation is supported on .NET Framework 4.5 and above on Windows and on .NET Core 2.1, 3.0, and 3.1 on Windows and Linux.
227227

@@ -321,7 +321,7 @@ The first table below lists configuration variables that are available for both
321321
| `DD_TRACE_AGENT_URL`<br/><br/>`AgentUri` | Sets the URL endpoint where traces are sent. Overrides `DD_AGENT_HOST` and `DD_TRACE_AGENT_PORT` if set. Default value is `http://<DD_AGENT_HOST>:<DD_TRACE_AGENT_PORT>`. |
322322
| `DD_AGENT_HOST` | Sets the host where traces are sent (the host running the Agent). Can be a hostname or an IP address. Ignored if `DD_TRACE_AGENT_URL` is set. Default is value `localhost`. |
323323
| `DD_TRACE_AGENT_PORT` | Sets the port where traces are sent (the port where the Agent is listening for connections). Ignored if `DD_TRACE_AGENT_URL` is set. Default value is `8126`. |
324-
| `DD_ENV`<br/><br/>`Environment` | If specified, adds the `env` tag with the specified value to all generated spans. See [Agent configuration][8] for more details about the `env` tag. |
324+
| `DD_ENV`<br/><br/>`Environment` | If specified, adds the `env` tag with the specified value to all generated spans. See [Agent configuration][9] for more details about the `env` tag. |
325325
| `DD_SERVICE_NAME`<br/><br/>`ServiceName` | If specified, sets the default service name. Otherwise, the .NET Tracer tries to determine service name automatically from application name (e.g. IIS application name, process entry assembly, or process name). |
326326
| `DD_LOGS_INJECTION`<br/><br/>`LogsInjectionEnabled` | Enables or disables automatic injection of correlation identifiers into application logs. |
327327
| `DD_TRACE_GLOBAL_TAGS`<br/><br/>`GlobalTags` | If specified, adds all of the specified tags to all generated spans. |
@@ -350,11 +350,12 @@ The following table lists configuration variables that are available only when u
350350
{{< partial name="whats-next/whats-next.html" >}}
351351

352352

353-
[1]: /tracing/send_traces/
354-
[2]: /tracing/setup/dotnet-framework/
355-
[3]: https://dotnet.microsoft.com/platform/support/policy/dotnet-core
356-
[4]: https://github.com/DataDog/dd-trace-dotnet/issues/302#issuecomment-603269367
357-
[5]: /help/
358-
[6]: https://www.nuget.org/packages/Datadog.Trace
359-
[7]: /tracing/manual_instrumentation/dotnet/
360-
[8]: /tracing/guide/setting_primary_tags_to_scope/#environment
353+
[1]: https://app.datadoghq.com/apm/install
354+
[2]: /tracing/send_traces/
355+
[3]: /tracing/setup/dotnet-framework/
356+
[4]: https://dotnet.microsoft.com/platform/support/policy/dotnet-core
357+
[5]: https://github.com/DataDog/dd-trace-dotnet/issues/302#issuecomment-603269367
358+
[6]: /help/
359+
[7]: https://www.nuget.org/packages/Datadog.Trace
360+
[8]: /tracing/manual_instrumentation/dotnet/
361+
[9]: /tracing/guide/setting_primary_tags_to_scope/#environment

content/en/tracing/setup/dotnet-framework.md

+16-15
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ further_reading:
2727

2828
## Getting Started
2929

30-
<div class="alert alert-info">If you already have a Datadog account you can find step-by-step instructions in our in-app guides for <a href="https://app.datadoghq.com/apm/docs?architecture=host-based&language=net" target="_blank">host-based</a> and <a href="https://app.datadoghq.com/apm/docs?architecture=container-based&language=net" target="_blank">container-based</a> set ups.</div>
30+
If you already have a Datadog account you can find [step-by-step instructions][1] in our in-app guides for either host-based or container-based set ups.
3131

32-
To begin tracing applications written in any language, first [install and configure the Datadog Agent][1]. The .NET Tracer runs in-process to instrument your applications and sends traces from your application to the Agent.
32+
Otherwise, to begin tracing applications written in any language, first [install and configure the Datadog Agent][2]. The .NET Tracer runs in-process to instrument your applications and sends traces from your application to the Agent.
3333

3434
**Note**: The .NET Tracer supports all .NET-based languages (C#, F#, Visual Basic, etc).
3535

@@ -44,11 +44,11 @@ Automatic instrumentation captures:
4444
- Unhandled exceptions, including stacktraces if available
4545
- A total count of traces (e.g. web requests) flowing through the system
4646

47-
The .NET Tracer supports automatic instrumentation on .NET Framework 4.5 and above. It also supports [.NET Core][2].
47+
The .NET Tracer supports automatic instrumentation on .NET Framework 4.5 and above. It also supports [.NET Core][3].
4848

4949
### Installation
5050

51-
To use automatic instrumentation on Windows, install the .NET Tracer on the host using the [MSI installer for Windows][3]. Choose the installer for the architecture that matches the operating system (x64 or x86).
51+
To use automatic instrumentation on Windows, install the .NET Tracer on the host using the [MSI installer for Windows][4]. Choose the installer for the architecture that matches the operating system (x64 or x86).
5252

5353
After installing the .NET Tracer, restart applications so they can read the new environment variables. To restart IIS, run the following commands as administrator:
5454

@@ -106,13 +106,13 @@ The .NET Tracer can instrument the following libraries automatically:
106106

107107
**Note:** The ADO.NET integration instruments calls made through the `DbCommand` abstract class or the `IDbCommand` interface, regardless of the underlying implementation. It also instruments direct calls to `SqlCommand`.
108108

109-
Don’t see your desired frameworks? Datadog is continually adding additional support. [Check with the Datadog team][4] for help.
109+
Don’t see your desired frameworks? Datadog is continually adding additional support. [Check with the Datadog team][5] for help.
110110

111111
## Manual Instrumentation
112112

113-
To manually instrument your code, add the `Datadog.Trace` [NuGet package][5] to your application. In your code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
113+
To manually instrument your code, add the `Datadog.Trace` [NuGet package][6] to your application. In your code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
114114

115-
For more details on manual instrumentation and custom tagging, see [Manual instrumentation documentation][6].
115+
For more details on manual instrumentation and custom tagging, see [Manual instrumentation documentation][7].
116116

117117
Manual instrumentation is supported on .NET Framework 4.5 and above on Windows and on .NET Core 2.1, 3.0, and 3.1 on Windows and Linux.
118118

@@ -217,7 +217,7 @@ The first table below lists configuration variables that are available for both
217217
| `DD_TRACE_AGENT_URL`<br/><br/>`AgentUri` | Sets the URL endpoint where traces are sent. Overrides `DD_AGENT_HOST` and `DD_TRACE_AGENT_PORT` if set. Default value is `http://<DD_AGENT_HOST>:<DD_TRACE_AGENT_PORT>`. |
218218
| `DD_AGENT_HOST` | Sets the host where traces are sent (the host running the Agent). Can be a hostname or an IP address. Ignored if `DD_TRACE_AGENT_URL` is set. Default is value `localhost`. |
219219
| `DD_TRACE_AGENT_PORT` | Sets the port where traces are sent (the port where the Agent is listening for connections). Ignored if `DD_TRACE_AGENT_URL` is set. Default value is `8126`. |
220-
| `DD_ENV`<br/><br/>`Environment` | If specified, adds the `env` tag with the specified value to all generated spans. See [Agent configuration][7] for more details about the `env` tag. |
220+
| `DD_ENV`<br/><br/>`Environment` | If specified, adds the `env` tag with the specified value to all generated spans. See [Agent configuration][8] for more details about the `env` tag. |
221221
| `DD_SERVICE_NAME`<br/><br/>`ServiceName` | If specified, sets the default service name. Otherwise, the .NET Tracer tries to determine service name automatically from application name (e.g. IIS application name, process entry assembly, or process name). |
222222
| `DD_LOGS_INJECTION`<br/><br/>`LogsInjectionEnabled` | Enables or disables automatic injection of correlation identifiers into application logs. |
223223
| `DD_TRACE_GLOBAL_TAGS`<br/><br/>`GlobalTags` | If specified, adds all of the specified tags to all generated spans. |
@@ -244,10 +244,11 @@ The following table lists configuration variables that are available only when u
244244

245245
{{< partial name="whats-next/whats-next.html" >}}
246246

247-
[1]: /tracing/send_traces/
248-
[2]: /tracing/setup/dotnet-core/
249-
[3]: https://github.com/DataDog/dd-trace-dotnet/releases
250-
[4]: /help/
251-
[5]: https://www.nuget.org/packages/Datadog.Trace
252-
[6]: /tracing/manual_instrumentation/dotnet/
253-
[7]: /tracing/guide/setting_primary_tags_to_scope/#environment
247+
[1]: https://app.datadoghq.com/apm/install
248+
[2]: /tracing/send_traces/
249+
[3]: /tracing/setup/dotnet-core/
250+
[4]: https://github.com/DataDog/dd-trace-dotnet/releases
251+
[5]: /help/
252+
[6]: https://www.nuget.org/packages/Datadog.Trace
253+
[7]: /tracing/manual_instrumentation/dotnet/
254+
[8]: /tracing/guide/setting_primary_tags_to_scope/#environment

0 commit comments

Comments
 (0)