You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/en/tracing/setup/cpp.md
+11-8
Original file line number
Diff line number
Diff line change
@@ -21,15 +21,17 @@ further_reading:
21
21
22
22
## Getting Started
23
23
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.
25
25
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].
27
29
28
30
## Compatibility
29
31
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].
31
33
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].
33
35
34
36
## Installation
35
37
@@ -181,7 +183,8 @@ Configure your application level tracers to submit traces to a custom Agent host
Copy file name to clipboardExpand all lines: content/en/tracing/setup/dotnet-core.md
+18-17
Original file line number
Diff line number
Diff line change
@@ -23,9 +23,9 @@ further_reading:
23
23
24
24
## Getting Started
25
25
26
-
<divclass="alert alert-info">If you already have a Datadog account you can find step-by-step instructions in our in-app guides for <ahref="https://app.datadoghq.com/apm/docs?architecture=host-based&language=net"target="_blank">host-based</a> and <ahref="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-basedset ups.
27
27
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.
29
29
30
30
**Note**: The .NET Tracer supports all .NET-based languages (C#, F#, Visual Basic, etc).
- Unhandled exceptions, including stacktraces if available
41
41
- A total count of traces (e.g. web requests) flowing through the system
42
42
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].
44
44
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.
46
46
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.
48
48
49
49
### Installation
50
50
@@ -215,13 +215,13 @@ The .NET Tracer can instrument the following libraries automatically:
215
215
216
216
**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`.
217
217
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.
219
219
220
220
## Manual Instrumentation
221
221
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.
223
223
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].
225
225
226
226
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.
227
227
@@ -321,7 +321,7 @@ The first table below lists configuration variables that are available for both
321
321
|`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>`. |
322
322
|`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`. |
323
323
|`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. |
325
325
|`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). |
326
326
|`DD_LOGS_INJECTION`<br/><br/>`LogsInjectionEnabled`| Enables or disables automatic injection of correlation identifiers into application logs. |
327
327
|`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
Copy file name to clipboardExpand all lines: content/en/tracing/setup/dotnet-framework.md
+16-15
Original file line number
Diff line number
Diff line change
@@ -27,9 +27,9 @@ further_reading:
27
27
28
28
## Getting Started
29
29
30
-
<divclass="alert alert-info">If you already have a Datadog account you can find step-by-step instructions in our in-app guides for <ahref="https://app.datadoghq.com/apm/docs?architecture=host-based&language=net"target="_blank">host-based</a> and <ahref="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-basedset ups.
31
31
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.
33
33
34
34
**Note**: The .NET Tracer supports all .NET-based languages (C#, F#, Visual Basic, etc).
- Unhandled exceptions, including stacktraces if available
45
45
- A total count of traces (e.g. web requests) flowing through the system
46
46
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].
48
48
49
49
### Installation
50
50
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).
52
52
53
53
After installing the .NET Tracer, restart applications so they can read the new environment variables. To restart IIS, run the following commands as administrator:
54
54
@@ -106,13 +106,13 @@ The .NET Tracer can instrument the following libraries automatically:
106
106
107
107
**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`.
108
108
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.
110
110
111
111
## Manual Instrumentation
112
112
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.
114
114
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].
116
116
117
117
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.
118
118
@@ -217,7 +217,7 @@ The first table below lists configuration variables that are available for both
217
217
|`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>`. |
218
218
|`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`. |
219
219
|`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. |
221
221
|`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). |
222
222
|`DD_LOGS_INJECTION`<br/><br/>`LogsInjectionEnabled`| Enables or disables automatic injection of correlation identifiers into application logs. |
223
223
|`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
0 commit comments