Re-enable the otlp build tag. (#134)

* Revert "Revert "Revert "Revert "Build binaries with otlp enabled. (#114)" (#115)" (#125)" (#128)"

This reverts commit d4cdfec.

* Include build tag in gh action options.

---------

Co-authored-by: AJ Stuyvenberg <[email protected]>

Author: purple4reina

.github/workflows/deploy-sandbox.yml

@@ -22,6 +22,13 @@ on:
         options:
         - amd64
         - arm64
+      buildTags:
+        type: choice
+        description: Build tags
+        default: 'serverless otlp'
+        options:
+          - 'serverless otlp'
+          - 'serverless'
       agentBranch:
         type: string
         description: Datadog agent branch name (default main)
@@ -80,6 +87,7 @@ jobs:
          --context-path "${GITHUB_WORKSPACE}" \
          --destination-path "${GITHUB_WORKSPACE}/tmp" \
          --docker-path "scripts_v2/Dockerfile.build" \
+         --build-tags "${{ inputs.buildTags }}" \
          --artifact-name "datadog_extension.zip"
       - name: Sign the layer
         env:

build-tools/bin/build_tools

@@ -23,6 +23,8 @@ pub struct BuildOptions {
     artifact_name: String,
     #[structopt(long)]
     docker_path: String,
+    #[structopt(long, default_value = "serverless otlp")]
+    build_tags: String,
 }
 
 pub fn build(args: &BuildOptions) -> Result<()> {
@@ -60,6 +62,7 @@ fn build_image(args: &BuildOptions, cmd_path: &str, dockerfile_path: &str) -> Re
     let extension_version_build_arg = format!("EXTENSION_VERSION={}", args.version);
     let agent_version_build_arg = format!("AGENT_VERSION={}", args.agent_version);
     let cmd_path_build_arg = format!("CMD_PATH={}", cmd_path);
+    let build_tags_build_arg = format!("BUILD_TAGS={}", args.build_tags);
 
     let docker_args = [
         "buildx",
@@ -76,6 +79,8 @@ fn build_image(args: &BuildOptions, cmd_path: &str, dockerfile_path: &str) -> Re
         agent_version_build_arg.as_str(),
         "--build-arg",
         cmd_path_build_arg.as_str(),
+        "--build-arg",
+        build_tags_build_arg.as_str(),
         args.context_path.as_str(),
         "--load",
     ];

build-tools/src/commands/build_command.rs

@@ -4,6 +4,7 @@ FROM alpine:3.16 as builder
 ARG EXTENSION_VERSION
 ARG AGENT_VERSION
 ARG CMD_PATH
+ARG BUILD_TAGS
 
 RUN apk add --no-cache git make musl-dev go gcc
 ENV GOROOT /usr/lib/go
@@ -30,12 +31,12 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     if [ -z "$AGENT_VERSION" ]; then \
         go build -ldflags="-w \
         -X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION" \
-        -tags serverless -o datadog-agent; \
+        -tags "${BUILD_TAGS}" -o datadog-agent; \
     else \
         go build -ldflags="-w \
         -X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION \
         -X github.com/DataDog/datadog-agent/pkg/version.agentVersionDefault=$AGENT_VERSION" \
-        -tags serverless -o datadog-agent; \
+        -tags "${BUILD_TAGS}" -o datadog-agent; \
     fi
 
 RUN go tool nm datadog-agent | grep -w 'github.com/DataDog/datadog-agent/pkg/version.agentVersionDefault' || \

scripts/Dockerfile.alpine.build

@@ -21,8 +21,10 @@ fi
 
 if [ -z "$CLOUD_RUN" ]; then
     CMD_PATH="cmd/serverless"
+    BUILD_TAGS="serverless otlp"
 else
     CMD_PATH="cmd/serverless-init"
+    BUILD_TAGS="serverless"
 fi
 
 AGENT_PATH="../datadog-agent"

scripts/build_binary_and_layer_dockerized.sh

@@ -4,6 +4,7 @@ FROM golang:1.19 as builder
 ARG EXTENSION_VERSION
 ARG AGENT_VERSION
 ARG CMD_PATH
+ARG BUILD_TAGS
 
 RUN mkdir -p /tmp/dd
 
@@ -18,12 +19,12 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     if [ -z "$AGENT_VERSION" ]; then \
         go build -ldflags="-w \
         -X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION" \
-        -tags serverless -o datadog-agent; \
+        -tags "${BUILD_TAGS}" -o datadog-agent; \
     else \
         go build -ldflags="-w \
         -X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION \
         -X github.com/DataDog/datadog-agent/pkg/version.agentVersionDefault=$AGENT_VERSION" \
-        -tags serverless -o datadog-agent; \
+        -tags "${BUILD_TAGS}" -o datadog-agent; \
     fi
 
 RUN go tool nm datadog-agent | grep -w 'github.com/DataDog/datadog-agent/pkg/version.agentVersionDefault' || \