From cd6ee1b64848d127aab374cb25e01542b51fd0a0 Mon Sep 17 00:00:00 2001 From: Tony Mancill Date: Tue, 12 Jul 2022 17:27:08 +0000 Subject: [PATCH 1/3] update org.mock-server from 5.5.1 to 5.13.2 --- gradle.properties | 2 +- .../java/com/newrelic/telemetry/EventApiIntegrationTest.java | 4 ++-- .../java/com/newrelic/telemetry/LogApiIntegrationTest.java | 4 ++-- .../java/com/newrelic/telemetry/MetricApiIntegrationTest.java | 4 ++-- .../java/com/newrelic/telemetry/SpanApiIntegrationTest.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2b4cb335..e568c476 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,6 +27,6 @@ guavaVersion=27.1-jre junitVersion=5.3.1 jsonassertVersion=1.5.0 mockitoVersion=2.23.0 -mockserverVersion=5.5.1 +mockserverVersion=5.13.2 okhttpVersion=4.8.0 testContainerVersion=1.15.1 diff --git a/integration_test/src/test/java/com/newrelic/telemetry/EventApiIntegrationTest.java b/integration_test/src/test/java/com/newrelic/telemetry/EventApiIntegrationTest.java index 8fdd313b..50d81c0e 100644 --- a/integration_test/src/test/java/com/newrelic/telemetry/EventApiIntegrationTest.java +++ b/integration_test/src/test/java/com/newrelic/telemetry/EventApiIntegrationTest.java @@ -11,7 +11,6 @@ import static org.mockserver.model.JsonBody.json; import com.google.common.collect.ImmutableMap; -import com.google.common.net.MediaType; import com.newrelic.telemetry.events.Event; import com.newrelic.telemetry.events.EventBatchSender; import com.newrelic.telemetry.events.EventBuffer; @@ -41,6 +40,7 @@ import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; import org.mockserver.model.JsonBody; +import org.mockserver.model.MediaType; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; import org.testcontainers.containers.wait.strategy.WaitAllStrategy; @@ -55,7 +55,7 @@ class EventApiIntegrationTest { private static URL containerUrl; private static final GenericContainer container = - new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.5.1") + new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.13.2") .withLogConsumer(outputFrame -> System.out.print(outputFrame.getUtf8String())) .withExposedPorts(SERVICE_PORT); diff --git a/integration_test/src/test/java/com/newrelic/telemetry/LogApiIntegrationTest.java b/integration_test/src/test/java/com/newrelic/telemetry/LogApiIntegrationTest.java index 27846e9a..8ae99e7a 100644 --- a/integration_test/src/test/java/com/newrelic/telemetry/LogApiIntegrationTest.java +++ b/integration_test/src/test/java/com/newrelic/telemetry/LogApiIntegrationTest.java @@ -11,7 +11,6 @@ import static org.mockserver.model.JsonBody.json; import com.google.common.collect.ImmutableMap; -import com.google.common.net.MediaType; import com.newrelic.telemetry.logs.Log; import com.newrelic.telemetry.logs.LogBatch; import com.newrelic.telemetry.logs.LogBatchSender; @@ -30,6 +29,7 @@ import org.mockserver.matchers.MatchType; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; +import org.mockserver.model.MediaType; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; import org.testcontainers.containers.wait.strategy.WaitAllStrategy; @@ -42,7 +42,7 @@ class LogApiIntegrationTest { private static String containerIpAddress; private static MockServerClient mockServerClient; private static final GenericContainer container = - new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.5.1") + new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.13.2") .withLogConsumer(outputFrame -> System.out.print(outputFrame.getUtf8String())) .withExposedPorts(SERVICE_PORT); private static URL endpointUrl; diff --git a/integration_test/src/test/java/com/newrelic/telemetry/MetricApiIntegrationTest.java b/integration_test/src/test/java/com/newrelic/telemetry/MetricApiIntegrationTest.java index 8bec87e4..9cc3932c 100644 --- a/integration_test/src/test/java/com/newrelic/telemetry/MetricApiIntegrationTest.java +++ b/integration_test/src/test/java/com/newrelic/telemetry/MetricApiIntegrationTest.java @@ -12,7 +12,6 @@ import static org.mockserver.model.JsonBody.json; import com.google.common.collect.ImmutableMap; -import com.google.common.net.MediaType; import com.newrelic.telemetry.exceptions.DiscardBatchException; import com.newrelic.telemetry.exceptions.ResponseException; import com.newrelic.telemetry.exceptions.RetryWithBackoffException; @@ -44,6 +43,7 @@ import org.mockserver.model.Delay; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; +import org.mockserver.model.MediaType; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; import org.testcontainers.containers.wait.strategy.WaitAllStrategy; @@ -58,7 +58,7 @@ class MetricApiIntegrationTest { private static URL endpointUrl; private static final GenericContainer container = - new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.5.1") + new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.13.2") .withLogConsumer(outputFrame -> System.out.print(outputFrame.getUtf8String())) .withExposedPorts(SERVICE_PORT); diff --git a/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java b/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java index de52a328..7446ee3e 100644 --- a/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java +++ b/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java @@ -11,7 +11,6 @@ import static org.mockserver.model.JsonBody.json; import com.google.common.collect.ImmutableMap; -import com.google.common.net.MediaType; import com.newrelic.telemetry.spans.Span; import com.newrelic.telemetry.spans.SpanBatch; import com.newrelic.telemetry.spans.SpanBatchSender; @@ -30,6 +29,7 @@ import org.mockserver.matchers.MatchType; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; +import org.mockserver.model.MediaType; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy; import org.testcontainers.containers.wait.strategy.WaitAllStrategy; @@ -42,7 +42,7 @@ class SpanApiIntegrationTest { private static String containerIpAddress; private static MockServerClient mockServerClient; private static final GenericContainer container = - new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.5.1") + new GenericContainer<>("jamesdbloom/mockserver:mockserver-5.13.2") .withLogConsumer(outputFrame -> System.out.print(outputFrame.getUtf8String())) .withExposedPorts(SERVICE_PORT); private static URL endpointUrl; From de91a75e9e609641f09e62da30db7837d1c77e49 Mon Sep 17 00:00:00 2001 From: Tony Mancill Date: Tue, 12 Jul 2022 17:27:57 +0000 Subject: [PATCH 2/3] update org.testcontainers:testcontainers from 1.15.1 to 1.17.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e568c476..bbb57638 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,4 +29,4 @@ jsonassertVersion=1.5.0 mockitoVersion=2.23.0 mockserverVersion=5.13.2 okhttpVersion=4.8.0 -testContainerVersion=1.15.1 +testContainerVersion=1.17.3 From 7bc29b5f63e987ffc9245c4ec74616675222158d Mon Sep 17 00:00:00 2001 From: Tony Mancill Date: Tue, 12 Jul 2022 17:28:28 +0000 Subject: [PATCH 3/3] update SpanApiIntegrationTest to expect floating point duration.ms --- .../java/com/newrelic/telemetry/SpanApiIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java b/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java index 7446ee3e..dc2e1aa4 100644 --- a/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java +++ b/integration_test/src/test/java/com/newrelic/telemetry/SpanApiIntegrationTest.java @@ -91,7 +91,7 @@ void testSuccessfulSpanSend() throws Exception { "attributes", ImmutableMap.of( "duration.ms", - 60, + 60.0, "service.name", "Span Test Service", "name",