Note: Filtering traces using any of the following options removes these requests from trace metrics. For information on how to reduce ingestion without affecting the trace metrics, see ingestion controls.
@@ -18,7 +18,7 @@ If you need assistance, contact [Datadog support][1].
The Trace Agent component within the Datadog Agent has two methods to prevent certain traces from coming through: ignoring span tags or ignoring resources. If traces are dropped due to these settings, the trace metrics exclude these requests.
-Configuring the Trace Agent to ignore certain spans or resources applies to all services that send traces to this particular Datadog Agent. If you have application-specific requirements, use the [Tracer configuration](#tracer-configuration) method instead.
+Configuring the Trace Agent to ignore certain spans or resources applies to all services that send traces to this particular Datadog Agent. If you have application-specific requirements, use the [APM SDK configuration](#tracer-configuration) method instead.
### Ignoring based on span tags
@@ -114,7 +114,7 @@ On the backend, Datadog creates and adds the following span tags to spans after
| `http.useragent_details.device.family` | The device family reported by the User-Agent. |
Note: Starting from October 1st 2022, Datadog backend applies a remapping in order to apply Span Tags Semantics
- across tracers on all ingested spans. If you want to drop spans based on tags at the Datadog Agent level, use tags in the Remap from column.
+ across APM SDKs on all ingested spans. If you want to drop spans based on tags at the Datadog Agent level, use tags in the Remap from column.
#### Network communications
@@ -210,7 +210,7 @@ apm_config:
Consider a trace that contains calls to `/api/healthcheck` that you don't want traces from:
-{{< img src="tracing/guide/ignoring_apm_resources/ignoreresources.png" alt="Flame graph of a resource you want the tracer to ignore" style="width:90%;">}}
+{{< img src="tracing/guide/ignoring_apm_resources/ignoreresources.png" alt="Flame graph of a resource you want the APM SDK to ignore" style="width:90%;">}}
Take note of the resource name of the global root span.
@@ -385,9 +385,9 @@ If you use Amazon ECS (such as on EC2), in your Datadog Agent container definiti
Note: Filtering traces this way removes these requests from trace metrics. For information on how to reduce ingestion without affecting the trace metrics, see ingestion controls.
-## Tracer configuration options
+## APM SDK configuration options
-Some of the language-specific tracers have an option to modify spans before they are sent to the Datadog Agent. Use this option if you have application-specific requirements and are using a language listed below.
+Some of the language-specific APM SDKs have an option to modify spans before they are sent to the Datadog Agent. Use this option if you have application-specific requirements and are using a language listed below.
Important: If the request is associated with a distributed trace, the resulting trace can have sampling inaccuracy if you drop portions of it due to these filtering rules.
@@ -396,7 +396,7 @@ Some of the language-specific tracers have an option to modify spans before they
{{< programming-lang lang="ruby" >}}
-The Ruby tracer has a post-processing pipeline that removes traces that meet certain criteria. More information and examples can be found in [Post-processing traces][1].
+The Ruby APM SDK has a post-processing pipeline that removes traces that meet certain criteria. More information and examples can be found in [Post-processing traces][1].
For example, if the resource name is `Api::HealthchecksController#index`, use the `Datadog::Tracing::Pipeline::SpanFilter` class to remove traces that contain the resource name. This filter can also be used to match on other metadata available for the [span object][2].
@@ -412,7 +412,7 @@ Datadog::Tracing.before_flush(
{{< programming-lang lang="python" >}}
-The Python tracer has a `FilterRequestsOnUrl` filter you can configure to remove traces from certain endpoints. Alternatively, you can write a custom filter. See [Trace Filtering][1] for more information.
+The Python APM SDK has a `FilterRequestsOnUrl` filter you can configure to remove traces from certain endpoints. Alternatively, you can write a custom filter. See [Trace Filtering][1] for more information.
Suppose the root span's `http.url` span tag has a value of `http://Note: The tracer configuration for the integration must come before that instrumented module is imported.
+Note: The APM SDK configuration for the integration must come before that instrumented module is imported.
[1]: https://datadoghq.dev/dd-trace-js/interfaces/export_.plugins.connect.html#blocklist
{{< /programming-lang >}}
{{< programming-lang lang="java" >}}
-The Java tracer has an option for a custom `TraceInterceptor` to filter out certain spans. See [Extending Tracers][1].
+The Java APM SDK has an option for a custom `TraceInterceptor` to filter out certain spans. See [Extending APM SDKs][1].
For example, if your resource name is `GET /healthcheck`, write a trace interceptor that drops traces containing this resource name. Adjust the logic to meet your use case.
@@ -484,7 +484,7 @@ public class GreetingController {
}
```
-[1]: /tracing/trace_collection/custom_instrumentation/java/#extending-tracers
+[1]: /tracing/trace_collection/custom_instrumentation/java/#extending-apm-sdks
{{< /programming-lang >}}
{{< /programming-lang-wrapper >}}
diff --git a/content/en/tracing/guide/inferred-service-opt-in.md b/content/en/tracing/guide/inferred-service-opt-in.md
index 7c0f1c8359c38..24c1a76d19161 100644
--- a/content/en/tracing/guide/inferred-service-opt-in.md
+++ b/content/en/tracing/guide/inferred-service-opt-in.md
@@ -12,7 +12,7 @@ further_reading:
text: "Sending Traces to Datadog"
- link: "/tracing/trace_collection/dd_libraries/"
tag: "Documentation"
- text: "Add the Datadog Tracing Library"
+ text: "Add the Datadog APM SDK"
---
{{< callout url="https://docs.google.com/forms/d/1imGm-4SfOPjwAr6fwgMgQe88mp4Y-n_zV0K3DcNW4UA/edit" d_target="#signupModal" btn_hidden="true" btn_hidden="false" header="Opt in to the private beta!" >}}
@@ -27,7 +27,7 @@ With the new inferred entities experience, you can filter [Service Catalog][3] e
To determine the names and types of the inferred service dependencies, Datadog uses standard span attributes and maps them to `peer.*` attributes. For the full list of `peer.*` attributes, see [Inferred service dependencies nomenclature](#inferred-service-dependencies-nomemclature). Inferred external APIs use the default naming scheme `net.peer.name`. For example, `api.stripe.com`, `api.twilio.com`, `us6.api.mailchimp.com`. Inferred databases use the default naming scheme `db.instance`.
-If you're using the Go, Java, NodeJS, PHP, .NET, or Ruby tracer, you can customize the default names for inferred entities.
+If you're using the Go, Java, NodeJS, PHP, .NET, or Ruby APM SDK you can customize the default names for inferred entities.
**Note:** If you configure monitors, dashboards, or notebooks for a given inferred service during the beta, you may need to update them if the naming scheme changes. Read more about migration steps in the [opt-in instructions](#opt-in).
@@ -43,7 +43,7 @@ Use the dependency map to visualize service-to-service communication and gain in
To opt in, Datadog recommends you adjust your:
- [Datadog Agent](#datadog-agent-configuration) (or [OpenTelemetry collector](#opentelemetry-collector)) configuration
-- [APM tracing libraries](#apm-tracing-library-configuration) configuration
+- [APM SDKs](#apm-sdk-configuration) configuration
### Datadog Agent configuration
@@ -63,7 +63,7 @@ Alternatively, configure this by setting the following environment variables in
{{< code-block collapsible="true" lang="yaml" >}}
-DD_APM_COMPUTE_STATS_BY_SPAN_KIND=true
+DD_APM_COMPUTE_STATS_BY_SPAN_KIND=true
DD_APM_PEER_TAGS_AGGREGATION=true
{{< /code-block >}}
@@ -85,18 +85,18 @@ Alternatively, configure this by setting the following environment variables in
{{< code-block collapsible="true" lang="yaml" >}}
-DD_APM_COMPUTE_STATS_BY_SPAN_KIND=true
+DD_APM_COMPUTE_STATS_BY_SPAN_KIND=true
DD_APM_PEER_TAGS_AGGREGATION=true
DD_APM_PEER_TAGS='["_dd.base_service","amqp.destination","amqp.exchange","amqp.queue","aws.queue.name","aws.s3.bucket","bucketname","cassandra.keyspace","db.cassandra.contact.points","db.couchbase.seed.nodes","db.hostname","db.instance","db.name","db.namespace","db.system","grpc.host","hostname","http.host","http.server_name","messaging.destination","messaging.destination.name","messaging.kafka.bootstrap.servers","messaging.rabbitmq.exchange","messaging.system","mongodb.db","msmq.queue.path","net.peer.name","network.destination.name","peer.hostname","peer.service","queuename","rpc.service","rpc.system","server.address","streamname","tablename","topicname"]'
{{< /code-block >}}
-#### Helm
+#### Helm
Include the same set of environment variables in your `values.yaml` [file][8].
-### OpenTelemetry Collector
+### OpenTelemetry Collector
Minimum version recommended: opentelemetry-collector-contrib >= [v0.95.0][7].
@@ -123,23 +123,23 @@ exporters:
traces:
compute_stats_by_span_kind: true
peer_tags_aggregation: true
- peer_tags: ["_dd.base_service","amqp.destination","amqp.exchange","amqp.queue","aws.queue.name","aws.s3.bucket","bucketname","db.cassandra.contact.points","db.couchbase.seed.nodes","db.hostname","db.instance","db.name","db.namespace","db.system","grpc.host","hostname","http.host","http.server_name","messaging.destination","messaging.destination.name","messaging.kafka.bootstrap.servers","messaging.rabbitmq.exchange","messaging.system","mongodb.db","msmq.queue.path","net.peer.name","network.destination.name","peer.hostname","peer.service","queuename","rpc.service","rpc.system","server.address","streamname","tablename","topicname"]
+ peer_tags: ["_dd.base_service","amqp.destination","amqp.exchange","amqp.queue","aws.queue.name","aws.s3.bucket","bucketname","db.cassandra.contact.points","db.couchbase.seed.nodes","db.hostname","db.instance","db.name","db.namespace","db.system","grpc.host","hostname","http.host","http.server_name","messaging.destination","messaging.destination.name","messaging.kafka.bootstrap.servers","messaging.rabbitmq.exchange","messaging.system","mongodb.db","msmq.queue.path","net.peer.name","network.destination.name","peer.hostname","peer.service","queuename","rpc.service","rpc.system","server.address","streamname","tablename","topicname"]
{{< /code-block >}}
-### APM tracing library configuration
+### APM SDK configuration
The following steps introduce a breaking change: Datadog will change the way service names are captured by default. Refer to Global default service naming migration, to determine if you need to take any migration actions.
{{< tabs >}}
{{% tab "Java" %}}
-The minimum Java tracer version required is 1.16.0. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum Java APM SDK version required is 1.16.0. Regular updates to the latest version are recommended to access changes and bug fixes.
-[Download the latest Java tracer version][1].
+[Download the latest Java APM SDK version][1].
-To opt in, add the following environment variables or system properties to your tracer settings:
+To opt in, add the following environment variables or system properties to your APM SDK settings:
| Environment variable | System property |
| --- | ----------- |
@@ -159,9 +159,9 @@ Remove the following settings from your configuration:
{{% tab "Go" %}}
-The minimum Go tracer version required is [v1.52.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum Go APM SDK version required is [v1.52.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variables or system properties to your tracer settings:
+To opt in, add the following environment variables or system properties to your APM SDK settings:
| Environment variable | System property |
| --- | ----------- |
@@ -173,9 +173,9 @@ To opt in, add the following environment variables or system properties to your
{{% tab "NodeJS" %}}
-The minimum NodeJS tracer versions required are [2.44.0][1], [3.31.0][2], or [4.10.0][3]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum NodeJS APM SDK versions required are [2.44.0][1], [3.31.0][2], or [4.10.0][3]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variables or system properties to your tracer settings:
+To opt in, add the following environment variables or system properties to your APM SDK settings:
| Environment variable | System property |
| --- | ----------- |
@@ -188,9 +188,9 @@ To opt in, add the following environment variables or system properties to your
{{% /tab %}}
{{% tab "PHP" %}}
-The minimum PHP tracer version required is [0.90.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum PHP APM SDK version required is [0.90.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variables or system properties to your tracer settings:
+To opt in, add the following environment variables or system properties to your APM SDK settings:
| Environment variable | System property |
| --- | ----------- |
@@ -201,9 +201,9 @@ To opt in, add the following environment variables or system properties to your
{{% tab ".NET" %}}
-The minimum .NET tracer version required is [v2.35.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum .NET APM SDK version required is [v2.35.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variable to your tracer settings or system properties:
+To opt in, add the following environment variable to your APM SDK settings or system properties:
- `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true`
[1]: https://github.com/DataDog/dd-trace-dotnet/releases/tag/v2.35.0
@@ -212,23 +212,23 @@ To opt in, add the following environment variable to your tracer settings or sys
{{% tab "Python" %}}
-The minimum Python tracer version required is [v1.16.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum Python APM SDK version required is [v1.16.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variables to your tracer settings or system properties:
+To opt in, add the following environment variables to your APM SDK settings or system properties:
-Add the following environment variables to your tracer settings or system properties:
+Add the following environment variables to your APM SDK settings or system properties:
- `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true`
-As of tracer version `v1.16.0` all libraries are supported except for Boto2.
+As of APM SDK version `v1.16.0` all libraries are supported except for Boto2.
[1]: https://github.com/DataDog/dd-trace-py/releases/tag/v1.16.0
{{% /tab %}}
{{% tab "Ruby" %}}
-The minimum Ruby tracer version required is [v1.13.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
+The minimum Ruby APM SDK version required is [v1.13.0][1]. Regular updates to the latest version are recommended to access changes and bug fixes.
-To opt in, add the following environment variables to your tracer settings or system properties:
+To opt in, add the following environment variables to your APM SDK settings or system properties:
- `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true`
[1]: https://github.com/DataDog/dd-trace-rb/releases/tag/v1.13.0
@@ -240,7 +240,7 @@ To opt in, add the following environment variables to your tracer settings or sy
## The new nomenclature: What is changing
-### List of newly introduced peer.* tags
+### List of newly introduced peer.* tags
`peer.*` dimensions | Remapped from ...
--------------------|-------------------
@@ -262,20 +262,20 @@ To opt in, add the following environment variables to your tracer settings or sy
### Global default service naming migration
-When you enable the `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` environment variable, it improves how service-to-service connections and inferred services are represented in Datadog visualizations, across all supported tracing library languages and integrations.
+When you enable the `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` environment variable, it improves how service-to-service connections and inferred services are represented in Datadog visualizations, across all supported APM SDK languages and integrations.
-Previously, some tracing libraries included the name of the associated integration in service name tagging. For example, .NET tagged gRPC calls as `service:Datadog tracing libraries support both 64-bit and 128-bit trace IDs. Read Span and Trace ID formats to learn more.
+Datadog APM SDKs support both 64-bit and 128-bit trace IDs. Read Span and Trace ID formats to learn more.
| Field | Type | Description |
|------------|---------|---------------------------------------|
diff --git a/content/en/tracing/guide/serverless_enable_aws_xray.md b/content/en/tracing/guide/serverless_enable_aws_xray.md
index 76a0854c398a4..583eeda5da869 100644
--- a/content/en/tracing/guide/serverless_enable_aws_xray.md
+++ b/content/en/tracing/guide/serverless_enable_aws_xray.md
@@ -28,7 +28,7 @@ xray:GetTraceSummaries
To get the most out of the AWS X-Ray integration:
- Enable it on your Lambda functions and API Gateways, either using the Serverless Framework plugin or manually; and
-- Install the tracing libraries in your Lambda functions.
+- Install the APM SDKs in your Lambda functions.
#### [Recommended] Datadog Serverless Framework plugin
diff --git a/content/en/tracing/guide/setting_primary_tags_to_scope.md b/content/en/tracing/guide/setting_primary_tags_to_scope.md
index 78fb5e179cfb5..b523d56409a01 100644
--- a/content/en/tracing/guide/setting_primary_tags_to_scope.md
+++ b/content/en/tracing/guide/setting_primary_tags_to_scope.md
@@ -29,18 +29,18 @@ Primary tags must follow a different set of rules from those of conventional [Da
The default and mandatory primary tag is the environment your traces are collected from. Its tag key is `env`, and its default value for un-tagged data is `env:none`.
-#### Tracer environment
+#### APM SDK environment
-Datadog recommends having the tracer set `env`. It also allows for greater flexibility because the definition of `env` lives within the actual runtime of the service.
+Datadog recommends having the APM SDK set `env`. It also allows for greater flexibility because the definition of `env` lives within the actual runtime of the service.
-If `DD_ENV` is exposed to your service's process, the tracer will use it automatically. See [Unified Service Tagging][3] to learn about setting `DD_ENV` and other standard service environment variables.
+If `DD_ENV` is exposed to your service's process, the APM SDK will use it automatically. See [Unified Service Tagging][3] to learn about setting `DD_ENV` and other standard service environment variables.
-You may also manually set `env` as a global tag for the tracer in code. See [assigning tags in APM][4] for more information.
+You may also manually set `env` as a global tag for the APM SDK in code. See [assigning tags in APM][4] for more information.
#### Agent environment
The `env` tag can be set in your Agent configuration.
-**Do not set different `env` tags on the Tracer and Agent. This may cause duplicate tagging on [trace metrics][5].**
+**Do not set different `env` tags on the APM SDK and Agent. This may cause duplicate tagging on [trace metrics][5].**
Options:
@@ -70,7 +70,7 @@ Environments appear at the top of APM pages. Use the `env` dropdown to scope the
## Add a second primary tag in Datadog
If you need to aggregate your trace metrics across additional dimensions, we recommend setting up a second primary tag in addition to the
-default and mandatory primary tag `env:The
-For more information on available configuration options, see [Configuring the Go Tracing Library][14].
+For more information on available configuration options, see [Configuring the Go APM SDK][14].
-### Use automatic tracing libraries
+### Use automatic APM SDKs
Datadog has several fully supported libraries for Go that allow for automatic tracing when implemented in the code. In the `cmd/notes/main.go` file, you can see the `go-chi`, `sql`, and `http` libraries being aliased to the corresponding Datadog libraries: `chitrace`, `sqltrace`, and `httptrace` respectively:
diff --git a/content/en/tracing/guide/tutorial-enable-java-admission-controller.md b/content/en/tracing/guide/tutorial-enable-java-admission-controller.md
index ad80adf5a1794..8b33d49ed376d 100644
--- a/content/en/tracing/guide/tutorial-enable-java-admission-controller.md
+++ b/content/en/tracing/guide/tutorial-enable-java-admission-controller.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application with the Admission Con
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
- link: /containers/cluster_agent/troubleshooting/
tag: "Documentation"
text: Troubleshooting the Datadog Cluster Agent
@@ -53,7 +53,7 @@ git clone https://github.com/DataDog/springblog.git
The repository contains a multi-service Java application pre-configured to be run within Docker and Kubernetes. The sample app is a basic Spring app using REST.
-## Start and run the sample application
+## Start and run the sample application
1. Switch to to the `/k8s` subdirectory in the springblog repo:
{{< code-block lang="shell" >}}
@@ -75,7 +75,7 @@ kubectl get pods{{< /code-block >}}
springfront-797b78d6db-p5c84 1/1 Terminating 0 2m41s
```
- The service is started and listens on port 8080. It exposes an `/upstream` endpoint.
+ The service is started and listens on port 8080. It exposes an `/upstream` endpoint.
4. Check that communication takes place by running the following curl command:
{{< code-block lang="shell" >}}
@@ -95,7 +95,7 @@ After you have your application working, instrument it using the Datadog Admissi
3. [Annotate][7] your pod for library injection.
4. [Label][8] your pod to instruct the Datadog Admission controller to mutate the pod.
-There's no need to add the tracing library because it's automatically injected. You don't need to redeploy your app yet. This section of the tutorial steps you through the process of adding Datadog variables and deploying a new image or version of your app.
+There's no need to add the APM SDK because it's automatically injected. You don't need to redeploy your app yet. This section of the tutorial steps you through the process of adding Datadog variables and deploying a new image or version of your app.
1. From the `k8s` subdirectory, use the following command to install the Datadog Cluster Agent, specifying the `values-with-lib-inj.yaml` config file and your [Datadog API key](/account_management/api-app-keys/):
{{< code-block lang="shell" >}}
@@ -122,12 +122,12 @@ labels:
tags.datadoghq.com/service: "springfront"
tags.datadoghq.com/version: "12"{{< /code-block >}}
-4. Configure the Datadog Admission Controller to inject a Java tracing library to the app container by adding the following annotation to the pod:
+4. Configure the Datadog Admission Controller to inject a Java APM SDK to the app container by adding the following annotation to the pod:
{{< code-block lang="yaml" >}}
annotations:
admission.datadoghq.com/java-lib.version: "latest"{{< /code-block >}}
- This annotation specifies the latest version of the Java tracing library. You can also reference a specific version of the library, such as `"v1.5.0"`.
+ This annotation specifies the latest version of the Java APM SDK. You can also reference a specific version of the library, such as `"v1.5.0"`.
The final pod definition should look like the excerpt below. See also the full [YAML file][10] in the sample repo. The instructions you added to instrument the app are highlighted:
@@ -202,7 +202,7 @@ kubectl describe pod springfront{{< /code-block >}}
Normal Started 2s kubelet Started container springfront
```
- As you can see, an init-container is added to your pod. This container includes the Datadog Java tracing libraries to a volume mount. Also `JAVA_TOOL_OPTIONS` is modified to include `javaagent`. And Datadog-specific environment variables are added to the container:
+ As you can see, an init-container is added to your pod. This container includes the Datadog Java APM SDKs to a volume mount. Also `JAVA_TOOL_OPTIONS` is modified to include `javaagent`. And Datadog-specific environment variables are added to the container:
```
Environment:
@@ -219,7 +219,7 @@ kubectl describe pod springfront{{< /code-block >}}
/var/run/secrets/kubernetes.io/serviceaccount from kube-api-access-qvmtk (ro)
```
-8. Verify that the Datadog tracing library is injected into the pod by checking the pod logs. For example::
+8. Verify that the Datadog APM SDK is injected into the pod by checking the pod logs. For example::
{{< code-block lang="shell" >}}
kubectl logs -f springfront-797b78d6db-jqjdl{{< /code-block >}}
@@ -272,4 +272,4 @@ If you're not receiving traces as expected, set up debug mode for the Java trace
[10]: https://github.com/DataDog/springblog/blob/main/k8s/depl-with-lib-inj.yaml
[11]: https://app.datadoghq.com/services
[12]: /tracing/trace_collection/admission_controller
-[13]: /tracing/troubleshooting/tracer_debug_logs/#enable-debug-mode
\ No newline at end of file
+[13]: /tracing/troubleshooting/tracer_debug_logs/#enable-debug-mode
diff --git a/content/en/tracing/guide/tutorial-enable-java-aws-ecs-ec2.md b/content/en/tracing/guide/tutorial-enable-java-aws-ecs-ec2.md
index be757e79b536c..3b87dc1504abd 100644
--- a/content/en/tracing/guide/tutorial-enable-java-aws-ecs-ec2.md
+++ b/content/en/tracing/guide/tutorial-enable-java-aws-ecs-ec2.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application on Amazon ECS with EC2
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -105,7 +105,7 @@ Your application (without tracing enabled) is containerized and available for EC
### Deploy the application
-Start the application and send some requests without tracing. After you've seen how the application works, you'll instrument it using the tracing library and Datadog Agent.
+Start the application and send some requests without tracing. After you've seen how the application works, you'll instrument it using the APM SDK and Datadog Agent.
To start, use a terraform script to deploy to Amazon ECS:
@@ -311,7 +311,7 @@ Now that you have a working Java application, configure it to enable tracing.
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, meaning that 100% of all service requests are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][14] and [sampling mechanisms][15].
diff --git a/content/en/tracing/guide/tutorial-enable-java-aws-ecs-fargate.md b/content/en/tracing/guide/tutorial-enable-java-aws-ecs-fargate.md
index 1b0031d9ce074..d6ed44b97a6ca 100644
--- a/content/en/tracing/guide/tutorial-enable-java-aws-ecs-fargate.md
+++ b/content/en/tracing/guide/tutorial-enable-java-aws-ecs-fargate.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application on Amazon ECS with Far
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -105,7 +105,7 @@ Your application (without tracing enabled) is containerized and available for EC
### Deploy the application
-Start the application and send some requests without tracing. After you've seen how the application works, you'll instrument it using the tracing library and Datadog Agent.
+Start the application and send some requests without tracing. After you've seen how the application works, you'll instrument it using the APM SDK and Datadog Agent.
To start, use a terraform script to deploy to Amazon ECS:
@@ -315,7 +315,7 @@ Now that you have a working Java application, configure it to enable tracing.
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, meaning that 100% of all service requests are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][14] and [sampling mechanisms][15].
diff --git a/content/en/tracing/guide/tutorial-enable-java-aws-eks.md b/content/en/tracing/guide/tutorial-enable-java-aws-eks.md
index 41cbe016d927b..98e428bb3c5ae 100644
--- a/content/en/tracing/guide/tutorial-enable-java-aws-eks.md
+++ b/content/en/tracing/guide/tutorial-enable-java-aws-eks.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application on AWS Elastic Kuberne
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -267,7 +267,7 @@ A `GET /notes` trace looks something like this:
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, which means that 100% of all requests to the `notes` service are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][14] and [sampling mechanisms][15].
@@ -277,7 +277,7 @@ Notice that the sampling rate flag in the command appears _before_ the `-jar` fl
Automatic instrumentation is convenient, but sometimes you want more fine-grained spans. Datadog's Java DD Trace API allows you to specify spans within your code using annotations or code.
-The following steps walk you through modifying the build scripts to download the Java tracing library and adding some annotations to the code to trace into some sample methods.
+The following steps walk you through modifying the build scripts to download the Java APM SDK and adding some annotations to the code to trace into some sample methods.
1. Delete the current application deployments:
{{< code-block lang="sh" >}}
diff --git a/content/en/tracing/guide/tutorial-enable-java-container-agent-host.md b/content/en/tracing/guide/tutorial-enable-java-container-agent-host.md
index 7748454d118ee..780827ae3eed8 100644
--- a/content/en/tracing/guide/tutorial-enable-java-container-agent-host.md
+++ b/content/en/tracing/guide/tutorial-enable-java-container-agent-host.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application in a Container and an
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -199,7 +199,7 @@ The `notes` section of your compose file should look something like this:
## Launch the containers to see automatic tracing
-Now that the Tracing Library is installed and the Agent is running, restart your application to start receiving traces. Run the following commands:
+Now that the APM SDK is installed and the Agent is running, restart your application to start receiving traces. Run the following commands:
```
docker-compose -f service-docker-compose.yaml build notes
@@ -244,7 +244,7 @@ A `GET /notes` trace looks something like this:
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, which means that 100% of all requests to the `notes` service are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][17] and [sampling mechanisms][16].
diff --git a/content/en/tracing/guide/tutorial-enable-java-containers.md b/content/en/tracing/guide/tutorial-enable-java-containers.md
index 97ea56f1e0e25..09de03126f297 100644
--- a/content/en/tracing/guide/tutorial-enable-java-containers.md
+++ b/content/en/tracing/guide/tutorial-enable-java-containers.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application and Datadog Agent in C
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -185,7 +185,7 @@ Add the Datadog Agent in the services section of your `all-docker-compose.yaml`
## Launch the containers to see automatic tracing
-Now that the Tracing Library is installed, restart your application and start receiving traces. Run the following commands:
+Now that the APM SDK is installed, restart your application and start receiving traces. Run the following commands:
```
docker-compose -f all-docker-compose.yaml build notes
@@ -234,7 +234,7 @@ A `GET /notes` trace looks something like this:
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, which means that 100% of all requests to the `notes` service are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][14] and [sampling mechanisms][15].
diff --git a/content/en/tracing/guide/tutorial-enable-java-gke.md b/content/en/tracing/guide/tutorial-enable-java-gke.md
index ad1ca6acaa61f..0c357d1a96b9b 100644
--- a/content/en/tracing/guide/tutorial-enable-java-gke.md
+++ b/content/en/tracing/guide/tutorial-enable-java-gke.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application on Google Kubernetes E
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -267,7 +267,7 @@ A `GET /notes` trace looks something like this:
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` in the Dockerfile tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
The `dd.trace.sample.rate` flag sets the sample rate for this application. The ENTRYPOINT command in the Dockerfile sets its value to `1`, which means that 100% of all requests to the `notes` service are sent to the Datadog backend for analysis and display. For a low-volume test application, this is fine. Do not do this in production or in any high-volume environment, because this results in a very large volume of data. Instead, sample some of your requests. Pick a value between 0 and 1. For example, `-Ddd.trace.sample.rate=0.1` sends traces for 10% of your requests to Datadog. Read more about [tracing configuration settings][14] and [sampling mechanisms][15].
@@ -277,7 +277,7 @@ Notice that the sampling rate flag in the command appears _before_ the `-jar` fl
Automatic instrumentation is convenient, but sometimes you want more fine-grained spans. Datadog's Java DD Trace API allows you to specify spans within your code using annotations or code.
-The following steps walk you through modifying the build scripts to download the Java tracing library and adding some annotations to the code to trace into some sample methods.
+The following steps walk you through modifying the build scripts to download the Java APM SDK and adding some annotations to the code to trace into some sample methods.
1. Delete the current application deployments:
{{< code-block lang="sh" >}}
diff --git a/content/en/tracing/guide/tutorial-enable-java-host.md b/content/en/tracing/guide/tutorial-enable-java-host.md
index ff6b90ca7b5d3..9146a954455d8 100644
--- a/content/en/tracing/guide/tutorial-enable-java-host.md
+++ b/content/en/tracing/guide/tutorial-enable-java-host.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Java Application on the Same Host as th
further_reading:
- link: /tracing/trace_collection/library_config/java/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/java/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/java/
tag: "Documentation"
text: Supported Java frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-java
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -149,7 +149,7 @@ Run more API calls to see the application in action. When you're done, type Ctrl
## Install Datadog tracing
-Next, download the Java tracing library (sometimes called the Java Agent). From your `apm-tutorial-java-host` directory, run:
+Next, download the Java APM SDK (sometimes called the Java Agent). From your `apm-tutorial-java-host` directory, run:
{{< code-block lang="sh" >}}
curl -Lo dd-java-agent.jar 'https://dtdg.co/latest-java-tracer'
@@ -240,7 +240,7 @@ A `GET /notes` trace looks something like this:
### Tracing configuration
-The Java tracing library uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` tells the JVM where to find the Java tracing library so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
+The Java APM SDK uses Java's built-in agent and monitoring support. The flag `-javaagent:../dd-java-agent.jar` tells the JVM where to find the Java APM SDK so it can run as a Java Agent. Learn more about Java Agents at [https://www.baeldung.com/java-instrumentation][7].
In addition to the `javaagent` flag, which enables the Java Agent, the launch commands specify three [Unified Service Tagging][10] settings to uniquely identify your application within Datadog. Always specify `env`, `service`, and `version` tags for every monitored application.
diff --git a/content/en/tracing/guide/tutorial-enable-python-container-agent-host.md b/content/en/tracing/guide/tutorial-enable-python-container-agent-host.md
index a88f47c8954a2..9b7e221170cda 100644
--- a/content/en/tracing/guide/tutorial-enable-python-container-agent-host.md
+++ b/content/en/tracing/guide/tutorial-enable-python-container-agent-host.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Python Application in a Container and a
further_reading:
- link: /tracing/trace_collection/library_config/python/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/python/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/python/
tag: "Documentation"
text: Supported Python frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-py
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -33,7 +33,7 @@ See [Tracing Python Applications][2] for general comprehensive tracing setup doc
- A Datadog account and [organization API key][3]
- Git
-- Python that meets the [tracing library requirements][4]
+- Python that meets the [APM SDK requirements][4]
## Install the Agent
@@ -48,7 +48,7 @@ To send data to a Datadog site other than `datadoghq.com`, replace the `DD_SITE`
Ensure your Agent is configured to receive trace data from containers. Open its [configuration file][15] and ensure `apm_config:` is uncommented, and `apm_non_local_traffic` is uncommented and set to `true`.
-If you have an Agent already installed on the host, ensure it is at least version 7.28. The minimum version of Datadog Agent required to use `ddtrace` to trace Python applications is documented in the [tracing library developer docs][7].
+If you have an Agent already installed on the host, ensure it is at least version 7.28. The minimum version of Datadog Agent required to use `ddtrace` to trace Python applications is documented in the [APM SDK developer docs][7].
## Install the sample Dockerized Python application
@@ -218,7 +218,7 @@ Verify that the Agent is running and sending data to Datadog by going to [**Even
## Launch the containers to see automatic tracing
-Now that the Tracing Library is installed and the Agent is running, restart your application to start receiving traces. Run the following commands:
+Now that the APM SDK is installed and the Agent is running, restart your application to start receiving traces. Run the following commands:
```
docker-compose -f docker/host-and-containers/exercise/docker-compose.yaml build notes_app
@@ -280,7 +280,7 @@ from ddtrace import tracer{{< /code-block >}}
logging.info("Hello from the long running process")
self.__private_method_1(){{< /code-block >}}
- Now, the tracer automatically labels the resource with the function name it is wrapped around, in this case, `long_running_process`.
+ Now, the APM SDK automatically labels the resource with the function name it is wrapped around, in this case, `long_running_process`.
4. Rebuild the containers by running:
{{< code-block lang="sh" >}}
diff --git a/content/en/tracing/guide/tutorial-enable-python-containers.md b/content/en/tracing/guide/tutorial-enable-python-containers.md
index 0412a1d10320d..9ea83946c97c0 100644
--- a/content/en/tracing/guide/tutorial-enable-python-containers.md
+++ b/content/en/tracing/guide/tutorial-enable-python-containers.md
@@ -4,10 +4,10 @@ title: Tutorial - Enabling Tracing for a Python Application and Datadog Agent in
further_reading:
- link: /tracing/trace_collection/library_config/python/
tag: "Documentation"
- text: Additional tracing library configuration options
+ text: Additional APM SDK configuration options
- link: /tracing/trace_collection/dd_libraries/python/
tag: "Documentation"
- text: Detailed tracing library setup instructions
+ text: Detailed APM SDK setup instructions
- link: /tracing/trace_collection/compatibility/python/
tag: "Documentation"
text: Supported Python frameworks for automatic instrumentation
@@ -16,7 +16,7 @@ further_reading:
text: Manually configuring traces and spans
- link: https://github.com/DataDog/dd-trace-py
tag: "Source Code"
- text: Tracing library open source code repository
+ text: APM SDK open source code repository
---
## Overview
@@ -33,7 +33,7 @@ See [Tracing Python Applications][2] for general comprehensive tracing setup doc
- A Datadog account and [organization API key][3]
- Git
-- Python that meets the [tracing library requirements][4]
+- Python that meets the [APM SDK requirements][4]
## Install the sample Dockerized Python application
@@ -59,7 +59,7 @@ docker-compose -f docker/containers/exercise/docker-compose.yaml build notes_app
docker-compose -f docker/containers/exercise/docker-compose.yaml up db notes_app
{{< /code-block >}}
- The application is ready to use when you see the following output in the terminal:
+ The application is ready to use when you see the following output in the terminal:
```
notes | * Debug mode: on
@@ -125,7 +125,7 @@ Now that you have a working Python application, configure it to enable tracing.
2. Within the notes application Dockerfile, `docker/containers/exercise/Dockerfile.notes`, change the CMD line that starts the application to use the `ddtrace` package:
```
- # Run the application with Datadog
+ # Run the application with Datadog
CMD ["ddtrace-run", "python", "-m", "notes_app.app"]
```
@@ -139,7 +139,7 @@ Now that you have a working Python application, configure it to enable tracing.
ENV DD_VERSION="0.1.0"
```
-4. Add Docker labels that correspond to the Universal Service Tags. This allows you also to get Docker metrics once your application is running.
+4. Add Docker labels that correspond to the Universal Service Tags. This allows you also to get Docker metrics once your application is running.
```
LABEL com.datadoghq.tags.service="notes"
@@ -162,8 +162,8 @@ Add the Datadog Agent in the services section of the `docker/containers/exercise
- DD_API_KEY=Makefile also sets the DD_TRACE_SAMPLE_RATE environment variable to 1, which represents a 100% sample rate. A 100% sample rate ensures that all requests to the notes service are sent to the Datadog backend for analysis and display for the purposes of this tutorial. In an actual production or high-volume environment, you wouldn't specify this high of a rate. Setting a high sample rate with this variable in the application overrides the Agent configuration and results in a very large volume of data being sent to Datadog. For most use cases, allow the Agent to automatically determine the sampling rate.
- Note: Starting with .NET Tracer version 2.0.1, automatic injection for the Serilog logging library requires the application to be instrumented with automatic instrumentation.
+ Note: Starting with .NET APM SDK version 2.0.1, automatic injection for the Serilog logging library requires the application to be instrumented with automatic instrumentation.
To automatically inject correlation identifiers into your log messages:
-1. Configure the .NET Tracer with the following tracer settings:
+1. Configure the .NET APM SDK with the following settings:
- `DD_ENV`
- `DD_SERVICE`
- `DD_VERSION`
@@ -67,12 +67,12 @@ To automatically inject correlation identifiers into your log messages:
{{% tab "log4net" %}}
- Note: Starting with .NET Tracer version 1.29.0, automatic injection for the log4net logging library requires the application to be instrumented with automatic instrumentation.
+ Note: Starting with .NET APM SDK version 1.29.0, automatic injection for the log4net logging library requires the application to be instrumented with automatic instrumentation.
To automatically inject correlation identifiers into your log messages:
-1. Configure the .NET Tracer with the following tracer settings:
+1. Configure the .NET APM SDK with the following APM SDK settings:
- `DD_ENV`
- `DD_SERVICE`
- `DD_VERSION`
@@ -112,12 +112,12 @@ For additional examples, see [the log4net automatic trace ID injection project][
{{% tab "NLog" %}}
- Note: Starting with .NET Tracer version 2.0.1, automatic injection for the NLog logging library requires the application to be instrumented with automatic instrumentation.
+ Note: Starting with .NET APM SDK version 2.0.1, automatic injection for the NLog logging library requires the application to be instrumented with automatic instrumentation.
To automatically inject correlation identifiers into your log messages:
-1. Configure the .NET Tracer with the following tracer settings:
+1. Configure the .NET APM SDK with the following APM SDK settings:
- `DD_ENV`
- `DD_SERVICE`
- `DD_VERSION`
@@ -170,7 +170,7 @@ For additional examples, see the automatic trace ID injection projects using [NL
{{% tab "Microsoft.Extensions.Logging" %}}
To automatically inject correlation identifiers into your log messages:
-1. Configure the .NET Tracer with the following tracer settings:
+1. Configure the .NET APM SDK with the following settings:
- `DD_ENV`
- `DD_SERVICE`
- `DD_VERSION`
@@ -212,7 +212,7 @@ Next, complete the setup for either automatic or manual injection.
The final step to enable automatic correlation identifier injection is to:
-1. Enable `DD_LOGS_INJECTION=true` in the .NET Tracer's environment variables. To configure the .NET Tracer with a different method, see [Configuring the .NET Tracer][6].
+1. Enable `DD_LOGS_INJECTION=true` in the .NET Tracer's environment variables. To configure the .NET APM SDK with a different method, see [Configuring the .NET Tracer][6].
After configuring the correlation identifier injection, see [C# Log Collection][7] to configure your log collection.
diff --git a/content/en/tracing/other_telemetry/connect_logs_and_traces/go.md b/content/en/tracing/other_telemetry/connect_logs_and_traces/go.md
index 04e04e1d6cc35..00aa1b1ab2779 100644
--- a/content/en/tracing/other_telemetry/connect_logs_and_traces/go.md
+++ b/content/en/tracing/other_telemetry/connect_logs_and_traces/go.md
@@ -23,7 +23,7 @@ further_reading:
## Manual injection
-The Go tracer API allows printing span information along with log statements using the `%v` format specifier:
+The Go APM SDK API allows printing span information along with log statements using the `%v` format specifier:
```go
package main
@@ -68,8 +68,8 @@ func main() {
logrus.SetFormatter(&logrus.JSONFormatter{})
// Add Datadog context log hook
- logrus.AddHook(&dd_logrus.DDContextLogHook{})
-
+ logrus.AddHook(&dd_logrus.DDContextLogHook{})
+
// ...
}
```
diff --git a/content/en/tracing/other_telemetry/connect_logs_and_traces/java.md b/content/en/tracing/other_telemetry/connect_logs_and_traces/java.md
index 2eaa5d37c4ddd..944c0e23de801 100644
--- a/content/en/tracing/other_telemetry/connect_logs_and_traces/java.md
+++ b/content/en/tracing/other_telemetry/connect_logs_and_traces/java.md
@@ -26,7 +26,7 @@ Ensure log collection is configured. See [Java Log Collection][1] for Log4j, Log
## Automatic injection
-Starting in version 0.74.0, the Java tracer automatically injects trace correlation identifiers into JSON formatted logs. For earlier versions, enable automatic injection in the Java tracer by adding `dd.logs.injection=true` as a system property, or through the environment variable `DD_LOGS_INJECTION=true`. Full configuration details can be found on the [Java tracer configuration][2] page.
+Starting in version 0.74.0, the Java APM SDK automatically injects trace correlation identifiers into JSON formatted logs. For earlier versions, enable automatic injection in the Java APM SDK by adding `dd.logs.injection=true` as a system property, or through the environment variable `DD_LOGS_INJECTION=true`. Full configuration details can be found on the [Java APM SDK configuration][2] page.
**Notes**:
- Automatic injection of trace correlation is available for Log4j2, Log4j, or SLF4J and Logback.
diff --git a/content/en/tracing/other_telemetry/connect_logs_and_traces/nodejs.md b/content/en/tracing/other_telemetry/connect_logs_and_traces/nodejs.md
index 8988d662f43a8..cff9f82f2ef31 100644
--- a/content/en/tracing/other_telemetry/connect_logs_and_traces/nodejs.md
+++ b/content/en/tracing/other_telemetry/connect_logs_and_traces/nodejs.md
@@ -23,7 +23,7 @@ further_reading:
## Automatic injection
-Enable injection with the environment variable `DD_LOGS_INJECTION=true` or by configuring the tracer directly:
+Enable injection with the environment variable `DD_LOGS_INJECTION=true` or by configuring the APM SDK directly:
```javascript
// This line must come before importing the logger.
@@ -34,7 +34,7 @@ const tracer = require('dd-trace').init({
This enables automatic trace ID injection for `bunyan`, `paperplane`, `pino`, and `winston`.
-If you haven't done so already, configure the Node.js tracer with `DD_ENV`, `DD_SERVICE`, and `DD_VERSION`. This will provide the best
+If you haven't done so already, configure the Node.js APM SDK with `DD_ENV`, `DD_SERVICE`, and `DD_VERSION`. This will provide the best
experience for adding `env`, `service`, and `version` (see [Unified Service Tagging][1] for more details).
**Note**: Automatic injection only works for logs formatted as JSON.
diff --git a/content/en/tracing/other_telemetry/connect_logs_and_traces/php.md b/content/en/tracing/other_telemetry/connect_logs_and_traces/php.md
index b001c3442d8b2..ccbd42ff11944 100644
--- a/content/en/tracing/other_telemetry/connect_logs_and_traces/php.md
+++ b/content/en/tracing/other_telemetry/connect_logs_and_traces/php.md
@@ -23,9 +23,9 @@ further_reading:
## Automatic injection
-Starting in version `0.89.0`, the PHP tracer automatically injects trace correlation identifiers into application logs. To enable automatic injection, set the environment variable `DD_LOGS_INJECTION` (INI setting `datadog.logs_injection`) to `true`.
+Starting in version `0.89.0`, the PHP APM SDK automatically injects trace correlation identifiers into application logs. To enable automatic injection, set the environment variable `DD_LOGS_INJECTION` (INI setting `datadog.logs_injection`) to `true`.
-The PHP tracer supports PSR-3 compliant loggers, such as [Monolog][4] or [Laminas Log][5].
+The PHP APM SDK supports PSR-3 compliant loggers, such as [Monolog][4] or [Laminas Log][5].
Note: Set up your logging library to produce logs in JSON format so that:
@@ -37,15 +37,15 @@ The PHP tracer supports PSR-3 compliant loggers, such as [Monolog][4] or [Lamina
### Configure injection in logs
-If you haven't done so already, configure the PHP tracer with `DD_ENV`, `DD_SERVICE`, and `DD_VERSION`. This provides the best experience for adding `env`, `service`, and `version` to your logs (see [Unified Service Tagging][6] for more details).
+If you haven't done so already, configure the PHP APM SDK with `DD_ENV`, `DD_SERVICE`, and `DD_VERSION`. This provides the best experience for adding `env`, `service`, and `version` to your logs (see [Unified Service Tagging][6] for more details).
-The PHP tracer provides various ways to configure the injection of trace correlation identifiers into your logs:
+The PHP APM SDK provides various ways to configure the injection of trace correlation identifiers into your logs:
- [Add the trace correlation identifiers to the log context](#add-the-trace-correlation-identifiers-to-the-log-context)
- [Use placeholders in your message](#use-placeholders-in-your-message)
#### Add the trace correlation identifiers to the log context {#add-the-trace-correlation-identifiers-to-the-log-context}
-The default behavior of the PHP tracer is to add the trace correlation identifiers to the log context.
+The default behavior of the PHP APM SDK is to add the trace correlation identifiers to the log context.
For example, if you are using the [Monolog][4] library in a Laravel application as follows:
@@ -55,17 +55,17 @@ use Illuminate\Support\Facades\Log;
Log::debug('Hello, World!');
```
-The PHP tracer adds the available trace correlation identifiers to the log context. The logged message above could be transformed into:
+The PHP APM SDK adds the available trace correlation identifiers to the log context. The logged message above could be transformed into:
```
[2022-12-09 16:02:42] production.DEBUG: Hello, World! {"dd.trace_id":"1234567890abcdef","dd.span_id":"1234567890abcdef","dd.service":"laravel","dd.version":"8.0.0","dd.env":"production","status":"debug"}
```
-**Note**: If there is a placeholder in your message or if a trace ID is already present in the message, the PHP tracer does **not** add the trace correlation identifiers to the log context.
+**Note**: If there is a placeholder in your message or if a trace ID is already present in the message, the PHP APM SDK does **not** add the trace correlation identifiers to the log context.
#### Use placeholders in your message {#use-placeholders-in-your-message}
-You can use placeholders in your message to automatically inject trace correlation identifiers into your logs. The PHP tracer supports the following placeholders:
+You can use placeholders in your message to automatically inject trace correlation identifiers into your logs. The PHP APM SDK supports the following placeholders:
- `%dd.trace_id%`: the trace ID
- `%dd.span_id%`: the span ID
- `%dd.service%`: the service name
@@ -82,7 +82,7 @@ use Illuminate\Support\Facades\Log;
Log::info('Hello, World! [%dd.trace_id% %dd.span_id% %status%]');
```
-The PHP tracer replaces the placeholders with the corresponding values. For example, the logged message above could be transformed into:
+The PHP APM SDK replaces the placeholders with the corresponding values. For example, the logged message above could be transformed into:
```
[2022-12-09 16:02:42] production.INFO: Hello, World! [dd.trace_id="1234567890abcdef" dd.span_id="1234567890abcdef" status="info"]
diff --git a/content/en/tracing/other_telemetry/connect_logs_and_traces/python.md b/content/en/tracing/other_telemetry/connect_logs_and_traces/python.md
index a821240dc5cc9..c757a00e720d5 100644
--- a/content/en/tracing/other_telemetry/connect_logs_and_traces/python.md
+++ b/content/en/tracing/other_telemetry/connect_logs_and_traces/python.md
@@ -36,7 +36,7 @@ To correlate your [traces][1] with your logs, complete the following steps:
#### Step 1 - Activate automatic instrumentation
Activate automatic instrumentation using one of the following options:
-
+
Option 1: [Library Injection][5]:
1. Set the environment variable `DD_LOGS_INJECTION=true` in the application `deployment/manifest` file.
2. Follow the instructions in [Library Injection][5] to set up tracing.
@@ -45,7 +45,7 @@ Option 2: `ddtrace-run`:
1. Set the environment variable `DD_LOGS_INJECTION=true` in the environment where the application is running.
2. Import **ddtrace** into the application.
3. Run the application with `ddtrace-run` (for example, `ddtrace-run python appname.py`).
-
+
Option 3: `patch`:
1. Import **ddtrace** into the application.
2. Add `ddtrace.patch(logging=True)` to the start of the application code.
@@ -82,7 +82,7 @@ To learn more about logs injection, read the [ddtrace documentation][6].
### No standard library logging
-If you are not using the standard library `logging` module, you can use the following code snippet to inject tracer information into your logs:
+If you are not using the standard library `logging` module, you can use the following code snippet to inject APM SDK information into your logs:
```python
from ddtrace import tracer
diff --git a/content/en/tracing/trace_collection/_index.md b/content/en/tracing/trace_collection/_index.md
index e3f7c78b36243..e2fad4a6a99f7 100644
--- a/content/en/tracing/trace_collection/_index.md
+++ b/content/en/tracing/trace_collection/_index.md
@@ -22,7 +22,7 @@ further_reading:
To get started with Datadog APM, you need to follow these key steps:
-1. Install and configure the Datadog Agent.
+1. Install and configure the Datadog Agent.
2. Instrument your application.
Enabling Tracing on a Python Application on the Same Host as Datadog Agent{{< /nextlink >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/_index.md b/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
index 9837426aea9ef..e9a3eb50f2686 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
@@ -10,7 +10,7 @@ further_reading:
## Overview
-Automatic instrumentation allows you to create spans automatically for your application. It allows you to capture observability data from a wide range of standard operations and popular frameworks with minimal manual intervention. You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][5] or when you [manually add Datadog tracing libraries][6] to your code.
+Automatic instrumentation allows you to create spans automatically for your application. It allows you to capture observability data from a wide range of standard operations and popular frameworks with minimal manual intervention. You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][5] or when you [manually add APM SDKs][6] to your code.
## Use cases
@@ -35,12 +35,12 @@ To get started, read the [Single Step Instrumentation][1] documentation.
{{% /tab %}}
-{{% tab "Datadog libraries" %}}
+{{% tab "Datadog SDKs" %}}
To automatically instrument your application with Datadog libraries:
1. [Install and configure the Agent](#install-and-configure-the-agent).
-2. [Add the Datadog tracing library to your code](#instrument-your-application).
+2. [Add the APM SDK to your code](#instrument-your-application).
### Install and configure the Agent
@@ -87,7 +87,7 @@ For other environments, see the [Integrations][14] documentation for that enviro
### Instrument your application
-Set up your application to send traces using one of the following official Datadog tracing libraries:
+Set up your application to send traces using one of the following official APM SDKs:
{{< partial name="apm/apm-languages.html" >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
index 10c7c807c8683..a1d5ace5b440f 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
@@ -1,5 +1,5 @@
---
-title: Add the Datadog Tracing Library
+title: Add the APM SDK
type: multi-code-lang
aliases:
- /tracing/languages
@@ -8,7 +8,7 @@ aliases:
- /tracing/trace_collection/dd_libraries/
---
-Set up your application to send [traces][1] using one of the following official Datadog tracing libraries:
+Set up your application to send [traces][1] using one of the following official APM SDKs:
{{< partial name="apm/apm-compatibility.html" >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
index a8beb2fed61a6..17eca8a3c8520 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
@@ -28,7 +28,7 @@ further_reading:
## Compatibility requirements
-The C++ tracing library requires C++17 toolchain to build. For a full list of Datadog's tracing library compatiblity requirements and processor architecture support, visit the [Compatibility Requirements][3] page.
+The C++ APM SDK requires C++17 toolchain to build. For a full list of Datadog's APM SDK compatiblity requirements and processor architecture support, visit the [Compatibility Requirements][3] page.
## Getting started
Before you begin, make sure you have already [installed and configured the Agent][6].
@@ -36,7 +36,7 @@ Before you begin, make sure you have already [installed and configured the Agent
## Instrument your application
Here is an example application that can be used for testing `dd-trace-cpp`.
-This application creates a tracer instance with the default settings and generates a trace with two spans, which is reported under the service name `my-service`.
+This application creates an APM SDK instance with the default settings and generates a trace with two spans, which is reported under the service name `my-service`.
```cpp
// tracer_example.cpp
@@ -192,7 +192,7 @@ DATADOG TRACER CONFIGURATION - {"collector":{"config":{"event_scheduler":{"type"
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][5] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][5] for details.
## Further Reading
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-core.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-core.md
index cef80e32a9624..627d6bb23b8fc 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-core.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-core.md
@@ -49,7 +49,7 @@ further_reading:
### Supported .NET Core runtimes
-The .NET Tracer supports instrumentation on .NET Core 2.1, .NET Core 3.1, .NET 5, .NET 6, .NET 7, and .NET 8.
+The .NET APM SDK supports instrumentation on .NET Core 2.1, .NET Core 3.1, .NET 5, .NET 6, .NET 7, and .NET 8.
For a full list of Datadog's .NET Core library and processor architecture support (including legacy and maintenance versions), see [Compatibility Requirements][1].
@@ -60,7 +60,7 @@ For a full list of Datadog's .NET Core library and processor architecture suppor
Simplify your setup! Install the Agent and instrument your application in one step with Single Step Instrumentation.
@@ -40,7 +40,7 @@ There are two main approaches to instrument your application: automatic or custo
Create spans for your application with minimal manual steps. To automatically instrument your application, you can use either of these options:
- [Single Step Instrumentation (Beta)][7]: Run a one-line install command to install the Datadog Agent, enable APM, and instrument all of your services on your Linux host, VM, or container.
-- [Datadog libraries][8]: Add Datadog tracing libraries to your application.
+- [Datadog SDKs][8]: Add Datadog SDKs to your application.
To learn more, see [automatic instrumentation][5].
@@ -48,14 +48,14 @@ To learn more, see [automatic instrumentation][5].
Capture observability data from in-house code or complex functions that aren't captured by automatic instrumentation. To custom instrument your application, you can use either of these options:
-- [Datadog libraries][9]: Use Datadog tracing libraries to add and customize observability within Datadog.
+- [Datadog APIs][9]: Use the Datadog API to add and customize observability within Datadog.
- [OpenTelemetry APIs][10]: Use OpenTelemetry API support in Datadog libraries to have vendor-neutral instrumentation of your code.
To learn more, see [custom instrumentation][6].
## APM setup tutorials
-The following tutorials guide you through setting up distributed tracing for a sample application on various infrastructure scenarios, with both automatic and custom instrumentation, using the Datadog tracing libraries:
+The following tutorials guide you through setting up distributed tracing for a sample application on various infrastructure scenarios, with both automatic and custom instrumentation, using the Datadog SDKs:
{{< whatsnext desc="Choose your language and environment:" >}}
{{< nextlink href="tracing/guide/tutorial-enable-python-host" >}} Enabling Tracing on a Python Application on the Same Host as Datadog Agent{{< /nextlink >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/_index.md b/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
index 9837426aea9ef..e9a3eb50f2686 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/_index.md
@@ -10,7 +10,7 @@ further_reading:
## Overview
-Automatic instrumentation allows you to create spans automatically for your application. It allows you to capture observability data from a wide range of standard operations and popular frameworks with minimal manual intervention. You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][5] or when you [manually add Datadog tracing libraries][6] to your code.
+Automatic instrumentation allows you to create spans automatically for your application. It allows you to capture observability data from a wide range of standard operations and popular frameworks with minimal manual intervention. You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][5] or when you [manually add APM SDKs][6] to your code.
## Use cases
@@ -35,12 +35,12 @@ To get started, read the [Single Step Instrumentation][1] documentation.
{{% /tab %}}
-{{% tab "Datadog libraries" %}}
+{{% tab "Datadog SDKs" %}}
To automatically instrument your application with Datadog libraries:
1. [Install and configure the Agent](#install-and-configure-the-agent).
-2. [Add the Datadog tracing library to your code](#instrument-your-application).
+2. [Add the APM SDK to your code](#instrument-your-application).
### Install and configure the Agent
@@ -87,7 +87,7 @@ For other environments, see the [Integrations][14] documentation for that enviro
### Instrument your application
-Set up your application to send traces using one of the following official Datadog tracing libraries:
+Set up your application to send traces using one of the following official APM SDKs:
{{< partial name="apm/apm-languages.html" >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
index 10c7c807c8683..a1d5ace5b440f 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/_index.md
@@ -1,5 +1,5 @@
---
-title: Add the Datadog Tracing Library
+title: Add the APM SDK
type: multi-code-lang
aliases:
- /tracing/languages
@@ -8,7 +8,7 @@ aliases:
- /tracing/trace_collection/dd_libraries/
---
-Set up your application to send [traces][1] using one of the following official Datadog tracing libraries:
+Set up your application to send [traces][1] using one of the following official APM SDKs:
{{< partial name="apm/apm-compatibility.html" >}}
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
index a8beb2fed61a6..17eca8a3c8520 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/cpp.md
@@ -28,7 +28,7 @@ further_reading:
- Note: Datadog's automatic instrumentation relies on the .NET CLR Profiling API. This API allows only one subscriber (for example, Datadog APM). To ensure maximum visibility, run only one APM solution in your application environment.
+ Note: Datadog's automatic instrumentation relies on the .NET CLR Profiling API. This API allows only one subscriber (for example, Datadog APM). To ensure maximum visibility, run only one APM solution in your application environment.
@@ -71,25 +71,25 @@ For a full list of Datadog's .NET Core library and processor architecture suppor
Before you begin, make sure you've already [installed and configured the Agent][12].
-1. [Install the tracer.](#install-the-tracer)
-2. [Enable the tracer for your service.](#enable-the-tracer-for-your-service)
+1. [Install the APM SDK.](#install-the-apm-sdk)
+2. [Enable the APM SDK for your service.](#enable-the-apm-sdk-for-your-service)
3. [View your live data.](#view-your-live-data)
-### Install the tracer
+### Install the APM SDK
-After you install and configure your Datadog Agent, the next step is to add the tracing library directly in the application to instrument it. Read more about [compatibility information][1].
+After you install and configure your Datadog Agent, the next step is to add the APM SDK directly in the application to instrument it. Read more about [compatibility information][1].
-You can install the Datadog .NET Tracer machine-wide so that all services on the machine are instrumented, or you can install it on a per-application basis to allow developers to manage the instrumentation through the application's dependencies. To see machine-wide installation instructions, click the Windows or Linux tab. To see per-application installation instructions, click the NuGet tab.
+You can install the Datadog .NET APM SDK machine-wide so that all services on the machine are instrumented, or you can install it on a per-application basis to allow developers to manage the instrumentation through the application's dependencies. To see machine-wide installation instructions, click the Windows or Linux tab. To see per-application installation instructions, click the NuGet tab.
{{< tabs >}}
{{% tab "Windows" %}}
-To install the .NET Tracer machine-wide:
+To install the .NET APM SDK machine-wide:
-1. Download the [.NET Tracer MSI installer][1]. Select the MSI installer for the architecture that matches the operating system (x64 or x86).
+1. Download the [.NET APM SDK MSI installer][1]. Select the MSI installer for the architecture that matches the operating system (x64 or x86).
-2. Run the .NET Tracer MSI installer with administrator privileges.
+2. Run the .NET APM SDK MSI installer with administrator privileges.
You can also script the MSI setup by running the following in PowerShell: `Start-Process -Wait msiexec -ArgumentList '/qn /i datadog-apm.msi'`
@@ -98,11 +98,11 @@ You can also script the MSI setup by running the following in PowerShell: `Start
{{% tab "Linux" %}}
-To install the .NET Tracer machine-wide:
+To install the .NET APM SDK machine-wide:
-1. Download the latest [.NET Tracer package][1] that supports your operating system and architecture.
+1. Download the latest [.NET APM SDK package][1] that supports your operating system and architecture.
-2. Run one of the following commands to install the package and create the .NET tracer log directory `/var/log/datadog/dotnet` with the appropriate permissions:
+2. Run one of the following commands to install the package and create the .NET SDK log directory `/var/log/datadog/dotnet` with the appropriate permissions:
Debian or Ubuntu
: `sudo dpkg -i ./datadog-dotnet-apm__amd64.deb && /opt/datadog/createLogPath.sh`
@@ -118,9 +118,9 @@ To install the .NET Tracer machine-wide:
#### Chiseled containers
-To install the .NET Tracer in chiseled or distroless Docker images (without a shell), use the following Dockerfile commands:
+To install the .NET APM SDK in chiseled or distroless Docker images (without a shell), use the following Dockerfile commands:
-- Use `ADD` to put the tracer files in the container.
+- Use `ADD` to put the APM SDK files in the container.
- Use `COPY --chown=$APP_UID` with an empty folder as source to create the logs path.
For example, in your Dockerfile:
@@ -139,7 +139,7 @@ COPY --chown=$APP_UID --from= /empty/ /var/log/datadog/dotnet/
Note: This installation does not instrument applications running in IIS. For applications running in IIS, follow the Windows machine-wide installation process.
-To install the .NET Tracer per-application:
+To install the .NET APM SDK per-application:
1. Add the `Datadog.Trace.Bundle` [NuGet package][1] to your application.
@@ -148,9 +148,9 @@ To install the .NET Tracer per-application:
{{< /tabs >}}
-### Enable the tracer for your service
+### Enable the APM SDK for your service
-To enable the .NET Tracer for your service, set the required environment variables and restart the application.
+To enable the .NET APM SDK for your service, set the required environment variables and restart the application.
For information about the different methods for setting environment variables, see [Configuring process environment variables](#configuring-process-environment-variables).
@@ -160,7 +160,7 @@ For information about the different methods for setting environment variables, s
#### Internet Information Services (IIS)
-1. The .NET Tracer MSI installer adds all required environment variables. There are no environment variables you need to configure.
+1. The .NET APM SDK MSI installer adds all required environment variables. There are no environment variables you need to configure.
Note: You must set the .NET CLR version for the application pool to No Managed Code as recommended by Microsoft.
@@ -175,13 +175,13 @@ For information about the different methods for setting environment variables, s
```
-To install the .NET Tracer per-application:
+To install the .NET APM SDK per-application:
1. Add the `Datadog.Trace.Bundle` [NuGet package][1] to your application.
@@ -112,9 +112,9 @@ To install the .NET Tracer per-application:
{{< /tabs >}}
-### Enable the tracer for your service
+### Enable the APM SDK for your service
-To enable the .NET Tracer for your service, set the required environment variables and restart the application.
+To enable the .NET APM SDK for your service, set the required environment variables and restart the application.
For information about the different methods for setting environment variables, see [Configuring process environment variables](#configuring-process-environment-variables).
@@ -124,7 +124,7 @@ For information about the different methods for setting environment variables, s
#### Internet Information Services (IIS)
-1. The .NET Tracer MSI installer adds all required environment variables. There are no environment variables you need to configure.
+1. The .NET APM SDK MSI installer adds all required environment variables. There are no environment variables you need to configure.
2. To automatically instrument applications hosted in IIS, completely stop and start IIS by running the following commands as an administrator:
@@ -135,13 +135,13 @@ For information about the different methods for setting environment variables, s
```
- Note: Always use the commands above to completely stop and restart IIS to enable the tracer. Avoid using the IIS Manager GUI application or
#### Services not in IIS
-iisreset.exe.
+ Note: Always use the commands above to completely stop and restart IIS to enable the APM SDK. Avoid using the IIS Manager GUI application or iisreset.exe.
Starting v2.14.0, you don't need to set
+CORECLR_PROFILER if you installed the tracer using the MSI.Starting v2.14.0, you don't need to set
1. Set the following required environment variables for automatic instrumentation to attach to your application:
@@ -221,7 +221,7 @@ Docker examples are also available in the [repository][2].
### View your live data
-After enabling the .NET Tracer for your service:
+After enabling the .NET APM SDK for your service:
1. Restart your service.
@@ -231,7 +231,7 @@ After enabling the .NET Tracer for your service:
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
## Custom instrumentation
@@ -248,7 +248,7 @@ Your setup for custom instrumentation depends on your automatic instrumentation
To use custom instrumentation in your .NET application:
1. Add the `Datadog.Trace` [NuGet package][1] to your application.
-2. In your application code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
+2. In your application code, access the global APM SDK through the `Datadog.Trace.Tracer.Instance` property to create new spans.
[1]: https://www.nuget.org/packages/Datadog.Trace
@@ -262,7 +262,7 @@ To use custom instrumentation in your .NET application:
To use custom instrumentation in your .NET application:
1. Add the `Datadog.Trace` [NuGet package][1] to your application.
-2. In your application code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
+2. In your application code, access the global APM SDK through the `Datadog.Trace.Tracer.Instance` property to create new spans.
[1]: https://www.nuget.org/packages/Datadog.Trace
@@ -272,7 +272,7 @@ To use custom instrumentation in your .NET application:
To use custom instrumentation in your .NET application:
-1. In your application code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
+1. In your application code, access the global APM SDK through the `Datadog.Trace.Tracer.Instance` property to create new spans.
{{% /tab %}}
@@ -282,13 +282,13 @@ For more information on adding spans and tags for custom instrumentation, see th
## Configuring process environment variables
-To attach automatic instrumentation to your service, you must set the required environment variables before starting the application. See [Enable the tracer for your service](#enable-the-tracer-for-your-service) section to identify which environment variables to set based on your .NET Tracer installation method and follow the examples below to correctly set the environment variables based on the environment of your instrumented service.
+To attach automatic instrumentation to your service, you must set the required environment variables before starting the application. See [Enable the APM SDK for your service](#enable-the-tracer-for-your-service) section to identify which environment variables to set based on your .NET APM SDK installation method and follow the examples below to correctly set the environment variables based on the environment of your instrumented service.
### Windows
#### Windows services
-CORECLR_PROFILER if you installed the APM SDK using the MSI.Starting v2.14.0, you don't need to set
+CORECLR_PROFILER if you installed the tracer using the MSI.Starting v2.14.0, you don't need to set
{{< tabs >}}
@@ -340,7 +340,7 @@ To automatically instrument a console application, set the environment variables
```bat
rem Set environment variables
SET CORECLR_ENABLE_PROFILING=1
-rem Unless v2.14.0+ and you installed the tracer with the MSI
+rem Unless v2.14.0+ and you installed the SDK with the MSI
SET CORECLR_PROFILER={846F5F1C-F9AE-4B07-969E-05C26BC060D8}
rem Set additional Datadog environment variables
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-framework.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-framework.md
index 5c699a501e51b..60144208dec62 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-framework.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-framework.md
@@ -53,7 +53,7 @@ further_reading:
### Supported .NET Framework runtimes
-The .NET Tracer supports instrumentation on .NET Framework >= 4.6.1.
+The .NET APM SDK supports instrumentation on .NET Framework >= 4.6.1.
For a full list of Datadog's .NET Framework library and processor architecture support (including legacy and maintenance versions), see [Compatibility Requirements][1].
@@ -71,25 +71,25 @@ For a full list of Datadog's .NET Framework library and processor architecture s
Before you begin, make sure you've already [installed and configured the Agent][12].
-1. [Install the tracer.](#install-the-tracer)
-3. [Enable the tracer for your service.](#enable-the-tracer-for-your-service)
+1. [Install the APM SDK.](#install-the-apm-sdk)
+3. [Enable the APM SDK for your service.](#enable-the-apm-sdk-for-your-service)
4. [View your live data.](#view-your-live-data)
-### Install the tracer
+### Install the APM SDK
-After you install and configure your Datadog Agent, the next step is to add the tracing library directly in the application to instrument it. Read more about [compatibility information][1].
+After you install and configure your Datadog Agent, the next step is to add the APM SDK directly in the application to instrument it. Read more about [compatibility information][1].
-Install the Datadog .NET Tracer machine-wide so that all services on the machine are instrumented or on a per-application basis, so developers can manage the instrumentation through the application's dependencies. To see machine-wide installation instructions, click the Windows tab. To see per-application installation instructions, click the NuGet tab.
+Install the Datadog .NET APM SDK machine-wide so that all services on the machine are instrumented or on a per-application basis, so developers can manage the instrumentation through the application's dependencies. To see machine-wide installation instructions, click the Windows tab. To see per-application installation instructions, click the NuGet tab.
{{< tabs >}}
{{% tab "Windows" %}}
-To install the .NET Tracer machine-wide:
+To install the .NET APM SDK machine-wide:
-1. Download the [.NET Tracer MSI installer][1]. Select the MSI installer for the architecture that matches the operating system (x64 or x86).
+1. Download the [.NET APM SDK MSI installer][1]. Select the MSI installer for the architecture that matches the operating system (x64 or x86).
-2. Run the .NET Tracer MSI installer with administrator privileges.
+2. Run the .NET APM SDK MSI installer with administrator privileges.
You can also script the MSI setup by running the following in PowerShell: `Start-Process -Wait msiexec -ArgumentList '/qn /i datadog-apm.msi'`
@@ -102,7 +102,7 @@ You can also script the MSI setup by running the following in PowerShell: `Start
Note: This installation does not instrument applications running in IIS. For applications running in IIS, follow the Windows machine-wide installation process.
CORECLR_PROFILER if you installed the APM SDK using the MSI.
- Note: Always use the commands above to completely stop and restart IIS to enable the tracer. Avoid using the IIS Manager GUI application or
#### Services not in IIS
-iisreset.exe.
+ Note: Always use the commands above to completely stop and restart IIS to enable the APM SDK. Avoid using the IIS Manager GUI application or iisreset.exe.
Starting v2.14.0, you don't need to set
+COR_PROFILER if you installed the tracer using the MSI.Starting v2.14.0, you don't need to set
1. Set the following required environment variables for automatic instrumentation to attach to your application:
@@ -168,7 +168,7 @@ Docker examples are also available in the [repository][2].
### View your live data
-After enabling the .NET Tracer for your service:
+After enabling the .NET APM SDK for your service:
1. Restart your service.
@@ -178,7 +178,7 @@ After enabling the .NET Tracer for your service:
## Configuration
-If needed, configure the tracing library to send application performance telemetry data, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
+If needed, configure the APM SDK to send application performance telemetry data, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
## Custom instrumentation
@@ -195,7 +195,7 @@ Your setup for custom instrumentation depends on your automatic instrumentation
To use custom instrumentation in your .NET application:
1. Add the `Datadog.Trace` [NuGet package][1] to your application.
-2. In your application code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
+2. In your application code, access the global APM SDK through the `Datadog.Trace.Tracer.Instance` property to create new spans.
[1]: https://www.nuget.org/packages/Datadog.Trace
@@ -205,7 +205,7 @@ To use custom instrumentation in your .NET application:
To use custom instrumentation in your .NET application:
-1. In your application code, access the global tracer through the `Datadog.Trace.Tracer.Instance` property to create new spans.
+1. In your application code, access the global APM SDK through the `Datadog.Trace.Tracer.Instance` property to create new spans.
{{% /tab %}}
@@ -215,11 +215,11 @@ For more information on adding spans and tags for custom instrumentation, see th
## Configuring process environment variables
-To attach automatic instrumentation to your service, set the required environment variables before starting the application. See [Enable the tracer for your service](#enable-the-tracer-for-your-service) section to identify which environment variables to set based on your .NET Tracer installation method and follow the examples below to correctly set the environment variables based on the environment of your instrumented service.
+To attach automatic instrumentation to your service, set the required environment variables before starting the application. See [Enable the APM SDK for your service](#enable-the-apm-sdk-for-your-service-for-your-service) section to identify which environment variables to set based on your .NET APM SDK installation method and follow the examples below to correctly set the environment variables based on the environment of your instrumented service.
### Windows
-COR_PROFILER if you installed the APM SDK using the MSI.Starting v2.14.0, you don't need to set
+COR_PROFILER if you installed the tracer using the MSI.Starting v2.14.0, you don't need to set
#### Windows services
@@ -273,7 +273,7 @@ To automatically instrument a console application, set the environment variables
```bat
rem Set environment variables
SET COR_ENABLE_PROFILING=1
-rem Unless v2.14.0+ and you installed the tracer with the MSI
+rem Unless v2.14.0+ and you installed the SDK with the MSI
SET COR_PROFILER={846F5F1C-F9AE-4B07-969E-05C26BC060D8}
rem Set additional Datadog environment variables
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/go.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/go.md
index e3cafd323345c..eb72a7bd9ca5d 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/go.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/go.md
@@ -25,7 +25,7 @@ further_reading:
## Compatibility requirements
-The Go Tracer requires Go `1.18+` and Datadog Agent `>= 5.21.1`. For a full list of Datadog's Go version and framework support (including legacy and maintenance versions), see the [Compatibility Requirements][1] page.
+The Go APM SDK requires Go `1.18+` and Datadog Agent `>= 5.21.1`. For a full list of Datadog's Go version and framework support (including legacy and maintenance versions), see the [Compatibility Requirements][1] page.
## Getting started
@@ -37,7 +37,7 @@ Datadog has a series of pluggable packages which provide out-of-the-box support
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][3] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][3] for details.
For configuration instructions and details about using the API, see the Datadog [API documentation][4].
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/java.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/java.md
index 7d93f6f4fa6b2..f1164cb4ef74b 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/java.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/java.md
@@ -21,7 +21,7 @@ further_reading:
---
## Compatibility requirements
-The latest Java Tracer supports all JVMs version 8 and higher. For additional information about JVM versions below 8, read [Supported JVM runtimes][10].
+The latest Java APM SDK supports all JVMs version 8 and higher. For additional information about JVM versions below 8, read [Supported JVM runtimes][10].
For a full list of Datadog's Java version and framework support (including legacy and maintenance versions), read [Compatibility Requirements][1].
@@ -31,11 +31,11 @@ Before you begin, make sure you've already [installed and configured the Agent][
### Instrument your application
-After you install and configure your Datadog Agent, the next step is to add the tracing library directly in the application to instrument it. Read more about [compatibility information][1].
+After you install and configure your Datadog Agent, the next step is to add the APM SDK directly in the application to instrument it. Read more about [compatibility information][1].
To begin tracing your applications:
-1. Download `dd-java-agent.jar` that contains the latest tracer class files, to a folder that is accessible by your Datadog user:
+1. Download `dd-java-agent.jar` that contains the latest APM SDK class files, to a folder that is accessible by your Datadog user:
{{< tabs >}}
{{% tab "Wget" %}}
@@ -82,7 +82,7 @@ To begin tracing your applications:
Additional [configuration options](#configuration) are described below.
-### Add the Java Tracer to the JVM
+### Add the Java APM SDK to the JVM
Use the documentation for your application server to figure out the right way to pass in `-javaagent` and other JVM arguments. Here are instructions for some commonly used frameworks:
@@ -229,7 +229,7 @@ Instrumentation may come from auto-instrumentation, the OpenTracing API, or a mi
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][9] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][9] for details.
## Further Reading
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs.md
index e548077cb008a..0a983115401ae 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs.md
@@ -29,35 +29,35 @@ further_reading:
---
## Compatibility requirements
-The latest Node.js Tracer supports Node.js versions `>=18`. For a full list of Datadog's Node.js version and framework support (including legacy and maintenance versions), see the [Compatibility Requirements][1] page.
+The latest Node.js APM SDK supports Node.js versions `>=18`. For a full list of Datadog's Node.js version and framework support (including legacy and maintenance versions), see the [Compatibility Requirements][1] page.
## Getting started
-Before you begin, make sure you've already [installed and configured the Agent][13]. Then, complete the following steps to add the Datadog tracing library to your Node.js application to instrument it.
+Before you begin, make sure you've already [installed and configured the Agent][13]. Then, complete the following steps to add the Datadog APM SDK to your Node.js application to instrument it.
-### Install the Datadog tracing library
+### Install the Datadog APM SDK
-To install the Datadog tracing library using npm for Node.js 18+, run:
+To install the Datadog APM SDK using npm for Node.js 18+, run:
```shell
npm install dd-trace --save
```
-To install the Datadog tracing library (version 4.x of `dd-trace`) for end-of-life Node.js version 16, run:
+To install the Datadog APM SDK (version 4.x of `dd-trace`) for end-of-life Node.js version 16, run:
```shell
npm install dd-trace@latest-node16
```
For more information on Datadog's distribution tags and Node.js runtime version support, see the [Compatibility Requirements][1] page.
If you are upgrading from a previous major version of the library (0.x, 1.x, 2.x, 3.x or 4.x) to another major version, read the [Migration Guide][5] to assess any breaking changes.
-### Import and initialize the tracer
+### Import and initialize the APM SDK
-Import and initialize the tracer either in code or with command line arguments. The Node.js tracing library needs to be imported and initialized **before** any other module.
+Import and initialize the APM SDK either in code or with command line arguments. The Node.js APM SDK needs to be imported and initialized **before** any other module.
-After you have completed setup, if you are not receiving complete traces, including missing URL routes for web requests, or disconnected or missing spans, **confirm the tracer has been imported and initialized correctly**. The tracing library being initialized first is necessary for the tracer to properly patch all of the required libraries for automatic instrumentation.
+After you have completed setup, if you are not receiving complete traces, including missing URL routes for web requests, or disconnected or missing spans, **confirm the SDK has been imported and initialized correctly**. The APM SDK being initialized first is necessary to properly patch all of the required libraries for automatic instrumentation.
-When using a transpiler such as TypeScript, Webpack, Babel, or others, import and initialize the tracer library in an external file and then import that file as a whole when building your application.
+When using a transpiler such as TypeScript, Webpack, Babel, or others, import and initialize the APM SDK in an external file and then import that file as a whole when building your application.
-#### Option 1: Add the tracer in code
+#### Option 1: Add the APM SDK in code
##### JavaScript
@@ -68,7 +68,7 @@ const tracer = require('dd-trace').init();
##### TypeScript and bundlers
-For TypeScript and bundlers that support EcmaScript Module syntax, initialize the tracer in a separate file to maintain correct load order.
+For TypeScript and bundlers that support EcmaScript Module syntax, initialize the APM SDK in a separate file to maintain correct load order.
```typescript
// server.ts
@@ -88,19 +88,19 @@ initializes in one step.
import 'dd-trace/init';
```
-#### Option 2: Add the tracer with command line arguments
+#### Option 2: Add the APM SDK with command line arguments
-Use the `--require` option to Node.js to load and initialize the tracer in one step.
+Use the `--require` option to Node.js to load and initialize the SDK in one step.
```sh
node --require dd-trace/init app.js
```
-**Note:** This approach requires using environment variables for all configuration of the tracer.
+**Note:** This approach requires using environment variables for all configuration of the APM SDK.
#### ESM applications only: Import the loader
-EcmaScript Modules (ESM) applications require an additional command line argument. Run this command regardless of how the tracer is imported and initialized.
+EcmaScript Modules (ESM) applications require an additional command line argument. Run this command regardless of how the SDK is imported and initialized.
**Node.js < v20.6**
```shell
@@ -119,12 +119,12 @@ node --import dd-trace/register.js entrypoint.js
Bundlers crawl all of the `require()` calls that an application makes to files on disk. It replaces the `require()` calls with custom code and combines all of the resulting JavaScript into one "bundled" file. When a built-in module is loaded, such as `require('fs')`, that call can then remain the same in the resulting bundle.
APM tools like `dd-trace` stop working at this point. They can continue to intercept the calls for built-in modules but don't intercept calls to third party libraries. This means that when you bundle a `dd-trace` app with a bundler it is likely to capture information about disk access (through `fs`) and outbound HTTP requests (through `http`), but omit calls to third party libraries. For example:
-- Extracting incoming request route information for the `express` framework.
+- Extracting incoming request route information for the `express` framework.
- Showing which query is run for the `mysql` database client.
A common workaround is to treat all third party modules that the APM needs to instrument as being "external" to the bundler. With this setting the instrumented modules remain on disk and continue to be loaded with `require()` while the non-instrumented modules are bundled. However, this results in a build with many extraneous files and starts to defeat the purpose of bundling.
-Datadog recommends you have custom-built bundler plugins. These plugins are able to instruct the bundler on how to behave, inject intermediary code and intercept the "translated" `require()` calls. As a result, more packages are included in the bundled JavaScript file.
+Datadog recommends you have custom-built bundler plugins. These plugins are able to instruct the bundler on how to behave, inject intermediary code and intercept the "translated" `require()` calls. As a result, more packages are included in the bundled JavaScript file.
**Note**: Some applications can have 100% of modules bundled, however native modules still need to remain external to the bundle.
@@ -168,7 +168,7 @@ esbuild.build({
})
```
-**Note**: Due to the usage of native modules in the tracer, which are compiled C++ code, (usually ending with a `.node` file extension), you need to add entries to your `external` list. Currently native modules used in the Node.js tracer live inside of `@datadog` prefixed packages. This will also require that you ship a `node_modules/` directory alongside your bundled application. You don't need to ship your entire `node_modules/` directory as it would contain many superfluous packages that should be contained in your bundle.
+**Note**: Due to the usage of native modules in the APM SDK, which are compiled C++ code, (usually ending with a `.node` file extension), you need to add entries to your `external` list. Currently native modules used in the Node.js APM SDK live inside of `@datadog` prefixed packages. This will also require that you ship a `node_modules/` directory alongside your bundled application. You don't need to ship your entire `node_modules/` directory as it would contain many superfluous packages that should be contained in your bundle.
To generate a smaller `node_modules/` directory with only the required native modules, (and their dependencies) you can first determine the versions of packages that you need, then create a temporary directory to install them into, and copy the resulting `node_modules/` directory from it. For example:
@@ -190,9 +190,9 @@ At this stage you should be able to deploy your bundle, (which is your applicati
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][4] for details.
-Read [tracer settings][3] for a list of initialization options.
+Read [APM SDK settings][3] for a list of initialization options.
## Further Reading
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/php.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/php.md
index 1abcf89468828..064bdc1f053b1 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/php.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/php.md
@@ -31,7 +31,7 @@ further_reading:
---
## Compatibility requirements
-The minimum PHP version requirement for the latest version of `dd-trace-php` is PHP 7. If you are using PHP 5, you can still use the PHP tracer up to version [0.99](https://github.com/DataDog/dd-trace-php/releases/tag/0.99.0). PHP 5 is EOL as of version 1.0 of the PHP library.
+The minimum PHP version requirement for the latest version of `dd-trace-php` is PHP 7. If you are using PHP 5, you can still use the PHP APM SDK up to version [0.99](https://github.com/DataDog/dd-trace-php/releases/tag/0.99.0). PHP 5 is EOL as of version 1.0 of the PHP library.
For a full list of Datadog's PHP version and framework support (including legacy and maintenance versions), see the [Compatibility Requirements][1] page.
@@ -91,7 +91,7 @@ If the PHP CLI binary is built as NTS (non thread-safe), while Apache uses a ZTS
COR_PROFILER if you installed the APM SDK using the MSI.
SELinux:
-If the httpd SELinux policies are configured on the host, functionality of the tracer may be limited, unless writing and executing temporary files is explicitly allowed in SELinux configuration:
+If the httpd SELinux policies are configured on the host, functionality of the APM SDK may be limited, unless writing and executing temporary files is explicitly allowed in SELinux configuration:
`allow httpd_t httpd_tmpfs_t:file { execute execute_no_trans };`
@@ -101,7 +101,7 @@ If the httpd SELinux policies are configured on the host, functionality of the t
Tracing is automatically enabled by default. Once the extension is installed, **ddtrace** traces your application and sends traces to the Agent.
-Datadog supports all web frameworks out of the box. Automatic instrumentation works by modifying PHP's runtime to wrap certain functions and methods to trace them. The PHP tracer supports automatic instrumentation for several libraries.
+Datadog supports all web frameworks out of the box. Automatic instrumentation works by modifying PHP's runtime to wrap certain functions and methods to trace them. The PHP APM SDK supports automatic instrumentation for several libraries.
Automatic instrumentation captures:
@@ -112,7 +112,7 @@ Automatic instrumentation captures:
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][6] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][6] for details.
## Tracing short- and long-running CLI scripts
@@ -120,7 +120,7 @@ Additional steps are required for instrumenting CLI scripts. Read [Trace PHP CLI
## Upgrading
-To upgrade the PHP tracer, [download the latest release][5] and follow the same steps as [installing the extension](#install-the-extension).
+To upgrade the PHP APM SDK, [download the latest release][5] and follow the same steps as [installing the extension](#install-the-extension).
Once the installation is completed restart PHP (PHP-FPM or the Apache SAPI).
@@ -128,7 +128,7 @@ Once the installation is completed restart PHP (PHP-FPM or the Apache SAPI).
## Removing
-To remove the PHP tracer:
+To remove the PHP APM SDK:
1. For php-fpm, stop the php-fpm service, otherwise stop the Apache web server.
2. Unlink files `98-ddtrace.ini` and `99-ddtrace-custom.ini` from your php configuration folder.
@@ -138,7 +138,7 @@ To remove the PHP tracer:
## Troubleshooting an application crash
-In the unusual event of an application crash caused by the PHP tracer, typically because of a segmentation fault, the best thing to do is obtain a core dump or a Valgrind trace and contact Datadog support.
+In the unusual event of an application crash caused by the PHP APM SDK, typically because of a segmentation fault, the best thing to do is obtain a core dump or a Valgrind trace and contact Datadog support.
### Install debug symbols
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/python.md b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/python.md
index d984d1df141c0..4203bfc3c3e8b 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/python.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/dd_libraries/python.md
@@ -34,9 +34,9 @@ Before you begin, make sure you've already [installed and configured the Agent][
### Instrument your application
-After you install and configure your Datadog Agent, the next step is to add the tracing library directly in the application to instrument it. Read more about [compatibility information][1].
+After you install and configure your Datadog Agent, the next step is to add the APM SDK directly in the application to instrument it. Read more about [compatibility information][1].
-To begin tracing applications written in Python, install the Datadog Tracing library, `ddtrace`, using pip:
+To begin tracing applications written in Python, install the Datadog APM SDK, `ddtrace`, using pip:
```python
pip install ddtrace
@@ -56,11 +56,11 @@ For example, if your application is started with `python app.py` then:
ddtrace-run python app.py
```
-Once you've finished setup and are running the tracer with your application, you can run `ddtrace-run --info` to check that configurations are working as expected. Note that the output from this command does not reflect configuration changes made during runtime in code.
+Once you've finished setup and are running the APM SDK with your application, you can run `ddtrace-run --info` to check that configurations are working as expected. Note that the output from this command does not reflect configuration changes made during runtime in code.
## Configuration
-If needed, configure the tracing library to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][3] for details.
+If needed, configure the APM SDK to send application performance telemetry data as you require, including setting up Unified Service Tagging. Read [Library Configuration][3] for details.
The connection for traces can also be configured in code:
diff --git a/content/en/tracing/trace_collection/automatic_instrumentation/single-step-apm.md b/content/en/tracing/trace_collection/automatic_instrumentation/single-step-apm.md
index 469de6dd7d6b3..f48774d812f8d 100644
--- a/content/en/tracing/trace_collection/automatic_instrumentation/single-step-apm.md
+++ b/content/en/tracing/trace_collection/automatic_instrumentation/single-step-apm.md
@@ -135,7 +135,7 @@ To enable Single Step Instrumentation with the Datadog Operator:
features:
apm:
instrumentation:
- enabled: true
+ enabled: true
```
Replace `` with your [Datadog site][12] and `` with the environment your Agent is installed on (for example, `env:staging`).
DD_SITE="" DD_APM_INSTRUMENTATION_ENABLED=host DD_ENV=staging bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
```
-You can optionally provide a version number for the tracing library by placing a colon after the language name and specifying the tracing library version. If you don't specify a version, it defaults to the latest version. Language names are comma-separated.
+You can optionally provide a version number for the APM SDK by placing a colon after the language name and specifying the APM SDK version. If you don't specify a version, it defaults to the latest version. Language names are comma-separated.
-Available versions are listed in tracer source repositories for each language:
+Available versions are listed in SDK source repositories for each language:
- [Java][8] (`java`)
- [Node.js][9] (`js`)
@@ -237,19 +237,19 @@ Available versions are listed in tracer source repositories for each language:
{{% tab "Docker" %}}
-### Specifying tracing library versions {#lib-docker}
+### Specifying APM SDK versions {#lib-docker}
By default, enabling APM on your server installs support for Java, Python, Ruby, Node.js, and .NET services. If you only have services implemented in some of these languages, set `DD_APM_INSTRUMENTATION_LIBRARIES` when running the installation script.
-For example, to install support for only v1.25.0 of the Java tracing library and the latest Python tracing library, add the following to the installation command:
+For example, to install support for only v1.25.0 of the Java APM SDK and the latest Python APM SDK, add the following to the installation command:
```shell
DD_APM_INSTRUMENTATION_ENABLED=docker DD_NO_AGENT_INSTALL=true DD_APM_INSTRUMENTATION_LIBRARIES="java:1.25.0,python" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
```
-You can optionally provide a version number for the tracing library by placing a colon after the language name and specifying the tracing library version. If you don't specify a version, it defaults to the latest version. Language names are comma-separated.
+You can optionally provide a version number for the APM SDK by placing a colon after the language name and specifying the APM SDK version. If you don't specify a version, it defaults to the latest version. Language names are comma-separated.
-Available versions are listed in tracer source repositories for each language:
+Available versions are listed in SDK source repositories for each language:
- [Java][8] (`java`)
- [Node.js][9] (`js`)
@@ -283,7 +283,7 @@ To enable instrumentation for specific namespaces, add `enabledNamespaces` confi
features:
apm:
instrumentation:
- enabled: true
+ enabled: true
enabledNamespaces: # Add namespaces to instrument
- default
- applications
@@ -295,7 +295,7 @@ To disable instrumentation for specific namespaces, add `disabledNamespaces` con
features:
apm:
instrumentation:
- enabled: true
+ enabled: true
disabledNamespaces: # Add namespaces to not instrument
- default
- applications
@@ -331,16 +331,16 @@ To disable instrumentation for specific namespaces, add `disabledNamespaces` con
{{< /collapse-content >}}
-### Specifying tracing library versions
+### Specifying APM SDK versions
-"` |
| Ruby | `admission.datadoghq.com/ruby-lib.version: ""` |
-Replace `` with the desired library version. Available versions are listed in the [Datadog container registries](#container-registries) and tracer source repositories for each language:
+Replace `` with the desired library version. Available versions are listed in the [Datadog container registries](#container-registries) and SDK source repositories for each language:
- [Java][31]
- [Node.js][32]
@@ -437,7 +437,7 @@ Datadog publishes instrumentation libraries images on gcr.io, Docker Hub, and Am
The `DD_ADMISSION_CONTROLLER_AUTO_INSTRUMENTATION_CONTAINER_REGISTRY` environment variable in the Datadog Cluster Agent configuration specifies the registry used by the Admission Controller. The default value is `gcr.io/datadoghq`.
-You can pull the tracing library from a different registry by changing it to `docker.io/datadog`, `public.ecr.aws/datadog`, or another URL if you are hosting the images in a local container registry.
+You can pull the APM SDK from a different registry by changing it to `docker.io/datadog`, `public.ecr.aws/datadog`, or another URL if you are hosting the images in a local container registry.
For instructions on changing your container registry, see [Changing Your Container Registry][30].
diff --git a/content/en/tracing/trace_collection/compatibility/_index.md b/content/en/tracing/trace_collection/compatibility/_index.md
index 906e20632f870..cc9f9b2a9c58b 100644
--- a/content/en/tracing/trace_collection/compatibility/_index.md
+++ b/content/en/tracing/trace_collection/compatibility/_index.md
@@ -5,7 +5,7 @@ description:
further_reading:
- link: "/tracing/trace_collection/"
tag: "Documentation"
- text: "Add the tracing library to your application"
+ text: "Add the APM SDK to your application"
aliases:
- /tracing/compatibility
- /tracing/compatibility_requirements
diff --git a/content/en/tracing/trace_collection/compatibility/dotnet-core.md b/content/en/tracing/trace_collection/compatibility/dotnet-core.md
index 2f3a295d56033..0c38662e9eb84 100644
--- a/content/en/tracing/trace_collection/compatibility/dotnet-core.md
+++ b/content/en/tracing/trace_collection/compatibility/dotnet-core.md
@@ -1,6 +1,6 @@
---
title: .NET and .NET Core Compatibility Requirements
-description: 'Compatibility Requirements for the .NET Tracer'
+description: 'Compatibility Requirements for the .NET APM SDK'
aliases:
- /tracing/compatibility_requirements/dotnet-core
- /tracing/setup_overview/compatibility_requirements/dotnet-core
@@ -20,13 +20,13 @@ further_reading:
---
-The Datadog .NET Tracer supports all .NET-based languages (for example, C#, F#, Visual Basic). It has [beta support for trimmed apps][12].
+The Datadog .NET APM SDK supports all .NET-based languages (for example, C#, F#, Visual Basic). It has [beta support for trimmed apps][12].
-The .NET Tracer is open source. For more information, see the [.NET Tracer repository][1].
+The .NET APM SDK is open source. For more information, see the [.NET APM SDK repository][1].
## Supported .NET and .NET Core runtimes
-The .NET Tracer supports automatic instrumentation on the following .NET and .NET Core versions. It also supports [.NET Framework][2].
+The .NET APM SDK supports automatic instrumentation on the following .NET and .NET Core versions. It also supports [.NET Framework][2].
| .NET Version | Microsoft End of Life | Support level | Package version |
| -------------------- | --------------------- | -------------------- | -------------------- |
@@ -44,7 +44,7 @@ Additional information can be found in [Microsoft's .NET and .NET Core Lifecycle
## Supported processor architectures
-The .NET Tracer supports automatic instrumentation on the following architectures:
+The .NET APM SDK supports automatic instrumentation on the following architectures:
| Processor architectures | Support level | Package version |
| ------------------------------------------|-----------------------|----------------------------------------|
@@ -56,7 +56,7 @@ The .NET Tracer supports automatic instrumentation on the following architecture
## Integrations
-The [latest version of the .NET Tracer][4] can automatically instrument the following libraries:
+The [latest version of the .NET APM SDK][4] can automatically instrument the following libraries:
| Framework or library | NuGet package | Integration Name |
| ------------------------------- | ---------------------------------------------------------------------------------------------------- | -------------------- |
@@ -92,9 +92,13 @@ The [latest version of the .NET Tracer][4] can automatically instrument the foll
Don't see the library you're looking for? First, check if the library produces observability data compatible with OpenTelemetry (see [Using OpenTelemetry Instrumentation Libraries][13] for more details). If not, Datadog is continually adding additional support. [Check with the Datadog team][5] for help.
+### Azure SDK
+
+Azure SDK provides built-in OpenTelemetry support. Enable it by setting the `AZURE_EXPERIMENTAL_ENABLE_ACTIVITY_SOURCE` environment variable to `true` or by setting the `Azure.Experimental.EnableActivitySource` context switch to `true` in your application code. See [Azure SDK documentation][14] for more details.
+
## End of life .NET runtime versions
-The .NET Tracer works on .NET Core 2.0, 2.1, 2.2, 3.0, and 3.1, and on .NET 5 and 7, but these versions reached their end of life and are no longer supported by Microsoft. See [Microsoft's support policy][3] for more details. Datadog recommends using the latest patch version of .NET 6 or .NET 8. Older versions of .NET and .NET Core may encounter the following runtime issues when enabling automatic instrumentation:
+The .NET APM SDK works on .NET Core 2.0, 2.1, 2.2, 3.0, and 3.1, and on .NET 5 and 7, but these versions reached their end of life and are no longer supported by Microsoft. See [Microsoft's support policy][3] for more details. Datadog recommends using the latest patch version of .NET 6 or .NET 8. Older versions of .NET and .NET Core may encounter the following runtime issues when enabling automatic instrumentation:
| Issue | Affected .NET Versions | Solution | More information |
|-----------------------------------------------|-------------------------------------------|------------------------------------------------------------------------|-----------------------------------------|
@@ -115,7 +119,7 @@ The .NET Tracer works on .NET Core 2.0, 2.1, 2.2, 3.0, and 3.1, and on .NET 5 an
## .NET runtime support policy
-The .NET Tracer depends on the host operating system, .NET runtime, certain .NET libraries, and the Datadog Agent/API. These third party software systems support specific versions of .NET and .NET Core. When the external software no longer supports a version of .NET, the .NET Tracer also limits its support for that version.
+The .NET APM SDK depends on the host operating system, .NET runtime, certain .NET libraries, and the Datadog Agent/API. These third party software systems support specific versions of .NET and .NET Core. When the external software no longer supports a version of .NET, the .NET APM SDK also limits its support for that version.
### Levels of support
@@ -129,7 +133,7 @@ The .NET Tracer depends on the host operating system, .NET runtime, certain .NET
### Package versioning
-The .NET Tracer practices [semantic versioning][11].
+The .NET APM SDK practices [semantic versioning][11].
Version updates imply the following changes to runtime support:
- **Major version updates** (for example `1.0.0` to `2.0.0`) may change support for any runtime from [Beta](#support-beta)/[GA](#support-ga) to [Maintenance](#support-maintenance)/[EOL](#support-eol).
diff --git a/content/en/tracing/trace_collection/compatibility/dotnet-framework.md b/content/en/tracing/trace_collection/compatibility/dotnet-framework.md
index 5ccd34b7854de..93ffef0b734cb 100644
--- a/content/en/tracing/trace_collection/compatibility/dotnet-framework.md
+++ b/content/en/tracing/trace_collection/compatibility/dotnet-framework.md
@@ -1,6 +1,6 @@
---
title: .NET Framework Compatibility Requirements
-description: 'Compatibility Requirements for the .NET Tracer'
+description: 'Compatibility Requirements for the .NET APM SDK'
aliases:
- /tracing/compatibility_requirements/dotnet-framework
- /tracing/setup_overview/compatibility_requirements/dotnet-framework
@@ -17,13 +17,13 @@ further_reading:
---
-The Datadog .NET Tracer supports all .NET-based languages (for example, C#, F#, Visual Basic).
+The Datadog .NET APM SDK supports all .NET-based languages (for example, C#, F#, Visual Basic).
-The .NET Tracer is open source. For more information, see the [.NET Tracer repository][1].
+The .NET APM SDK is open source. For more information, see the [.NET APM SDK repository][1].
## Supported .NET Framework runtimes
-The .NET Tracer supports automatic and custom instrumentation on the following .NET Framework versions. It also supports [.NET Core and .NET 5+][2]. The .NET Tracer does not support code running in partial trust environments.
+The .NET APM SDK supports automatic and custom instrumentation on the following .NET Framework versions. It also supports [.NET Core and .NET 5+][2]. The .NET APM SDK does not support code running in partial trust environments.
| .NET Framework Version | Microsoft End of Life | Support level | Package version | Datadog End of Life |
| ----------------------- | --------------------- | ----------------------------------- | -------------------------- | ------------------- |
@@ -41,13 +41,13 @@ The .NET Tracer supports automatic and custom instrumentation on the following .
Additional information can be found in [Microsoft's .NET Framework Lifecycle Policy][4] and in [.NET runtime support policy](#net-runtime-support-policy).
See Advanced options for more options.
@@ -145,7 +145,7 @@ To enable Single Step Instrumentation with the Datadog Operator:
kubectl apply -f /path/to/your/datadog-agent.yaml
```
5. After waiting a few minutes for the Datadog Cluster Agent changes to apply, restart your applications.
-{{< /collapse-content >}}
+{{< /collapse-content >}}
{{< collapse-content title="Installing with Helm" level="h4" >}}
Follow these steps to enable Single Step Instrumentation across your entire cluster with Helm. This automatically sends traces for all applications in the cluster that are written in supported languages.
@@ -182,7 +182,7 @@ To enable Single Step Instrumentation with Helm:
```
5. After waiting a few minutes for the Datadog Cluster Agent changes to apply, restart your applications.
-{{< /collapse-content >}}
+{{< /collapse-content >}}
[1]: https://v3.helm.sh/docs/intro/install/
[2]: https://kubernetes.io/docs/tasks/tools/install-kubectl/
@@ -205,19 +205,19 @@ When you run the one-line installation command, there are a few options to custo
{{< tabs >}}
{{% tab "Linux host or VM" %}}
-### Specifying tracing library versions {#lib-linux}
+### Specifying APM SDK versions {#lib-linux}
By default, enabling APM on your server installs support for Java, Python, Ruby, Node.js, and .NET Core services. If you only have services implemented in some of these languages, set `DD_APM_INSTRUMENTATION_LIBRARIES` in your one-line installation command.
-For example, to install support for only v1.25.0 of the Java tracing library and the latest Python tracing library, add the following to the installation command:
+For example, to install support for only v1.25.0 of the Java APM SDK and the latest Python APM SDK, add the following to the installation command:
```shell
DD_APM_INSTRUMENTATION_LIBRARIES="java:1.25.0,python" DD_API_KEY=Starting with Datadog Cluster Agent v7.52.0+, you can automatically instrument a subset of your applications, based on the tracing libraries you specify.
+Starting with Datadog Cluster Agent v7.52.0+, you can automatically instrument a subset of your applications, based on the APM SDKs you specify.
-Specify Datadog tracing libraries and their versions to automatically instrument applications written in those languages. You can configure this in two ways, which are applied in the following order of precedence:
+Specify Datadog APM SDKs and their versions to automatically instrument applications written in those languages. You can configure this in two ways, which are applied in the following order of precedence:
1. [Specify at the service level](#specifying-at-the-service-level), or
2. [Specify at the cluster level](#specifying-at-the-cluster-level).
-**Default**: If you don't specify any library versions and `apm.instrumentation.enabled=true`, applications written in supported languages are automatically instrumented using the latest tracing library versions.
+**Default**: If you don't specify any library versions and `apm.instrumentation.enabled=true`, applications written in supported languages are automatically instrumented using the latest APM SDK versions.
#### Specifying at the service level
@@ -354,7 +354,7 @@ To automatically instrument applications in specific pods, add the appropriate l
| .NET | `admission.datadoghq.com/dotnet-lib.version: "
-
Note: When deciding which tracer version to use for an automatic instrumentation, use the .NET Framework version installed on the application server. For example, if you compile your application to target .NET Framework 4.5.1, but the application runs on a server that has .NET Framework 4.8 installed, use the latest version of the tracer. To determine which version of .NET Framework is installed on a machine, follow the guidance provided by Microsoft.
+
## Supported processor architectures
-The .NET Tracer supports automatic instrumentation on the following architectures:
+The .NET APM SDK supports automatic instrumentation on the following architectures:
| Processor architectures | Support level | Package version |
| ------------------------------------------------------------------------|-----------------------|----------------------------------------|
@@ -95,6 +95,10 @@ The [latest version of the .NET Tracer][5] can automatically instrument the foll
Don't see the library you're looking for? First, check if the library produces observability data compatible with OpenTelemetry (see [Using OpenTelemetry Instrumentation Libraries][11] for more details). If not, Datadog is continually adding additional support. [Check with the Datadog team][6] for help.
+### Azure SDK
+
+Azure SDK provides built-in OpenTelemetry support. Enable it by setting the `AZURE_EXPERIMENTAL_ENABLE_ACTIVITY_SOURCE` environment variable to `true` or by setting the `Azure.Experimental.EnableActivitySource` context switch to `true` in your application code. See [Azure SDK documentation][12] for more details.
+
## Supported Datadog Agent versions
| **Datadog Agent version** | **Package version** |
@@ -105,7 +109,7 @@ Don't see the library you're looking for? First, check if the library produces o
## .NET runtime support policy
-The .NET Tracer depends on the host operating system, .NET Framework runtime, certain .NET Framework libraries, and the Datadog Agent/API. These third party software systems support specific versions of .NET Framework. When the external software no longer supports a version of .NET Framework, the .NET Tracer also limits its support for that version.
+The .NET APM SDK depends on the host operating system, .NET Framework runtime, certain .NET Framework libraries, and the Datadog Agent/API. These third party software systems support specific versions of .NET Framework. When the external software no longer supports a version of .NET Framework, the .NET APM SDK also limits its support for that version.
### Levels of support
diff --git a/content/en/tracing/trace_collection/compatibility/go.md b/content/en/tracing/trace_collection/compatibility/go.md
index 7976dfee0d691..d2f125598a365 100644
--- a/content/en/tracing/trace_collection/compatibility/go.md
+++ b/content/en/tracing/trace_collection/compatibility/go.md
@@ -1,6 +1,6 @@
---
title: Go Compatibility Requirements
-description: 'Compatibility Requirements for the Go tracer'
+description: 'Compatibility Requirements for the Go APM SDK'
aliases:
- /tracing/compatibility_requirements/go
- /tracing/setup_overview/compatibility_requirements/go
@@ -17,18 +17,18 @@ further_reading:
The Go Datadog Trace library is open source. View the [GitHub repository][1] for more information.
-The Go Datadog Trace Library has a [version support policy][2] defined for Go versions. The two latest releases of Go are fully supported, while the third newest release is considered in [maintenance][3]. Older versions may function, but no support is provided by default. For special requests, [contact support][4].
+The Go APM SDK has a [version support policy][2] defined for Go versions. The two latest releases of Go are fully supported, while the third newest release is considered in [maintenance][3]. Older versions may function, but no support is provided by default. For special requests, [contact support][4].
### Requirements
- Datadog Agent v5.21.1+.
-- [Add and initialize the Datadog Go tracer][77] before configuring integrations.
+- [Add and initialize the Datadog Go APM SDK][77] before configuring integrations.
### Integrations
#### Framework compatibility
-Integrate the Go tracer with the following list of web frameworks using one of the following helper packages.
+Integrate the Go APM SDK with the following list of web frameworks using one of the following helper packages.
**Note**: The [integrations documentation][5] provides a detailed overview of the supported packages and their APIs, along with usage examples.
@@ -45,7 +45,7 @@ Integrate the Go tracer with the following list of web frameworks using one of t
#### Library compatibility
-The Go tracer includes support for the following data stores and libraries.
+The Go APM SDK includes support for the following data stores and libraries.
| Library | Support Type | Examples and Documentation |
|-------------------------|-----------------|---------------------------------------------------------------------------------|
diff --git a/content/en/tracing/trace_collection/compatibility/java.md b/content/en/tracing/trace_collection/compatibility/java.md
index 5d2f5a27df219..784a5d89e2139 100644
--- a/content/en/tracing/trace_collection/compatibility/java.md
+++ b/content/en/tracing/trace_collection/compatibility/java.md
@@ -1,6 +1,6 @@
---
title: Java Compatibility Requirements
-description: 'Compatibility Requirements for the Java tracer'
+description: 'Compatibility Requirements for the Java APM SDK'
code_lang: java
type: multi-code-lang
code_lang_weight: 0
@@ -20,9 +20,9 @@ The Java Datadog Trace library is open source - view the [GitHub repository][1]
### Supported Java runtimes
-The Java Tracer supports automatic instrumentation for the following Oracle JDK, OpenJDK JVM, and [GraalVM](#graalvm-native-image-support) runtimes.
+The Java APM SDK supports automatic instrumentation for the following Oracle JDK, OpenJDK JVM, and [GraalVM](#graalvm-native-image-support) runtimes.
-#### Java Tracer v1 (latest)
+#### Java APM SDK v1 (latest)
Note: When deciding which APM SDK version to use for an automatic instrumentation, use the .NET Framework version installed on the application server. For example, if you compile your application to target .NET Framework 4.5.1, but the application runs on a server that has .NET Framework 4.8 installed, use the latest version of the tracer. To determine which version of .NET Framework is installed on a machine, follow the guidance provided by Microsoft.