Add pubsub.delivery_duration_ms to push subscriptions #7205

nina9753 · 2026-01-09T15:27:49Z

What does this PR do?

Small clean up PR to :

remove redundant pubsub.batch.request_span_id span tag which is the same as the pubsub.batch.request_trace_id tag.
added pubsub.delivery_duration_ms to push subscriptions for tag parity with pull subscriptions
Update synthetic span for push subscription name from pubsub.delivery to pubsub.push.receive
Updates tests to test the new changes with garbage collector

Motivation

Plugin Checklist

Additional Notes

codecov · 2026-01-09T15:28:50Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 77.90%. Comparing base (4f81eaf) to head (44d7e36).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7205      +/-   ##
==========================================
- Coverage   84.56%   77.90%   -6.66%     
==========================================
  Files         532      384     -148     
  Lines       22656    17739    -4917     
==========================================
- Hits        19159    13820    -5339     
- Misses       3497     3919     +422

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4f36e20970

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-01-09T15:32:44Z

packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

    const requestSpanId = attrs['_dd.pubsub_request.span_id']
-    if (requestTraceId && requestSpanId) {
-      span.setTag('pubsub.batch.request_trace_id', requestTraceId)
+    if (requestSpanId) {
      span.setTag('pubsub.batch.request_span_id', requestSpanId)


Restore batch request trace ID tag

By only emitting pubsub.batch.request_span_id here, the delivery span no longer carries the batch request’s trace ID. That’s not redundant: in producer.js the batch trace ID is derived from spanCtx.toTraceId(true) while the span ID comes from spanCtx.toSpanId(true), so they differ whenever the publish happens under an existing trace (non‑root batch span). Without the trace ID, pubsub.batch.request_span_id becomes ambiguous (span IDs are only unique within a trace), so downstream correlation that relies on the public pubsub.batch.* tags can’t reliably link back to the batch request. Consider restoring pubsub.batch.request_trace_id (or emitting an equivalent public trace ID tag) alongside the span ID.

Useful? React with 👍 / 👎.

github-actions · 2026-01-09T15:36:30Z

Overall package size

Self size: 4.39 MB
Deduped: 5.21 MB
No deduping: 5.21 MB

Dependency sizes

| name | version | self size | total size | |------|---------|-----------|------------| | import-in-the-middle | 2.0.0 | 68.46 kB | 797.03 kB | | dc-polyfill | 0.1.10 | 26.73 kB | 26.73 kB |

_{🤖 This report was automatically generated by heaviest-objects-in-the-universe}

BridgeAR

Our tests seem to not reflect this change properly.

When I ran the tests locally, the span assertion always returned early and never found a match. It should actually not contain the return. Our test helper would pass, if any trace contains the correct span, which does not seem to be the case.

Please have a look at that and update the test so that it would now need an update due to the changed code.

I just removed the early returns in the tests and now the following all fail:

      1) should create BOTH pubsub.delivery span AND HTTP span in same trace
      2) should propagate distributed trace context from producer to push delivery
      3) should add batch metadata to delivery span
      4) should set service name with -pubsub suffix

packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

pr-commenter · 2026-01-12T16:44:19Z

Benchmarks

Benchmark execution time: 2026-01-14 15:56:07

Comparing candidate commit 44d7e36 in PR branch nina.rei/gcp_pubsub_span_tag_cleanup with baseline commit 4f81eaf in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 290 metrics, 30 unstable metrics.

BridgeAR

Nice! The tests are now seemingly running correct, thank you for fixing them! I believe this should be good to land as soon as the type changes are undone

packages/datadog-plugin-google-cloud-pubsub/test/pubsub-push-subscription.spec.js

packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js

* add pubsub.delivery_duration_ms to push subscriptions * update push tests and names of span tags * update tests for push subscriptions * update tests: remove K_SERVICE delete * Update all tests and naming convention of inferred span * create global const for gc * remove ts error check for gc

add pubsub.delivery_duration_ms to push subscriptions

4f36e20

nina9753 requested review from a team as code owners January 9, 2026 15:27

nina9753 added integration-google-cloud-pubsub serverless labels Jan 9, 2026

chatgpt-codex-connector bot reviewed Jan 9, 2026

View reviewed changes

nina9753 added the semver-patch label Jan 9, 2026

BridgeAR requested changes Jan 9, 2026

View reviewed changes

packages/datadog-plugin-google-cloud-pubsub/src/consumer.js Outdated Show resolved Hide resolved

packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js Show resolved Hide resolved

update push tests and names of span tags

5e0b601

This comment has been minimized.

Sign in to view

nina9753 and others added 5 commits January 12, 2026 12:49

Merge branch 'master' into nina.rei/gcp_pubsub_span_tag_cleanup

c2015a8

update tests for push subscriptions

3525296

update tests: remove K_SERVICE delete

8ff45b3

Update all tests and naming convention of inferred span

7aa0503

Merge branch 'master' into nina.rei/gcp_pubsub_span_tag_cleanup

e749bed

nina9753 requested a review from BridgeAR January 13, 2026 19:17

BridgeAR reviewed Jan 14, 2026

View reviewed changes

packages/datadog-plugin-google-cloud-pubsub/test/pubsub-push-subscription.spec.js Show resolved Hide resolved

nina9753 and others added 2 commits January 14, 2026 09:37

Merge branch 'master' into nina.rei/gcp_pubsub_span_tag_cleanup

44c403d

create global const for gc

2584154

nina9753 requested a review from BridgeAR January 14, 2026 14:40

BridgeAR reviewed Jan 14, 2026

View reviewed changes

packages/datadog-plugin-google-cloud-pubsub/test/index.spec.js Show resolved Hide resolved

nina9753 and others added 2 commits January 14, 2026 10:43

remove ts error check for gc

9c46090

Merge branch 'master' into nina.rei/gcp_pubsub_span_tag_cleanup

44d7e36

BridgeAR approved these changes Jan 14, 2026

View reviewed changes

nina9753 merged commit 145d856 into master Jan 14, 2026
795 checks passed

nina9753 deleted the nina.rei/gcp_pubsub_span_tag_cleanup branch January 14, 2026 16:25

dd-octo-sts bot mentioned this pull request Jan 15, 2026

v5.82.0 proposal #7136

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add pubsub.delivery_duration_ms to push subscriptions #7205

Add pubsub.delivery_duration_ms to push subscriptions #7205

Uh oh!

nina9753 commented Jan 9, 2026 •

edited

Loading

Uh oh!

codecov bot commented Jan 9, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Jan 9, 2026

Uh oh!

github-actions bot commented Jan 9, 2026 •

edited

Loading

Uh oh!

BridgeAR left a comment

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

pr-commenter bot commented Jan 12, 2026 •

edited

Loading

Uh oh!

BridgeAR left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Add pubsub.delivery_duration_ms to push subscriptions #7205

Add pubsub.delivery_duration_ms to push subscriptions #7205

Uh oh!

Conversation

nina9753 commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Motivation

Plugin Checklist

Additional Notes

Uh oh!

codecov bot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 9, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overall package size

Uh oh!

BridgeAR left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

pr-commenter bot commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Benchmarks

Uh oh!

BridgeAR left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nina9753 commented Jan 9, 2026 •

edited

Loading

codecov bot commented Jan 9, 2026 •

edited

Loading

github-actions bot commented Jan 9, 2026 •

edited

Loading

pr-commenter bot commented Jan 12, 2026 •

edited

Loading