Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions content/en/serverless/azure_functions/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This page explains how to collect traces, trace metrics, runtime metrics, and cu
```js
require('@datadog/serverless-compat').start();

// This line must come before importing any instrumented module.
// This line must come before importing any instrumented module.
const tracer = require('dd-trace').init()
```

Expand Down Expand Up @@ -101,7 +101,7 @@ This page explains how to collect traces, trace metrics, runtime metrics, and cu
Datadog.Serverless.CompatibilityLayer.Start();
```

If your Azure Function app uses the In-Process model, add a NuGet package reference to `Microsoft.Azure.Functions.Extensions`:
If your Azure Function app uses the In-Container model, add a NuGet package reference to `Microsoft.Azure.Functions.Extensions`:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we try to keep casing persistent? I see it lower and upper-cased in different areas.

```shell
dotnet package add Microsoft.Azure.Functions.Extensions
```
Expand Down Expand Up @@ -197,7 +197,7 @@ You can collect [debug logs][6] for troubleshooting. To configure debug logs, us
`DD_TRACE_DEBUG`
: Enables (`true`) or disables (`false`) debug logging for the Datadog Tracing Library. Defaults to `false`.

**Values**: `true`, `false`
**Values**: `true`, `false`

`DD_LOG_LEVEL`
: Sets logging level for the Datadog Serverless Compatibility Layer. Defaults to `info`.
Expand Down
12 changes: 6 additions & 6 deletions content/en/serverless/google_cloud_run/containers/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ further_reading:
- link: 'https://www.datadoghq.com/blog/collect-traces-logs-from-cloud-run-with-datadog/'
tag: 'Blog'
text: 'Collect traces, logs, and custom metrics from Cloud Run services'
- link: "/serverless/google_cloud_run/containers/in_process/"
- link: "/serverless/google_cloud_run/containers/in_container/"
tag: 'Documentation'
text: 'Instrument your container with the in-process approach'
text: 'Instrument your container with the in-container approach'
- link: "/serverless/google_cloud_run/containers/sidecar/"
tag: 'Documentation'
text: 'Instrument your container with the sidecar approach'
Expand All @@ -22,12 +22,12 @@ To instrument your Google Cloud Run containers with Datadog, choose one of two o

{{% gcr-container-options %}}

- [**In-process**][1]: Wraps your application container with the Datadog Agent. Choose this option for a simpler setup, lower cost overhead, and direct log piping.
- [**In-Container**][1]: Wraps your application container with the Datadog Agent. Choose this option for a simpler setup, lower cost overhead, and direct log piping.
- [**Sidecar**][2]: Deploys the Datadog Agent in a separate container alongside your app container. Choose this option if you have multiple containers in a single service, if you prefer strict isolation of the Datadog Agent, or if you have performance-sensitive workloads.

## Comparison: in-process versus sidecar instrumentation
## Comparison: In-Container versus sidecar instrumentation

| Aspect | In-process | Sidecar |
| Aspect | In-Container | Sidecar |
|-------------------------------|----------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Deployment | One container (your app, wrapped with the Datadog Agent) | Two containers ( your app, Datadog Agent) |
| Image changes | Increases app image size. | No change to app image. |
Expand All @@ -41,5 +41,5 @@ To instrument your Google Cloud Run containers with Datadog, choose one of two o

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

[1]: /serverless/google_cloud_run/containers/in_process
[1]: /serverless/google_cloud_run/containers/in_container
[2]: /serverless/google_cloud_run/containers/sidecar
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
---
title: In-Process Instrumentation
title: In-Container Instrumentation
type: multi-code-lang
aliases:
- /serverless/google_cloud_run/containers_in_process/
- /serverless/google_cloud_run/containers/in_process/
---

First, set up the **[Google Cloud Integration][1]** to collect metrics and logs from Google Cloud services. Remember to add the `cloud asset viewer` role to your service account and enable the Cloud Asset Inventory API in Google Cloud.

Then, instrument your application using one of the following guides:

{{% container-languages path="in_process" %}}
{{% container-languages path="in_container" %}}

[1]: /integrations/google-cloud-platform/
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a .NET Cloud Run Container In-Process
title: Instrumenting a .NET Cloud Run Container In-Container
code_lang: dotnet
type: multi-code-lang
code_lang_weight: 50
aliases:
- /serverless/google_cloud_run/containers/in_process/dotnet
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/dotnet-core/?tab=linux'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/dotnet">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/dotnet">available on GitHub</a>.</div>

1. **Install the Datadog .NET tracer** in your Dockerfile.

Expand Down Expand Up @@ -76,7 +78,7 @@ logger.LogInformation("Hello World!");

To send custom metrics, [install the DogStatsD client][4] and [view code examples][5].

{{% gcr-env-vars instrumentationMethod="in-process" language="csharp" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="csharp" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a Go Cloud Run Container In-Process
title: Instrumenting a Go Cloud Run Container In-Container
code_lang: go
type: multi-code-lang
code_lang_weight: 30
aliases:
- /serverless/google_cloud_run/containers/in_process/go
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/go/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/go">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/go">available on GitHub</a>.</div>

1. **Install the Datadog Go tracer**.

Expand Down Expand Up @@ -71,7 +73,7 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2

To send custom metrics, [install the DogStatsD client][4] and [view code examples][5].

{{% gcr-env-vars instrumentationMethod="in-process" language="go" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="go" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a Java Cloud Run Container In-Process
title: Instrumenting a Java Cloud Run Container In-Container
code_lang: java
type: multi-code-lang
code_lang_weight: 40
aliases:
- /serverless/google_cloud_run/containers/in_process/java
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/java/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/java">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/java">available on GitHub</a>.</div>

1. **Install the Datadog Java tracer**.

Expand Down Expand Up @@ -86,7 +88,7 @@ logger.info("Hello World!");

To send custom metrics, [install the DogStatsD client][3] and [view code examples][4].

{{% gcr-env-vars instrumentationMethod="in-process" language="java" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="java" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a Node.js Cloud Run Container In-Process
title: Instrumenting a Node.js Cloud Run Container In-Container
code_lang: nodejs
type: multi-code-lang
code_lang_weight: 20
aliases:
- /serverless/google_cloud_run/containers/in_process/nodejs
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/node">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/node">available on GitHub</a>.</div>

1. **Install the Datadog Node.js tracer**.

Expand Down Expand Up @@ -79,7 +81,7 @@ logger.info(`Hello world!`);

To send custom metrics, [view code examples][3].

{{% gcr-env-vars instrumentationMethod="in-process" language="nodejs" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="nodejs" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a PHP Cloud Run Container In-Process
title: Instrumenting a PHP Cloud Run Container In-Container
code_lang: php
type: multi-code-lang
code_lang_weight: 70
aliases:
- /serverless/google_cloud_run/containers/in_process/php
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/php/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/php">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/php">available on GitHub</a>.</div>

1. **Install the Datadog PHP tracer** in your Dockerfile.

Expand Down Expand Up @@ -55,7 +57,7 @@ apk add libgcc

To send custom metrics, [install the DogStatsD client][3] and [view code examples][4].

{{% gcr-env-vars instrumentationMethod="in-process" language="php" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="php" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a Python Cloud Run Container In-Process
title: Instrumenting a Python Cloud Run Container In-Container
code_lang: python
type: multi-code-lang
code_lang_weight: 10
aliases:
- /serverless/google_cloud_run/containers/in_process/python
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/python/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/python">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/python">available on GitHub</a>.</div>

1. **Install the Datadog Python tracer**.

Expand Down Expand Up @@ -76,7 +78,7 @@ logger.info("Hello world!")

To send custom metrics, [install the DogStatsD client][4] and [view code examples][5].

{{% gcr-env-vars instrumentationMethod="in-process" language="python" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="python" %}}

## Troubleshooting

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
---
title: Instrumenting a Ruby Cloud Run Container In-Process
title: Instrumenting a Ruby Cloud Run Container In-Container
code_lang: ruby
type: multi-code-lang
code_lang_weight: 60
aliases:
- /serverless/google_cloud_run/containers/in_process/ruby
further_reading:
- link: '/tracing/trace_collection/automatic_instrumentation/dd_libraries/ruby/'
tag: 'Documentation'
Expand All @@ -14,7 +16,7 @@ further_reading:

## Setup

<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-process/ruby">available on GitHub</a>.</div>
<div class="alert alert-info">A sample application is <a href="https://github.com/DataDog/serverless-gcp-sample-apps/tree/main/cloud-run/in-container/ruby">available on GitHub</a>.</div>

1. **Install the Datadog Ruby tracer**.

Expand Down Expand Up @@ -58,7 +60,7 @@ logger.info "Hello world!"

To send custom metrics, [install the DogStatsD client][3] and [view code examples][4].

{{% gcr-env-vars instrumentationMethod="in-process" language="ruby" %}}
{{% gcr-env-vars instrumentationMethod="in-container" language="ruby" %}}

## Troubleshooting

Expand Down
4 changes: 2 additions & 2 deletions content/en/serverless/google_cloud_run/functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ See [Configure labels for services][15] in the Cloud Run documentation for instr
| `DD_SOURCE` | See [Unified Service Tagging][13]. |
| `DD_TAGS` | See [Unified Service Tagging][13]. |

Do not use the `DD_LOGS_ENABLED` environment variable. This variable is only used for [in-process container instrumentation][14].
Do not use the `DD_LOGS_ENABLED` environment variable. This variable is only used for [In-Container container instrumentation][14].

You can also find `FUNCTION_TARGET` on the source tab inside Google console: `Function entry point`.

Expand Down Expand Up @@ -757,6 +757,6 @@ public class Function : IHttpFunction
[11]: /tracing/other_telemetry/connect_logs_and_traces/go
[12]: /tracing/other_telemetry/connect_logs_and_traces/ruby
[13]: /getting_started/tagging/unified_service_tagging/
[14]: /serverless/google_cloud_run/containers_in_process
[14]: /serverless/google_cloud_run/containers/in_container/
[15]: https://cloud.google.com/run/docs/configuring/services/labels
[16]: https://cloud.google.com/blog/products/serverless/google-cloud-functions-is-now-cloud-run-functions
4 changes: 2 additions & 2 deletions layouts/shortcodes/gcr-container-options.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="container cards-dd col-num-2">
<div class="row g-2 g-xl-3 justify-content-center">
<div class="col">
<a class="card h-100" href="/serverless/google_cloud_run/containers/in_process">
<a class="card h-100" href="/serverless/google_cloud_run/containers/in_container">
<div class="card-body text-center d-flex align-items-center justify-content-center p-0" style="min-height: 120px;">
<h5 class="m-0">In-Process</h5>
<h5 class="m-0">In-Container</h5>
</div>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/shortcodes/gcr-env-vars.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| Variable | Description |
| ------------------------ | ----------- |
| `DD_API_KEY` | [Datadog API key][1001] - **Required**|
| `DD_SITE` | [Datadog site][1002] - **Required** |{{ if eq (.Get "instrumentationMethod") "in-process" }}
| `DD_SITE` | [Datadog site][1002] - **Required** |{{ if eq (.Get "instrumentationMethod") "in-container" }}
| `DD_LOGS_ENABLED` | When true, send logs (stdout and stderr) to Datadog. Defaults to false. |{{ end }}{{ if eq (.Get "instrumentationMethod") "sidecar" }}
| `DD_SERVERLESS_LOG_PATH` | The path where the sidecar should tail logs from. Defaults to `/shared-volume/logs/app.log`. |{{ end }}
| `DD_LOGS_INJECTION` | When true, enrich all logs with trace data for supported loggers. See [Correlate Logs and Traces][1003] for more information. {{ if eq (.Get "instrumentationMethod") "sidecar" }}Set in your *main* application container, not the sidecar container.{{ end }}|
Expand Down
Loading