Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove apache-geode-micrometer2 module.

Browse Source 
The integration module between Apache Geode 1.14.x (based on Micrometer 1.x) and Micrometer 2.0 is not longer needed since the Micrometer team is rolling back changes to the Micrometer Binders API in 2.0 to re-include the Binders back in micrometer-core.
This commit is contained in:
John Blum
2022-04-12 15:51:17 -07:00
parent ff726c000e
commit 7607415b36
12 changed files with 0 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-geode-project/apache-geode-extensions/apache-geode-extensions.gradle
View File

@@ -16,6 +16,4 @@ dependencies {
testImplementation "org.apache.geode:geode-membership:$apacheGeodeVersion"
testImplementation "org.apache.geode:geode-serialization:$apacheGeodeVersion"
testRuntimeOnly project(':apache-geode-micrometer2')
}

9
spring-geode-project/apache-geode-micrometer2/apache-geode-micrometer2.gradle
View File

@@ -1,9 +0,0 @@
apply plugin: 'io.spring.convention.spring-module'
description = "Integration for Apache Geode and Micrometer 2"
dependencies {
implementation "io.micrometer:micrometer-binders"
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmGcMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.jvm;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.jvm.JvmGcMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.jvm.JvmGcMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class JvmGcMetrics extends io.micrometer.binder.jvm.JvmGcMetrics {
/**
* @inheritDoc
*/
public JvmGcMetrics() { }
/**
* @inheritDoc
*/
public JvmGcMetrics(Iterable<Tag> tags) {
super(tags);
}
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmMemoryMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.jvm;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.jvm.JvmMemoryMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.jvm.JvmMemoryMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class JvmMemoryMetrics extends io.micrometer.binder.jvm.JvmMemoryMetrics {
/**
* @inheritDoc
*/
public JvmMemoryMetrics() { }
/**
* @inheritDoc
*/
public JvmMemoryMetrics(Iterable<Tag> tags) {
super(tags);
}
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/jvm/JvmThreadMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.jvm;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.jvm.JvmThreadMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.jvm.JvmThreadMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class JvmThreadMetrics extends io.micrometer.binder.jvm.JvmThreadMetrics {
/**
* @inheritDoc
*/
public JvmThreadMetrics() { }
/**
* @inheritDoc
*/
public JvmThreadMetrics(Iterable<Tag> tags) {
super(tags);
}
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/FileDescriptorMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.system;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.system.FileDescriptorMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.system.FileDescriptorMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class FileDescriptorMetrics extends io.micrometer.binder.system.FileDescriptorMetrics {
/**
* @inheritDoc
*/
public FileDescriptorMetrics() { }
/**
* @inheritDoc
*/
public FileDescriptorMetrics(Iterable<Tag> tags) {
super(tags);
}
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/ProcessorMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.system;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.system.FileDescriptorMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.system.ProcessorMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class ProcessorMetrics extends io.micrometer.binder.system.ProcessorMetrics {
/**
* @inheritDoc
*/
public ProcessorMetrics() { }
/**
* @inheritDoc
*/
public ProcessorMetrics(Iterable<Tag> tags) {
super(tags);
}
}

42
spring-geode-project/apache-geode-micrometer2/src/main/java/io/micrometer/core/instrument/binder/system/UptimeMetrics.java
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2017-present the original author or authors.
*
* 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.core.instrument.binder.system;
import io.micrometer.core.instrument.Tag;
/**
* Extension of {@link io.micrometer.binder.system.UptimeMetrics} for adapting and repackaging purposes
* as required by Apache Geode 1.x, which is based on Micrometer 1.x.
*
* @author John Blum
* @see io.micrometer.binder.system.UptimeMetrics
* @since 2.0.0
*/
@SuppressWarnings("unused")
public class UptimeMetrics extends io.micrometer.binder.system.UptimeMetrics {
/**
* @inheritDoc
*/
public UptimeMetrics() { }
/**
* @inheritDoc
*/
public UptimeMetrics(Iterable<Tag> tags) {
super(tags);
}
}

2
spring-geode-project/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
View File

@@ -13,6 +13,4 @@ dependencies {
// defined in the DependencySetPlugin.
testImplementation "org.springframework.boot:spring-boot-starter-test"
testRuntimeOnly project(':apache-geode-micrometer2')
}

2
spring-geode-project/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
View File

@@ -28,8 +28,6 @@ dependencies {
testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
testRuntimeOnly project(':apache-geode-micrometer2')
testRuntimeOnly "javax.cache:cache-api"
testRuntimeOnly "org.apache.geode:geode-http-service:$apacheGeodeVersion"
testRuntimeOnly "org.apache.geode:geode-web:$apacheGeodeVersion"

2
spring-geode-project/spring-geode-starters/spring-geode-starter/spring-geode-starter.gradle
View File

@@ -9,8 +9,6 @@ dependencies {
api project(':spring-geode')
api project(':spring-geode-autoconfigure')
runtimeOnly project(':apache-geode-micrometer2')
runtimeOnly 'org.springframework.shell:spring-shell'
}

2
spring-geode-project/spring-geode/spring-geode.gradle
View File

@@ -33,8 +33,6 @@ dependencies {
testImplementation "org.springframework.data:spring-data-geode-test"
testImplementation "org.testcontainers:testcontainers"
testRuntimeOnly project(':apache-geode-micrometer2')
testRuntimeOnly "org.hsqldb:hsqldb"
}