APM SDKs

content/en/tracing/_index.md

@@ -49,7 +49,7 @@ For an introduction to terminology used in Datadog APM, see [APM Terms and Conce
 
 The simplest way to start with Datadog APM is with Single Step Instrumentation. This approach installs the Datadog Agent and instruments your application in one step, with no additional configuration steps required. To learn more, read [Single Step Instrumentation][27].
 
-For setups that require more customization, Datadog supports custom instrumentation with Datadog tracing libraries. To learn more, read [Application Instrumentation][2].
+For setups that require more customization, Datadog supports custom instrumentation with Datadog APM SDKs. To learn more, read [Application Instrumentation][2].
 
 <div class="alert alert-info">If you're new to Datadog APM, read <a href="https://docs.datadoghq.com/getting_started/tracing/">Getting Started with APM</a> to learn how to send your first trace to Datadog.</div>
 

content/en/tracing/configure_data_security/_index.md

@@ -16,15 +16,15 @@ further_reading:
 ---
 ## Overview
 
-Datadog tracing libraries collect data from an instrumented application. That data is sent to Datadog as traces and it may contain sensitive data such as personally identifiable information (PII). If you are ingesting sensitive data as traces into Datadog, remediations can be added at ingestion with [Sensitive Data Scanner][12]. You can also configure the Datadog Agent or the tracing library to remediate sensitive data at collection before traces are sent to Datadog.
+Datadog APM SDKs collect data from an instrumented application. That data is sent to Datadog as traces and it may contain sensitive data such as personally identifiable information (PII). If you are ingesting sensitive data as traces into Datadog, remediations can be added at ingestion with [Sensitive Data Scanner][12]. You can also configure the Datadog Agent or the APM SDK to remediate sensitive data at collection before traces are sent to Datadog.
 
 If the configurations described here do not cover your compliance requirements, reach out to [the Datadog support team][1].
 
 ### Personal information in trace data
 
-Datadog's APM tracing libraries collect relevant observability data about your applications. Because these libraries collect hundreds of unique attributes in trace data, this page describes categories of data, with a focus on attributes that may contain personal information about your employees and end-users. 
+Datadog's APM SDKs collect relevant observability data about your applications. Because these libraries collect hundreds of unique attributes in trace data, this page describes categories of data, with a focus on attributes that may contain personal information about your employees and end-users.
 
-The table below describes the personal data categories collected by the automatic instrumentation provided by the tracing libraries, with some common examples listed. 
+The table below describes the personal data categories collected by the automatic instrumentation provided by the APM SDKs, with some common examples listed.
 
 | Category            | Description                                                                                                            |
 |:--------------------|:-----------------------------------------------------------------------------------------------------------------------|
@@ -36,7 +36,7 @@ The table below describes the personal data categories collected by the automati
 | URI parameters      | The parameter values in the variable part of the URI path or the URI query.                                            |
 | URI userinfo        | The userinfo subcomponent of the URI that may contain the user name.                                                   |
 
-The table below describes the default behavior of each language tracing library with regard to whether a data category is collected and whether it is obfuscated by default.
+The table below describes the default behavior of each language APM SDK with regard to whether a data category is collected and whether it is obfuscated by default.
 
 {{% tabs %}}
 
@@ -215,7 +215,7 @@ The table below describes the default behavior of each language tracing library
 
 {{% /tabs %}}
 
-If you use Datadog Application Security Management (ASM), the tracing libraries collect HTTP request data to help you understand the nature of a security trace. Datadog ASM automatically redacts certain data, and you can configure your own detection rules. Learn more about these defaults and configuration options in the Datadog ASM [data privacy][13] documentation.
+If you use Datadog Application Security Management (ASM), the APM SDKs collect HTTP request data to help you understand the nature of a security trace. Datadog ASM automatically redacts certain data, and you can configure your own detection rules. Learn more about these defaults and configuration options in the Datadog ASM [data privacy][13] documentation.
 
 ## Agent
 
@@ -570,8 +570,8 @@ If you are running in a containerized environment, set `DD_APM_IGNORE_RESOURCES`
 
 ### HTTP
 
-Datadog is standardizing [span tag semantics][3] across tracing libraries. Information from HTTP requests are added as span tags prefixed with `http.`. The libraries have the following configuration options to control sensitive data collected in HTTP spans.
-    
+Datadog is standardizing [span tag semantics][3] across APM SDKs. Information from HTTP requests are added as span tags prefixed with `http.`. The libraries have the following configuration options to control sensitive data collected in HTTP spans.
+
 #### Redact query strings
 
 The `http.url` tag is assigned the full URL value, including the query string. The query string could contain sensitive data, so by default Datadog parses it and redacts suspicious-looking values. This redaction process is configurable. To modify the regular expression used for redaction, set the `DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP` environment variable to a valid regex of your choice. Valid regex is platform-specific. When the regex finds a suspicious key-value pair, it replaces it with `<redacted>`.
@@ -586,17 +586,17 @@ To collect trace header tags, set the `DD_TRACE_HEADER_TAGS` environment variabl
 DD_TRACE_HEADER_TAGS=CASE-insensitive-Header:my-tag-name,User-ID:userId,My-Header-And-Tag-Name
 ```
 
-### Processing 
+### Processing
 
-Some tracing libraries provide an interface for processing spans to manually modify or remove sensitive data collected in traces:
+Some APM SDKs provide an interface for processing spans to manually modify or remove sensitive data collected in traces:
 
 * Java: [TraceInterceptor interface][9]
 * Ruby: [Processing Pipeline][10]
 * Python: [Trace Filtering][11]
 
 ## Telemetry collection
 
-Datadog may gather environmental and diagnostic information about your tracing libraries for processing; this may include information about the host running an application, operating system, programming language and runtime, APM integrations used, and application dependencies. Additionally, Datadog may collect information such as diagnostic logs, crash dumps with obfuscated stack traces, and various system performance metrics.
+Datadog may gather environmental and diagnostic information about your APM SDKs for processing; this may include information about the host running an application, operating system, programming language and runtime, APM integrations used, and application dependencies. Additionally, Datadog may collect information such as diagnostic logs, crash dumps with obfuscated stack traces, and various system performance metrics.
 
 You can disable this telemetry collection using either of these settings:
 
@@ -654,7 +654,7 @@ PCI compliance for APM is not available for the {{< region-param key="dd_site_na
 [6]: /tracing/guide/ignoring_apm_resources/
 [7]: /agent/docker/apm/?tab=standard#docker-apm-agent-environment-variables
 [8]: /tracing/guide/send_traces_to_agent_by_api/
-[9]: /tracing/trace_collection/custom_instrumentation/java/#extending-tracers
+[9]: /tracing/trace_collection/custom_instrumentation/java/#extending-apm-sdks
 [10]: /tracing/trace_collection/custom_instrumentation/ruby/?tab=activespan#post-processing-traces
 [11]: https://ddtrace.readthedocs.io/en/stable/advanced_usage.html#trace-filtering
 [12]: /sensitive_data_scanner/

content/en/tracing/error_tracking/_index.md

@@ -36,7 +36,7 @@ To get started with configuring your repository, see the [Source Code Integratio
 
 ## Use span tags to track error spans
 
-The Datadog tracers collect errors through integrations and the manual instrumentation of your backend services' source code. Error spans within a trace are processed by Error Tracking **if the error is located in a service entry span** (the uppermost service span). This span must also contain the `error.stack`, `error.message`, and `error.type` [span tags][1] to be tracked.
+The Datadog APM SDKs collect errors through integrations and the manual instrumentation of your backend services' source code. Error spans within a trace are processed by Error Tracking **if the error is located in a service entry span** (the uppermost service span). This span must also contain the `error.stack`, `error.message`, and `error.type` [span tags][1] to be tracked.
 
 {{< img src="tracing/error_tracking/flamegraph_with_errors.png" alt="Flame graph with errors" style="width:100%;" >}}
 
@@ -57,4 +57,4 @@ Issues created from APM include the distribution of impacted spans, the latest m
 [3]: /tracing/error_tracking/explorer
 [4]: /tracing
 [5]: https://app.datadoghq.com/apm/error-tracking
-[6]: /integrations/guide/source-code-integration
+[6]: /integrations/guide/source-code-integration

content/en/tracing/faq/app_analytics_agent_configuration.md

@@ -14,7 +14,7 @@ Migrate to <a href="/tracing/trace_pipeline"> Trace Retention and Ingestion </a>
 
 [App Analytics][1] is used to filter APM data by user-defined tags such as `customer_id`, `error_type`, or `app_name` to help troubleshoot and filter your requests. To enable it, either:
 
-* Configure your APM tracer to emit the relevant analytics from your services—either [automatically][2] or [manually][3].
+* Configure your APM APM SDK to emit the relevant analytics from your services—either [automatically][2] or [manually][3].
 * Configure the Datadog Agent to emit the relevant analytics from your services (instructions below).
 
 **Note**: To enable App Analytics with the Agent, [services][1] must be already flowing into Datadog.

content/en/tracing/glossary/_index.md

@@ -31,7 +31,7 @@ further_reading:
 
 The APM UI provides many tools to troubleshoot application performance and correlate it throughout the product, enabling you to find and resolve issues in distributed systems.
 
-For additional definitions and descriptions of important APM terms such as _spans_ and _indexed_, see the [main Glossary][22]. 
+For additional definitions and descriptions of important APM terms such as _spans_ and _indexed_, see the [main Glossary][22].
 
 | Concept                         | Description                                                                                                                                                                                                          |
 |---------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -70,7 +70,7 @@ Don't see the HTTP endpoints you were expecting on the Service page? In APM, end
 
 ## Resources
 
-Resources represent a particular domain of a customer application. They could typically be an instrumented web endpoint, database query, or background job. For a web service, these resources can be dynamic web endpoints that are grouped by a static span name -  `web.request`. In a database service, these would be database queries with the span name `db.query`. For example the `web-store` service has automatically instrumented resources - web endpoints - which handle checkouts, updating carts, adding items, and so on. A Resource name can be the HTTP method and the HTTP route, for example `GET /productpage` or `ShoppingCartController#checkout`. 
+Resources represent a particular domain of a customer application. They could typically be an instrumented web endpoint, database query, or background job. For a web service, these resources can be dynamic web endpoints that are grouped by a static span name -  `web.request`. In a database service, these would be database queries with the span name `db.query`. For example the `web-store` service has automatically instrumented resources - web endpoints - which handle checkouts, updating carts, adding items, and so on. A Resource name can be the HTTP method and the HTTP route, for example `GET /productpage` or `ShoppingCartController#checkout`.
 
 Each resource has its own [Resource page][7] with [trace metrics][15] scoped to the specific endpoint. Trace metrics can be used like any other Datadog metric - they are exportable to a dashboard or can be used to create monitors. The Resource page also shows the span summary widget with an aggregate view of [spans][21] for all [traces](#trace), latency distribution of requests, and traces which show requests made to this endpoint.
 
@@ -100,7 +100,7 @@ For more information, see the [propagating the trace context][27] for your appli
 
 Instrumentation is the process of adding code to your application to capture and report observability data to Datadog, such as traces, metrics, and logs. Datadog provides instrumentation libraries for various programming languages and frameworks.
 
-You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][24] or when you [manually add Datadog tracing libraries][25] to your code.
+You can automatically instrument your application when you install the Datadog Agent with [Single Step Instrumentation][24] or when you [manually add Datadog APM SDKs][25] to your code.
 
 You can use custom instrumentation by embedding tracing code directly into your application code. This allows you to programmatically create, modify, or delete traces to send to Datadog.
 
@@ -135,4 +135,4 @@ To learn more, read [Application Instrumentation][26].
 [24]: /tracing/trace_collection/automatic_instrumentation/single-step-apm
 [25]: /tracing/trace_collection/automatic_instrumentation/dd_libraries/
 [26]: /tracing/trace_collection/
-[27]: /tracing/trace_collection/trace_context_propagation
+[27]: /tracing/trace_collection/trace_context_propagation

content/en/tracing/guide/_index.md

@@ -77,6 +77,6 @@ These tutorials walk you through setting up a sample multi-service application w
     {{< nextlink href="tracing/guide/serverless_enable_aws_xray/" >}}Decide When to Use Datadog APM and AWS X-Ray {{< /nextlink >}}
     {{< nextlink href="/tracing/guide/setting_up_apm_with_cpp/" >}}Setting Up APM with C++{{< /nextlink >}}
     {{< nextlink href="/tracing/guide/leveraging_diversity_sampling/" >}}Understand Datadog Trace Retention Policy{{< /nextlink >}}
-    {{< nextlink href="/tracing/guide/agent_tracer_hostnames" >}}Understand the Difference Between the Agent Host and the Tracer Host{{< /nextlink >}}
+    {{< nextlink href="/tracing/guide/agent_tracer_hostnames" >}}Understand the Difference Between the Agent Host and the APM SDK Host{{< /nextlink >}}
     {{< nextlink href="/tracing/guide/setting_up_apm_with_kubernetes_service/" >}}Setting up APM with Kubernetes Service{{< /nextlink >}}
 {{< /whatsnext >}}

content/en/tracing/guide/agent_tracer_hostnames.md

@@ -1,31 +1,31 @@
 ---
-title: Understand the Difference Between the Agent Host and the Tracer Host
+title: Understand the Difference Between the Agent Host and the APM SDK Host
 
 ---
 
 ## Overview
 
 In Datadog APM, the `host` tag correlates spans and traces to infrastructure monitoring data, so host metrics are associated with hosts from spans and traces.
 
-## Datadog Agent vs. Tracer hostname
+## Datadog Agent vs. APM SDK hostname
 
-The **Agent host** is the host on which the Datadog Agent is running. The **Tracer host** is the host on which the application instrumented with the tracing library is running.
+The **Agent host** is the host on which the Datadog Agent is running. The **APM SDK host** is the host on which the application instrumented with the APM SDK is running.
 
-The Agent host and the Tracer host may differ based on how you deploy the Datadog Agent on your infrastructure:
+The Agent host and the APM SDK host may differ based on how you deploy the Datadog Agent on your infrastructure:
 
 
-When the Agent is deployed on the same host as the application (for example, using a [DaemonSet][1]), the Agent host and the Tracer host are the same.
+When the Agent is deployed on the same host as the application (for example, using a [DaemonSet][1]), the Agent host and the APM SDK host are the same.
 
 {{< img src="/tracing/guide/agent_tracer_hostnames/agent_host.png" alt="Agent deployed on the same host as the application" style="width:80%;" >}}
 
-When the Agent is deployed on a remote host, the Agent host is different from the Tracer host.
+When the Agent is deployed on a remote host, the Agent host is different from the APM SDK host.
 
 {{< img src="/tracing/guide/agent_tracer_hostnames/remote_host.png" alt="Agent deployed on a remote host, different from the application" style="width:80%;" >}}
 
-### When are the Tracer and Agent hosts set on spans?
+### When are the APM SDK and Agent hosts set on spans?
 
 - The Datadog Agent hostname is always set on spans.
-- The Tracer hostname is set on spans if `DD_TRACE_REPORT_HOSTNAME` is `true` (default is `false`).
+- The APM SDK hostname is set on spans if `DD_TRACE_REPORT_HOSTNAME` is `true` (default is `false`).
 
  Language | Config | Environment Variable
 ----------|--------|---------------------
@@ -37,7 +37,7 @@ Python | - | `DD_TRACE_REPORT_HOSTNAME`
 PHP | `datadog.trace.report_hostname` | `DD_TRACE_REPORT_HOSTNAME`
 Java |  `dd.trace.report-hostname` | `DD_TRACE_REPORT_HOSTNAME`
 
-### When does APM use host information? 
+### When does APM use host information?
 
 APM uses host information when you create [retention filters][2], generate [metrics from spans][3], or create [sensitive data scanner rules][4] using host tag filters in queries. For example, host tag filters like `availability-zone` and `cluster-name` are enriched from the Datadog Agent host information.
 
@@ -49,4 +49,4 @@ APM uses host information when you create [retention filters][2], generate [metr
 [1]: /containers/kubernetes/apm/?tab=daemonset
 [2]: /tracing/trace_pipeline/trace_retention
 [3]: /tracing/trace_pipeline/generate_metrics
-[4]: /sensitive_data_scanner/
+[4]: /sensitive_data_scanner/