Skip to content

Commit fc85543

Browse files
tonyredondotonyredondo
authored
[Profiler] Fix and bump timeitsharp (#7294)
## Summary of changes This PR fixes the currently broken execution benchmark for the profiler product. ## Reason for change It's broken ## Implementation details ## Test coverage ## Other details <!-- Fixes #{issue} --> <!-- ⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
1 parent 314ded4 commit fc85543

26 files changed

+93
-100
lines changed

‎profiler/build/Allocations.linux.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_allocation",
@@ -44,7 +44,6 @@
4444
"LD_PRELOAD": "$(CWD)/../../shared/bin/monitoring-home/linux-x64/Datadog.Linux.ApiWrapper.x64.so",
4545
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
4646
"DD_PROFILING_GC_ENABLED": "0"
47-
4847
},
4948
"tags": {
5049
"runtime.architecture": "x64",

‎profiler/build/Allocations.windows.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_allocation",
@@ -45,7 +45,8 @@
4545
"CORECLR_PROFILER": "{BD1A650D-AC5D-4896-B64F-D6FA25D6B26A}",
4646
"CORECLR_PROFILER_PATH": "$(CWD)\\..\\..\\shared\\bin\\monitoring-home\\win-$(arch)\\Datadog.Profiler.Native.dll",
4747
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
48-
"DD_PROFILING_GC_ENABLED": "0"
48+
"DD_PROFILING_GC_ENABLED": "0",
49+
"DOTNET_ROOT": ""
4950
},
5051
"tags": {
5152
"runtime.architecture": "$(arch)",

‎profiler/build/Contention.linux.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_contention",
@@ -44,7 +44,6 @@
4444
"LD_PRELOAD": "$(CWD)/../../shared/bin/monitoring-home/linux-x64/Datadog.Linux.ApiWrapper.x64.so",
4545
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
4646
"DD_PROFILING_GC_ENABLED": "0"
47-
4847
},
4948
"tags": {
5049
"runtime.architecture": "x64",

‎profiler/build/Contention.windows.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_contention",
@@ -45,7 +45,8 @@
4545
"CORECLR_PROFILER": "{BD1A650D-AC5D-4896-B64F-D6FA25D6B26A}",
4646
"CORECLR_PROFILER_PATH": "$(CWD)\\..\\..\\shared\\bin\\monitoring-home\\win-$(arch)\\Datadog.Profiler.Native.dll",
4747
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
48-
"DD_PROFILING_GC_ENABLED": "0"
48+
"DD_PROFILING_GC_ENABLED": "0",
49+
"DOTNET_ROOT": ""
4950
},
5051
"tags": {
5152
"runtime.architecture": "$(arch)",

‎profiler/build/CpuWallTime.linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_cpu",

‎profiler/build/CpuWallTime.windows.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_cpu",
@@ -41,7 +41,8 @@
4141
"CORECLR_PROFILER": "{BD1A650D-AC5D-4896-B64F-D6FA25D6B26A}",
4242
"CORECLR_PROFILER_PATH": "$(CWD)\\..\\..\\shared\\bin\\monitoring-home\\win-$(arch)\\Datadog.Profiler.Native.dll",
4343
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
44-
"DD_PROFILING_GC_ENABLED": "0"
44+
"DD_PROFILING_GC_ENABLED": "0",
45+
"DOTNET_ROOT": ""
4546
},
4647
"tags": {
4748
"runtime.architecture": "$(arch)",

‎profiler/build/Exceptions.linux.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_exception",
@@ -52,5 +52,6 @@
5252
"benchmark.job.runtime.name": ".NET 7.0",
5353
"benchmark.job.runtime.moniker": "net7.0"
5454
},
55-
"metricsFilePath": "*metrics.json"
55+
"metricsFilePath": "*metrics.json",
56+
"overheadThreshold": 100
5657
}

‎profiler/build/Exceptions.windows.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_exception",
8+
"isBaseline": true,
89
"environmentVariables": {
910
"CORECLR_ENABLE_PROFILING": "0",
1011
"COR_ENABLE_PROFILING": "0"
@@ -45,7 +46,8 @@
4546
"CORECLR_PROFILER": "{BD1A650D-AC5D-4896-B64F-D6FA25D6B26A}",
4647
"CORECLR_PROFILER_PATH": "$(CWD)\\..\\..\\shared\\bin\\monitoring-home\\win-$(arch)\\Datadog.Profiler.Native.dll",
4748
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
48-
"DD_PROFILING_GC_ENABLED": "0"
49+
"DD_PROFILING_GC_ENABLED": "0",
50+
"DOTNET_ROOT": ""
4951
},
5052
"tags": {
5153
"runtime.architecture": "$(arch)",
@@ -54,5 +56,6 @@
5456
"benchmark.job.runtime.name": ".NET 7.0",
5557
"benchmark.job.runtime.moniker": "net7.0"
5658
},
57-
"metricsFilePath": "*metrics.json"
59+
"metricsFilePath": "*metrics.json",
60+
"overheadThreshold": 100
5861
}

‎profiler/build/GarbageCollections.linux.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_garbagecollections",
8+
"isBaseline": true,
89
"environmentVariables": {
910
"CORECLR_ENABLE_PROFILING": "0",
1011
"COR_ENABLE_PROFILING": "0"
@@ -52,5 +53,6 @@
5253
"benchmark.job.runtime.name": ".NET 7.0",
5354
"benchmark.job.runtime.moniker": "net7.0"
5455
},
55-
"metricsFilePath": "*metrics.json"
56+
"metricsFilePath": "*metrics.json",
57+
"overheadThreshold": 100
5658
}

‎profiler/build/GarbageCollections.windows.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"enableDatadog": true,
33
"warmUpCount": 2,
4-
"count": 10,
4+
"count": 20,
55
"scenarios": [
66
{
77
"name": "Baseline_garbagecollections",
8+
"isBaseline": true,
89
"environmentVariables": {
910
"CORECLR_ENABLE_PROFILING": "0",
1011
"COR_ENABLE_PROFILING": "0"
@@ -44,7 +45,8 @@
4445
"CORECLR_ENABLE_PROFILING": "1",
4546
"CORECLR_PROFILER": "{BD1A650D-AC5D-4896-B64F-D6FA25D6B26A}",
4647
"CORECLR_PROFILER_PATH": "$(CWD)\\..\\..\\shared\\bin\\monitoring-home\\win-$(arch)\\Datadog.Profiler.Native.dll",
47-
"DD_PROFILING_METRICS_FILEPATH": "metrics.json"
48+
"DD_PROFILING_METRICS_FILEPATH": "metrics.json",
49+
"DOTNET_ROOT": ""
4850
},
4951
"tags": {
5052
"runtime.architecture": "$(arch)",
@@ -53,5 +55,6 @@
5355
"benchmark.job.runtime.name": ".NET 7.0",
5456
"benchmark.job.runtime.moniker": "net7.0"
5557
},
56-
"metricsFilePath": "*metrics.json"
58+
"metricsFilePath": "*metrics.json",
59+
"overheadThreshold": 100
5760
}

0 commit comments

Comments
 (0)