diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd9f7add..ed6e089e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,12 +26,13 @@ jobs: - name: Build and test run: mvn clean install - name: Build and test dogstatsd-http-core - run: mvn clean install - working-directory: dogstatsd-http-core - - name: Build and test dogstatsd-http-forwarder + if: matrix.java-version < 11 + run: mvn clean install -pl core + working-directory: dogstatsd-http + - name: Build and test dogstatsd-http if: matrix.java-version >= 11 run: mvn clean install - working-directory: dogstatsd-http-forwarder + working-directory: dogstatsd-http test-jnr-exclude: name: Test (Java 9, jnr-exclude) diff --git a/dogstatsd-http-core/.gitignore b/dogstatsd-http/core/.gitignore similarity index 100% rename from dogstatsd-http-core/.gitignore rename to dogstatsd-http/core/.gitignore diff --git a/dogstatsd-http-core/pom.xml b/dogstatsd-http/core/pom.xml similarity index 72% rename from dogstatsd-http-core/pom.xml rename to dogstatsd-http/core/pom.xml index a09b695c..fae2af54 100644 --- a/dogstatsd-http-core/pom.xml +++ b/dogstatsd-http/core/pom.xml @@ -3,39 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.datadoghq + + com.datadoghq + dogstatsd-http + 1.0.0-SNAPSHOT + + dogstatsd-http-core jar dogstatsd-http-core - 1.0.0-SNAPSHOT Core primitives for the DogStatsD HTTP client. - https://github.com/DataDog/java-dogstatsd-client - - - UTF-8 - - - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - - - - https://github.com/DataDog/java-dogstatsd-client - scm:git:git@github.com:DataDog/java-dogstatsd-client.git - scm:git:git@github.com:Datadog/java-dogstatsd-client.git - - - - - datadog - Datadog developers - dev@datadoghq.com - - diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/Sketch.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/Sketch.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/Sketch.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/Sketch.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Buffer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Buffer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Buffer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Buffer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ByteBuffer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ByteBuffer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ByteBuffer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ByteBuffer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Column.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Column.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Column.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Column.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ColumnarBuffer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ColumnarBuffer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ColumnarBuffer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ColumnarBuffer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DeltaEncoder.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DeltaEncoder.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DeltaEncoder.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DeltaEncoder.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DoubleBuffer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DoubleBuffer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DoubleBuffer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/DoubleBuffer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Interner.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Interner.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Interner.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Interner.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/LongBuffer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/LongBuffer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/LongBuffer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/LongBuffer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Metric.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Metric.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Metric.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Metric.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Origin.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Origin.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Origin.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/Origin.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilder.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilder.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilder.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilder.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadConsumer.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadConsumer.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadConsumer.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PayloadConsumer.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PointKind.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PointKind.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PointKind.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/PointKind.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ProtoUtil.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ProtoUtil.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ProtoUtil.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ProtoUtil.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ScalarMetric.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ScalarMetric.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ScalarMetric.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ScalarMetric.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/SketchMetric.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/SketchMetric.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/SketchMetric.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/SketchMetric.java diff --git a/dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ValueType.java b/dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ValueType.java similarity index 100% rename from dogstatsd-http-core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ValueType.java rename to dogstatsd-http/core/src/main/java/com/datadoghq/dogstatsd/http/serializer/ValueType.java diff --git a/dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/SketchTest.java b/dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/SketchTest.java similarity index 100% rename from dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/SketchTest.java rename to dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/SketchTest.java diff --git a/dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilderTest.java b/dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilderTest.java similarity index 100% rename from dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilderTest.java rename to dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PayloadBuilderTest.java diff --git a/dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PointKindTest.java b/dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PointKindTest.java similarity index 100% rename from dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PointKindTest.java rename to dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/PointKindTest.java diff --git a/dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/TestUtil.java b/dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/TestUtil.java similarity index 100% rename from dogstatsd-http-core/src/test/java/com/datadoghq/dogstatsd/http/serializer/TestUtil.java rename to dogstatsd-http/core/src/test/java/com/datadoghq/dogstatsd/http/serializer/TestUtil.java diff --git a/dogstatsd-http-forwarder/.gitignore b/dogstatsd-http/forwarder/.gitignore similarity index 100% rename from dogstatsd-http-forwarder/.gitignore rename to dogstatsd-http/forwarder/.gitignore diff --git a/dogstatsd-http-forwarder/pom.xml b/dogstatsd-http/forwarder/pom.xml similarity index 72% rename from dogstatsd-http-forwarder/pom.xml rename to dogstatsd-http/forwarder/pom.xml index 840e86f7..6a72a802 100644 --- a/dogstatsd-http-forwarder/pom.xml +++ b/dogstatsd-http/forwarder/pom.xml @@ -3,39 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.datadoghq + + com.datadoghq + dogstatsd-http + 1.0.0-SNAPSHOT + + dogstatsd-http-forwarder jar dogstatsd-http-forwarder - 1.0.0-SNAPSHOT HTTP forwarder for DogStatsD metrics. - https://github.com/DataDog/java-dogstatsd-client - - - UTF-8 - - - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - - - - https://github.com/DataDog/java-dogstatsd-client - scm:git:git@github.com:DataDog/java-dogstatsd-client.git - scm:git:git@github.com:Datadog/java-dogstatsd-client.git - - - - - datadog - Datadog developers - dev@datadoghq.com - - diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueue.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueue.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueue.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueue.java diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Forwarder.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Forwarder.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Forwarder.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Forwarder.java diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/HttpCode.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/HttpCode.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/HttpCode.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/HttpCode.java diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Payload.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Payload.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Payload.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Payload.java diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Telemetry.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Telemetry.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Telemetry.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/Telemetry.java diff --git a/dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/WhenFull.java b/dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/WhenFull.java similarity index 100% rename from dogstatsd-http-forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/WhenFull.java rename to dogstatsd-http/forwarder/src/main/java/com/datadoghq/dogstatsd/http/forwarder/WhenFull.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueueTest.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueueTest.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueueTest.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/BoundedQueueTest.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/ForwarderTest.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/ForwarderTest.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/ForwarderTest.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/ForwarderTest.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/KeyComparatorTest.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/KeyComparatorTest.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/KeyComparatorTest.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/KeyComparatorTest.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockClock.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockClock.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockClock.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockClock.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockNanos.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockNanos.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockNanos.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/MockNanos.java diff --git a/dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/TelemetryTest.java b/dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/TelemetryTest.java similarity index 100% rename from dogstatsd-http-forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/TelemetryTest.java rename to dogstatsd-http/forwarder/src/test/java/com/datadoghq/dogstatsd/http/forwarder/TelemetryTest.java diff --git a/dogstatsd-http/pom.xml b/dogstatsd-http/pom.xml new file mode 100644 index 00000000..6f02d219 --- /dev/null +++ b/dogstatsd-http/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + + com.datadoghq + dogstatsd-http + pom + dogstatsd-http + 1.0.0-SNAPSHOT + Aggregator for the DogStatsD HTTP client modules. + https://github.com/DataDog/java-dogstatsd-client + + + UTF-8 + + + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + + https://github.com/DataDog/java-dogstatsd-client + scm:git:git@github.com:DataDog/java-dogstatsd-client.git + scm:git:git@github.com:Datadog/java-dogstatsd-client.git + + + + + datadog + Datadog developers + dev@datadoghq.com + + + + + core + forwarder + +