Skip to content

Commit 62141f4

Browse files
zegelinzegelin
committed
Adjusts the package layout slightly.
1 parent 007c500 commit 62141f4

38 files changed

+119
-112
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ target/
66
out/
77

88
dependency-reduced-pom.xml
9+
10+
*.releaseBackup
11+
release.properties
12+
13+

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
5151
<manifestEntries>
52-
<Premain-Class>com.zegelin.prometheus.cassandra.Agent</Premain-Class>
52+
<Premain-Class>com.zegelin.cassandra.exporter.Agent</Premain-Class>
5353
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
5454
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
5555
</manifestEntries>

‎agent/src/main/java/com/zegelin/prometheus/cassandra/Agent.java‎ renamed to ‎agent/src/main/java/com/zegelin/cassandra/exporter/Agent.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

33
import java.lang.instrument.Instrumentation;
44
import java.util.List;
55
import java.util.concurrent.Callable;
66

77
import com.sun.jmx.mbeanserver.JmxMBeanServerBuilder;
88
import com.zegelin.agent.AgentArgumentParser;
9-
import com.zegelin.prometheus.cassandra.cli.HarvesterOptions;
10-
import com.zegelin.prometheus.cli.HttpServerOptions;
11-
import com.zegelin.prometheus.netty.Server;
9+
import com.zegelin.cassandra.exporter.cli.HarvesterOptions;
10+
import com.zegelin.cassandra.exporter.cli.HttpServerOptions;
11+
import com.zegelin.cassandra.exporter.netty.Server;
1212
import picocli.CommandLine;
1313
import picocli.CommandLine.Command;
1414
import picocli.CommandLine.Mixin;

‎agent/src/main/java/com/zegelin/prometheus/cassandra/InternalMetadataFactory.java‎ renamed to ‎agent/src/main/java/com/zegelin/cassandra/exporter/InternalMetadataFactory.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

3+
import com.zegelin.cassandra.exporter.MetadataFactory;
34
import org.apache.cassandra.config.CFMetaData;
45
import org.apache.cassandra.config.DatabaseDescriptor;
56
import org.apache.cassandra.config.Schema;
7+
import org.apache.cassandra.gms.Gossiper;
68
import org.apache.cassandra.locator.IEndpointSnitch;
79
import org.apache.cassandra.utils.FBUtilities;
810

‎agent/src/main/java/com/zegelin/prometheus/cassandra/MBeanServerInterceptorHarvester.java‎ renamed to ‎agent/src/main/java/com/zegelin/cassandra/exporter/MBeanServerInterceptorHarvester.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

33
import com.sun.jmx.mbeanserver.JmxMBeanServer;
4+
import com.zegelin.cassandra.exporter.collector.InternalGossiperMBeanMetricFamilyCollector;
45
import com.zegelin.jmx.DelegatingMBeanServerInterceptor;
5-
import com.zegelin.prometheus.cassandra.cli.HarvesterOptions;
6-
import com.zegelin.prometheus.cassandra.collector.InternalGossiperMBeanMetricFamilyCollector;
6+
import com.zegelin.cassandra.exporter.cli.HarvesterOptions;
77

88
import javax.management.*;
99
import java.lang.management.ManagementFactory;

‎agent/src/main/java/com/zegelin/prometheus/cassandra/collector/InternalGossiperMBeanMetricFamilyCollector.java‎ renamed to ‎agent/src/main/java/com/zegelin/cassandra/exporter/collector/InternalGossiperMBeanMetricFamilyCollector.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.zegelin.prometheus.cassandra.collector;
1+
package com.zegelin.cassandra.exporter.collector;
22

3-
import com.zegelin.prometheus.cassandra.MetadataFactory;
3+
import com.zegelin.cassandra.exporter.MetadataFactory;
44
import com.zegelin.prometheus.domain.Labels;
55
import com.zegelin.prometheus.domain.NumericMetric;
66
import org.apache.cassandra.gms.EndpointState;
@@ -11,8 +11,8 @@
1111
import java.util.Set;
1212
import java.util.stream.Stream;
1313

14-
import static com.zegelin.prometheus.cassandra.CassandraObjectNames.GOSSIPER_MBEAN_NAME;
15-
import static com.zegelin.prometheus.cassandra.MetricValueConversionFunctions.millisecondsToSeconds;
14+
import static com.zegelin.cassandra.exporter.CassandraObjectNames.GOSSIPER_MBEAN_NAME;
15+
import static com.zegelin.cassandra.exporter.MetricValueConversionFunctions.millisecondsToSeconds;
1616

1717
public class InternalGossiperMBeanMetricFamilyCollector extends GossiperMBeanMetricFamilyCollector {
1818
public static Factory factory(final MetadataFactory metadataFactory) {
@@ -24,7 +24,6 @@ public static Factory factory(final MetadataFactory metadataFactory) {
2424
};
2525
};
2626

27-
2827
private final Gossiper gossiper;
2928
private final MetadataFactory metadataFactory;
3029

‎common/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<groupId>info.picocli</groupId>
2929
<artifactId>picocli</artifactId>
3030
<version>${version.picocli}</version>
31+
<scope>compile</scope>
3132
</dependency>
3233
</dependencies>
3334
</project>

‎common/src/main/java/com/zegelin/prometheus/cassandra/CassandraMetricsUtilities.java‎ renamed to ‎common/src/main/java/com/zegelin/cassandra/exporter/CassandraMetricsUtilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

33
import com.codahale.metrics.Counting;
44
import com.codahale.metrics.Metric;

‎common/src/main/java/com/zegelin/prometheus/cassandra/CassandraObjectNames.java‎ renamed to ‎common/src/main/java/com/zegelin/cassandra/exporter/CassandraObjectNames.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

33
import com.zegelin.jmx.ObjectNames;
44

‎common/src/main/java/com/zegelin/prometheus/cassandra/CollectorFunctions.java‎ renamed to ‎common/src/main/java/com/zegelin/cassandra/exporter/CollectorFunctions.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.zegelin.prometheus.cassandra;
1+
package com.zegelin.cassandra.exporter;
22

33
import com.zegelin.function.FloatFloatFunction;
4-
import com.zegelin.prometheus.cassandra.collector.dynamic.FunctionalMetricFamilyCollector.CollectorFunction;
5-
import com.zegelin.prometheus.cassandra.collector.dynamic.FunctionalMetricFamilyCollector.LabeledObjectGroup;
4+
import com.zegelin.cassandra.exporter.collector.dynamic.FunctionalMetricFamilyCollector.CollectorFunction;
5+
import com.zegelin.cassandra.exporter.collector.dynamic.FunctionalMetricFamilyCollector.LabeledObjectGroup;
66
import com.zegelin.prometheus.domain.*;
77
import org.apache.cassandra.metrics.CassandraMetricsRegistry.JmxCounterMBean;
88
import org.apache.cassandra.metrics.CassandraMetricsRegistry.JmxGaugeMBean;
@@ -104,7 +104,7 @@ public static CollectorFunction<JmxGaugeMBean> numericGaugeAsGauge() {
104104

105105

106106
/**
107-
* Collect a {@link JmxGaugeMBean} with a {@see Number} value as a Prometheus counter
107+
* Collect a {@link JmxGaugeMBean} with a {@link Number} value as a Prometheus counter
108108
*/
109109
public static CollectorFunction<JmxGaugeMBean> numericGaugeAsCounter(final FloatFloatFunction scaleFunction) {
110110
return group -> {

0 commit comments

Comments
 (0)