Dikke refactort

jaybaws · Nov 26, 2024 · ce23ba9 · ce23ba9
1 parent 1d96038
commit ce23ba9
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 38 deletions.
diff --git a/businessworks5-metrics/pom.xml b/businessworks5-metrics/pom.xml
@@ -24,6 +24,11 @@
       <artifactId>micrometer-core</artifactId>
       <version>${micrometer.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-otlp</artifactId>
+      <version>${micrometer.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
@@ -95,7 +100,7 @@
               <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
             </manifest>
             <manifestEntries>
-              <Premain-Class>com.tibco.psg.metrics.bw.BW5MicrometerAgent</Premain-Class>
+              <Premain-Class>org.jaybaws.metrics.bw.BW5MicrometerAgent</Premain-Class>
               <Can-Redefine-Classes>false</Can-Redefine-Classes>
               <Can-Retransform-Classes>false</Can-Retransform-Classes>
             </manifestEntries>

diff --git a/...co/psg/metrics/bw/BW5MicrometerAgent.java → ...aybaws/metrics/bw/BW5MicrometerAgent.java b/...co/psg/metrics/bw/BW5MicrometerAgent.java → ...aybaws/metrics/bw/BW5MicrometerAgent.java
@@ -1,7 +1,7 @@
-package com.tibco.psg.metrics.bw;
-import com.tibco.psg.metrics.bw.util.SmartInstrumenter;
-import com.tibco.psg.metrics.bw.workers.*;
-import com.tibco.psg.metrics.bw.util.BWUtils;
+package org.jaybaws.metrics.bw;
+import org.jaybaws.metrics.bw.util.SmartInstrumenter;
+import org.jaybaws.metrics.bw.workers.*;
+import org.jaybaws.metrics.bw.util.BWUtils;
 import io.micrometer.core.instrument.*;
 import javax.management.*;
 import javax.management.relation.MBeanServerNotificationFilter;

diff --git a/...om/tibco/psg/metrics/bw/util/BWUtils.java → .../org/jaybaws/metrics/bw/util/BWUtils.java b/...om/tibco/psg/metrics/bw/util/BWUtils.java → .../org/jaybaws/metrics/bw/util/BWUtils.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.bw.util;
+package org.jaybaws.metrics.bw.util;
 import java.io.FileInputStream;
 import java.util.Properties;
 

diff --git a/...sg/metrics/bw/util/SmartInstrumenter.java → ...ws/metrics/bw/util/SmartInstrumenter.java b/...sg/metrics/bw/util/SmartInstrumenter.java → ...ws/metrics/bw/util/SmartInstrumenter.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.bw.util;
+package org.jaybaws.metrics.bw.util;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Properties;

diff --git a/.../workers/GetActiveProcessCountWorker.java → .../workers/GetActiveProcessCountWorker.java b/.../workers/GetActiveProcessCountWorker.java → .../workers/GetActiveProcessCountWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.MBeanServerConnection;

diff --git a/...trics/bw/workers/GetActivitiesWorker.java → ...trics/bw/workers/GetActivitiesWorker.java b/...trics/bw/workers/GetActivitiesWorker.java → ...trics/bw/workers/GetActivitiesWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.*;

diff --git a/...metrics/bw/workers/GetExecInfoWorker.java → ...metrics/bw/workers/GetExecInfoWorker.java b/...metrics/bw/workers/GetExecInfoWorker.java → ...metrics/bw/workers/GetExecInfoWorker.java
@@ -1,6 +1,6 @@
-package com.tibco.psg.metrics.bw.workers;
+package org.jaybaws.metrics.bw.workers;
 
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 

diff --git a/...rics/bw/workers/GetMemoryUsageWorker.java → ...rics/bw/workers/GetMemoryUsageWorker.java b/...rics/bw/workers/GetMemoryUsageWorker.java → ...rics/bw/workers/GetMemoryUsageWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.MBeanServerConnection;

diff --git a/...ics/bw/workers/GetProcessCountWorker.java → ...ics/bw/workers/GetProcessCountWorker.java b/...ics/bw/workers/GetProcessCountWorker.java → ...ics/bw/workers/GetProcessCountWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.MBeanServerConnection;

diff --git a/.../workers/GetProcessDefinitionsWorker.java → .../workers/GetProcessDefinitionsWorker.java b/.../workers/GetProcessDefinitionsWorker.java → .../workers/GetProcessDefinitionsWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.MBeanServerConnection;

diff --git a/.../bw/workers/GetProcessStartersWorker.java → .../bw/workers/GetProcessStartersWorker.java b/.../bw/workers/GetProcessStartersWorker.java → .../bw/workers/GetProcessStartersWorker.java
@@ -1,5 +1,5 @@
-package com.tibco.psg.metrics.bw.workers;
-import com.tibco.psg.metrics.bw.BW5MicrometerAgent;
+package org.jaybaws.metrics.bw.workers;
+import org.jaybaws.metrics.bw.BW5MicrometerAgent;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import javax.management.MBeanServerConnection;

diff --git a/...sg/metrics/bw/BW5MicrometerAgentTest.java → ...ws/metrics/bw/BW5MicrometerAgentTest.java b/...sg/metrics/bw/BW5MicrometerAgentTest.java → ...ws/metrics/bw/BW5MicrometerAgentTest.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.bw;
+package org.jaybaws.metrics.bw;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 

diff --git a/ems-metrics/pom.xml b/ems-metrics/pom.xml
@@ -93,7 +93,7 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
-              <mainClass>com.tibco.psg.metrics.ems.EMSMicrometerApp</mainClass>
+              <mainClass>org.jaybaws.metrics.ems.EMSMicrometerApp</mainClass>
             </manifest>
             <manifestEntries>
               <Class-Path>lib/jms-2.0.jar lib/tibjms.jar lib/tibjmsadmin.jar</Class-Path>

diff --git a/...bco/psg/metrics/ems/EMSMicrometerApp.java → ...jaybaws/metrics/ems/EMSMicrometerApp.java b/...bco/psg/metrics/ems/EMSMicrometerApp.java → ...jaybaws/metrics/ems/EMSMicrometerApp.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ems;
+package org.jaybaws.metrics.ems;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

diff --git a/...ava/com/tibco/psg/metrics/ems/Worker.java → .../java/org/jaybaws/metrics/ems/Worker.java b/...ava/com/tibco/psg/metrics/ems/Worker.java → .../java/org/jaybaws/metrics/ems/Worker.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ems;
+package org.jaybaws.metrics.ems;
 import com.tibco.tibjms.admin.*;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;

diff --git a/...psg/metrics/ems/EMSMicrometerAppTest.java → ...aws/metrics/ems/EMSMicrometerAppTest.java b/...psg/metrics/ems/EMSMicrometerAppTest.java → ...aws/metrics/ems/EMSMicrometerAppTest.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ems;
+package org.jaybaws.metrics.ems;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 

diff --git a/ibmmq-metrics/pom.xml b/ibmmq-metrics/pom.xml
@@ -92,7 +92,7 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
-              <mainClass>com.tibco.psg.metrics.ibmmq.MQMicrometerApp</mainClass>
+              <mainClass>org.jaybaws.metrics.ibmmq.MQMicrometerApp</mainClass>
             </manifest>
           </archive>
         </configuration>

diff --git a/...co/psg/metrics/ibmmq/MQMicrometerApp.java → ...aybaws/metrics/ibmmq/MQMicrometerApp.java b/...co/psg/metrics/ibmmq/MQMicrometerApp.java → ...aybaws/metrics/ibmmq/MQMicrometerApp.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ibmmq;
+package org.jaybaws.metrics.ibmmq;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

diff --git a/...a/com/tibco/psg/metrics/ibmmq/Worker.java → ...ava/org/jaybaws/metrics/ibmmq/Worker.java b/...a/com/tibco/psg/metrics/ibmmq/Worker.java → ...ava/org/jaybaws/metrics/ibmmq/Worker.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ibmmq;
+package org.jaybaws.metrics.ibmmq;
 import com.ibm.mq.MQQueueManager;
 import com.ibm.mq.constants.CMQC;
 import com.ibm.mq.constants.CMQCFC;

diff --git a/...sg/metrics/ibmmq/MQMicrometerAppTest.java → ...ws/metrics/ibmmq/MQMicrometerAppTest.java b/...sg/metrics/ibmmq/MQMicrometerAppTest.java → ...ws/metrics/ibmmq/MQMicrometerAppTest.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.ibmmq;
+package org.jaybaws.metrics.ibmmq;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 

diff --git a/process-metrics/pom.xml b/process-metrics/pom.xml
@@ -99,7 +99,7 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>com.tibco.psg.metrics.os.ProcessMicrometerApp</mainClass>
+							<mainClass>org.jaybaws.metrics.os.ProcessMicrometerApp</mainClass>
 						</manifest>
 					</archive>
 				</configuration>

diff --git a/.../psg/metrics/os/ProcessMicrometerApp.java → ...baws/metrics/os/ProcessMicrometerApp.java b/.../psg/metrics/os/ProcessMicrometerApp.java → ...baws/metrics/os/ProcessMicrometerApp.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;

diff --git a/...java/com/tibco/psg/metrics/os/Worker.java → ...n/java/org/jaybaws/metrics/os/Worker.java b/...java/com/tibco/psg/metrics/os/Worker.java → ...n/java/org/jaybaws/metrics/os/Worker.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import org.json.JSONObject;
 import java.time.Duration;
 import java.time.Instant;

diff --git a/.../metrics/os/ProcessMicrometerAppTest.java → .../metrics/os/ProcessMicrometerAppTest.java b/.../metrics/os/ProcessMicrometerAppTest.java → .../metrics/os/ProcessMicrometerAppTest.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 

diff --git a/socket-metrics/pom.xml b/socket-metrics/pom.xml
@@ -93,7 +93,7 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathPrefix>lib/</classpathPrefix>
-              <mainClass>com.tibco.psg.metrics.os.SocketMicrometerApp</mainClass>
+              <mainClass>org.jaybaws.metrics.os.SocketMicrometerApp</mainClass>
             </manifest>
           </archive>
         </configuration>

diff --git a/...o/psg/metrics/os/SocketMicrometerApp.java → ...ybaws/metrics/os/SocketMicrometerApp.java b/...o/psg/metrics/os/SocketMicrometerApp.java → ...ybaws/metrics/os/SocketMicrometerApp.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;

diff --git a/...java/com/tibco/psg/metrics/os/Worker.java → ...n/java/org/jaybaws/metrics/os/Worker.java b/...java/com/tibco/psg/metrics/os/Worker.java → ...n/java/org/jaybaws/metrics/os/Worker.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import java.io.IOException;

diff --git a/...g/metrics/os/SocketMicrometerAppTest.java → ...s/metrics/os/SocketMicrometerAppTest.java b/...g/metrics/os/SocketMicrometerAppTest.java → ...s/metrics/os/SocketMicrometerAppTest.java
@@ -1,4 +1,4 @@
-package com.tibco.psg.metrics.os;
+package org.jaybaws.metrics.os;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;