Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion content/en/administrators_guide/plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Centrally administer and manage all of your Datadog Agents with [Fleet Automatio

### Remote Configuration

Use Datadog's [Remote Configuration][35] (enabled by default), to remotely configure and change the behavior of Datadog components (for example, Agents, tracing libraries, and Observability Pipelines Worker) deployed in your infrastructure. For more information, see [supported products and capabilities][36].
Use Datadog's [Remote Configuration][35] (enabled by default), to remotely configure and change the behavior of Datadog components (for example, Agents, SDKs, and Observability Pipelines Worker) deployed in your infrastructure. For more information, see [supported products and capabilities][36].

### Notebooks

Expand Down
2 changes: 1 addition & 1 deletion content/en/agent/configuration/network.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ The APM receiver and the DogStatsD ports are located in the **Trace Collection C
# receiver_port: 8126
{{< /code-block >}}

<div class="alert alert-danger">If you change the DogStatsD port or APM receiver port value here, you must also change the APM tracing library configuration for the corresponding port. See the information about configuring ports in the <a href="/tracing/trace_collection/library_config/">Library Configuration docs for your language</a>.</div>
<div class="alert alert-danger">If you change the DogStatsD port or APM receiver port value here, you must also change the Datadog SDK configuration for the corresponding port. See the information about configuring ports in the <a href="/tracing/trace_collection/library_config/">Library Configuration docs for your language</a>.</div>

## Using proxies

Expand Down
2 changes: 1 addition & 1 deletion content/en/agent/guide/heroku-ruby.md
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ git commit -m "Enable distributed tracing"
git push heroku main
```

During the build, error messages are displayed about the tracer not being able to reach the Datadog APM Agent endpoint. This is normal, as during the build process, the Datadog Agent hasn't started yet. You can ignore these messages:
During the build, error messages are displayed about the SDK not being able to reach the Datadog APM Agent endpoint. This is normal, as during the build process, the Datadog Agent hasn't started yet. You can ignore these messages:

```bash
remote: Download Yarn at https://yarnpkg.com/en/docs/install
Expand Down
4 changes: 2 additions & 2 deletions content/en/agent/guide/linux-key-rotation-2024.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: "Information about the 2024 GPG key rotation for Datadog RPM and DE
As a common best practice, Datadog periodically rotates the keys and certificates used to sign Datadog's Agent packages. Datadog packages include:

- the different flavors of Agent (`datadog-agent`, `datadog-iot-agent`, `datadog-heroku-agent` and `datadog-dogstatsd`).
- additional packages: Observability Pipelines Worker (`observability-pipelines-worker`), FIPS proxy (`datadog-fips-proxy`) and the APM injection and tracer libraries for Java, Python, .NET, Ruby and Node.js (all `datadog-apm-*` packages).
- additional packages: Observability Pipelines Worker (`observability-pipelines-worker`), FIPS proxy (`datadog-fips-proxy`) and the APM injection and SDKs for Java, Python, .NET, Ruby and Node.js (all `datadog-apm-*` packages).

The following GPG keys, used to sign the above RPM and DEB packages, reach their end-of-life in September 2024. The rotation is planned for June 2024:

Expand Down Expand Up @@ -43,7 +43,7 @@ If you're using one of the following installation methods, your host automatical

Additionally, installing the DEB Agent v6.48.0+ or v7.48.0+ package through `apt` from the `apt.datadoghq.com` repository installs the [`datadog-signing-keys` package](#the-datadog-signing-keys-package) version 1.3.1. The `datadog-signing-keys` package automatically ensures that your host trusts the new key. If you have `datadog-signing-keys` version 1.3.1 or later installed, no further action is needed. Versions of `datadog-signing-keys` older than version 1.3.1 don't guarantee full preparedness for the key rotation.

If you installed Observability Pipelines Worker or APM tracer libraries **using the above install methods**, they already come with the newest keys. No further action is required.
If you installed Observability Pipelines Worker or Datadog SDKs **using the above install methods**, they already come with the newest keys. No further action is required.

If you're installing the DEB Agent package from a different repository or you are not using `apt` (or a similar tool that checks repo metadata signatures), your system doesn't need to know the Datadog signing keys. No further action is needed. However, you may benefit from the [`datadog-signing-keys` package](#the-datadog-signing-keys-package).

Expand Down
4 changes: 2 additions & 2 deletions content/en/change_tracking/feature_flags.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ Trace-based enrichment uses APM traces to automatically associate feature flag c

#### Setup

To automatically detect services using a feature flag, instrument your feature flag evaluation code with the APM tracing library. This allows Datadog to automatically detect all services that evaluate a specific flag, even if they weren't originally tagged.
To automatically detect services using a feature flag, instrument your feature flag evaluation code with the Datadog SDK. This allows Datadog to automatically detect all services that evaluate a specific flag, even if they weren't originally tagged.

1. [Instrument your feature flag evaluation code][4] using the Datadog tracing library.
1. [Instrument your feature flag evaluation code][4] using the Datadog SDK.
1. Create a custom span with the operation name `experiments.IsEnabled` to track feature flag evaluations.
3. Tag the span with `experiment_id:<flag-id>`, where `<flag-id>` matches the feature flag ID.

Expand Down
20 changes: 10 additions & 10 deletions content/en/containers/amazon_ecs/apm.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ If you are updating a local file for your Agent's task definition, [register you

## Configure your application container to submit traces to Datadog Agent

### Install the tracing library
Follow the [setup instructions for installing the Datadog tracing library][2] for your application's language. For ECS install the tracer into your application's container image.
### Install the SDK
Follow the [setup instructions for installing the Datadog SDK][2] for your application's language. For ECS install the SDK into your application's container image.

### Provide the UDS configuration

Expand Down Expand Up @@ -174,7 +174,7 @@ To configure this in your application's task definition:
Once deployed, the Application container and Datadog Agent container will share the `sourcePath` typed volume at `/var/run/datadog` and can communicate through the sockets in this folder.

### Provide the private IP address for the EC2 instance
If you are not using UDS, provide the tracer with the private IP address of the underlying EC2 instance that the application container is running on. This address is the hostname of the tracer endpoint. The Datadog Agent container on the same host (with the host port enabled) receives these traces.
If you are not using UDS, provide the SDK with the private IP address of the underlying EC2 instance that the application container is running on. This address is the hostname of the SDK endpoint. The Datadog Agent container on the same host (with the host port enabled) receives these traces.

Use one of the following methods to dynamically get the private IP address:

Expand Down Expand Up @@ -212,11 +212,11 @@ cat $ECS_CONTAINER_METADATA_FILE | jq -r .HostPrivateIPv4Address
{{% /tab %}}
{{< /tabs >}}

Provide the result of this request to the tracer by setting the `DD_AGENT_HOST` environment variable for each application container that sends traces.
Provide the result of this request to the SDK by setting the `DD_AGENT_HOST` environment variable for each application container that sends traces.

### Configure the Trace Agent endpoint

In cases where variables on your ECS application are set at launch time (Java, .NET, and PHP), you **must** set the hostname of the tracer endpoint as an environment variable with `DD_AGENT_HOST` using one of the above methods. The examples below use the IMDSv1 metadata endpoint, but the configuration can be interchanged if needed. If you have a startup script as your entry point, include this call as part of the script, otherwise add it to the ECS Task Definition's `entryPoint`.
In cases where variables on your ECS application are set at launch time (Java, .NET, and PHP), you **must** set the hostname of the SDK endpoint as an environment variable with `DD_AGENT_HOST` using one of the above methods. The examples below use the IMDSv1 metadata endpoint, but the configuration can be interchanged if needed. If you have a startup script as your entry point, include this call as part of the script, otherwise add it to the ECS Task Definition's `entryPoint`.

For other supported languages (Python, JavaScript, Ruby, and Go) you can alternatively set the hostname in your application's source code.

Expand Down Expand Up @@ -253,7 +253,7 @@ Update the Task Definition's `entryPoint` with the following, substituting your
```

#### Code
You can alternatively update your code to have the tracer set the hostname explicitly:
You can alternatively update your code to have the SDK set the hostname explicitly:

```javascript
const tracer = require('dd-trace').init();
Expand All @@ -280,7 +280,7 @@ Update the Task Definition's `entryPoint` with the following, substituting your
```

#### Code
You can alternatively update your code to have the tracer set the hostname explicitly:
You can alternatively update your code to have the SDK set the hostname explicitly:

```ruby
require 'datadog' # Use 'ddtrace' if you're using v1.x
Expand All @@ -307,7 +307,7 @@ Update the Task Definition's `entryPoint` with the following, substituting your
```

#### Code
You can alternatively update your code to have the tracer set the hostname explicitly. {{% tracing-go-v2 %}}
You can alternatively update your code to have the SDK set the hostname explicitly. {{% tracing-go-v2 %}}

```go
package main
Expand Down Expand Up @@ -347,9 +347,9 @@ Update the Task Definition's `entryPoint` with the following, substituting your
"export DD_AGENT_HOST=$(curl http://169.254.169.254/latest/meta-data/local-ipv4); <Java Startup Command>"
]
```
The Java startup command should include your `-javaagent:/path/to/dd-java-agent.jar`, see the [Java tracing docs for adding the tracer to the JVM][1] for further examples.
The Java startup command should include your `-javaagent:/path/to/dd-java-agent.jar`, see the [Java tracing docs for adding the SDK to the JVM][1] for further examples.

[1]: /tracing/trace_collection/dd_libraries/java/?tab=containers#add-the-java-tracer-to-the-jvm
[1]: /tracing/trace_collection/dd_libraries/java/?tab=containers#add-the-java-sdk-to-the-jvm
{{< /programming-lang >}}

{{< programming-lang lang=".NET" >}}
Expand Down
6 changes: 3 additions & 3 deletions content/en/containers/cluster_agent/admission_controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ further_reading:
## Overview
The Datadog Admission Controller is a component of the Datadog Cluster Agent. The main benefit of the Admission Controller is to simplify your application Pod configuration. For that, it has two main functionalities:

- Inject environment variables (`DD_AGENT_HOST`, `DD_TRACE_AGENT_URL`, `DD_ENTITY_ID` and `DD_EXTERNAL_ENV`) to configure DogStatsD and APM tracer libraries into the user's application containers.
- Inject environment variables (`DD_AGENT_HOST`, `DD_TRACE_AGENT_URL`, `DD_ENTITY_ID` and `DD_EXTERNAL_ENV`) to configure DogStatsD and Datadog SDKs into the user's application containers.
- Inject Datadog standard tags (`env`, `service`, `version`) from application labels into the container environment variables.

Datadog's Admission Controller is `MutatingAdmissionWebhook` type. For more details on admission controllers, see the [Kubernetes guide on admission controllers][1].
Expand Down Expand Up @@ -133,7 +133,7 @@ Add environment variables to the Cluster Agent deployment which enable the Admis
- name: DD_ADMISSION_CONTROLLER_SERVICE_NAME
value: "datadog-cluster-agent-admission-controller"

# Uncomment this to configure APM tracers automatically (see below)
# Uncomment this to configure Datadog SDKs automatically (see below)
# - name: DD_ADMISSION_CONTROLLER_MUTATE_UNLABELLED
# value: "true"
{{< /code-block >}}
Expand All @@ -151,7 +151,7 @@ Finally, run the following commands:
### APM Instrumentation library injection
You can configure the Cluster Agent (version 7.39 and higher) to inject instrumentation libraries using Single Step Instrumentation. Read [Single Step APM Instrumentation][2] for more information.

If you do not want to use Single Step Instrumentation, the Datadog Admission Controller can be used to inject APM tracer libraries directly as a manual, pod-level alternative. Read [Local SDK Injection][7] for more information.
If you do not want to use Single Step Instrumentation, the Datadog Admission Controller can be used to inject Datadog SDKs directly as a manual, pod-level alternative. Read [Local SDK Injection][7] for more information.

### APM and DogStatsD environment variable injection

Expand Down
4 changes: 2 additions & 2 deletions content/en/containers/docker/apm.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ As of Agent 6.0.0, the Trace Agent is enabled by default. If it has been turned

The CLI commands on this page are for the Docker runtime. Replace `docker` with `nerdctl` for the containerd runtime, or `podman` for the Podman runtime.

<div class="alert alert-info">If you are collecting traces from a containerized app (your Agent and app running in separate containers), as an alternative to the following instructions, you can automatically inject the tracing library into your application. Read <a href="/tracing/trace_collection/library_injection_local/?tab=agentandappinseparatecontainers">Injecting Libraries</a> for instructions.</div>
<div class="alert alert-info">If you are collecting traces from a containerized app (your Agent and app running in separate containers), as an alternative to the following instructions, you can automatically inject the SDK into your application. Read <a href="/tracing/trace_collection/library_injection_local/?tab=agentandappinseparatecontainers">Injecting Libraries</a> for instructions.</div>

## Tracing from the host

Expand Down Expand Up @@ -225,7 +225,7 @@ Where your `<DATADOG_SITE>` is {{< region-param key="dd_site" code="true" >}} (d
This exposes the hostname `datadog-agent` in your `app` container.
If you're using `docker-compose`, `<NETWORK_NAME>` parameters are the ones defined under the `networks` section of your `docker-compose.yml`.

Your application tracers must be configured to submit traces to this address. Set environment variables with the `DD_AGENT_HOST` as the Agent container name, and `DD_TRACE_AGENT_PORT` as the Agent Trace port in your application containers. The example above uses host `datadog-agent` and port `8126` (the default value so you don't have to set it).
Your application SDKs must be configured to submit traces to this address. Set environment variables with the `DD_AGENT_HOST` as the Agent container name, and `DD_TRACE_AGENT_PORT` as the Agent Trace port in your application containers. The example above uses host `datadog-agent` and port `8126` (the default value so you don't have to set it).

Alternately, see the examples below to set the Agent host manually in each supported language:

Expand Down
2 changes: 1 addition & 1 deletion content/en/containers/kubernetes/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ For Agent commands, see the [Agent Commands guides][9]. For information on the D
{{< nextlink href="/agent/kubernetes/installation">}}<u>Installation</u>: Install the Datadog Agent in a Kubernetes environment.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/configuration">}}<u>Further Configuration</u>: Collect events, override proxy settings, send custom metrics with DogStatsD, configure container allowlists and blocklists, and reference the full list of available environment variables.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/distributions">}}<u>Distributions</u>: Review base configurations for major Kubernetes distributions, including AWS Elastic Kubernetes Service (EKS), Azure Kubernetes Service (AKS), Google Kubernetes Engine (GKE), Red Hat OpenShift, Rancher, and Oracle Container Engine for Kubernetes (OKE).{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/apm">}}<u>APM</u>: Set up trace collection: configure the Agent to accept traces, configure your Pods to communicate with the Agent, and configure your application tracers to emit traces.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/apm">}}<u>APM</u>: Set up trace collection: configure the Agent to accept traces, configure your Pods to communicate with the Agent, and configure your application SDKs to emit traces.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/appsec">}}<u>App and API Protection</u>: Automatically enable App and API Protection for your Kubernetes ingress proxies and gateways to detect threats and protect APIs at the edge.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/csi">}}<u>CSI Driver</u>: Install and set up Datadog CSI driver, and mount DogStatsD and Trace Agent UDS socket using Datadog CSI volumes.{{< /nextlink >}}
{{< nextlink href="/agent/kubernetes/log">}}<u>Log collection</u>: Set up log collection in a Kubernetes environment.{{< /nextlink >}}
Expand Down
10 changes: 5 additions & 5 deletions content/en/containers/kubernetes/apm.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ further_reading:

This page describes how to set up and configure [Application Performance Monitoring (APM)][10] for your Kubernetes application.

{{< img src="tracing/visualization/troubleshooting_pipeline_kubernetes.png" alt="The APM troubleshooting pipeline: The tracer sends traces and metrics data from the application pod to the Agent pod, which sends it to the Datadog backend to be shown in the Datadog UI.">}}
{{< img src="tracing/visualization/troubleshooting_pipeline_kubernetes.png" alt="The APM troubleshooting pipeline: The SDK sends traces and metrics data from the application pod to the Agent pod, which sends it to the Datadog backend to be shown in the Datadog UI.">}}

You can send traces over Unix Domain Socket (UDS), TCP (`IP:Port`), or Kubernetes service. Datadog recommends that you use UDS, but it is possible to use all three at the same time, if necessary.

Expand Down Expand Up @@ -140,8 +140,8 @@ kind: Deployment
name: apmsocketpath
```

### Configure your application tracers to emit traces:
After configuring your Datadog Agent to collect traces and giving your application pods the configuration on *where* to send traces, install the Datadog tracer into your applications to emit the traces. Once this is done, the tracer sends the traces to the appropriate `DD_TRACE_AGENT_URL` endpoint.
### Configure your application SDKs to emit traces:
After configuring your Datadog Agent to collect traces and giving your application pods the configuration on *where* to send traces, install the Datadog SDK into your applications to emit the traces. Once this is done, the SDK sends the traces to the appropriate `DD_TRACE_AGENT_URL` endpoint.

{{% /tab %}}

Expand All @@ -165,8 +165,8 @@ kind: Deployment
```
**Note:** This configuration requires the Agent to be configured to accept traces over TCP

### Configure your application tracers to emit traces:
After configuring your Datadog Agent to collect traces and giving your application pods the configuration on *where* to send traces, install the Datadog tracer into your applications to emit the traces. Once this is done, the tracer automatically sends the traces to the appropriate `DD_AGENT_HOST` endpoint.
### Configure your application SDKs to emit traces:
After configuring your Datadog Agent to collect traces and giving your application pods the configuration on *where* to send traces, install the Datadog SDK into your applications to emit the traces. Once this is done, the SDK automatically sends the traces to the appropriate `DD_AGENT_HOST` endpoint.

[1]: /agent/cluster_agent/admission_controller/
{{% /tab %}}
Expand Down
Loading
Loading