Skip to content

[Version Bump] 3.8.0#6457

Merged
robertpi merged 1 commit into
masterfrom
version-bump-3.8.0
Dec 18, 2024
Merged

[Version Bump] 3.8.0#6457
robertpi merged 1 commit into
masterfrom
version-bump-3.8.0

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

The following files were found to be modified (as expected)

  • docs/CHANGELOG.md
  • .azure-pipelines/ultimate-pipeline.yml
  • profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
  • profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
  • profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h
  • profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
  • profiler/src/ProfilerEngine/ProductVersion.props
  • shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
  • shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
  • shared/src/msi-installer/WindowsInstaller.wixproj
  • shared/src/native-src/version.h
  • tracer/build/artifacts/dd-dotnet.sh
  • tracer/build/_build/Build.cs
  • tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj
  • tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
  • tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
  • tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
  • tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
  • tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
  • tracer/samples/ConsoleApp/Alpine3.10.dockerfile
  • tracer/samples/ConsoleApp/Alpine3.9.dockerfile
  • tracer/samples/ConsoleApp/Debian.dockerfile
  • tracer/samples/OpenTelemetry/Debian.dockerfile
  • tracer/samples/WindowsContainer/Dockerfile
  • tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj
  • tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
  • tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
  • tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
  • tracer/src/Datadog.Tracer.Native/CMakeLists.txt
  • tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
  • tracer/src/Datadog.Tracer.Native/Resource.rc
  • tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
  • tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj
  • tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
  • tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj
  • tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj
  • tracer/src/Datadog.Trace/Datadog.Trace.csproj
  • tracer/src/Datadog.Trace/TracerConstants.cs
  • tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj
  • tracer/tools/PipelineMonitor/PipelineMonitor.csproj

@DataDog/apm-dotnet

@github-actions github-actions Bot requested review from a team as code owners December 18, 2024 12:09

@andrewlock andrewlock left a comment

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.

LGTM

@datadog-ddstaging

datadog-ddstaging Bot commented Dec 18, 2024

Copy link
Copy Markdown

Datadog Report

Branch report: version-bump-3.8.0
Commit report: 391e816
Test service: dd-trace-dotnet

✅ 0 Failed, 471726 Passed, 4165 Skipped, 34h 46m 5.72s Total Time

@andrewlock

Copy link
Copy Markdown
Member

Execution-Time Benchmarks Report ⏱️

Execution-time results for samples comparing the following branches/commits:

Execution-time benchmarks measure the whole time it takes to execute a program. And are intended to measure the one-off costs. Cases where the execution time results for the PR are worse than latest master results are shown in red. The following thresholds were used for comparing the execution times:

  • Welch test with statistical test for significance of 5%
  • Only results indicating a difference greater than 5% and 5 ms are considered.

Note that these results are based on a single point-in-time result for each branch. For full results, see the dashboard.

Graphs show the p99 interval based on the mean and StdDev of the test run, as well as the mean value of the run (shown as a diamond below the graph).

