[Serverless-Init] Reduce in-container vs sidecar confusion; explain serverless-init image tags

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
 

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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" %}}

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**.
 

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**.
 

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**.
 

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**.
 

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**.
 

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:<YOUR_TAG>`
    - 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:

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:<YOUR_TAG>`. 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:
    <ul>

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:<YOUR_TAG>
           name: serverless-init-1
           resources:
             limits:

layouts/shortcodes/serverless-init-install.html

@@ -10,10 +10,10 @@
 - `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
+COPY --from=datadog/serverless-init:<YOUR_TAG> /datadog-init /app/datadog-init
 ENTRYPOINT ["/app/datadog-init"]
 CMD [{{ .Get "cmd" | safeHTML }}]
 ```
@@ -54,3 +54,4 @@ <h4 class='header-text-inner'>Alternative configuration</h4>
   </div>
 </details>
 <br/>
+{{ end }}