Skip to content

Commit 397738e

Browse files
zeitlingerzeitlinger
authored
reformat all files with spotless (#1015)
* reformat all files with spotless Signed-off-by: Gregor Zeitlinger <[email protected]> * reformat all files with spotless Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 50d9950 commit 397738e

File tree

220 files changed

+23898
-22085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+23898
-22085
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
with:
11-
fetch-depth: 0
1210
- name: Set up JDK
1311
uses: actions/setup-java@v4
1412
with:

‎benchmarks/src/main/java/io/prometheus/metrics/benchmarks/BenchmarkRunner.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.prometheus.metrics.benchmarks;
22

33
public class BenchmarkRunner {
4-
public static void main(String[] args) throws Exception {
5-
org.openjdk.jmh.Main.main(args);
6-
}
4+
public static void main(String[] args) throws Exception {
5+
org.openjdk.jmh.Main.main(args);
6+
}
77
}

‎benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java‎

Lines changed: 149 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
/**
2121
* Results on a machine with dedicated 8 vCPU cores:
22+
*
2223
* <pre>
2324
* Benchmark Mode Cnt Score Error Units
2425
* i.p.metrics.benchmarks.CounterBenchmark.codahaleIncNoLabels thrpt 25 30978.055 ± 424.088 ops/s
@@ -32,182 +33,174 @@
3233
* i.p.metrics.benchmarks.CounterBenchmark.simpleclientInc thrpt 25 9057.637 ± 67.761 ops/s
3334
* i.p.metrics.benchmarks.CounterBenchmark.simpleclientNoLabelsInc thrpt 25 8993.471 ± 49.581 ops/s
3435
* </pre>
35-
* Prometheus counters are faster than counters of other libraries. For example, incrementing a single counter
36-
* without labels is more than 2 times faster (34752 ops / second) than doing the same with an OpenTelemetry
37-
* counter (16634 ops / sec).
36+
*
37+
* Prometheus counters are faster than counters of other libraries. For example, incrementing a
38+
* single counter without labels is more than 2 times faster (34752 ops / second) than doing the
39+
* same with an OpenTelemetry counter (16634 ops / sec).
3840
*/
3941
public class CounterBenchmark {
4042

41-
@State(Scope.Benchmark)
42-
public static class PrometheusCounter {
43-
44-
final Counter noLabels;
45-
final CounterDataPoint dataPoint;
46-
47-
public PrometheusCounter() {
48-
noLabels = Counter.builder()
49-
.name("test")
50-
.help("help")
51-
.build();
52-
53-
Counter labels = Counter.builder()
54-
.name("test")
55-
.help("help")
56-
.labelNames("path", "status")
57-
.build();
58-
this.dataPoint = labels.labelValues("/", "200");
59-
}
60-
}
43+
@State(Scope.Benchmark)
44+
public static class PrometheusCounter {
6145

62-
@State(Scope.Benchmark)
63-
public static class SimpleclientCounter {
46+
final Counter noLabels;
47+
final CounterDataPoint dataPoint;
6448

65-
final io.prometheus.client.Counter noLabels;
66-
final io.prometheus.client.Counter.Child dataPoint;
49+
public PrometheusCounter() {
50+
noLabels = Counter.builder().name("test").help("help").build();
6751

68-
public SimpleclientCounter() {
69-
noLabels = io.prometheus.client.Counter.build()
70-
.name("name")
71-
.help("help")
72-
.create();
52+
Counter labels =
53+
Counter.builder().name("test").help("help").labelNames("path", "status").build();
54+
this.dataPoint = labels.labelValues("/", "200");
55+
}
56+
}
7357

74-
io.prometheus.client.Counter counter = io.prometheus.client.Counter.build()
75-
.name("name")
76-
.help("help")
77-
.labelNames("path", "status")
78-
.create();
58+
@State(Scope.Benchmark)
59+
public static class SimpleclientCounter {
7960

80-
this.dataPoint = counter.labels("/", "200");
81-
}
82-
}
61+
final io.prometheus.client.Counter noLabels;
62+
final io.prometheus.client.Counter.Child dataPoint;
8363

84-
@State(Scope.Benchmark)
85-
public static class CodahaleCounterNoLabels {
86-
final com.codahale.metrics.Counter counter = new com.codahale.metrics.MetricRegistry().counter("test");
87-
}
64+
public SimpleclientCounter() {
65+
noLabels = io.prometheus.client.Counter.build().name("name").help("help").create();
8866

89-
@State(Scope.Benchmark)
90-
public static class OpenTelemetryCounter {
91-
92-
final LongCounter longCounter;
93-
final DoubleCounter doubleCounter;
94-
final Attributes attributes;
95-
96-
public OpenTelemetryCounter() {
97-
98-
SdkMeterProvider sdkMeterProvider = SdkMeterProvider.builder()
99-
.registerMetricReader(InMemoryMetricReader.create())
100-
.setResource(Resource.getDefault())
101-
.build();
102-
OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
103-
.setMeterProvider(sdkMeterProvider)
104-
.build();
105-
Meter meter = openTelemetry
106-
.meterBuilder("instrumentation-library-name")
107-
.setInstrumentationVersion("1.0.0")
108-
.build();
109-
this.longCounter = meter
110-
.counterBuilder("test1")
111-
.setDescription("test")
112-
.build();
113-
this.doubleCounter = meter
114-
.counterBuilder("test2")
115-
.ofDoubles()
116-
.setDescription("test")
117-
.build();
118-
this.attributes = Attributes.of(
119-
AttributeKey.stringKey("path"), "/",
120-
AttributeKey.stringKey("status"), "200");
121-
}
122-
}
67+
io.prometheus.client.Counter counter =
68+
io.prometheus.client.Counter.build()
69+
.name("name")
70+
.help("help")
71+
.labelNames("path", "status")
72+
.create();
12373

124-
@Benchmark
125-
@Threads(4)
126-
public CounterDataPoint prometheusAdd(RandomNumbers randomNumbers, PrometheusCounter counter) {
127-
for (int i=0; i<randomNumbers.randomNumbers.length; i++) {
128-
counter.dataPoint.inc(randomNumbers.randomNumbers[i]);
129-
}
130-
return counter.dataPoint;
74+
this.dataPoint = counter.labels("/", "200");
13175
}
132-
133-
@Benchmark
134-
@Threads(4)
135-
public CounterDataPoint prometheusInc(PrometheusCounter counter) {
136-
for (int i=0; i<10*1024; i++) {
137-
counter.dataPoint.inc();
138-
}
139-
return counter.dataPoint;
76+
}
77+
78+
@State(Scope.Benchmark)
79+
public static class CodahaleCounterNoLabels {
80+
final com.codahale.metrics.Counter counter =
81+
new com.codahale.metrics.MetricRegistry().counter("test");
82+
}
83+
84+
@State(Scope.Benchmark)
85+
public static class OpenTelemetryCounter {
86+
87+
final LongCounter longCounter;
88+
final DoubleCounter doubleCounter;
89+
final Attributes attributes;
90+
91+
public OpenTelemetryCounter() {
92+
93+
SdkMeterProvider sdkMeterProvider =
94+
SdkMeterProvider.builder()
95+
.registerMetricReader(InMemoryMetricReader.create())
96+
.setResource(Resource.getDefault())
97+
.build();
98+
OpenTelemetry openTelemetry =
99+
OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
100+
Meter meter =
101+
openTelemetry
102+
.meterBuilder("instrumentation-library-name")
103+
.setInstrumentationVersion("1.0.0")
104+
.build();
105+
this.longCounter = meter.counterBuilder("test1").setDescription("test").build();
106+
this.doubleCounter = meter.counterBuilder("test2").ofDoubles().setDescription("test").build();
107+
this.attributes =
108+
Attributes.of(
109+
AttributeKey.stringKey("path"), "/",
110+
AttributeKey.stringKey("status"), "200");
140111
}
112+
}
141113

142-
@Benchmark
143-
@Threads(4)
144-
public DoubleCounter openTelemetryAdd(RandomNumbers randomNumbers, OpenTelemetryCounter counter) {
145-
for (int i=0; i<randomNumbers.randomNumbers.length; i++) {
146-
counter.doubleCounter.add(randomNumbers.randomNumbers[i], counter.attributes);
147-
}
148-
return counter.doubleCounter;
114+
@Benchmark
115+
@Threads(4)
116+
public CounterDataPoint prometheusAdd(RandomNumbers randomNumbers, PrometheusCounter counter) {
117+
for (int i = 0; i < randomNumbers.randomNumbers.length; i++) {
118+
counter.dataPoint.inc(randomNumbers.randomNumbers[i]);
149119
}
150-
151-
@Benchmark
152-
@Threads(4)
153-
public LongCounter openTelemetryInc(OpenTelemetryCounter counter) {
154-
for (int i=0; i<10*1024; i++) {
155-
counter.longCounter.add(1, counter.attributes);
156-
}
157-
return counter.longCounter;
120+
return counter.dataPoint;
121+
}
122+
123+
@Benchmark
124+
@Threads(4)
125+
public CounterDataPoint prometheusInc(PrometheusCounter counter) {
126+
for (int i = 0; i < 10 * 1024; i++) {
127+
counter.dataPoint.inc();
158128
}
159-
160-
@Benchmark
161-
@Threads(4)
162-
public LongCounter openTelemetryIncNoLabels(OpenTelemetryCounter counter) {
163-
for (int i=0; i<10*1024; i++) {
164-
counter.longCounter.add(1);
165-
}
166-
return counter.longCounter;
129+
return counter.dataPoint;
130+
}
131+
132+
@Benchmark
133+
@Threads(4)
134+
public DoubleCounter openTelemetryAdd(RandomNumbers randomNumbers, OpenTelemetryCounter counter) {
135+
for (int i = 0; i < randomNumbers.randomNumbers.length; i++) {
136+
counter.doubleCounter.add(randomNumbers.randomNumbers[i], counter.attributes);
167137
}
168-
169-
@Benchmark
170-
@Threads(4)
171-
public io.prometheus.client.Counter.Child simpleclientAdd(RandomNumbers randomNumbers, SimpleclientCounter counter) {
172-
for (int i=0; i<randomNumbers.randomNumbers.length; i++) {
173-
counter.dataPoint.inc(randomNumbers.randomNumbers[i]);
174-
}
175-
return counter.dataPoint;
138+
return counter.doubleCounter;
139+
}
140+
141+
@Benchmark
142+
@Threads(4)
143+
public LongCounter openTelemetryInc(OpenTelemetryCounter counter) {
144+
for (int i = 0; i < 10 * 1024; i++) {
145+
counter.longCounter.add(1, counter.attributes);
176146
}
177-
178-
@Benchmark
179-
@Threads(4)
180-
public io.prometheus.client.Counter.Child simpleclientInc(SimpleclientCounter counter) {
181-
for (int i=0; i<10*1024; i++) {
182-
counter.dataPoint.inc();
183-
}
184-
return counter.dataPoint;
147+
return counter.longCounter;
148+
}
149+
150+
@Benchmark
151+
@Threads(4)
152+
public LongCounter openTelemetryIncNoLabels(OpenTelemetryCounter counter) {
153+
for (int i = 0; i < 10 * 1024; i++) {
154+
counter.longCounter.add(1);
185155
}
186-
187-
@Benchmark
188-
@Threads(4)
189-
public com.codahale.metrics.Counter codahaleIncNoLabels(RandomNumbers randomNumbers, CodahaleCounterNoLabels counter) {
190-
for (int i=0; i<10*1024; i++) {
191-
counter.counter.inc();
192-
}
193-
return counter.counter;
156+
return counter.longCounter;
157+
}
158+
159+
@Benchmark
160+
@Threads(4)
161+
public io.prometheus.client.Counter.Child simpleclientAdd(
162+
RandomNumbers randomNumbers, SimpleclientCounter counter) {
163+
for (int i = 0; i < randomNumbers.randomNumbers.length; i++) {
164+
counter.dataPoint.inc(randomNumbers.randomNumbers[i]);
194165
}
195-
196-
@Benchmark
197-
@Threads(4)
198-
public io.prometheus.metrics.core.metrics.Counter prometheusNoLabelsInc(PrometheusCounter counter) {
199-
for (int i=0; i<10*1024; i++) {
200-
counter.noLabels.inc();
201-
}
202-
return counter.noLabels;
166+
return counter.dataPoint;
167+
}
168+
169+
@Benchmark
170+
@Threads(4)
171+
public io.prometheus.client.Counter.Child simpleclientInc(SimpleclientCounter counter) {
172+
for (int i = 0; i < 10 * 1024; i++) {
173+
counter.dataPoint.inc();
203174
}
204-
205-
@Benchmark
206-
@Threads(4)
207-
public io.prometheus.client.Counter simpleclientNoLabelsInc(SimpleclientCounter counter) {
208-
for (int i=0; i<10*1024; i++) {
209-
counter.noLabels.inc();
210-
}
211-
return counter.noLabels;
175+
return counter.dataPoint;
176+
}
177+
178+
@Benchmark
179+
@Threads(4)
180+
public com.codahale.metrics.Counter codahaleIncNoLabels(
181+
RandomNumbers randomNumbers, CodahaleCounterNoLabels counter) {
182+
for (int i = 0; i < 10 * 1024; i++) {
183+
counter.counter.inc();
184+
}
185+
return counter.counter;
186+
}
187+
188+
@Benchmark
189+
@Threads(4)
190+
public io.prometheus.metrics.core.metrics.Counter prometheusNoLabelsInc(
191+
PrometheusCounter counter) {
192+
for (int i = 0; i < 10 * 1024; i++) {
193+
counter.noLabels.inc();
194+
}
195+
return counter.noLabels;
196+
}
197+
198+
@Benchmark
199+
@Threads(4)
200+
public io.prometheus.client.Counter simpleclientNoLabelsInc(SimpleclientCounter counter) {
201+
for (int i = 0; i < 10 * 1024; i++) {
202+
counter.noLabels.inc();
212203
}
204+
return counter.noLabels;
205+
}
213206
}

0 commit comments

Comments
 (0)