Skip to content

Commit 84fa38d

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #166 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents c4d1151 + 5e56476 commit 84fa38d

File tree

20 files changed

+76
-58
lines changed

20 files changed

+76
-58
lines changed

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
canSkip: ${{ steps.Checker.outputs.canSkip }}
1313
steps:
1414
- name: Get files
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Get tools
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
path: tools/
2020
repository: openliberty/guides-common
@@ -45,10 +45,11 @@ jobs:
4545
working-directory: finish
4646

4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
4949
- name: Set up JDK 11
50-
uses: actions/setup-java@v1
50+
uses: actions/setup-java@v4
5151
with:
52+
distribution: 'semeru'
5253
java-version: 11
5354
- run: unset _JAVA_OPTIONS
5455

‎README.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, 2024 IBM Corporation and others.
1+
// Copyright (c) 2023, 2025 IBM Corporation and others.
22
// Licensed under Creative Commons Attribution-NoDerivatives
33
// 4.0 International (CC BY-ND 4.0)
44
// https://creativecommons.org/licenses/by-nd/4.0/
@@ -279,7 +279,7 @@ system/server.xml
279279
include::finish/system/src/main/liberty/config/server.xml[]
280280
----
281281

282-
The [hotspot=mpTelemetry file=0]`mpTelemetry` feature is now enabled in the `server.xml` of the `system` service.
282+
The [hotspot=microprofile hotspot=mpTelemetry file=0]`mpTelemetry` feature is now enabled in the `server.xml` of the `system` service.
283283

284284
[role="code_command hotspot file=1", subs="quotes"]
285285
----
@@ -310,7 +310,7 @@ system/microprofile-config.properties
310310
include::finish/system/src/main/resources/META-INF/microprofile-config.properties[]
311311
----
312312

313-
The MicroProfile properties file sets the [hotspot=service file=2]`otel.service.name` property with the `system` service name and sets the [hotspot=disabled file=2]`otel.sdk.disabled` property to `false` to enable tracing.
313+
The MicroProfile properties file sets the [hotspot=service file=2]`otel.service.name` property with the `system` service name, sets the [hotspot=disabled file=2]`otel.sdk.disabled` property to `false` to enable tracing, sets the [hotspot=metrics file=2]`otel.metrics.exporter` property to `none` to disable metrics, and sets the [hotspot=logs file=2]`otel.logs.exporter` property to `none` to disable exporting logs.
314314

315315

316316
[role="code_command hotspot file=3", subs="quotes"]
@@ -327,7 +327,7 @@ include::finish/inventory/src/main/resources/META-INF/microprofile-config.proper
327327

328328
Similarly, specify the [hotspot=otel file=3]`otel` properties for the `inventory` service.
329329

330-
For more information about these and other Telemetry properties, see the https://openliberty.io/docs/latest/microprofile-config-properties.html#telemetry[MicroProfile Config properties for MicroProfile Telemetry^] documentation.
330+
For more information about these and other Telemetry properties, see the https://openliberty.io/docs/latest/reference/microprofile-config-properties.html#telemetry[MicroProfile Config properties for MicroProfile Telemetry^] documentation.
331331

332332
ifndef::cloud-hosted[]
333333
To run the `system` and `inventory` services, simply navigate your browser to the http://localhost:9081/inventory/systems/localhost URL. To view the traces, go to the http://localhost:16686 URL.

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
3131
<dependency>
3232
<groupId>org.eclipse.microprofile</groupId>
3333
<artifactId>microprofile</artifactId>
34-
<version>6.1</version>
34+
<version>7.0</version>
3535
<type>pom</type>
3636
<scope>provided</scope>
3737
</dependency>

‎finish/inventory/src/main/liberty/config/server.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<server description="inventory service">
22

33
<featureManager>
4-
<feature>cdi-4.0</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>jsonp-2.1</feature>
7-
<feature>restfulWS-3.1</feature>
8-
<feature>mpConfig-3.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>cdi</feature>
7+
<feature>jsonb</feature>
8+
<feature>jsonp</feature>
9+
<feature>restfulWS</feature>
10+
<feature>mpConfig</feature>
911
<!-- tag::mpTelemetry[] -->
10-
<feature>mpTelemetry-1.1</feature>
12+
<feature>mpTelemetry</feature>
1113
<!-- end::mpTelemetry[] -->
1214
</featureManager>
1315

‎finish/inventory/src/main/resources/META-INF/microprofile-config.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ io.openliberty.guides.inventory.client.SystemClient/mp-rest/url=http://localhost
22
# tag::otel[]
33
otel.service.name=inventory
44
otel.sdk.disabled=false
5+
otel.metrics.exporter=none
6+
otel.logs.exporter=none
57
# end::otel[]

‎finish/inventory/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

‎finish/inventory/src/main/webapp/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ <h2>Eclipse MicroProfile</h2>
2727
<p>
2828
For more information about the features used in this application, see the Open Liberty documentation:
2929
<ul>
30-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
31-
<li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry-1.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry 1.1</a></li>
32-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
34-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
30+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
31+
<li><a href="https://openliberty.io/docs/ref/feature/#mpTelemetry.html" target="_blank" rel="noopener noreferrer">MicroProfile Telemetry</a></li>
32+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
3737
</ul>
3838
</p>
3939
</div>

‎finish/system/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.eclipse.microprofile</groupId>
3030
<artifactId>microprofile</artifactId>
31-
<version>6.1</version>
31+
<version>7.0</version>
3232
<type>pom</type>
3333
<scope>provided</scope>
3434
</dependency>

‎finish/system/src/main/liberty/config/server.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<server description="system service">
22

33
<featureManager>
4-
<feature>cdi-4.0</feature>
5-
<feature>jsonb-3.0</feature>
6-
<feature>jsonp-2.1</feature>
7-
<feature>restfulWS-3.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<!-- tag::microprofile[] -->
6+
<platform>microprofile-7.0</platform>
7+
<!-- end::microprofile[] -->
8+
<feature>cdi</feature>
9+
<feature>jsonb</feature>
10+
<feature>jsonp</feature>
11+
<feature>restfulWS</feature>
812
<!-- tag::mpTelemetry[] -->
9-
<feature>mpTelemetry-1.1</feature>
13+
<feature>mpTelemetry</feature>
1014
<!-- end::mpTelemetry[] -->
1115
</featureManager>
1216

‎finish/system/src/main/resources/META-INF/microprofile-config.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@ otel.service.name=system
44
# tag::disabled[]
55
otel.sdk.disabled=false
66
# end::disabled[]
7+
# tag::metrics[]
8+
otel.metrics.exporter=none
9+
# end::metrics[]
10+
# tag::logs[]
11+
otel.logs.exporter=none
12+
# end::logs[]

0 commit comments

Comments
 (0)