Skip to content

Commit 2c290bd

Browse files
jfallowsjfallows
committed
Include engine metrics for otlp exporter IT
1 parent 0b75d51 commit 2c290bd

7 files changed

Lines changed: 115 additions & 41 deletions

File tree

‎runtime/exporter-otlp/pom.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -154,32 +154,6 @@
154154
<outputDirectory>${project.build.directory}/classes</outputDirectory>
155155
</configuration>
156156
</execution>
157-
<execution>
158-
<id>unpack-test-resources</id>
159-
<phase>process-test-resources</phase>
160-
<goals>
161-
<goal>unpack</goal>
162-
</goals>
163-
<configuration>
164-
<artifactItems>
165-
<artifactItem>
166-
<groupId>${project.groupId}</groupId>
167-
<artifactId>exporter-otlp.spec</artifactId>
168-
<fileMappers>
169-
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
170-
<pattern>^\Qio/aklivity/zilla/specs/exporter/otlp/\E</pattern>
171-
<replacement>io/aklivity/zilla/runtime/exporter/otlp/internal/</replacement>
172-
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
173-
</fileMappers>
174-
</artifactItem>
175-
</artifactItems>
176-
<includes>
177-
io/aklivity/zilla/specs/exporter/otlp/application/**/*,
178-
io/aklivity/zilla/specs/exporter/otlp/config/*
179-
</includes>
180-
<outputDirectory>${project.build.directory}/test-classes</outputDirectory>
181-
</configuration>
182-
</execution>
183157
</executions>
184158
</plugin>
185159
<plugin>

‎runtime/exporter-otlp/src/test/java/io/aklivity/zilla/runtime/exporter/otlp/internal/EventIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class EventIT
4343
private final EngineRule engine = new EngineRule()
4444
.directory(ENGINE_DIRECTORY)
4545
.configure(ENGINE_WORKERS, 1)
46-
.configurationRoot("io/aklivity/zilla/runtime/exporter/otlp/internal/config")
46+
.configurationRoot("io/aklivity/zilla/specs/exporter/otlp/config")
4747
.external("app0")
4848
.clean();
4949

‎runtime/exporter-otlp/src/test/java/io/aklivity/zilla/runtime/exporter/otlp/internal/MetricsIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public class MetricsIT
3434
private static final String ENGINE_DIRECTORY = "target/zilla-itests";
3535

3636
private final K3poRule k3po = new K3poRule()
37-
.setScriptRoot("io/aklivity/zilla/runtime/exporter/otlp/internal/application");
37+
.setScriptRoot("io/aklivity/zilla/specs/exporter/otlp/application");
3838

3939
private final TestRule timeout = new DisableOnDebug(new Timeout(10, SECONDS));
4040

4141
private final EngineRule engine = new EngineRule()
4242
.directory(ENGINE_DIRECTORY)
4343
.configure(ENGINE_WORKERS, 3)
44-
.configurationRoot("io/aklivity/zilla/runtime/exporter/otlp/internal/config")
44+
.configurationRoot("io/aklivity/zilla/specs/exporter/otlp/config")
4545
.clean();
4646

4747
@Rule

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics.with.service.name/client.rpt‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connected
1919
write http:method "POST"
2020
write http:version "HTTP/1.1"
2121
write http:header "Host" "localhost:4318"
22-
write http:header "Content-Length" "1205"
22+
write http:header "Content-Length" "1669"
2323
write
2424
'{'
2525
'"resourceMetrics":[{'
@@ -60,9 +60,9 @@ write
6060
'"isMonotonic":true'
6161
'}'
6262
'},{'
63-
'"name":"engine.worker.count",'
63+
'"name":"engine.workers.count",'
6464
'"unit":"",'
65-
'"description":"Engine worker count",'
65+
'"description":"Engine workers count",'
6666
'"sum":{'
6767
'"dataPoints":[{'
6868
'"asInt":3,'
@@ -75,6 +75,34 @@ write
7575
'"aggregationTemporality":2,'
7676
'"isMonotonic":true'
7777
'}'
78+
'},{'
79+
'"name":"engine.workers.capacity",'
80+
'"unit":"",'
81+
'"description":"Engine workers capacity",'
82+
'"gauge":{'
83+
'"dataPoints":[{'
84+
'"asInt":192,'
85+
'"timeUnixNano":0123456789123456789,'
86+
'"attributes":[{'
87+
'"key":"service.name",'
88+
'"value":{"stringValue":"zilla"}'
89+
'}]'
90+
'}]'
91+
'}'
92+
'},{'
93+
'"name":"engine.workers.utilization",'
94+
'"unit":"",'
95+
'"description":"Engine workers utilization",'
96+
'"gauge":{'
97+
'"dataPoints":[{'
98+
'"asInt":0,'
99+
'"timeUnixNano":0123456789123456789,'
100+
'"attributes":[{'
101+
'"key":"service.name",'
102+
'"value":{"stringValue":"zilla"}'
103+
'}]'
104+
'}]'
105+
'}'
78106
'},{'
79107
'"name":"test.gauge",'
80108
'"unit":"",'

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics.with.service.name/server.rpt‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ connected
2020
read http:method "POST"
2121
read http:version "HTTP/1.1"
2222
read http:header "Host" "localhost:4318"
23-
read http:header "Content-Length" "1205"
23+
read http:header "Content-Length" "1669"
2424
read
2525
'{'
2626
'"resourceMetrics":[{'
@@ -61,9 +61,9 @@ read
6161
'"isMonotonic":true'
6262
'}'
6363
'},{'
64-
'"name":"engine.worker.count",'
64+
'"name":"engine.workers.count",'
6565
'"unit":"",'
66-
'"description":"Engine worker count",'
66+
'"description":"Engine workers count",'
6767
'"sum":{'
6868
'"dataPoints":[{'
6969
'"asInt":3,'
@@ -76,6 +76,34 @@ read
7676
'"aggregationTemporality":2,'
7777
'"isMonotonic":true'
7878
'}'
79+
'},{'
80+
'"name":"engine.workers.capacity",'
81+
'"unit":"",'
82+
'"description":"Engine workers capacity",'
83+
'"gauge":{'
84+
'"dataPoints":[{'
85+
'"asInt":192,'
86+
'"timeUnixNano":' [0..19] ','
87+
'"attributes":[{'
88+
'"key":"service.name",'
89+
'"value":{"stringValue":"zilla"}'
90+
'}]'
91+
'}]'
92+
'}'
93+
'},{'
94+
'"name":"engine.workers.utilization",'
95+
'"unit":"",'
96+
'"description":"Engine workers utilization",'
97+
'"gauge":{'
98+
'"dataPoints":[{'
99+
'"asInt":0,'
100+
'"timeUnixNano":' [0..19] ','
101+
'"attributes":[{'
102+
'"key":"service.name",'
103+
'"value":{"stringValue":"zilla"}'
104+
'}]'
105+
'}]'
106+
'}'
79107
'},{'
80108
'"name":"test.gauge",'
81109
'"unit":"",'

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics/client.rpt‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connected
1919
write http:method "POST"
2020
write http:version "HTTP/1.1"
2121
write http:header "Host" "localhost:4318"
22-
write http:header "Content-Length" "2162"
22+
write http:header "Content-Length" "2518"
2323
write
2424
'{'
2525
'"resourceMetrics":[{'
@@ -54,9 +54,9 @@ write
5454
'"isMonotonic":true'
5555
'}'
5656
'},{'
57-
'"name":"engine.worker.count",'
57+
'"name":"engine.workers.count",'
5858
'"unit":"",'
59-
'"description":"Engine worker count",'
59+
'"description":"Engine workers count",'
6060
'"sum":{'
6161
'"dataPoints":[{'
6262
'"asInt":3,'
@@ -66,6 +66,28 @@ write
6666
'"aggregationTemporality":2,'
6767
'"isMonotonic":true'
6868
'}'
69+
'},{'
70+
'"name":"engine.workers.capacity",'
71+
'"unit":"",'
72+
'"description":"Engine workers capacity",'
73+
'"gauge":{'
74+
'"dataPoints":[{'
75+
'"asInt":192,'
76+
'"timeUnixNano":0123456789123456789,'
77+
'"attributes":[]'
78+
'}]'
79+
'}'
80+
'},{'
81+
'"name":"engine.workers.utilization",'
82+
'"unit":"",'
83+
'"description":"Engine workers utilization",'
84+
'"gauge":{'
85+
'"dataPoints":[{'
86+
'"asInt":0,'
87+
'"timeUnixNano":0123456789123456789,'
88+
'"attributes":[]'
89+
'}]'
90+
'}'
6991
'},{'
7092
'"name":"test.gauge",'
7193
'"unit":"",'

‎specs/exporter-otlp.spec/src/main/scripts/io/aklivity/zilla/specs/exporter/otlp/application/metrics/server.rpt‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ connected
2020
read http:method "POST"
2121
read http:version "HTTP/1.1"
2222
read http:header "Host" "localhost:4318"
23-
read http:header "Content-Length" "2162"
23+
read http:header "Content-Length" "2518"
2424
read
2525
'{'
2626
'"resourceMetrics":[{'
@@ -55,9 +55,9 @@ read
5555
'"isMonotonic":true'
5656
'}'
5757
'},{'
58-
'"name":"engine.worker.count",'
58+
'"name":"engine.workers.count",'
5959
'"unit":"",'
60-
'"description":"Engine worker count",'
60+
'"description":"Engine workers count",'
6161
'"sum":{'
6262
'"dataPoints":[{'
6363
'"asInt":3,'
@@ -67,6 +67,28 @@ read
6767
'"aggregationTemporality":2,'
6868
'"isMonotonic":true'
6969
'}'
70+
'},{'
71+
'"name":"engine.workers.capacity",'
72+
'"unit":"",'
73+
'"description":"Engine workers capacity",'
74+
'"gauge":{'
75+
'"dataPoints":[{'
76+
'"asInt":192,'
77+
'"timeUnixNano":' [0..19] ','
78+
'"attributes":[]'
79+
'}]'
80+
'}'
81+
'},{'
82+
'"name":"engine.workers.utilization",'
83+
'"unit":"",'
84+
'"description":"Engine workers utilization",'
85+
'"gauge":{'
86+
'"dataPoints":[{'
87+
'"asInt":0,'
88+
'"timeUnixNano":' [0..19] ','
89+
'"attributes":[]'
90+
'}]'
91+
'}'
7092
'},{'
7193
'"name":"test.gauge",'
7294
'"unit":"",'

0 commit comments

Comments
 (0)