Merge pull request #79 from intergral/build

fix(example): fix compile issue in example

Author: Umaaz

.github/workflows/on_push.yml

@@ -46,6 +46,7 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
+
       - name: Check Formatting
         run: make lint
 
@@ -60,6 +61,7 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
+
       - name: Run PMD check
         run: make pmd
 
@@ -75,6 +77,21 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
+
       - name: Run docs check
         run: make docs
 
+  compile:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Run compile check
+        run: make compile

Makefile

@@ -1,46 +1,61 @@
+# This file just contains shortcuts for dev, as there are a lot of options for different builds
 
-
+# Run the PMD check - while skipping tests
+# Doesn't run PMD on it tests or examples
 .PHONY: pmd
 pmd:
 	mvn -U -B verify -Ppmd -DskipTests $(MVN_ARGS)
 
+# Run lint on all code
 ,PHONY: lint
 lint:
 	mvn -U -B validate -Plint,examples,cf-it-tests $(MVN_ARGS)
 
+# Package and verify all code expect cf-tests and examples
 .PHONY: test
 test:
 	mvn -U -B clean verify $(MVN_ARGS)
 
+# Generate documentation from source
 .PHONY: docs
 docs:
 	mvn -s .ci-settings.xml clean package javadoc:jar -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make $(MVN_ARGS)
 
+# Generate the agent and rebuild all the dependant modules
 .PHONY: package-agent
 package:
 	mvn package -U -B -pl agent --also-make -DskipTests $(MVN_ARGS)
 
+# Run the CF it tests
 .PHONY: cf-tests
 cf-tests: package
 	mvn verify -U -B -P cf-it-tests -pl it-tests/cf-tests --also-make $(MVN_ARGS)
-# This file just contains shortcuts for dev, as there are a lot of options for different builds
 
+# Build the agent and deep, also rebuild all dependant modules
 .PHONY: build
 build:
 	mvn clean package -U -B -pl agent,deep --also-make $(MVN_ARGS)
 
-
+# Install the agent and deep into the local repo (~/.m2)
 .PHONY: install
 install:
 	mvn clean install -U -B -pl agent,deep --also-make $(MVN_ARGS)
 
+# Run the coverage checks
 .PHONY: coverage
 coverage:
 	mvn clean verify -U -B -P coverage -pl '!it-tests/java-tests,!it-tests'
 
+# Compile all modules
+.PHONY: compile
+compile:
+	mvn clean compile -U -B -P cf-it-tests,coverage,docs,examples,lint,pmd
+
+# Combine a few common checks in a single task
 .PHONY: precommit
 precommit:
 	$(MAKE) lint
 	$(MAKE) pmd
 	$(MAKE) coverage
-	$(MAKE) docs
+	$(MAKE) docs
+	$(MAKE) compile

deep/pom.xml

@@ -83,9 +83,9 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <!-- Unpack tcnative so we can relocate these -->
-            <id>unpack-tcnative</id>
-            <phase>generate-resources</phase>
+            <!-- Unpack dependant jars -->
+            <id>unpack</id>
+            <phase>prepare-package</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -98,13 +98,6 @@
                   <outputDirectory>${project.build.directory}/unpack/</outputDirectory>
                   <destFileName>deep-agent.jar</destFileName>
                 </dependency>
-                <!--                                <dependency>-->
-                <!--                                    <groupId>com.nerdvision</groupId>-->
-                <!--                                    <artifactId>native</artifactId>-->
-                <!--                                    <version>${project.version}</version>-->
-                <!--                                    <outputDirectory>${project.build.directory}/unpack/</outputDirectory>-->
-                <!--                                    <destFileName>nerdvision-native.jar</destFileName>-->
-                <!--                                </dependency>-->
                 <dependency>
                   <groupId>com.sun</groupId>
                   <artifactId>tools</artifactId>

examples/prometheus-metrics-example/src/main/java/com/intergral/deep/examples/Main.java

@@ -21,6 +21,7 @@
 import com.intergral.deep.Deep;
 import com.intergral.deep.agent.api.IDeep;
 import com.intergral.deep.agent.api.plugin.MetricDefinition;
+import com.intergral.deep.agent.api.plugin.MetricDefinition.Label;
 import com.intergral.deep.agent.api.reflection.IReflection;
 import com.intergral.deep.agent.api.settings.ISettings;
 import com.intergral.deep.api.DeepAPI;
@@ -29,8 +30,10 @@
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
@@ -90,7 +93,7 @@ public static void main(String[] args) throws Throwable {
 
       System.out.println("HTTPServer listening on port http://localhost:" + server.getPort() + "/metrics");
 
-      final HashMap<String, String> tags = new HashMap<>();
+      final List<Label> labels = new ArrayList<>();
       // USe the API to create a tracepoint that will fire forever
       final Map<String, String> fireCount = new HashMap<>();
       fireCount.put("fire_count", "-1");
@@ -100,7 +103,7 @@ public static void main(String[] args) throws Throwable {
           .registerTracepoint("com/intergral/deep/examples/SimpleTest", 46,
               fireCount, Collections.emptyList(),
               Collections.singletonList(
-                  new MetricDefinition("custom_metric", tags, "histogram", "this.cnt", "deep", "help message", "unit")));
+                  new MetricDefinition("custom_metric", labels, "histogram", "this.cnt", "deep", "help message", "unit")));
 
       Random random = new Random(0);
       final SimpleTest ts = new SimpleTest("This is a test", 2);