Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Jakarta JMS instrumentation to micrometer-jakarta9 #4201

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Move Jakarta JMS instrumentation to micrometer-jakarta9 #4201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ subprojects {

check.dependsOn("testModules")

if (!(project.name in ['micrometer-osgi-test'])) {
if (!(project.name in ['micrometer-jakarta10'])) {
apply plugin: 'me.champeau.gradle.japicmp'
apply plugin: 'de.undercouch.download'

Expand Down
26 changes: 26 additions & 0 deletions micrometer-jakarta10/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
description 'Module for Jakarta 10+ based instrumentations'

jar {
bundle {

bnd '''\
Import-Package: \
jakarta.jms.*;resolution:=dynamic;version="${@}",\
io.micrometer.observation.*;resolution:=dynamic;version="${@}",\
*
'''.stripIndent()
}
}

dependencies {
api project(":micrometer-core")
api project(":micrometer-commons")
api project(":micrometer-observation")

optionalApi 'jakarta.jms:jakarta.jms-api'

testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'com.tngtech.archunit:archunit-junit5'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.assertj:assertj-core'
}
5 changes: 2 additions & 3 deletions ...faultJmsProcessObservationConvention.java → ...faultJmsProcessObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
import io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation.LowCardinalityKeyNames;
import jakarta.jms.*;

import static io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation.*;
import io.micrometer.jakarta10.instrument.jms.JmsObservationDocumentation.*;

/**
* Default implementation for {@link JmsProcessObservationConvention}.
Expand Down
4 changes: 2 additions & 2 deletions ...faultJmsPublishObservationConvention.java → ...faultJmsPublishObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.KeyValue;
import io.micrometer.common.KeyValues;
import jakarta.jms.*;

import static io.micrometer.core.instrument.binder.jms.JmsObservationDocumentation.*;
import static io.micrometer.jakarta10.instrument.jms.JmsObservationDocumentation.*;

/**
* Default implementation for {@link JmsPublishObservationConvention}.
Expand Down
2 changes: 1 addition & 1 deletion ...rument/binder/jms/JmsInstrumentation.java → ...10/instrument/jms/JmsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.ObservationRegistry;
import jakarta.jms.Session;
Expand Down
2 changes: 1 addition & 1 deletion ...nder/jms/JmsObservationDocumentation.java → ...ment/jms/JmsObservationDocumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.KeyValue;
import io.micrometer.common.docs.KeyName;
Expand Down
2 changes: 1 addition & 1 deletion ...der/jms/JmsProcessObservationContext.java → ...ent/jms/JmsProcessObservationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.transport.ReceiverContext;
import jakarta.jms.JMSException;
Expand Down
2 changes: 1 addition & 1 deletion .../jms/JmsProcessObservationConvention.java → .../jms/JmsProcessObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
Expand Down
2 changes: 1 addition & 1 deletion ...der/jms/JmsPublishObservationContext.java → ...ent/jms/JmsPublishObservationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.lang.Nullable;
import io.micrometer.observation.transport.SenderContext;
Expand Down
2 changes: 1 addition & 1 deletion .../jms/JmsPublishObservationConvention.java → .../jms/JmsPublishObservationConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
Expand Down
2 changes: 1 addition & 1 deletion ...jms/MessageConsumerInvocationHandler.java → ...jms/MessageConsumerInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
Expand Down
2 changes: 1 addition & 1 deletion ...jms/MessageProducerInvocationHandler.java → ...jms/MessageProducerInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.lang.Nullable;
import io.micrometer.observation.Observation;
Expand Down
2 changes: 1 addition & 1 deletion .../binder/jms/SessionInvocationHandler.java → ...trument/jms/SessionInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.observation.ObservationRegistry;
import jakarta.jms.MessageConsumer;
Expand Down
2 changes: 1 addition & 1 deletion ...e/instrument/binder/jms/package-info.java → ...akarta10/instrument/jms/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
@NonNullFields
@NonNullApi
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.lang.NonNullApi;
import io.micrometer.common.lang.NonNullFields;
34 changes: 34 additions & 0 deletions micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2023 VMware, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.jakarta10;

import com.tngtech.archunit.junit.AnalyzeClasses;
import com.tngtech.archunit.junit.ArchTest;
import com.tngtech.archunit.lang.ArchRule;

import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;

@AnalyzeClasses(packages = "io.micrometer.jakarta10")
class NoJavaxArchitectureTests {

@ArchTest
static final ArchRule noJavaxDependencies = noClasses().that()
.resideInAPackage("io.micrometer.jakarta10..")
.should()
.dependOnClassesThat()
.resideInAPackage("javax..");

}
2 changes: 1 addition & 1 deletion ...JmsProcessObservationConventionTests.java → ...JmsProcessObservationConventionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.KeyValue;
import jakarta.jms.*;
Expand Down
2 changes: 1 addition & 1 deletion ...JmsPublishObservationConventionTests.java → ...JmsPublishObservationConventionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micrometer.core.instrument.binder.jms;
package io.micrometer.jakarta10.instrument.jms;

import io.micrometer.common.KeyValue;
import jakarta.jms.*;
Expand Down
1 change: 1 addition & 0 deletions micrometer-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation 'org.awaitility:awaitility'

testImplementation project(':micrometer-observation-test')
testImplementation project(':micrometer-jakarta10')

testImplementation 'org.jsr107.ri:cache-ri-impl'

Expand Down
1 change: 1 addition & 0 deletions ...-test/src/test/java/io/micrometer/core/instrument/binder/jms/JmsInstrumentationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import io.micrometer.jakarta10.instrument.jms.JmsInstrumentation;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.observation.tck.TestObservationRegistryAssert;
import jakarta.jms.*;
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ include 'micrometer-test', 'micrometer-observation-test'
}

include 'micrometer-bom'
include 'micrometer-jakarta10'
include 'micrometer-jetty11'
include 'micrometer-osgi-test'
include 'docs'