gantt
    title Execution time (ms) FakeDbCommand (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (68ms)  : 66, 71
     .   : milestone, 68,
    master - mean (69ms)  : 66, 71
     .   : milestone, 69,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (977ms)  : 952, 1003
     .   : milestone, 977,
    master - mean (983ms)  : 960, 1007
     .   : milestone, 983,

Loading
gantt
    title Execution time (ms) FakeDbCommand (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (107ms)  : 105, 109
     .   : milestone, 107,
    master - mean (107ms)  : 105, 109
     .   : milestone, 107,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (676ms)  : 663, 690
     .   : milestone, 676,
    master - mean (676ms)  : 660, 691
     .   : milestone, 676,

Loading
gantt
    title Execution time (ms) FakeDbCommand (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (91ms)  : 89, 93
     .   : milestone, 91,
    master - mean (91ms)  : 89, 94
     .   : milestone, 91,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (636ms)  : 619, 652
     .   : milestone, 636,
    master - mean (637ms)  : 621, 653
     .   : milestone, 637,

Loading
gantt
    title Execution time (ms) HttpMessageHandler (.NET Framework 4.6.2) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (194ms)  : 190, 197
     .   : milestone, 194,
    master - mean (194ms)  : 189, 199
     .   : milestone, 194,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (1,101ms)  : 1072, 1129
     .   : milestone, 1101,
    master - mean (1,104ms)  : 1075, 1134
     .   : milestone, 1104,

Loading
gantt
    title Execution time (ms) HttpMessageHandler (.NET Core 3.1) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (278ms)  : 274, 282
     .   : milestone, 278,
    master - mean (278ms)  : 274, 283
     .   : milestone, 278,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (872ms)  : 846, 897
     .   : milestone, 872,
    master - mean (875ms)  : 849, 902
     .   : milestone, 875,

Loading
gantt
    title Execution time (ms) HttpMessageHandler (.NET 6) 
    dateFormat  X
    axisFormat %s
    todayMarker off
    section Baseline
    This PR (6457) - mean (266ms)  : 262, 271
     .   : milestone, 266,
    master - mean (267ms)  : 262, 271
     .   : milestone, 267,

    section CallTarget+Inlining+NGEN
    This PR (6457) - mean (853ms)  : 818, 888
     .   : milestone, 853,
    master - mean (854ms)  : 825, 883
     .   : milestone, 854,

Loading

@andrewlock

Copy link
Copy Markdown
Member

Throughput/Crank Report ⚡

Throughput results for AspNetCoreSimpleController comparing the following branches/commits:

Cases where throughput results for the PR are worse than latest master (5% drop or greater), results are shown in red.

Note that these results are based on a single point-in-time result for each branch. For full results, see one of the many, many dashboards!

gantt
    title Throughput Linux x64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (6457) (11.275M)   : 0, 11275018
    master (10.964M)   : 0, 10964152
    benchmarks/2.9.0 (11.033M)   : 0, 11032866

    section Automatic
    This PR (6457) (7.362M)   : 0, 7361612
    master (7.166M)   : 0, 7165701
    benchmarks/2.9.0 (7.786M)   : 0, 7785853

    section Trace stats
    master (7.553M)   : 0, 7552596

    section Manual
    master (11.037M)   : 0, 11036554

    section Manual + Automatic
    This PR (6457) (6.724M)   : 0, 6724103
    master (6.706M)   : 0, 6705822

    section DD_TRACE_ENABLED=0
    master (10.151M)   : 0, 10150783

Loading
gantt
    title Throughput Linux arm64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (6457) (9.446M)   : 0, 9445508
    master (9.585M)   : 0, 9584528
    benchmarks/2.9.0 (9.495M)   : 0, 9494821

    section Automatic
    This PR (6457) (6.274M)   : 0, 6273735
    master (6.497M)   : 0, 6496538

    section Trace stats
    master (6.703M)   : 0, 6702958

    section Manual
    master (9.509M)   : 0, 9509229

    section Manual + Automatic
    This PR (6457) (5.877M)   : 0, 5876539
    master (6.082M)   : 0, 6081784

    section DD_TRACE_ENABLED=0
    master (8.861M)   : 0, 8860554

Loading
gantt
    title Throughput Windows x64 (Total requests) 
    dateFormat  X
    axisFormat %s
    section Baseline
    This PR (6457) (9.404M)   : 0, 9403813
    master (9.538M)   : 0, 9538182
    benchmarks/2.9.0 (10.020M)   : 0, 10019592

    section Automatic
    This PR (6457) (5.981M)   : 0, 5980767
    master (6.268M)   : 0, 6268404
    benchmarks/2.9.0 (7.255M)   : 0, 7255257

    section Trace stats
    master (6.907M)   : 0, 6906948

    section Manual
    master (9.724M)   : 0, 9724267

    section Manual + Automatic
    This PR (6457) (5.608M)   : crit ,0, 5607911
    master (5.919M)   : 0, 5918616

    section DD_TRACE_ENABLED=0
    master (8.995M)   : 0, 8994559

Loading

@gleocadie gleocadie left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@robertpi robertpi merged commit 137aac2 into master Dec 18, 2024
@robertpi robertpi deleted the version-bump-3.8.0 branch December 18, 2024 14:51
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.13.4)

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.

I think this was a side effect of a massive replace, this line should probably be reverted ?

andrewlock added a commit that referenced this pull request Dec 19, 2024
## Summary of changes

Fix the build and the version-bump action

## Reason for change

In #6457, @vandonr
spotted that we accidentally, incorrectly, "bumped" the required version
of cmake.


![image](https://github.com/user-attachments/assets/5843c1db-2dad-439e-8ed8-eeeb2d05def5)

Additionally, the new calltargets_generated.g.cpp file _also_ now embeds
the version, so we need to either update that, or stop embedding the
version.

@daniel-romano-DD is looking into the latter approach
[here](#6464), so this PR
is just a fix to unblock PRs.

## Implementation details

- Revert the broken CMakeLists.txt
- Fix the broken generated file
- Be more discerning in our CMakeLists updates

## Test coverage

Tested the version bump routine locally, and confirmed it works as
expected now.

## Other details

It would be _really_ nice if the version bumping just required bumping
one or two values... That _might_ be somewhat feasible in the future,
but for now...
chojomok pushed a commit that referenced this pull request Jul 15, 2025
The following files were found to be modified (as expected)

- [x] docs/CHANGELOG.md
- [x] .azure-pipelines/ultimate-pipeline.yml
- [x]
profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
- [x]
profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
- [x]
profiler/src/ProfilerEngine/Datadog.Profiler.Native/dd_profiler_version.h
- [x]
profiler/src/ProfilerEngine/Datadog.Linux.ApiWrapper/CMakeLists.txt
- [x] profiler/src/ProfilerEngine/ProductVersion.props
- [x] shared/src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
- [x] shared/src/Datadog.Trace.ClrProfiler.Native/Resource.rc
- [x] shared/src/msi-installer/WindowsInstaller.wixproj
- [x] shared/src/native-src/version.h
- [x] tracer/build/artifacts/dd-dotnet.sh
- [x] tracer/build/_build/Build.cs
- [x]
tracer/samples/AutomaticTraceIdInjection/MicrosoftExtensionsExample/MicrosoftExtensionsExample.csproj
- [x]
tracer/samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
- [x]
tracer/samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
- [x]
tracer/samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
- [x]
tracer/samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
- [x]
tracer/samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
- [x] tracer/samples/ConsoleApp/Alpine3.10.dockerfile
- [x] tracer/samples/ConsoleApp/Alpine3.9.dockerfile
- [x] tracer/samples/ConsoleApp/Debian.dockerfile
- [x] tracer/samples/OpenTelemetry/Debian.dockerfile
- [x] tracer/samples/WindowsContainer/Dockerfile
- [x] tracer/src/Datadog.Trace.Bundle/Datadog.Trace.Bundle.csproj
- [x]
tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
- [x] tracer/src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
- [x] tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
- [x] tracer/src/Datadog.Tracer.Native/CMakeLists.txt
- [x] tracer/src/Datadog.Tracer.Native/dd_profiler_constants.h
- [x] tracer/src/Datadog.Tracer.Native/Resource.rc
- [x] tracer/src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
- [x]
tracer/src/Datadog.Trace.BenchmarkDotNet/Datadog.Trace.BenchmarkDotNet.csproj
- [x]
tracer/src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
- [x]
tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj
- [x]
tracer/src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.csproj
- [x] tracer/src/Datadog.Trace/Datadog.Trace.csproj
- [x] tracer/src/Datadog.Trace/TracerConstants.cs
- [x] tracer/src/Datadog.Trace.Trimming/Datadog.Trace.Trimming.csproj
- [x] tracer/tools/PipelineMonitor/PipelineMonitor.csproj

@DataDog/apm-dotnet

Co-authored-by: robertpi <robertpi@users.noreply.github.com>
chojomok pushed a commit that referenced this pull request Jul 15, 2025
## Summary of changes

Fix the build and the version-bump action

## Reason for change

In #6457, @vandonr
spotted that we accidentally, incorrectly, "bumped" the required version
of cmake.


![image](https://github.com/user-attachments/assets/5843c1db-2dad-439e-8ed8-eeeb2d05def5)

Additionally, the new calltargets_generated.g.cpp file _also_ now embeds
the version, so we need to either update that, or stop embedding the
version.

@daniel-romano-DD is looking into the latter approach
[here](#6464), so this PR
is just a fix to unblock PRs.

## Implementation details

- Revert the broken CMakeLists.txt
- Fix the broken generated file
- Be more discerning in our CMakeLists updates

## Test coverage

Tested the version bump routine locally, and confirmed it works as
expected now.

## Other details

It would be _really_ nice if the version bumping just required bumping
one or two values... That _might_ be somewhat feasible in the future,
but for now...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants