From 2dc9258a286c3ec2345786ac98bbc91cbd8afb30 Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Tue, 11 Nov 2025 14:26:28 -0500 Subject: [PATCH 1/5] remove confusing 'observing multiple containers' from comparison --- content/en/serverless/azure_container_apps/_index.md | 1 - content/en/serverless/google_cloud_run/containers/_index.md | 1 - 2 files changed, 2 deletions(-) diff --git a/content/en/serverless/azure_container_apps/_index.md b/content/en/serverless/azure_container_apps/_index.md index 712093f0dcf88..17e41815a118a 100644 --- a/content/en/serverless/azure_container_apps/_index.md +++ b/content/en/serverless/azure_container_apps/_index.md @@ -44,7 +44,6 @@ To instrument your Azure Container App with Datadog, choose one of two options: | Cost overhead | Less than sidecar (no extra container). | Extra vCPU/memory. Overallocating the sidecar wastes cost; underallocating leads to premature scaling. | | Logging | Direct stdout/stderr access. | Shared volume + log library routing to a log file. Uncaught errors require extra handling, since they are not automatically handled by your logging library. | | Failure isolation | In rare cases, Datadog Agent bugs can affect your app. | Datadog Agent faults are isolated. | -| Observing multiple containers | Not supported | Supported | ## Further reading diff --git a/content/en/serverless/google_cloud_run/containers/_index.md b/content/en/serverless/google_cloud_run/containers/_index.md index 13540995ae6ff..8314b53245089 100644 --- a/content/en/serverless/google_cloud_run/containers/_index.md +++ b/content/en/serverless/google_cloud_run/containers/_index.md @@ -34,7 +34,6 @@ To instrument your Google Cloud Run containers with Datadog, choose one of two o | Cost overhead | Less than sidecar (no extra container). | Extra vCPU/memory. Overallocating the sidecar wastes cost; underallocating leads to premature scaling. | | Logging | Direct stdout/stderr access. | Shared volume + log library routing to a log file. Uncaught errors require extra handling, since they are not automatically handled by your logging library. | | Failure isolation | In rare cases, Datadog Agent bugs can affect your app. | Datadog Agent faults are isolated. | -| Observing multiple containers | Not supported | Supported | ## Further reading From dbcfd3fad9a12e32272913e1d717ed65d6e6389a Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Tue, 11 Nov 2025 14:26:49 -0500 Subject: [PATCH 2/5] modify `serverless-init-install.html` so it can be reused in sidecar --- layouts/shortcodes/serverless-init-install.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/shortcodes/serverless-init-install.html b/layouts/shortcodes/serverless-init-install.html index de4dbba31f29d..33bc7892d898e 100644 --- a/layouts/shortcodes/serverless-init-install.html +++ b/layouts/shortcodes/serverless-init-install.html @@ -10,7 +10,7 @@ - `1.x.x`, `1.x.x-alpine`: use these to pin to a precise version of the library - `latest`, `latest-alpine`: use these to follow the latest version release, which may include breaking changes -Add the following instructions and arguments to your Dockerfile. +{{ if eq (.Get "mode") "in-container" }}Add the following instructions and arguments to your Dockerfile. ```dockerfile COPY --from=datadog/serverless-init:1 /datadog-init /app/datadog-init @@ -54,3 +54,4 @@

Alternative configuration


