[CONTINT-3864] Send both origin the container-id and the ENTITY_ID

[AliDatadog]

We would like customers to be able to retrieve container tags even when DD_ENTITY_ID is set to false. The current behavior does not send the container-id if the entity id is set.

Note that the admission controller will set the container-id on Kubernetes.

For those who do not want container-tags, several alternatives are possible:

• Send the tag dd.internal.card=none
• Inject DD_ORIGIN_DETECTION_ENABLED=false to the application pod

See this doc for reference

[wdhif]

Links to https://github.com/DataDog/datadogpy/pull/828

[wdhif]

/merge

[dd-devflow[bot]]

:steam_locomotive: MergeQueue

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals. Note: if you pushed new commits since the last approval, you may need additional approval. You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

[dd-devflow[bot]]

:steam_locomotive: MergeQueue

Pull request added to the queue.

This build is going to start soon! (estimated merge in less than 0s)

Use /merge -c to cancel this operation!

[dd-devflow[bot]]

:rotating_light: MergeQueue

Gitlab pipeline didn't start on its own and we were unable to create it... Please retry.

If you need support, contact us on Slack #devflow with those details!

[wdhif]

/merge

[dd-devflow[bot]]

:steam_locomotive: MergeQueue

Pull request added to the queue.

This build is going to start soon! (estimated merge in less than 0s)

Use /merge -c to cancel this operation!

[dd-devflow[bot]]

:rotating_light: MergeQueue

Gitlab pipeline didn't start on its own and we were unable to create it... Please retry.

If you need support, contact us on Slack #devflow with those details!