Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect the active service/env/version for metric tags #2742

Merged
merged 1 commit into from
Jul 5, 2024

Conversation

bwoebi
Copy link
Collaborator

@bwoebi bwoebi commented Jul 3, 2024

I just noticed that while testing live-debugger metrics - the actual service still ought to be reported.
It's just php-dogstatsd which isn't aware of ddtrace state.

@bwoebi bwoebi requested a review from a team as a code owner July 3, 2024 22:41
@codecov-commenter
Copy link

codecov-commenter commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 73.33333% with 4 lines in your changes missing coverage. Please review.

Project coverage is 77.96%. Comparing base (aa31d0c) to head (b719477).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2742      +/-   ##
============================================
- Coverage     79.52%   77.96%   -1.57%     
  Complexity     2216     2216              
============================================
  Files           201      227      +26     
  Lines         22595    26634    +4039     
  Branches          0      989     +989     
============================================
+ Hits          17969    20764    +2795     
- Misses         4626     5344     +718     
- Partials          0      526     +526     
Flag Coverage Δ
appsec-extension 69.19% <ø> (?)
tracer-extension 78.81% <73.33%> (-0.01%) ⬇️
tracer-php 80.54% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
ext/sidecar.c 88.72% <100.00%> (+0.53%) ⬆️
ext/serializer.c 81.25% <50.00%> (-0.23%) ⬇️

... and 26 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aa31d0c...b719477. Read the comment docs.

@pr-commenter
Copy link

pr-commenter bot commented Jul 3, 2024

Benchmarks

Benchmark execution time: 2024-07-03 23:07:07

Comparing candidate commit b719477 in PR branch bob/use-active-service with baseline commit aa31d0c in branch master.

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

scenario:PDOBench/benchPDOBaseline

  • 🟩 execution_time [-17.521µs; -15.977µs] or [-9.160%; -8.353%]

scenario:PDOBench/benchPDOOverhead

  • 🟩 execution_time [-14.300µs; -6.259µs] or [-4.992%; -2.185%]

scenario:TraceSerializationBench/benchSerializeTrace

  • 🟩 execution_time [-8.463µs; -4.337µs] or [-4.231%; -2.169%]

Copy link
Contributor

@iamluc iamluc left a comment

Choose a reason for hiding this comment

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

Expect the issue with property_env, 👍

ext/sidecar.c Outdated
zend_string *env = get_DD_ENV();
if (span) {
env = ddtrace_convert_to_str(&span->property_version);
Copy link
Contributor

Choose a reason for hiding this comment

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

property_env .
Also get_DD_ENV(); could be called in the "else" branch to avoid an unnecessary call when span is not null. 🤷
Same for get_DD_VERSION() below

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
@bwoebi bwoebi merged commit c290676 into master Jul 5, 2024
10 of 13 checks passed
@bwoebi bwoebi deleted the bob/use-active-service branch July 5, 2024 00:28
@github-actions github-actions bot added profiling Relates to the Continuous Profiler tracing area:asm labels Jul 5, 2024
@github-actions github-actions bot added this to the 1.2.0 milestone Jul 5, 2024
bwoebi added a commit that referenced this pull request Jul 5, 2024
PROFeNoM pushed a commit that referenced this pull request Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:asm profiling Relates to the Continuous Profiler tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants