From add86248ce1f07ad45cc36cd1cfead35a42b3788 Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Mon, 25 Aug 2025 13:59:42 -0400 Subject: [PATCH 1/4] move files from `in_process` to `in_container` --- .../containers/{in_process => in_container}/_index.md | 0 .../containers/{in_process => in_container}/dotnet.md | 0 .../containers/{in_process => in_container}/go.md | 0 .../containers/{in_process => in_container}/java.md | 0 .../containers/{in_process => in_container}/nodejs.md | 0 .../containers/{in_process => in_container}/php.md | 0 .../containers/{in_process => in_container}/python.md | 0 .../containers/{in_process => in_container}/ruby.md | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/_index.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/dotnet.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/go.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/java.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/nodejs.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/php.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/python.md (100%) rename content/en/serverless/google_cloud_run/containers/{in_process => in_container}/ruby.md (100%) diff --git a/content/en/serverless/google_cloud_run/containers/in_process/_index.md b/content/en/serverless/google_cloud_run/containers/in_container/_index.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/_index.md rename to content/en/serverless/google_cloud_run/containers/in_container/_index.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/dotnet.md b/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/dotnet.md rename to content/en/serverless/google_cloud_run/containers/in_container/dotnet.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/go.md b/content/en/serverless/google_cloud_run/containers/in_container/go.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/go.md rename to content/en/serverless/google_cloud_run/containers/in_container/go.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/java.md b/content/en/serverless/google_cloud_run/containers/in_container/java.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/java.md rename to content/en/serverless/google_cloud_run/containers/in_container/java.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/nodejs.md b/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/nodejs.md rename to content/en/serverless/google_cloud_run/containers/in_container/nodejs.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/php.md b/content/en/serverless/google_cloud_run/containers/in_container/php.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/php.md rename to content/en/serverless/google_cloud_run/containers/in_container/php.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/python.md b/content/en/serverless/google_cloud_run/containers/in_container/python.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/python.md rename to content/en/serverless/google_cloud_run/containers/in_container/python.md diff --git a/content/en/serverless/google_cloud_run/containers/in_process/ruby.md b/content/en/serverless/google_cloud_run/containers/in_container/ruby.md similarity index 100% rename from content/en/serverless/google_cloud_run/containers/in_process/ruby.md rename to content/en/serverless/google_cloud_run/containers/in_container/ruby.md From ab8ce2ec6548ec22af1a4b1559e52c63e1968dca Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Mon, 25 Aug 2025 14:03:11 -0400 Subject: [PATCH 2/4] add aliases --- .../google_cloud_run/containers/in_container/_index.md | 1 + .../google_cloud_run/containers/in_container/dotnet.md | 2 ++ .../serverless/google_cloud_run/containers/in_container/go.md | 2 ++ .../serverless/google_cloud_run/containers/in_container/java.md | 2 ++ .../google_cloud_run/containers/in_container/nodejs.md | 2 ++ .../serverless/google_cloud_run/containers/in_container/php.md | 2 ++ .../google_cloud_run/containers/in_container/python.md | 2 ++ .../serverless/google_cloud_run/containers/in_container/ruby.md | 2 ++ 8 files changed, 15 insertions(+) diff --git a/content/en/serverless/google_cloud_run/containers/in_container/_index.md b/content/en/serverless/google_cloud_run/containers/in_container/_index.md index d391a9b3d4eb5..5ac430936d0ba 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/_index.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/_index.md @@ -3,6 +3,7 @@ title: In-Process 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. diff --git a/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md b/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md index 2928a1b4a3845..c398b41dd33d4 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md @@ -3,6 +3,8 @@ title: Instrumenting a .NET Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/go.md b/content/en/serverless/google_cloud_run/containers/in_container/go.md index 7e128701a9cd9..48d32ec2e1352 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/go.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/go.md @@ -3,6 +3,8 @@ title: Instrumenting a Go Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/java.md b/content/en/serverless/google_cloud_run/containers/in_container/java.md index 9c49e1128a299..14b347d8d469f 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/java.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/java.md @@ -3,6 +3,8 @@ title: Instrumenting a Java Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md b/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md index 144ec482ebbc7..2ef32cbad4752 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md @@ -3,6 +3,8 @@ title: Instrumenting a Node.js Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/php.md b/content/en/serverless/google_cloud_run/containers/in_container/php.md index ed5a1f1f45333..5cd229760104c 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/php.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/php.md @@ -3,6 +3,8 @@ title: Instrumenting a PHP Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/python.md b/content/en/serverless/google_cloud_run/containers/in_container/python.md index 95b02574d8d17..fd3cd2c09a5f2 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/python.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/python.md @@ -3,6 +3,8 @@ title: Instrumenting a Python Cloud Run Container In-Process 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' diff --git a/content/en/serverless/google_cloud_run/containers/in_container/ruby.md b/content/en/serverless/google_cloud_run/containers/in_container/ruby.md index b1e8895f3f490..a0c10b6a62601 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/ruby.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/ruby.md @@ -3,6 +3,8 @@ title: Instrumenting a Ruby Cloud Run Container In-Process 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' From d759fbb57b365cfd90c1f921c3857e38845540db Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Mon, 25 Aug 2025 14:26:53 -0400 Subject: [PATCH 3/4] Rename other references to in-process --- content/en/serverless/azure_functions/_index.md | 6 +++--- .../serverless/google_cloud_run/containers/_index.md | 12 ++++++------ .../containers/in_container/_index.md | 4 ++-- .../containers/in_container/dotnet.md | 6 +++--- .../google_cloud_run/containers/in_container/go.md | 6 +++--- .../google_cloud_run/containers/in_container/java.md | 6 +++--- .../containers/in_container/nodejs.md | 6 +++--- .../google_cloud_run/containers/in_container/php.md | 6 +++--- .../containers/in_container/python.md | 6 +++--- .../google_cloud_run/containers/in_container/ruby.md | 6 +++--- content/en/serverless/google_cloud_run/functions.md | 4 ++-- layouts/shortcodes/gcr-container-options.html | 4 ++-- layouts/shortcodes/gcr-env-vars.html | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/content/en/serverless/azure_functions/_index.md b/content/en/serverless/azure_functions/_index.md index e54b683780a86..f84df6e312061 100644 --- a/content/en/serverless/azure_functions/_index.md +++ b/content/en/serverless/azure_functions/_index.md @@ -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() ``` @@ -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`: ```shell dotnet package add Microsoft.Azure.Functions.Extensions ``` @@ -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`. diff --git a/content/en/serverless/google_cloud_run/containers/_index.md b/content/en/serverless/google_cloud_run/containers/_index.md index 865175e141ebd..f076a42d27859 100644 --- a/content/en/serverless/google_cloud_run/containers/_index.md +++ b/content/en/serverless/google_cloud_run/containers/_index.md @@ -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' @@ -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. | @@ -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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/_index.md b/content/en/serverless/google_cloud_run/containers/in_container/_index.md index 5ac430936d0ba..173edf47cc69e 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/_index.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/_index.md @@ -1,5 +1,5 @@ --- -title: In-Process Instrumentation +title: In-Container Instrumentation type: multi-code-lang aliases: - /serverless/google_cloud_run/containers_in_process/ @@ -10,6 +10,6 @@ First, set up the **[Google Cloud Integration][1]** to collect metrics and logs 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/ diff --git a/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md b/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md index c398b41dd33d4..31bc627108d43 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/dotnet.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog .NET tracer** in your Dockerfile. @@ -78,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/go.md b/content/en/serverless/google_cloud_run/containers/in_container/go.md index 48d32ec2e1352..3a2e6c0609599 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/go.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/go.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog Go tracer**. @@ -73,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/java.md b/content/en/serverless/google_cloud_run/containers/in_container/java.md index 14b347d8d469f..3e17bad83c57b 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/java.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/java.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog Java tracer**. @@ -88,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md b/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md index 2ef32cbad4752..5c363502a7c55 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/nodejs.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog Node.js tracer**. @@ -81,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/php.md b/content/en/serverless/google_cloud_run/containers/in_container/php.md index 5cd229760104c..0e9bcc07a3f4b 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/php.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/php.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog PHP tracer** in your Dockerfile. @@ -57,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/python.md b/content/en/serverless/google_cloud_run/containers/in_container/python.md index fd3cd2c09a5f2..5db7211235e4e 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/python.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/python.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog Python tracer**. @@ -78,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 diff --git a/content/en/serverless/google_cloud_run/containers/in_container/ruby.md b/content/en/serverless/google_cloud_run/containers/in_container/ruby.md index a0c10b6a62601..a3e30b691e32b 100644 --- a/content/en/serverless/google_cloud_run/containers/in_container/ruby.md +++ b/content/en/serverless/google_cloud_run/containers/in_container/ruby.md @@ -1,5 +1,5 @@ --- -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 @@ -16,7 +16,7 @@ further_reading: ## Setup -
A sample application is available on GitHub.
+
A sample application is available on GitHub.
1. **Install the Datadog Ruby tracer**. @@ -60,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 diff --git a/content/en/serverless/google_cloud_run/functions.md b/content/en/serverless/google_cloud_run/functions.md index 817e7eb31931e..1b8a453ef5bac 100644 --- a/content/en/serverless/google_cloud_run/functions.md +++ b/content/en/serverless/google_cloud_run/functions.md @@ -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`. @@ -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 diff --git a/layouts/shortcodes/gcr-container-options.html b/layouts/shortcodes/gcr-container-options.html index 7fb999d5228ad..aa349555d2c62 100644 --- a/layouts/shortcodes/gcr-container-options.html +++ b/layouts/shortcodes/gcr-container-options.html @@ -2,9 +2,9 @@
- +
-
In-Process
+
In-Container
diff --git a/layouts/shortcodes/gcr-env-vars.html b/layouts/shortcodes/gcr-env-vars.html index 822929b2c7fe0..6cfcd80bd8ec7 100644 --- a/layouts/shortcodes/gcr-env-vars.html +++ b/layouts/shortcodes/gcr-env-vars.html @@ -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 }}| From 0ef9bc7b8c7b976338a1c1845f9416f098df93ae Mon Sep 17 00:00:00 2001 From: cecilia saixue watt Date: Tue, 26 Aug 2025 10:12:40 -0700 Subject: [PATCH 4/4] standardize capitalization of in-container --- content/en/serverless/google_cloud_run/containers/_index.md | 4 ++-- content/en/serverless/google_cloud_run/functions.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/serverless/google_cloud_run/containers/_index.md b/content/en/serverless/google_cloud_run/containers/_index.md index f076a42d27859..76bb9b3397b51 100644 --- a/content/en/serverless/google_cloud_run/containers/_index.md +++ b/content/en/serverless/google_cloud_run/containers/_index.md @@ -25,9 +25,9 @@ To instrument your Google Cloud Run containers with Datadog, choose one of two o - [**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-container versus sidecar instrumentation +## Comparison: In-Container versus sidecar instrumentation -| Aspect | In-container | 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. | diff --git a/content/en/serverless/google_cloud_run/functions.md b/content/en/serverless/google_cloud_run/functions.md index 1b8a453ef5bac..75d09bd9eb981 100644 --- a/content/en/serverless/google_cloud_run/functions.md +++ b/content/en/serverless/google_cloud_run/functions.md @@ -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-container 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`.