+{{ end }} From 07f364b7ea70d97d5f61dbc866d581c8d93d526f Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Tue, 11 Nov 2025 14:27:22 -0500 Subject: [PATCH 3/5] update in-container docs --- .../en/serverless/azure_container_apps/in_container/dotnet.md | 2 +- content/en/serverless/azure_container_apps/in_container/go.md | 2 +- content/en/serverless/azure_container_apps/in_container/java.md | 2 +- .../en/serverless/azure_container_apps/in_container/nodejs.md | 2 +- content/en/serverless/azure_container_apps/in_container/php.md | 2 +- .../en/serverless/azure_container_apps/in_container/python.md | 2 +- content/en/serverless/azure_container_apps/in_container/ruby.md | 2 +- .../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 +- content/en/serverless/google_cloud_run/jobs/dotnet.md | 2 +- content/en/serverless/google_cloud_run/jobs/go.md | 2 +- content/en/serverless/google_cloud_run/jobs/java.md | 2 +- content/en/serverless/google_cloud_run/jobs/nodejs.md | 2 +- content/en/serverless/google_cloud_run/jobs/python.md | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/content/en/serverless/azure_container_apps/in_container/dotnet.md b/content/en/serverless/azure_container_apps/in_container/dotnet.md index 9f78cf50ce793..4c1dbddd13ff1 100644 --- a/content/en/serverless/azure_container_apps/in_container/dotnet.md +++ b/content/en/serverless/azure_container_apps/in_container/dotnet.md @@ -41,7 +41,7 @@ RUN mkdir -p /dd_tracer/dotnet/ && tar -xzvf /tmp/datadog-dotnet-apm.tar.gz -C / 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"dotnet\", \"dotnet.dll\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"dotnet\", \"dotnet.dll\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/go.md b/content/en/serverless/azure_container_apps/in_container/go.md index 2757929aa48cd..0bb4f0898e307 100644 --- a/content/en/serverless/azure_container_apps/in_container/go.md +++ b/content/en/serverless/azure_container_apps/in_container/go.md @@ -41,7 +41,7 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2 2. **Install serverless-init**. - {{% serverless-init-install cmd="./your-binary" %}} + {{% serverless-init-install mode="in-container" cmd="./your-binary" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/java.md b/content/en/serverless/azure_container_apps/in_container/java.md index 72892a3f5ed1d..53101f9fd574f 100644 --- a/content/en/serverless/azure_container_apps/in_container/java.md +++ b/content/en/serverless/azure_container_apps/in_container/java.md @@ -50,7 +50,7 @@ implementation 'com.datadoghq:dd-trace-api:DD_TRACE_JAVA_VERSION_HERE' 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"./mvnw\", \"spring-boot:run\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"./mvnw\", \"spring-boot:run\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/nodejs.md b/content/en/serverless/azure_container_apps/in_container/nodejs.md index 2b5e1a3a4737b..e66b7aa72783e 100644 --- a/content/en/serverless/azure_container_apps/in_container/nodejs.md +++ b/content/en/serverless/azure_container_apps/in_container/nodejs.md @@ -38,7 +38,7 @@ ENV NODE_OPTIONS="--require dd-trace/init" 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/php.md b/content/en/serverless/azure_container_apps/in_container/php.md index 684949ed9eb64..a6abea7dfe869 100644 --- a/content/en/serverless/azure_container_apps/in_container/php.md +++ b/content/en/serverless/azure_container_apps/in_container/php.md @@ -33,7 +33,7 @@ apk add libgcc 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"apache2-foreground\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"apache2-foreground\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/python.md b/content/en/serverless/azure_container_apps/in_container/python.md index 1f42b5555e85e..e7a920cf69175 100644 --- a/content/en/serverless/azure_container_apps/in_container/python.md +++ b/content/en/serverless/azure_container_apps/in_container/python.md @@ -35,7 +35,7 @@ CMD ["ddtrace-run", "python", "app.py"] 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/azure_container_apps/in_container/ruby.md b/content/en/serverless/azure_container_apps/in_container/ruby.md index f4c15e325f8a8..b1c4d8433ca7a 100644 --- a/content/en/serverless/azure_container_apps/in_container/ruby.md +++ b/content/en/serverless/azure_container_apps/in_container/ruby.md @@ -26,7 +26,7 @@ gem 'datadog' 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"rails\", \"server\", \"-b\", \"0.0.0.0\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"rails\", \"server\", \"-b\", \"0.0.0.0\"" %}} 3. **Set up logs**. 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 c64ad9cac97cd..bee2c1595eefa 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 @@ -45,7 +45,7 @@ RUN mkdir -p /dd_tracer/dotnet/ && tar -xzvf /tmp/datadog-dotnet-apm.tar.gz -C / 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"dotnet\", \"dotnet.dll\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"dotnet\", \"dotnet.dll\"" %}} 3. **Set up logs**. 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 e7bb3b2d4b49b..eda0a3838b0bc 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 @@ -45,7 +45,7 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2 2. **Install serverless-init**. - {{% serverless-init-install cmd="./your-binary" %}} + {{% serverless-init-install mode="in-container" cmd="./your-binary" %}} 3. **Set up logs**. 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 023186a79a924..d2f0a01deb419 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 @@ -54,7 +54,7 @@ implementation 'com.datadoghq:dd-trace-api:DD_TRACE_JAVA_VERSION_HERE' 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"./mvnw\", \"spring-boot:run\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"./mvnw\", \"spring-boot:run\"" %}} 3. **Set up logs**. 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 219e6187174d2..b2533ae36b421 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 @@ -42,7 +42,7 @@ ENV NODE_OPTIONS="--require dd-trace/init" 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} 3. **Set up logs**. 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 759cb2a9729ce..0fd4a77d85ee2 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 @@ -37,7 +37,7 @@ apk add libgcc 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"apache2-foreground\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"apache2-foreground\"" %}} 3. **Set up logs**. 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 41ee19ece35c8..4402cd39295eb 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 @@ -39,7 +39,7 @@ CMD ["ddtrace-run", "python", "app.py"] 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} 3. **Set up logs**. 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 f3332bd0d7823..4ea8fdf27ead1 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 @@ -30,7 +30,7 @@ gem 'datadog' 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"rails\", \"server\", \"-b\", \"0.0.0.0\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"rails\", \"server\", \"-b\", \"0.0.0.0\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/google_cloud_run/jobs/dotnet.md b/content/en/serverless/google_cloud_run/jobs/dotnet.md index d0a9de2709ef5..324f36d3a83a8 100644 --- a/content/en/serverless/google_cloud_run/jobs/dotnet.md +++ b/content/en/serverless/google_cloud_run/jobs/dotnet.md @@ -50,7 +50,7 @@ RUN mkdir -p /dd_tracer/dotnet/ && tar -xzvf /tmp/datadog-dotnet-apm.tar.gz -C / 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"dotnet\", \"dotnet.dll\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"dotnet\", \"dotnet.dll\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/google_cloud_run/jobs/go.md b/content/en/serverless/google_cloud_run/jobs/go.md index 0dbf584057a83..437baf994ec81 100644 --- a/content/en/serverless/google_cloud_run/jobs/go.md +++ b/content/en/serverless/google_cloud_run/jobs/go.md @@ -50,7 +50,7 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2 2. **Install serverless-init**. - {{% serverless-init-install cmd="./your-binary" %}} + {{% serverless-init-install mode="in-container" cmd="./your-binary" %}} 3. **Set up logs**. diff --git a/content/en/serverless/google_cloud_run/jobs/java.md b/content/en/serverless/google_cloud_run/jobs/java.md index ed013ac1ed159..3ad6c7c443d86 100644 --- a/content/en/serverless/google_cloud_run/jobs/java.md +++ b/content/en/serverless/google_cloud_run/jobs/java.md @@ -57,7 +57,7 @@ implementation 'com.datadoghq:dd-trace-api:DD_TRACE_JAVA_VERSION_HERE' 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"./mvnw\", \"spring-boot:run\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"./mvnw\", \"spring-boot:run\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/google_cloud_run/jobs/nodejs.md b/content/en/serverless/google_cloud_run/jobs/nodejs.md index 5a021552d5588..f4418471b4f65 100644 --- a/content/en/serverless/google_cloud_run/jobs/nodejs.md +++ b/content/en/serverless/google_cloud_run/jobs/nodejs.md @@ -47,7 +47,7 @@ ENV NODE_OPTIONS="--require dd-trace/init" 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"/nodejs/bin/node\", \"/path/to/your/app.js\"" %}} 3. **Set up logs**. diff --git a/content/en/serverless/google_cloud_run/jobs/python.md b/content/en/serverless/google_cloud_run/jobs/python.md index 8368922103795..99fb152f184c4 100644 --- a/content/en/serverless/google_cloud_run/jobs/python.md +++ b/content/en/serverless/google_cloud_run/jobs/python.md @@ -44,7 +44,7 @@ CMD ["ddtrace-run", "python", "app.py"] 2. **Install serverless-init**. - {{% serverless-init-install cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} + {{% serverless-init-install mode="in-container" cmd="\"ddtrace-run\", \"python\", \"path/to/your/python/app.py\"" %}} 3. **Set up logs**. From b0827e68ad3ca48795eb4c9607cce5870d2fe05b Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Tue, 11 Nov 2025 14:28:28 -0500 Subject: [PATCH 4/5] add image tag info to sidecar docs --- content/en/serverless/azure_container_apps/sidecar/dotnet.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/go.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/java.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/nodejs.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/php.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/python.md | 2 ++ content/en/serverless/azure_container_apps/sidecar/ruby.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/dotnet.md | 2 ++ content/en/serverless/google_cloud_run/containers/sidecar/go.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/java.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/nodejs.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/php.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/python.md | 2 ++ .../en/serverless/google_cloud_run/containers/sidecar/ruby.md | 2 ++ 14 files changed, 28 insertions(+) diff --git a/content/en/serverless/azure_container_apps/sidecar/dotnet.md b/content/en/serverless/azure_container_apps/sidecar/dotnet.md index a2683190b2a17..d93bf31bb9e08 100644 --- a/content/en/serverless/azure_container_apps/sidecar/dotnet.md +++ b/content/en/serverless/azure_container_apps/sidecar/dotnet.md @@ -42,6 +42,8 @@ RUN mkdir -p /dd_tracer/dotnet/ && tar -xzvf /tmp/datadog-dotnet-apm.tar.gz -C / 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/go.md b/content/en/serverless/azure_container_apps/sidecar/go.md index 7f80ded4fc128..a9cdcb98e0eff 100644 --- a/content/en/serverless/azure_container_apps/sidecar/go.md +++ b/content/en/serverless/azure_container_apps/sidecar/go.md @@ -41,6 +41,8 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/java.md b/content/en/serverless/azure_container_apps/sidecar/java.md index d61e1adaed06b..c5ced84181bd6 100644 --- a/content/en/serverless/azure_container_apps/sidecar/java.md +++ b/content/en/serverless/azure_container_apps/sidecar/java.md @@ -50,6 +50,8 @@ implementation 'com.datadoghq:dd-trace-api:DD_TRACE_JAVA_VERSION_HERE' 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/nodejs.md b/content/en/serverless/azure_container_apps/sidecar/nodejs.md index 4c1d44c81e3eb..f41411a095e15 100644 --- a/content/en/serverless/azure_container_apps/sidecar/nodejs.md +++ b/content/en/serverless/azure_container_apps/sidecar/nodejs.md @@ -38,6 +38,8 @@ ENV NODE_OPTIONS="--require dd-trace/init" 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/php.md b/content/en/serverless/azure_container_apps/sidecar/php.md index dbfbcee250766..d8f53d97540b1 100644 --- a/content/en/serverless/azure_container_apps/sidecar/php.md +++ b/content/en/serverless/azure_container_apps/sidecar/php.md @@ -33,6 +33,8 @@ apk add libgcc 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/python.md b/content/en/serverless/azure_container_apps/sidecar/python.md index f9d88998a87c7..f8e2b751ce43e 100644 --- a/content/en/serverless/azure_container_apps/sidecar/python.md +++ b/content/en/serverless/azure_container_apps/sidecar/python.md @@ -35,6 +35,8 @@ CMD ["ddtrace-run", "python", "app.py"] 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/azure_container_apps/sidecar/ruby.md b/content/en/serverless/azure_container_apps/sidecar/ruby.md index 3328dd54f95df..33f26d2dcb274 100644 --- a/content/en/serverless/azure_container_apps/sidecar/ruby.md +++ b/content/en/serverless/azure_container_apps/sidecar/ruby.md @@ -26,6 +26,8 @@ gem 'datadog' 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Terraform" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/dotnet.md b/content/en/serverless/google_cloud_run/containers/sidecar/dotnet.md index c591e0d8c003d..e76cf50e8b86a 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/dotnet.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/dotnet.md @@ -44,6 +44,8 @@ RUN mkdir -p /dd_tracer/dotnet/ && tar -xzvf /tmp/datadog-dotnet-apm.tar.gz -C / 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/go.md b/content/en/serverless/google_cloud_run/containers/sidecar/go.md index ec09075925ce3..a426a4277a9e6 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/go.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/go.md @@ -43,6 +43,8 @@ go get github.com/DataDog/dd-trace-go/contrib/net/http/v2 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/java.md b/content/en/serverless/google_cloud_run/containers/sidecar/java.md index d9ae285436a94..cf9f1c4d7bca1 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/java.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/java.md @@ -52,6 +52,8 @@ implementation 'com.datadoghq:dd-trace-api:DD_TRACE_JAVA_VERSION_HERE' 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/nodejs.md b/content/en/serverless/google_cloud_run/containers/sidecar/nodejs.md index 882729d8aa0e2..310fe4062eefe 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/nodejs.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/nodejs.md @@ -40,6 +40,8 @@ ENV NODE_OPTIONS="--require dd-trace/init" 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/php.md b/content/en/serverless/google_cloud_run/containers/sidecar/php.md index cbc7812cdf71d..3bd94a98a8f5a 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/php.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/php.md @@ -35,6 +35,8 @@ apk add libgcc 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/python.md b/content/en/serverless/google_cloud_run/containers/sidecar/python.md index 3707a0e77de5e..368880623a5ce 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/python.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/python.md @@ -37,6 +37,8 @@ CMD ["ddtrace-run", "python", "app.py"] 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} diff --git a/content/en/serverless/google_cloud_run/containers/sidecar/ruby.md b/content/en/serverless/google_cloud_run/containers/sidecar/ruby.md index dbcc60a349fa5..03da8720bb9e2 100644 --- a/content/en/serverless/google_cloud_run/containers/sidecar/ruby.md +++ b/content/en/serverless/google_cloud_run/containers/sidecar/ruby.md @@ -28,6 +28,8 @@ gem 'datadog' 2. **Install serverless-init as a sidecar**. + {{% serverless-init-install mode="sidecar" %}} + {{< tabs >}} {{% tab "Datadog CLI" %}} From 6306fd654f393a72192b1ce23e42f8c676db3f1f Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Tue, 11 Nov 2025 14:37:48 -0500 Subject: [PATCH 5/5] don't recommend `latest` tag --- layouts/shortcodes/aca-install-sidecar-manual.md | 2 +- layouts/shortcodes/gcr-install-sidecar-other.md | 2 +- layouts/shortcodes/gcr-install-sidecar-yaml.md | 2 +- layouts/shortcodes/serverless-init-install.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/shortcodes/aca-install-sidecar-manual.md b/layouts/shortcodes/aca-install-sidecar-manual.md index 3aa743328edc3..d91a1130ecf7f 100644 --- a/layouts/shortcodes/aca-install-sidecar-manual.md +++ b/layouts/shortcodes/aca-install-sidecar-manual.md @@ -15,7 +15,7 @@ Because Azure Container Apps is built on Kubernetes, you cannot share environmen - **Image source**: Docker Hub or other registries - **Image type**: `Public` - **Registry login server**: `docker.io` - - **Image and tag**: `datadog/serverless-init:latest` + - **Image and tag**: `datadog/serverless-init:` - Define your container resource allocation based on your usage. 4. Add a volume mount using [replica-scoped storage][1001]. Use type "Ephemeral storage" when creating your volume. Ensure that the name and mount path matches the mount you configured in the application container. 5. Set the environment variables in the following table: diff --git a/layouts/shortcodes/gcr-install-sidecar-other.md b/layouts/shortcodes/gcr-install-sidecar-other.md index 0055b5c2eec84..37eb53fddb2e8 100644 --- a/layouts/shortcodes/gcr-install-sidecar-other.md +++ b/layouts/shortcodes/gcr-install-sidecar-other.md @@ -1,7 +1,7 @@ After deploying your Cloud Run app, you can manually modify your app's settings to enable Datadog monitoring. 1. Create a **Volume** with `In-Memory` volume type. -2. Add a **new container** with image URL: `gcr.io/datadoghq/serverless-init:latest`. See the [latest releases on Docker Hub][1001] to pin a specific version. +2. Add a **new container** with image URL: `gcr.io/datadoghq/serverless-init:`. See the [latest releases on Docker Hub][1001] to pin a specific version. 3. Add the volume mount to every container in your application. Choose a path such as `/shared-volume`, and remember it for the next step. 4. Add the following environment variables to your `serverless-init` sidecar container:
    diff --git a/layouts/shortcodes/gcr-install-sidecar-yaml.md b/layouts/shortcodes/gcr-install-sidecar-yaml.md index ba0f2c216f84c..8074bfaafdb01 100644 --- a/layouts/shortcodes/gcr-install-sidecar-yaml.md +++ b/layouts/shortcodes/gcr-install-sidecar-yaml.md @@ -65,7 +65,7 @@ spec: value: '{{ .Get "language" }}' - name: DD_HEALTH_PORT value: '12345' - image: gcr.io/datadoghq/serverless-init:latest + image: gcr.io/datadoghq/serverless-init: name: serverless-init-1 resources: limits: diff --git a/layouts/shortcodes/serverless-init-install.html b/layouts/shortcodes/serverless-init-install.html index 33bc7892d898e..22748faca666e 100644 --- a/layouts/shortcodes/serverless-init-install.html +++ b/layouts/shortcodes/serverless-init-install.html @@ -13,7 +13,7 @@ {{ if eq (.Get "mode") "in-container" }}Add the following instructions and arguments to your Dockerfile. ```dockerfile -COPY --from=datadog/serverless-init:1 /datadog-init /app/datadog-init +COPY --from=datadog/serverless-init: /datadog-init /app/datadog-init ENTRYPOINT ["/app/datadog-init"] CMD [{{ .Get "cmd" | safeHTML }}] ```