Skip to content

[SVLS-8160] Add serverless-identifying tag to Azure App Service Windows profiles#45281

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits intomainfrom
kathie.huang/SVLS-8160/fix-additional-profile-tags-test
Jan 23, 2026
Merged

[SVLS-8160] Add serverless-identifying tag to Azure App Service Windows profiles#45281
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits intomainfrom
kathie.huang/SVLS-8160/fix-additional-profile-tags-test

Conversation

@kathiehuang
Copy link
Copy Markdown
Contributor

@kathiehuang kathiehuang commented Jan 20, 2026

Note: This is a reimplementation of this PR, which was reverted here. This fixes the failing CI test.

Working CI tests: Job 1, Job 2

What does this PR do?

  • Adds _dd.origin:appservice tag to profiles for Azure App Service Windows Apps
    • The tag gets passed via apm_config.additional_profile_tags, which is set in this PR in the AAS Site Extension
  • Refactors how extra tags get added to profiles
    • Turns AzureServerlessTags into a map called AdditionalProfileTags for clearer future use

The only changes between this PR and the reverted PR is commit ef27a8a, which fixes the CI test (failed job #1, failed job #2), and dcc9ad9, which renames azureServerlessTags to be cloud-agnostic as _dd.origin gets set for profiles in Google Cloud Run Services, Jobs, and Functions, not just Azure products.

Motivation

  • This will help the profiling backend filter out and track serverless profiles for billing purposes.

See related PR

Describe how you validated your changes

Deployed Node.js and .NET Azure App Service Windows Apps with the Site Extension with DD_PROFILING_ENABLED=true and looked at network request to validate that _dd.origin is set correctly

  1. Downloaded datadog-trace-agent.exe and dogstatsd.exe from the package_build > windows_zip_agent_binaries_x64-a7 job
  2. Stopped an existing AAS Windows app using the site extension
  3. In Kudu, replaced datadog-trace-agent.exe and dogstatsd.exe with the dev version
  4. Copied and pasted the changes in datadog.yaml from the related AAS Extension PR over
  5. Started the app
  6. Saw _dd.origin in the profile tags!
image
  • Also tested with an Azure Container App to make sure the refactoring didn't affect anything there, and tested in GCP environments to verify the _dd.origin tag gets set in profiles

- Add apm_config.additional_profile_tags configuration
- Bind to DD_APM_ADDITIONAL_PROFILE_TAGS env var
- Add tests for YAML and env var configuration
- Update config template documentation
@github-actions github-actions Bot added medium review PR review might take time team/agent-apm trace-agent labels Jan 20, 2026
@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr Bot commented Jan 20, 2026

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 13603b6
📊 Static Quality Gates Dashboard

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 +4.84 KiB (0.00% increase) 753.471 → 753.475 → 754.830
agent_msi +2.86 KiB (0.00% increase) 663.006 → 663.009 → 1072.620
agent_rpm_amd64 +4.84 KiB (0.00% increase) 753.454 → 753.459 → 754.800
agent_suse_amd64 +4.84 KiB (0.00% increase) 753.454 → 753.459 → 754.800
docker_agent_amd64 +4.84 KiB (0.00% increase) 815.576 → 815.580 → 817.140
docker_agent_jmx_amd64 +4.84 KiB (0.00% increase) 1006.454 → 1006.459 → 1008.020
25 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_deb_amd64_fips 702.148 MiB
agent_heroku_amd64 326.923 MiB
agent_rpm_amd64_fips 702.132 MiB
agent_rpm_arm64 732.226 MiB
agent_rpm_arm64_fips 684.213 MiB
agent_suse_amd64_fips 702.132 MiB
agent_suse_arm64 732.226 MiB
agent_suse_arm64_fips 684.213 MiB
docker_agent_arm64 818.934 MiB
docker_agent_jmx_arm64 998.532 MiB
docker_cluster_agent_amd64 181.088 MiB
docker_cluster_agent_arm64 196.918 MiB
docker_cws_instrumentation_amd64 7.135 MiB
docker_cws_instrumentation_arm64 6.689 MiB
docker_dogstatsd_amd64 38.855 MiB
docker_dogstatsd_arm64 37.128 MiB
dogstatsd_deb_amd64 30.075 MiB
dogstatsd_deb_arm64 28.220 MiB
dogstatsd_rpm_amd64 30.075 MiB
dogstatsd_suse_amd64 30.075 MiB
iot_agent_deb_amd64 43.033 MiB
iot_agent_deb_arm64 40.135 MiB
iot_agent_deb_armhf 40.705 MiB
iot_agent_rpm_amd64 43.034 MiB
iot_agent_suse_amd64 43.034 MiB
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 +50.75 KiB (0.03% increase) 183.912 → 183.962 → 184.810
agent_deb_amd64_fips +45.67 KiB (0.03% increase) 172.644 → 172.689 → 173.790
agent_heroku_amd64 +11.69 KiB (0.01% increase) 87.129 → 87.140 → 88.450
agent_msi -12.0 KiB (0.01% reduction) 143.160 → 143.148 → 143.300
agent_rpm_amd64 -24.77 KiB (0.01% reduction) 186.804 → 186.780 → 188.160
agent_rpm_amd64_fips +24.35 KiB (0.01% increase) 175.709 → 175.733 → 176.600
agent_rpm_arm64 -19.01 KiB (0.01% reduction) 168.616 → 168.598 → 169.930
agent_rpm_arm64_fips -3.46 KiB (0.00% reduction) 159.232 → 159.228 → 160.550
agent_suse_amd64 -24.77 KiB (0.01% reduction) 186.804 → 186.780 → 188.160
agent_suse_amd64_fips +24.35 KiB (0.01% increase) 175.709 → 175.733 → 176.600
agent_suse_arm64 -19.01 KiB (0.01% reduction) 168.616 → 168.598 → 169.930
agent_suse_arm64_fips -3.46 KiB (0.00% reduction) 159.232 → 159.228 → 160.550
docker_agent_amd64 neutral 276.699 MiB → 277.400
docker_agent_arm64 +2.48 KiB (0.00% increase) 264.140 → 264.142 → 266.040
docker_agent_jmx_amd64 neutral 345.333 MiB → 346.020
docker_agent_jmx_arm64 neutral 328.757 MiB → 330.660
docker_cluster_agent_amd64 -4.63 KiB (0.01% reduction) 63.991 → 63.987 → 64.490
docker_cluster_agent_arm64 neutral 60.250 MiB → 61.170
docker_cws_instrumentation_amd64 neutral 2.994 MiB → 3.330
docker_cws_instrumentation_arm64 neutral 2.726 MiB → 3.090
docker_dogstatsd_amd64 neutral 15.036 MiB → 15.820
docker_dogstatsd_arm64 neutral 14.361 MiB → 14.830
dogstatsd_deb_amd64 neutral 7.950 MiB → 8.790
dogstatsd_deb_arm64 neutral 6.830 MiB → 7.710
dogstatsd_rpm_amd64 neutral 7.961 MiB → 8.800
dogstatsd_suse_amd64 neutral 7.961 MiB → 8.800
iot_agent_deb_amd64 neutral 11.290 MiB → 12.040
iot_agent_deb_arm64 neutral 9.651 MiB → 10.450
iot_agent_deb_armhf neutral 9.846 MiB → 10.620
iot_agent_rpm_amd64 -3.27 KiB (0.03% reduction) 11.311 → 11.308 → 12.060
iot_agent_suse_amd64 -3.27 KiB (0.03% reduction) 11.311 → 11.308 → 12.060

@kathiehuang kathiehuang force-pushed the kathie.huang/SVLS-8160/fix-additional-profile-tags-test branch from 759fe49 to dcc9ad9 Compare January 21, 2026 14:52
@kathiehuang kathiehuang added the changelog/no-changelog No changelog entry needed label Jan 21, 2026
@kathiehuang kathiehuang marked this pull request as ready for review January 21, 2026 15:11
@kathiehuang kathiehuang requested review from a team as code owners January 21, 2026 15:11
@kathiehuang kathiehuang requested a review from s-alad January 21, 2026 15:11
Comment thread pkg/config/setup/apm.go
Comment on lines +144 to +149
config.BindEnvAndSetDefault("apm_config.additional_profile_tags", map[string]string{}, "DD_APM_ADDITIONAL_PROFILE_TAGS")
config.BindEnv("apm_config.additional_endpoints", "DD_APM_ADDITIONAL_ENDPOINTS") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("apm_config.replace_tags", "DD_APM_REPLACE_TAGS") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("apm_config.analyzed_spans", "DD_APM_ANALYZED_SPANS") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("apm_config.ignore_resources", "DD_APM_IGNORE_RESOURCES", "DD_IGNORE_RESOURCE") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
config.BindEnv("apm_config.instrumentation.targets", "DD_APM_INSTRUMENTATION_TARGETS") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to have all of these be BindEnvAndSetDefault?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These configs were already here so I'm not sure if I should change them / what the defaults would be!

Copy link
Copy Markdown
Member

@s-alad s-alad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for agent-config files

#
# # @param additional_profile_tags - map of strings - optional
# # @env DD_APM_ADDITIONAL_PROFILE_TAGS - JSON string - optional
# # Additional tags to add to all profiles. These tags are added on the agent side
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what this means, but if my suggestion is incorrect, ignore!

Suggested change
# # Additional tags to add to all profiles. These tags are added on the agent side
# # Additional tags to add to all profiles. These tags are added by the Agent

# # tags that should be applied to all profiles (e.g., origin).
# #
# # Note: For Azure App Service in Windows, this configuration is set in the AAS Site Extension.
# # Overriding the default tags in AAS Windows should be done with reference to https://datadoghq.atlassian.net/wiki/spaces/SLS/pages/6007685143/Profiling.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we reference internal confluence in public repos?

Suggested change
# # Overriding the default tags in AAS Windows should be done with reference to https://datadoghq.atlassian.net/wiki/spaces/SLS/pages/6007685143/Profiling.
# # To override the default tags in AAS Windows see https://datadoghq.atlassian.net/wiki/spaces/SLS/pages/6007685143/Profiling.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we have some examples of referencing internal confluence in this repo (example)

See this discussion on the reverted PR for context - overriding these profile tags wouldn't be normal user behavior so I don't think it would make sense to have it in public docs

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "To override the default tags... see" would make this sound more like regular user behavior. I want to convey that this would be a rare customer workflow

@cit-pr-commenter-54b7da
Copy link
Copy Markdown

cit-pr-commenter-54b7da Bot commented Jan 21, 2026

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 3eabcd33-c91f-4b32-95a9-d1c01d62ec81

Baseline: 40c9ac0
Comparison: 55393cd
Diff

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Regressions in experiments with settings containing erratic: true are ignored.

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +1.67 [-1.41, +4.75] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_metrics_logs memory utilization +2.38 [+2.17, +2.59] 1 Logs bounds checks dashboard
docker_containers_cpu % cpu utilization +1.67 [-1.41, +4.75] 1 Logs
tcp_syslog_to_blackhole ingress throughput +1.28 [+1.18, +1.38] 1 Logs
ddot_metrics_sum_delta memory utilization +0.97 [+0.77, +1.16] 1 Logs
ddot_metrics memory utilization +0.73 [+0.52, +0.94] 1 Logs
quality_gate_idle_all_features memory utilization +0.65 [+0.61, +0.69] 1 Logs bounds checks dashboard
quality_gate_logs % cpu utilization +0.59 [-0.91, +2.09] 1 Logs bounds checks dashboard
ddot_metrics_sum_cumulative memory utilization +0.36 [+0.20, +0.51] 1 Logs
file_tree memory utilization +0.03 [-0.02, +0.09] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.03 [-0.01, +0.08] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.03 [-0.48, +0.54] 1 Logs
otlp_ingest_logs memory utilization +0.02 [-0.09, +0.13] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.01 [-0.39, +0.40] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.00 [-0.40, +0.40] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.00 [-0.12, +0.13] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.01 [-0.10, +0.09] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.01 [-0.12, +0.11] 1 Logs
ddot_logs memory utilization -0.04 [-0.11, +0.02] 1 Logs
otlp_ingest_metrics memory utilization -0.13 [-0.29, +0.02] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.26 [-0.50, -0.03] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.28 [-0.33, -0.23] 1 Logs
quality_gate_idle memory utilization -0.32 [-0.37, -0.28] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization -0.50 [-0.58, -0.43] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
docker_containers_cpu simple_check_run 10/10
docker_containers_memory memory_usage 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency lost_bytes 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 bounds checks dashboard
quality_gate_metrics_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.

@kathiehuang kathiehuang added the qa/done QA done before merge and regressions are covered by tests label Jan 21, 2026
Copy link
Copy Markdown
Contributor

@apiarian-datadog apiarian-datadog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved as long as we have a link to a passing test that was previously failing

@kathiehuang
Copy link
Copy Markdown
Contributor Author

/trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on

@gh-worker-devflow-routing-ef8351
Copy link
Copy Markdown

gh-worker-devflow-routing-ef8351 Bot commented Jan 22, 2026

View all feedbacks in Devflow UI.

2026-01-22 17:07:30 UTC ℹ️ Start processing command /trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on


2026-01-22 17:09:05 UTC ℹ️ Gitlab pipeline started

Started pipeline #92314628

@kathiehuang
Copy link
Copy Markdown
Contributor Author

Previously failed jobs that pass now!
Job 1
Job 2

@kathiehuang
Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351
Copy link
Copy Markdown

gh-worker-devflow-routing-ef8351 Bot commented Jan 23, 2026

View all feedbacks in Devflow UI.

2026-01-23 17:53:29 UTC ℹ️ Start processing command /merge


2026-01-23 17:53:47 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 1h (p90).


2026-01-23 18:47:53 UTC ℹ️ MergeQueue: This merge request was merged

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 97a87e8 into main Jan 23, 2026
402 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the kathie.huang/SVLS-8160/fix-additional-profile-tags-test branch January 23, 2026 18:47
@github-actions github-actions Bot locked and limited conversation to collaborators Jan 23, 2026
@github-actions github-actions Bot added this to the 7.77.0 milestone Jan 23, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

changelog/no-changelog No changelog entry needed medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/agent-apm trace-agent

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants