Skip to content

Commit

Permalink
Merge pull request #19 from jfdenise/glow-preview-31.0.0.Final
Browse files Browse the repository at this point in the history 
Add micrometer and opentelemetry with Glow support
  • Loading branch information
@kabir
kabir authored Jan 25, 2024
2 parents 5f22b77 + 1063471 commit fe93e01
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 87 deletions.
80 changes: 37 additions & 43 deletions micrometer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
<version.server>31.0.0.Final</version.server>
<!-- The versions for the BOMs, Packs and Plugins -->
<version.bom.ee>${version.server}</version.bom.ee>
<version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
<version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
<version.pack.cloud>6.0.0.Final</version.pack.cloud>
<version.plugin.wildfly>5.0.0.Beta2</version.plugin.wildfly>
</properties>

<repositories>
Expand Down Expand Up @@ -184,17 +182,13 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<!-- layers may be used to customize the server to provision-->
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>micrometer</layer>
</layers>
<discover-provisioning-info>
<version>${version.server}</version>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<!-- use cli script(s) to configure the server -->
<packaging-scripts>
<packaging-script>
Expand Down Expand Up @@ -226,24 +220,25 @@
<plugins>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.server}</feature-pack-location>
<layers>
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>micrometer</layer>
</layers>
<plugin-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</plugin-options>
<cli-sessions>
<cli-session>
<script-files>
<discover-provisioning-info>
<version>${version.server}</version>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<bootable-jar>true</bootable-jar>
<!-- deploys the quickstart on root web context -->
<name>ROOT.war</name>
<packaging-scripts>
<packaging-script>
<scripts>
<script>${basedir}/configure-micrometer.cli</script>
</script-files>
</cli-session>
</cli-sessions>
</scripts>
</packaging-script>
</packaging-scripts>
</configuration>
<executions>
<execution>
Expand All @@ -265,19 +260,18 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>micrometer</layer>
</layers>
<discover-provisioning-info>
<version>${version.server}</version>
<context>cloud</context>
<!-- A workaround for WFLY-18955 -->
<add-ons>
<add-on>micrometer</add-on>
</add-ons>
</discover-provisioning-info>
<!--
The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
application is deployed in the root web context. Add ROOT.war to the server.
-->
<filename>ROOT.war</filename>
<packaging-scripts>
<packaging-script>
Expand Down
70 changes: 26 additions & 44 deletions opentelemetry-tracing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
<version.server>31.0.0.Final</version.server>
<!-- The versions for the BOMs, Packs and Plugins -->
<version.bom.ee>${version.server}</version.bom.ee>
<version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
<version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
<version.pack.cloud>6.0.0.Final</version.pack.cloud>
<version.plugin.wildfly>5.0.0.Beta2</version.plugin.wildfly>
</properties>

<repositories>
Expand Down Expand Up @@ -173,17 +171,9 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
</feature-packs>
<layers>
<!-- layers may be used to customize the server to provision-->
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>opentelemetry</layer>
</layers>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<packaging-scripts>
<packaging-script>
<scripts>
Expand Down Expand Up @@ -212,24 +202,21 @@
<plugins>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-jar-maven-plugin</artifactId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.server}</feature-pack-location>
<layers>
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>opentelemetry</layer>
</layers>
<cli-sessions>
<cli-session>
<script-files>
<discover-provisioning-info>
<version>${version.server}</version>
</discover-provisioning-info>
<bootable-jar>true</bootable-jar>
<!-- deploys the quickstart on root web context -->
<name>ROOT.war</name>
<packaging-scripts>
<packaging-script>
<scripts>
<script>${basedir}/configure-opentelemetry.cli</script>
</script-files>
</cli-session>
</cli-sessions>
<plugin-options>
<jboss-fork-embedded>true</jboss-fork-embedded>
</plugin-options>
</scripts>
</packaging-script>
</packaging-scripts>
</configuration>
<executions>
<execution>
Expand All @@ -251,27 +238,22 @@
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<feature-packs>
<feature-pack>
<location>org.wildfly:wildfly-galleon-pack:${version.server}</location>
</feature-pack>
<feature-pack>
<location>org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud}</location>
</feature-pack>
</feature-packs>
<layers>
<layer>cdi</layer>
<layer>jaxrs-server</layer>
<layer>opentelemetry</layer>
</layers>
<discover-provisioning-info>
<version>${version.server}</version>
<context>cloud</context>
</discover-provisioning-info>
<packaging-scripts>
<packaging-script>
<scripts>
<script>${basedir}/configure-opentelemetry.cli</script>
</scripts>
</packaging-script>
</packaging-scripts>
<name>ROOT.war</name>
<!--
The parent POM's 'openshift' profile renames the output archive to ROOT.war so that the
application is deployed in the root web context. Add ROOT.war to the server.
-->
<filename>ROOT.war</filename>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit fe93e01

Please sign in to comment.