fix tresholds

freef4ll · freef4ll · commit 43cfe7b0905b · 2023-10-16T14:30:22.000+03:00
diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift
@@ -18,7 +18,7 @@ import PackageDescription
 let package = Package(
     name: "benchmarks",
     platforms: [
-        .macOS("14"),
+        .macOS(.v13),
     ],
     dependencies: [
         .package(path: "../"),
diff --git a/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Counter_#1.p90.json b/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Counter_#1.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Counter_#2.p90.json b/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Counter_#2.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.DurationHistogram.p90.json b/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.DurationHistogram.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
diff --git a/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Gauge.p90.json b/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.Gauge.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json b/Benchmarks/Thresholds/5.10/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Counter_#1.p90.json b/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Counter_#1.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Counter_#2.p90.json b/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Counter_#2.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.DurationHistogram.p90.json b/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.DurationHistogram.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
diff --git a/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Gauge.p90.json b/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.Gauge.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json b/Benchmarks/Thresholds/5.7/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Counter_#1.p90.json b/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Counter_#1.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Counter_#2.p90.json b/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Counter_#2.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.DurationHistogram.p90.json b/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.DurationHistogram.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 2
+}
diff --git a/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Gauge.p90.json b/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.Gauge.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 1
+}
diff --git a/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json b/Benchmarks/Thresholds/5.8/PrometheusBenchmarks.RegistryEmit_-_5000_metrics.p90.json
@@ -0,0 +1,3 @@
+{
+  "mallocCountTotal" : 0
+}
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,6 +16,9 @@ ENV LANGUAGE en_US.UTF-8
 RUN apt-get update && apt-get install -y wget
 RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools libz-dev curl jq # used by integration tests
 
+# install jemalloc for running allocation benchmarks
+RUN apt-get update & apt-get install -y libjemalloc-dev
+
 # ruby and jazzy for docs generation
 RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
 # jazzy no longer works on xenial as ruby is too old.
diff --git a/docker/docker-compose.2204.510.yaml b/docker/docker-compose.2204.510.yaml
@@ -0,0 +1,27 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: prometheus:22.04-5.10
+    build:
+      args:
+        base_image: "swiftlang/swift:nightly-5.10-jammy"
+
+  documentation-check:
+    image: prometheus:22.04-5.10
+
+  test:
+    image: prometheus:22.04-5.10
+    environment:
+      - SWIFT_VERSION=main
+      - IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
+      #- SANITIZER_ARG=--sanitize=thread
+
+  update-benchmark-baseline:
+    image: prometheus:22.04-5.10
+    environment:
+      - SWIFT_VERSION=5.10
+
+  shell:
+    image: prometheus:22.04-5.10
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -16,8 +16,8 @@ services:
     depends_on: [runtime-setup]
     volumes:
       - ~/.ssh:/root/.ssh
-      - ..:/code:z
-    working_dir: /code
+      - ..:/swift-prometheus:z
+    working_dir: /swift-prometheus
     cap_drop:
       - CAP_NET_RAW
       - CAP_NET_BIND_SERVICE

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "mallocCountTotal" : 1`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "mallocCountTotal" : 0`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "mallocCountTotal" : 2`
	`3`	`+}`