From ba30c88cdc1e92bbb91b412cc3040ec3e31813bc Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:38:34 -0500 Subject: [PATCH 001/106] Support service name overrides for DSM --- .../KafkaProducerInstrumentation.java | 3 +- .../kafka_clients38/PayloadSizeAdvice.java | 3 +- .../RecordingDatastreamsPayloadWriter.groovy | 2 +- .../DataStreamContextExtractor.java | 11 ++- .../datastreams/DatastreamsPayloadWriter.java | 2 +- .../DefaultDataStreamsMonitoring.java | 74 ++++++++++++++----- .../datastreams/DefaultPathwayContext.java | 70 ++++++++++++------ .../MsgPackDatastreamsPayloadWriter.java | 8 +- .../datastreams/DataStreamsWritingTest.groovy | 66 +++++++++++++++-- .../DefaultDataStreamsMonitoringTest.groovy | 52 ++++++------- .../groovy/DataStreamsIntegrationTest.groovy | 2 +- .../api/AgentDataStreamsMonitoring.java | 16 ++++ .../instrumentation/api/AgentTracer.java | 6 ++ .../instrumentation/api/Backlog.java | 9 ++- .../instrumentation/api/StatsPoint.java | 9 ++- 15 files changed, 248 insertions(+), 85 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 4b09bd46af1..6366973f63e 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -200,7 +200,8 @@ public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) saved.getTimestampNanos(), saved.getPathwayLatencyNano(), saved.getEdgeLatencyNano(), - estimatedPayloadSize); + estimatedPayloadSize, + saved.getServiceNameOverride()); // then send the point AgentTracer.get().getDataStreamsMonitoring().add(updated); } diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java index 47a2e6d0201..6192485a47e 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java @@ -27,7 +27,8 @@ public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) saved.getTimestampNanos(), saved.getPathwayLatencyNano(), saved.getEdgeLatencyNano(), - estimatedPayloadSize); + estimatedPayloadSize, + saved.getServiceNameOverride()); // then send the point AgentTracer.get().getDataStreamsMonitoring().add(updated); } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy index 4ddb26b51af..396985b24cd 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy @@ -19,7 +19,7 @@ class RecordingDatastreamsPayloadWriter implements DatastreamsPayloadWriter { private final Set backlogs = [] @Override - synchronized void writePayload(Collection data) { + synchronized void writePayload(Collection data, String serviceNameOverride) { log.info("payload written - {}", data) this.@payloads.addAll(data) data.each { this.@groups.addAll(it.groups) } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextExtractor.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextExtractor.java index f97989b8798..f831d1cf10d 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextExtractor.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextExtractor.java @@ -12,16 +12,19 @@ public class DataStreamContextExtractor implements HttpCodec.Extractor { private final TimeSource timeSource; private final Supplier traceConfigSupplier; private final long hashOfKnownTags; + private final String serviceNameOverride; public DataStreamContextExtractor( HttpCodec.Extractor delegate, TimeSource timeSource, Supplier traceConfigSupplier, - long hashOfKnownTags) { + long hashOfKnownTags, + String serviceNameOverride) { this.delegate = delegate; this.timeSource = timeSource; this.traceConfigSupplier = traceConfigSupplier; this.hashOfKnownTags = hashOfKnownTags; + this.serviceNameOverride = serviceNameOverride; } @Override @@ -37,7 +40,8 @@ public TagContext extract(C carrier, AgentPropagation.ContextVisitor gett if (shouldExtractPathwayContext) { DefaultPathwayContext pathwayContext = - DefaultPathwayContext.extract(carrier, getter, this.timeSource, this.hashOfKnownTags); + DefaultPathwayContext.extract( + carrier, getter, this.timeSource, this.hashOfKnownTags, serviceNameOverride); extracted.withPathwayContext(pathwayContext); } @@ -45,7 +49,8 @@ public TagContext extract(C carrier, AgentPropagation.ContextVisitor gett return extracted; } else if (traceConfigSupplier.get().isDataStreamsEnabled()) { DefaultPathwayContext pathwayContext = - DefaultPathwayContext.extract(carrier, getter, this.timeSource, this.hashOfKnownTags); + DefaultPathwayContext.extract( + carrier, getter, this.timeSource, this.hashOfKnownTags, serviceNameOverride); if (pathwayContext != null) { extracted = new TagContext(); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java index 07d040dd9ac..b0ddf1f9870 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DatastreamsPayloadWriter.java @@ -3,5 +3,5 @@ import java.util.Collection; public interface DatastreamsPayloadWriter { - void writePayload(Collection data); + void writePayload(Collection data, String serviceNameOverride); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index 9df53fe08b5..fbc3e0e609f 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -39,6 +39,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -54,11 +55,11 @@ public class DefaultDataStreamsMonitoring implements DataStreamsMonitoring, Even static final long FEATURE_CHECK_INTERVAL_NANOS = TimeUnit.MINUTES.toNanos(5); private static final StatsPoint REPORT = - new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0, 0); + new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0, 0, null); private static final StatsPoint POISON_PILL = - new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0, 0); + new StatsPoint(Collections.emptyList(), 0, 0, 0, 0, 0, 0, 0, null); - private final Map timeToBucket = new HashMap<>(); + private final Map> timeToBucket = new HashMap<>(); private final MpscArrayQueue inbox = new MpscArrayQueue<>(1024); private final DatastreamsPayloadWriter payloadWriter; private final DDAgentFeaturesDiscovery features; @@ -74,6 +75,8 @@ public class DefaultDataStreamsMonitoring implements DataStreamsMonitoring, Even private volatile boolean agentSupportsDataStreams = false; private volatile boolean configSupportsDataStreams = false; private final ConcurrentHashMap schemaSamplers; + private static final ConcurrentHashMap threadServiceNames = + new ConcurrentHashMap<>(); public DefaultDataStreamsMonitoring( Config config, @@ -184,10 +187,24 @@ public void setProduceCheckpoint(String type, String target) { setProduceCheckpoint(type, target, DataStreamsContextCarrier.NoOp.INSTANCE, false); } + @Override + public void setThreadServiceName(Long threadId, String serviceName) { + threadServiceNames.put(threadId, serviceName); + } + + @Override + public void clearThreadServiceName(Long threadId) { + threadServiceNames.remove(threadId); + } + + private static String getThreadServiceNameOverride() { + return threadServiceNames.getOrDefault(Thread.currentThread().getId(), null); + } + @Override public PathwayContext newPathwayContext() { if (configSupportsDataStreams) { - return new DefaultPathwayContext(timeSource, hashOfKnownTags); + return new DefaultPathwayContext(timeSource, hashOfKnownTags, getThreadServiceNameOverride()); } else { return AgentTracer.NoopPathwayContext.INSTANCE; } @@ -196,7 +213,7 @@ public PathwayContext newPathwayContext() { @Override public HttpCodec.Extractor extractor(HttpCodec.Extractor delegate) { return new DataStreamContextExtractor( - delegate, timeSource, traceConfigSupplier, hashOfKnownTags); + delegate, timeSource, traceConfigSupplier, hashOfKnownTags, getThreadServiceNameOverride()); } @Override @@ -212,7 +229,8 @@ public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrie carrier, DataStreamsContextCarrierAdapter.INSTANCE, this.timeSource, - this.hashOfKnownTags); + this.hashOfKnownTags, + getThreadServiceNameOverride()); ((DDSpan) span).context().mergePathwayContext(pathwayContext); } } @@ -226,7 +244,8 @@ public void trackBacklog(LinkedHashMap sortedTags, long value) { } tags.add(tag); } - inbox.offer(new Backlog(tags, value, timeSource.getCurrentTimeNanos())); + inbox.offer( + new Backlog(tags, value, timeSource.getCurrentTimeNanos(), getThreadServiceNameOverride())); } @Override @@ -308,6 +327,15 @@ public void close() { } private class InboxProcessor implements Runnable { + + private StatsBucket getStatsBucket(final long timestamp, final String serviceNameOverride) { + long bucket = currentBucket(timestamp); + Map statsBucketMap = + timeToBucket.computeIfAbsent(bucket, startTime -> new HashMap<>(1)); + return statsBucketMap.computeIfAbsent( + serviceNameOverride, s -> new StatsBucket(bucket, bucketDurationNanos)); + } + @Override public void run() { Thread currentThread = Thread.currentThread(); @@ -335,17 +363,14 @@ public void run() { } else if (supportsDataStreams) { if (payload instanceof StatsPoint) { StatsPoint statsPoint = (StatsPoint) payload; - Long bucket = currentBucket(statsPoint.getTimestampNanos()); StatsBucket statsBucket = - timeToBucket.computeIfAbsent( - bucket, startTime -> new StatsBucket(startTime, bucketDurationNanos)); + getStatsBucket( + statsPoint.getTimestampNanos(), statsPoint.getServiceNameOverride()); statsBucket.addPoint(statsPoint); } else if (payload instanceof Backlog) { Backlog backlog = (Backlog) payload; - Long bucket = currentBucket(backlog.getTimestampNanos()); StatsBucket statsBucket = - timeToBucket.computeIfAbsent( - bucket, startTime -> new StatsBucket(startTime, bucketDurationNanos)); + getStatsBucket(backlog.getTimestampNanos(), backlog.getServiceNameOverride()); statsBucket.addBacklog(backlog); } } @@ -363,21 +388,30 @@ private long currentBucket(long timestampNanos) { private void flush(long timestampNanos) { long currentBucket = currentBucket(timestampNanos); - List includedBuckets = new ArrayList<>(); - Iterator> mapIterator = timeToBucket.entrySet().iterator(); + // stats are grouped by time buckets and service names + Map> includedBuckets = new HashMap<>(); + Iterator>> mapIterator = + timeToBucket.entrySet().iterator(); while (mapIterator.hasNext()) { - Map.Entry entry = mapIterator.next(); - + Map.Entry> entry = mapIterator.next(); if (entry.getKey() < currentBucket) { mapIterator.remove(); - includedBuckets.add(entry.getValue()); + for (Map.Entry buckets : entry.getValue().entrySet()) { + if (!includedBuckets.containsKey(buckets.getKey())) { + includedBuckets.put(buckets.getKey(), new LinkedList<>()); + } + + includedBuckets.get(buckets.getKey()).add(buckets.getValue()); + } } } if (!includedBuckets.isEmpty()) { - log.debug("Flushing {} buckets", includedBuckets.size()); - payloadWriter.writePayload(includedBuckets); + for (Map.Entry> entry : includedBuckets.entrySet()) { + log.debug("Flushing {} buckets", entry.getValue()); + payloadWriter.writePayload(entry.getValue(), entry.getKey()); + } } } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java index 87847c0b78d..1fec6b9852b 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java @@ -35,6 +35,7 @@ public class DefaultPathwayContext implements PathwayContext { private final Lock lock = new ReentrantLock(); private final long hashOfKnownTags; private final TimeSource timeSource; + private final String serviceNameOverride; private final GrowingByteArrayOutput outputBuffer = GrowingByteArrayOutput.withInitialCapacity(20); @@ -68,9 +69,11 @@ public class DefaultPathwayContext implements PathwayContext { TagsProcessor.DATASET_NAMESPACE_TAG, TagsProcessor.MANUAL_TAG)); - public DefaultPathwayContext(TimeSource timeSource, long hashOfKnownTags) { + public DefaultPathwayContext( + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride) { this.timeSource = timeSource; this.hashOfKnownTags = hashOfKnownTags; + this.serviceNameOverride = serviceNameOverride; } private DefaultPathwayContext( @@ -79,8 +82,9 @@ private DefaultPathwayContext( long pathwayStartNanos, long pathwayStartNanoTicks, long edgeStartNanoTicks, - long hash) { - this(timeSource, hashOfKnownTags); + long hash, + String serviceNameOverride) { + this(timeSource, hashOfKnownTags, serviceNameOverride); this.pathwayStartNanos = pathwayStartNanos; this.pathwayStartNanoTicks = pathwayStartNanoTicks; this.edgeStartNanoTicks = edgeStartNanoTicks; @@ -126,7 +130,8 @@ public void setCheckpoint( // So far, each tag key has only one tag value, so we're initializing the capacity to match // the number of tag keys for now. We should revisit this later if it's no longer the case. List allTags = new ArrayList<>(sortedTags.size()); - PathwayHashBuilder pathwayHashBuilder = new PathwayHashBuilder(hashOfKnownTags); + PathwayHashBuilder pathwayHashBuilder = + new PathwayHashBuilder(hashOfKnownTags, serviceNameOverride); DataSetHashBuilder aggregationHashBuilder = new DataSetHashBuilder(); if (!started) { @@ -190,7 +195,8 @@ public void setCheckpoint( startNanos, pathwayLatencyNano, edgeLatencyNano, - payloadSizeBytes); + payloadSizeBytes, + serviceNameOverride); edgeStartNanoTicks = nanoTicks; hash = newHash; @@ -272,18 +278,21 @@ public String toString() { private static class PathwayContextExtractor implements AgentPropagation.KeyClassifier { private final TimeSource timeSource; private final long hashOfKnownTags; + private final String serviceNameOverride; private DefaultPathwayContext extractedContext; - PathwayContextExtractor(TimeSource timeSource, long hashOfKnownTags) { + PathwayContextExtractor( + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride) { this.timeSource = timeSource; this.hashOfKnownTags = hashOfKnownTags; + this.serviceNameOverride = serviceNameOverride; } @Override public boolean accept(String key, String value) { if (PathwayContext.PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) { try { - extractedContext = strDecode(timeSource, hashOfKnownTags, value); + extractedContext = strDecode(timeSource, hashOfKnownTags, serviceNameOverride, value); } catch (IOException e) { return false; } @@ -296,11 +305,14 @@ private static class BinaryPathwayContextExtractor implements AgentPropagation.BinaryKeyClassifier { private final TimeSource timeSource; private final long hashOfKnownTags; + private final String serviceNameOverride; private DefaultPathwayContext extractedContext; - BinaryPathwayContextExtractor(TimeSource timeSource, long hashOfKnownTags) { + BinaryPathwayContextExtractor( + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride) { this.timeSource = timeSource; this.hashOfKnownTags = hashOfKnownTags; + this.serviceNameOverride = serviceNameOverride; } @Override @@ -308,7 +320,7 @@ public boolean accept(String key, byte[] value) { // older versions support, should be removed in the future if (PathwayContext.PROPAGATION_KEY.equalsIgnoreCase(key)) { try { - extractedContext = decode(timeSource, hashOfKnownTags, value); + extractedContext = decode(timeSource, hashOfKnownTags, serviceNameOverride, value); } catch (IOException e) { return false; } @@ -316,7 +328,7 @@ public boolean accept(String key, byte[] value) { if (PathwayContext.PROPAGATION_KEY_BASE64.equalsIgnoreCase(key)) { try { - extractedContext = base64Decode(timeSource, hashOfKnownTags, value); + extractedContext = base64Decode(timeSource, hashOfKnownTags, serviceNameOverride, value); } catch (IOException e) { return false; } @@ -329,13 +341,18 @@ static DefaultPathwayContext extract( C carrier, AgentPropagation.ContextVisitor getter, TimeSource timeSource, - long hashOfKnownTags) { + long hashOfKnownTags, + String serviceNameOverride) { if (getter instanceof AgentPropagation.BinaryContextVisitor) { return extractBinary( - carrier, (AgentPropagation.BinaryContextVisitor) getter, timeSource, hashOfKnownTags); + carrier, + (AgentPropagation.BinaryContextVisitor) getter, + timeSource, + hashOfKnownTags, + serviceNameOverride); } PathwayContextExtractor pathwayContextExtractor = - new PathwayContextExtractor(timeSource, hashOfKnownTags); + new PathwayContextExtractor(timeSource, hashOfKnownTags, serviceNameOverride); getter.forEachKey(carrier, pathwayContextExtractor); if (pathwayContextExtractor.extractedContext == null) { log.debug("No context extracted"); @@ -349,9 +366,10 @@ static DefaultPathwayContext extractBinary( C carrier, AgentPropagation.BinaryContextVisitor getter, TimeSource timeSource, - long hashOfKnownTags) { + long hashOfKnownTags, + String serviceNameOverride) { BinaryPathwayContextExtractor pathwayContextExtractor = - new BinaryPathwayContextExtractor(timeSource, hashOfKnownTags); + new BinaryPathwayContextExtractor(timeSource, hashOfKnownTags, serviceNameOverride); getter.forEachKey(carrier, pathwayContextExtractor); if (pathwayContextExtractor.extractedContext == null) { log.debug("No context extracted"); @@ -362,18 +380,22 @@ static DefaultPathwayContext extractBinary( } private static DefaultPathwayContext strDecode( - TimeSource timeSource, long hashOfKnownTags, String data) throws IOException { + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride, String data) + throws IOException { byte[] base64Bytes = data.getBytes(UTF_8); - return base64Decode(timeSource, hashOfKnownTags, base64Bytes); + return base64Decode(timeSource, hashOfKnownTags, serviceNameOverride, base64Bytes); } private static DefaultPathwayContext base64Decode( - TimeSource timeSource, long hashOfKnownTags, byte[] data) throws IOException { - return decode(timeSource, hashOfKnownTags, Base64.getDecoder().decode(data)); + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride, byte[] data) + throws IOException { + return decode( + timeSource, hashOfKnownTags, serviceNameOverride, Base64.getDecoder().decode(data)); } private static DefaultPathwayContext decode( - TimeSource timeSource, long hashOfKnownTags, byte[] data) throws IOException { + TimeSource timeSource, long hashOfKnownTags, String serviceNameOverride, byte[] data) + throws IOException { ByteArrayInput input = ByteArrayInput.wrap(data); long hash = input.readLongLE(); @@ -397,7 +419,8 @@ private static DefaultPathwayContext decode( pathwayStartNanos, pathwayStartNanoTicks, edgeStartNanoTicks, - hash); + hash, + serviceNameOverride); } static class DataSetHashBuilder { @@ -412,8 +435,11 @@ public long addValue(String val) { private static class PathwayHashBuilder { private long hash; - public PathwayHashBuilder(long baseHash) { + public PathwayHashBuilder(long baseHash, String serviceNameOverride) { hash = baseHash; + if (serviceNameOverride != null) { + addTag(serviceNameOverride); + } } public void addTag(String tag) { diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java index 461e5457673..e6dc2a18e05 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java @@ -56,7 +56,7 @@ public void reset() { } @Override - public void writePayload(Collection data) { + public void writePayload(Collection data, String serviceNameOverride) { writer.startMap(7); /* 1 */ writer.writeUTF8(ENV); @@ -64,7 +64,11 @@ public void writePayload(Collection data) { /* 2 */ writer.writeUTF8(SERVICE); - writer.writeUTF8(wellKnownTags.getService()); + if (serviceNameOverride != null) { + writer.writeUTF8(serviceNameOverride.getBytes(ISO_8859_1)); + } else { + writer.writeUTF8(wellKnownTags.getService()); + } /* 3 */ writer.writeUTF8(LANG); diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index d4e6ccc8f7f..d6623cb8647 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -46,6 +46,62 @@ class DataStreamsWritingTest extends DDCoreSpecification { requestBodies = [] } + def "Service overrides split buckets"() { + given: + def conditions = new PollingConditions(timeout: 2) + + def testOkhttpClient = OkHttpUtils.buildHttpClient(HttpUrl.get(server.address), 5000L) + + def features = Stub(DDAgentFeaturesDiscovery) { + supportsDataStreams() >> true + } + + def wellKnownTags = new WellKnownTags("runtimeid", "hostname", "test", Config.get().getServiceName(), "version", "java") + + def fakeConfig = Stub(Config) { + getAgentUrl() >> server.address.toString() + getWellKnownTags() >> wellKnownTags + getPrimaryTag() >> "region-1" + } + + def sharedCommObjects = new SharedCommunicationObjects() + sharedCommObjects.featuresDiscovery = features + sharedCommObjects.okHttpClient = testOkhttpClient + sharedCommObjects.createRemaining(fakeConfig) + + def timeSource = new ControllableTimeSource() + + def traceConfig = Mock(TraceConfig) { + isDataStreamsEnabled() >> true + } + def serviceNameOverride = "service-name-override" + + when: + def dataStreams = new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, { traceConfig }) + dataStreams.start() + dataStreams.setThreadServiceName(Thread.currentThread().getId(), serviceNameOverride) + dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, serviceNameOverride)) + dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130) + timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) + // force flush + dataStreams.report() + dataStreams.close() + then: + conditions.eventually { + assert requestBodies.size() == 1 + } + GzipSource gzipSource = new GzipSource(Okio.source(new ByteArrayInputStream(requestBodies[0]))) + + BufferedSource bufferedSource = Okio.buffer(gzipSource) + MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream()) + + assert unpacker.unpackMapHeader() == 7 + assert unpacker.unpackString() == "Env" + assert unpacker.unpackString() == "test" + assert unpacker.unpackString() == "Service" + assert unpacker.unpackString() == serviceNameOverride + } + def "Write bucket to mock server"() { given: def conditions = new PollingConditions(timeout: 2) @@ -78,15 +134,15 @@ class DataStreamsWritingTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, { traceConfig }) dataStreams.start() - dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0)) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, null)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0, null)) dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 100) dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5)) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 2)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5, null)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 2, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy index 5313f1eb412..36c4dc04287 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultDataStreamsMonitoringTest.groovy @@ -40,7 +40,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 0, 0, 0, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 0, 0, 0, timeSource.currentTimeNanos, 0, 0, 0, null)) dataStreams.report() then: @@ -131,7 +131,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -177,7 +177,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, bucketDuration) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(bucketDuration) then: @@ -220,9 +220,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 3, 4, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 3, 4, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l) dataStreams.report() @@ -266,9 +266,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l) dataStreams.close() @@ -377,9 +377,9 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -434,12 +434,12 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 1, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 1, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS - 100l) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 1, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 1, timeSource.currentTimeNanos, SECONDS.toNanos(10), SECONDS.toNanos(10), 10, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2,1, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5)) - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 5, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2,1, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5, null)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 5, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -508,7 +508,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: "reporting points when data streams is not supported" def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -538,7 +538,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS) dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -584,7 +584,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { dataStreams.start() supportsDataStreaming = false dataStreams.onEvent(EventListener.EventType.DOWNGRADED, "") - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -601,7 +601,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS) dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -646,7 +646,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: "reporting points when data streams is not enabled" def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -662,7 +662,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { dsmEnabled = true dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -695,7 +695,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: "submitting points after being disabled" payloadWriter.buckets.clear() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -729,7 +729,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: "reporting points when data streams is not supported" def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -746,7 +746,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { timeSource.advance(FEATURE_CHECK_INTERVAL_NANOS) dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -760,7 +760,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { dsmEnabled = true dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -805,7 +805,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { when: "reporting points when data streams is not supported" def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { traceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) dataStreams.start() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -821,7 +821,7 @@ class DefaultDataStreamsMonitoringTest extends DDCoreSpecification { dsmEnabled = true dataStreams.report() - dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0)) + dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 3, timeSource.currentTimeNanos, 0, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() @@ -841,7 +841,7 @@ class CapturingPayloadWriter implements DatastreamsPayloadWriter { boolean accepting = true List buckets = new ArrayList<>() - void writePayload(Collection payload) { + void writePayload(Collection payload, String serviceNameOverride) { if (accepting) { buckets.addAll(payload) } diff --git a/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy index 6f7ac8676a1..8b5fe50e019 100644 --- a/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy +++ b/dd-trace-core/src/traceAgentTest/groovy/DataStreamsIntegrationTest.groovy @@ -51,7 +51,7 @@ class DataStreamsIntegrationTest extends DDSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(sink, sharedCommunicationObjects.featuresDiscovery, timeSource, { traceConfig }, Config.get()) dataStreams.start() - dataStreams.accept(new StatsPoint("testType", "testGroup", "testTopic", 1, 2, timeSource.currentTimeNanos, 0, 0)) + dataStreams.accept(new StatsPoint("testType", "testGroup", "testTopic", 1, 2, timeSource.currentTimeNanos, 0, 0, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java index 641716a2df3..e6cb15603dc 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java @@ -42,4 +42,20 @@ void setCheckpoint( Schema getSchema(String schemaName, SchemaIterator iterator); void setProduceCheckpoint(String type, String target); + + /** + * setServiceNameOverride is used override service name for all DataStreams payloads produced + * within given thread + * + * @param threadId thread Id + * @param serviceName new service name to use for DSM checkpoints. + */ + void setThreadServiceName(Long threadId, String serviceName); + + /** + * clearThreadServiceName clears up threadId -> Service name mapping + * + * @param threadId thread Id + */ + void clearThreadServiceName(Long threadId); } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index 256aab3d970..5d113534179 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -1134,6 +1134,12 @@ public Schema getSchema(String schemaName, SchemaIterator iterator) { @Override public void setProduceCheckpoint(String type, String target) {} + @Override + public void setThreadServiceName(Long threadId, String serviceName) {} + + @Override + public void clearThreadServiceName(Long threadId) {} + @Override public void setConsumeCheckpoint( String type, String source, DataStreamsContextCarrier carrier) {} diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Backlog.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Backlog.java index 333a43f6e87..9b2a26540bc 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Backlog.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Backlog.java @@ -18,13 +18,20 @@ public long getTimestampNanos() { return timestampNanos; } + public String getServiceNameOverride() { + return serviceNameOverride; + } + private final List sortedTags; private final long value; private final long timestampNanos; + private final String serviceNameOverride; - public Backlog(List sortedTags, long value, long timestampNanos) { + public Backlog( + List sortedTags, long value, long timestampNanos, String serviceNameOverride) { this.sortedTags = sortedTags; this.value = value; this.timestampNanos = timestampNanos; + this.serviceNameOverride = serviceNameOverride; } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java index 1901b160ebb..fb313ddcef2 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/StatsPoint.java @@ -11,6 +11,7 @@ public class StatsPoint implements InboxItem { private final long pathwayLatencyNano; private final long edgeLatencyNano; private final long payloadSizeBytes; + private final String serviceNameOverride; public StatsPoint( List edgeTags, @@ -20,7 +21,8 @@ public StatsPoint( long timestampNanos, long pathwayLatencyNano, long edgeLatencyNano, - long payloadSizeBytes) { + long payloadSizeBytes, + String serviceNameOverride) { this.edgeTags = edgeTags; this.hash = hash; this.parentHash = parentHash; @@ -29,6 +31,7 @@ public StatsPoint( this.pathwayLatencyNano = pathwayLatencyNano; this.edgeLatencyNano = edgeLatencyNano; this.payloadSizeBytes = payloadSizeBytes; + this.serviceNameOverride = serviceNameOverride; } public List getEdgeTags() { @@ -63,6 +66,10 @@ public long getAggregationHash() { return aggregationHash; } + public String getServiceNameOverride() { + return serviceNameOverride; + } + @Override public String toString() { return "StatsPoint{" From a0e834efb4cb7cf0ff073c0f8c15f1bbd9837e2f Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:16:16 -0500 Subject: [PATCH 002/106] Set thread service name for spark tasks --- .../spark/SparkExecutorDecorator.java | 25 +++++++++++++++++-- .../spark/SparkExecutorInstrumentation.java | 6 +++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java index 0f9519c696c..e1dda5459d1 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java @@ -1,8 +1,11 @@ package datadog.trace.instrumentation.spark; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; +import java.lang.reflect.Field; +import java.util.Properties; import org.apache.spark.executor.Executor; import org.apache.spark.executor.TaskMetrics; @@ -10,6 +13,7 @@ public class SparkExecutorDecorator extends BaseDecorator { public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task"); public static final CharSequence SPARK = UTF8BytesString.create("spark"); public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator(); + private final String propSparkAppName = "spark.app.name"; @Override protected String[] instrumentationNames() { @@ -26,12 +30,29 @@ protected CharSequence component() { return SPARK; } - public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner) { + public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner, Object taskDescription) { span.setTag("task_id", taskRunner.taskId()); span.setTag("task_thread_name", taskRunner.threadName()); + + if (taskDescription != null) { + try { + Field prop = taskDescription.getClass().getDeclaredField("properties"); + prop.setAccessible(true); + Properties props = (Properties) prop.get(taskDescription); + String appName = props.getProperty(propSparkAppName); + if (appName != null) { + AgentTracer.get() + .getDataStreamsMonitoring() + .setThreadServiceName(taskRunner.getThreadId(), appName); + } + } catch (Exception ignored) { + } + } } public void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) { + AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName(taskRunner.getThreadId()); + // task is set by spark in run() by deserializing the task binary coming from the driver if (taskRunner.task() == null) { return; @@ -50,7 +71,7 @@ public void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) { span.setTag("app_attempt_id", taskRunner.task().appAttemptId().get()); } span.setTag( - "application_name", taskRunner.task().localProperties().getProperty("spark.app.name")); + "application_name", taskRunner.task().localProperties().getProperty(propSparkAppName)); TaskMetrics metrics = taskRunner.task().metrics(); span.setMetric("spark.executor_deserialize_time", metrics.executorDeserializeTime()); diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java index 0a8a6532326..8de403a83bf 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java @@ -52,11 +52,13 @@ public void methodAdvice(MethodTransformer transformer) { public static final class RunAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.This Executor.TaskRunner taskRunner) { + public static AgentScope enter( + @Advice.FieldValue("taskDescription") final Object taskDescription, + @Advice.This Executor.TaskRunner taskRunner) { final AgentSpan span = startSpan("spark-executor", SPARK_TASK); DECORATE.afterStart(span); - DECORATE.onTaskStart(span, taskRunner); + DECORATE.onTaskStart(span, taskRunner, taskDescription); return activateSpan(span); } From 3703c422653c2922935e5eb523f0eed0b61a4faf Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:14:09 -0500 Subject: [PATCH 003/106] Fixed tests --- .../DefaultPathwayContextTest.groovy | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy index 4838c842335..ecdce8e0651 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DefaultPathwayContextTest.groovy @@ -45,7 +45,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "First Set checkpoint starts the context."() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(50) @@ -60,7 +60,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Checkpoint generated"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(50) @@ -86,7 +86,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Checkpoint with payload size"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(25) @@ -107,7 +107,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Multiple checkpoints generated"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(50) @@ -147,7 +147,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Exception thrown when trying to encode unstarted context"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: context.encode() @@ -159,14 +159,14 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Set checkpoint with dataset tags"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "s3", "ds.namespace": "my_bucket", "ds.name": "my_object.csv", "direction": "in"]), pointConsumer) def encoded = context.strEncode() timeSource.advance(MILLISECONDS.toNanos(2)) - def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, encoded) + def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, null, encoded) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["type": "s3", "ds.namespace": "my_bucket", "ds.name": "my_object.csv", "direction": "out"]), pointConsumer) @@ -185,14 +185,14 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "internal"]), pointConsumer) def encoded = context.strEncode() timeSource.advance(MILLISECONDS.toNanos(2)) - def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, encoded) + def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, null, encoded) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -213,7 +213,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Set checkpoint with timestamp"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) def timeFromQueue = timeSource.getCurrentTimeMillis() - 200 when: context.setCheckpoint(["type": "internal"], pointConsumer, timeFromQueue) @@ -234,7 +234,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(MILLISECONDS.toNanos(50)) @@ -242,7 +242,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = context.strEncode() timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, encoded) + def decodedContext = DefaultPathwayContext.strDecode(timeSource, baseHash, null, encoded) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -261,7 +261,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { when: def secondEncode = decodedContext.strEncode() timeSource.advance(MILLISECONDS.toNanos(2)) - def secondDecode = DefaultPathwayContext.strDecode(timeSource, baseHash, secondEncode) + def secondDecode = DefaultPathwayContext.strDecode(timeSource, baseHash, null, secondEncode) timeSource.advance(MILLISECONDS.toNanos(30)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topicB", "type": "kafka"]), pointConsumer) @@ -282,7 +282,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) def contextVisitor = new Base64MapContextVisitor() when: @@ -292,7 +292,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = context.strEncode() Map carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): encoded, "someotherkey": "someothervalue"] timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash) + def decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -312,7 +312,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def secondEncode = decodedContext.strEncode() carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): secondEncode] timeSource.advance(MILLISECONDS.toNanos(2)) - def secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash) + def secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(30)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topicB", "type": "kafka"]), pointConsumer) @@ -333,14 +333,14 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "internal"]), pointConsumer) def encoded = context.encode() timeSource.advance(MILLISECONDS.toNanos(2)) - def decodedContext = DefaultPathwayContext.decode(timeSource, baseHash, encoded) + def decodedContext = DefaultPathwayContext.decode(timeSource, baseHash, null, encoded) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -362,7 +362,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(MILLISECONDS.toNanos(50)) @@ -370,7 +370,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = context.encode() timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.decode(timeSource, baseHash, encoded) + def decodedContext = DefaultPathwayContext.decode(timeSource, baseHash, null, encoded) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -389,7 +389,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { when: def secondEncode = decodedContext.encode() timeSource.advance(MILLISECONDS.toNanos(2)) - def secondDecode = DefaultPathwayContext.decode(timeSource, baseHash, secondEncode) + def secondDecode = DefaultPathwayContext.decode(timeSource, baseHash, null, secondEncode) timeSource.advance(MILLISECONDS.toNanos(30)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topicB", "type": "kafka"]), pointConsumer) @@ -409,7 +409,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Legacy binary encoding"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) def contextVisitor = new BinaryMapContextVisitor() when: @@ -419,7 +419,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = java.util.Base64.getDecoder().decode(context.encode()) Map carrier = [(PathwayContext.PROPAGATION_KEY): encoded] timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash) + def decodedContext = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash, null) then: decodedContext.strEncode() == context.strEncode() @@ -429,7 +429,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) def contextVisitor = new BinaryMapContextVisitor() when: @@ -439,7 +439,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = context.encode() Map carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): encoded, "someotherkey": new byte[0]] timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash) + def decodedContext = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topic", "type": "kafka"]), pointConsumer) @@ -459,7 +459,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def secondEncode = decodedContext.encode() carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): secondEncode] timeSource.advance(MILLISECONDS.toNanos(2)) - def secondDecode = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash) + def secondDecode = DefaultPathwayContext.extractBinary(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(30)) context.setCheckpoint(new LinkedHashMap<>(["group": "group", "topic": "topicB", "type": "kafka"]), pointConsumer) @@ -480,7 +480,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { // Timesource needs to be advanced in milliseconds because encoding truncates to millis given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) def contextVisitor = new Base64MapContextVisitor() when: @@ -490,7 +490,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def encoded = context.strEncode() Map carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): encoded, "someotherkey": "someothervalue"] timeSource.advance(MILLISECONDS.toNanos(1)) - def decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash) + def decodedContext = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(25)) context.setCheckpoint(new LinkedHashMap<>(["topic": "topic", "type": "sqs"]), pointConsumer) @@ -510,7 +510,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def secondEncode = decodedContext.strEncode() carrier = [(PathwayContext.PROPAGATION_KEY_BASE64): secondEncode] timeSource.advance(MILLISECONDS.toNanos(2)) - def secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash) + def secondDecode = DefaultPathwayContext.extract(carrier, contextVisitor, timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(30)) context.setCheckpoint(new LinkedHashMap<>(["topic": "topicB", "type": "sqs"]), pointConsumer) @@ -530,7 +530,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def "Empty tags not set"() { given: def timeSource = new ControllableTimeSource() - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) when: timeSource.advance(50) @@ -591,7 +591,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { globalTraceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "internal"]), pointConsumer) def encoded = context.strEncode() @@ -637,7 +637,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { globalTraceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "internal"]), pointConsumer) def encoded = context.strEncode() @@ -678,7 +678,7 @@ class DefaultPathwayContextTest extends DDCoreSpecification { def dataStreams = new DefaultDataStreamsMonitoring(sink, features, timeSource, { globalTraceConfig }, wellKnownTags, payloadWriter, DEFAULT_BUCKET_DURATION_NANOS) - def context = new DefaultPathwayContext(timeSource, baseHash) + def context = new DefaultPathwayContext(timeSource, baseHash, null) timeSource.advance(MILLISECONDS.toNanos(50)) context.setCheckpoint(new LinkedHashMap<>(["type": "internal"]), pointConsumer) def encoded = context.strEncode() From 71d5678fab36fb85da8bc0cb06a2f9aa6e5acd52 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:51:05 -0500 Subject: [PATCH 004/106] Restructured tests --- .../trace/core/datastreams/DataStreamsWritingTest.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index d6623cb8647..490258606a7 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -145,15 +145,13 @@ class DataStreamsWritingTest extends DDCoreSpecification { dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 2, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) dataStreams.report() + dataStreams.close() then: conditions.eventually { assert requestBodies.size() == 1 } validateMessage(requestBodies[0]) - - cleanup: - dataStreams.close() } def validateMessage(byte[] message) { From f8c7b949118a79b835b0d385b6472d87210b4da4 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:20:40 -0500 Subject: [PATCH 005/106] Updated failing test --- .../trace/core/datastreams/DataStreamsWritingTest.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index 490258606a7..ff8150d5a7a 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -144,14 +144,16 @@ class DataStreamsWritingTest extends DDCoreSpecification { dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic"], 1, 2, 5, timeSource.currentTimeNanos, SECONDS.toNanos(5), SECONDS.toNanos(5), 5, null)) dataStreams.add(new StatsPoint(["type:testType", "group:testGroup", "topic:testTopic2"], 3, 4, 6, timeSource.currentTimeNanos, SECONDS.toNanos(2), 0, 2, null)) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.report() dataStreams.close() then: conditions.eventually { - assert requestBodies.size() == 1 + assert requestBodies.size() > 0 + } + + for (int i = 0; i < requestBodies.size(); i++) { + validateMessage(requestBodies[i]) } - validateMessage(requestBodies[0]) } def validateMessage(byte[] message) { From dacc353187815fb2cf511d3a17ab6f2d2a8d1abd Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:02:10 -0500 Subject: [PATCH 006/106] Fixed tests --- .../core/datastreams/DefaultDataStreamsMonitoring.java | 6 ++++-- .../trace/core/datastreams/DataStreamsWritingTest.groovy | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index fbc3e0e609f..70ad439988c 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -409,8 +409,10 @@ private void flush(long timestampNanos) { if (!includedBuckets.isEmpty()) { for (Map.Entry> entry : includedBuckets.entrySet()) { - log.debug("Flushing {} buckets", entry.getValue()); - payloadWriter.writePayload(entry.getValue(), entry.getKey()); + if (!entry.getValue().isEmpty()) { + log.debug("Flushing {} buckets", entry.getValue()); + payloadWriter.writePayload(entry.getValue(), entry.getKey()); + } } } } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index ff8150d5a7a..a800d6dc197 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -148,12 +148,10 @@ class DataStreamsWritingTest extends DDCoreSpecification { then: conditions.eventually { - assert requestBodies.size() > 0 + assert requestBodies.size() == 1 } - for (int i = 0; i < requestBodies.size(); i++) { - validateMessage(requestBodies[i]) - } + validateMessage(requestBodies[0]) } def validateMessage(byte[] message) { From 5c484ede3c85036ec6db9f2434dab65ad6452b9d Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:59:37 -0500 Subject: [PATCH 007/106] Reset service name override in test --- .../datadog/trace/core/datastreams/DataStreamsWritingTest.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index a800d6dc197..31c010d1e41 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -83,6 +83,7 @@ class DataStreamsWritingTest extends DDCoreSpecification { dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, serviceNameOverride)) dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) + dataStreams.setThreadServiceName(Thread.currentThread().getId(), null) // force flush dataStreams.report() dataStreams.close() From 545c9284d42a5997ff58eb9d8b7534c72028f241 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:52:15 -0500 Subject: [PATCH 008/106] Test now uses clearThreadServiceName --- .../core/datastreams/DefaultDataStreamsMonitoring.java | 6 ++++++ .../trace/core/datastreams/DataStreamsWritingTest.groovy | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index 70ad439988c..01f1c5781fa 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -189,6 +189,12 @@ public void setProduceCheckpoint(String type, String target) { @Override public void setThreadServiceName(Long threadId, String serviceName) { + // setting service name to null == removing the value + if (serviceName == null) { + clearThreadServiceName(threadId); + return; + } + threadServiceNames.put(threadId, serviceName); } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index 31c010d1e41..51583ff8060 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -83,10 +83,10 @@ class DataStreamsWritingTest extends DDCoreSpecification { dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, serviceNameOverride)) dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) - dataStreams.setThreadServiceName(Thread.currentThread().getId(), null) // force flush dataStreams.report() dataStreams.close() + dataStreams.clearThreadServiceName(Thread.currentThread().getId()) then: conditions.eventually { assert requestBodies.size() == 1 From cef6dc72fc9631a26a37851e725b8e849ce9d01e Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:28:06 -0500 Subject: [PATCH 009/106] Log service name --- .../trace/core/datastreams/DefaultDataStreamsMonitoring.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index 01f1c5781fa..a966425f504 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -416,7 +416,7 @@ private void flush(long timestampNanos) { if (!includedBuckets.isEmpty()) { for (Map.Entry> entry : includedBuckets.entrySet()) { if (!entry.getValue().isEmpty()) { - log.debug("Flushing {} buckets", entry.getValue()); + log.debug("Flushing {} buckets ({})", entry.getValue(), entry.getKey()); payloadWriter.writePayload(entry.getValue(), entry.getKey()); } } From 02ce8d81a5efde4cc639aebfbf8caa6d41ab1387 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:16:01 -0600 Subject: [PATCH 010/106] Use unreflected method to get properties --- .../spark/SparkExecutorDecorator.java | 64 ++++++++++++++++--- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java index e1dda5459d1..45a870e72ea 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java @@ -4,16 +4,60 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.util.Properties; import org.apache.spark.executor.Executor; import org.apache.spark.executor.TaskMetrics; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SparkExecutorDecorator extends BaseDecorator { + private static final Logger log = LoggerFactory.getLogger(SparkExecutorDecorator.class); + public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task"); public static final CharSequence SPARK = UTF8BytesString.create("spark"); public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator(); private final String propSparkAppName = "spark.app.name"; + private static final String TASK_DESCRIPTION_CLASSNAME = + "org.apache.spark.scheduler.TaskDescription"; + private static final MethodHandles.Lookup lookup = MethodHandles.lookup(); + private static final MethodHandle propertiesField_mh; + + private static Class initClass() { + try { + return Class.forName( + SparkExecutorDecorator.TASK_DESCRIPTION_CLASSNAME, + false, + SparkExecutorDecorator.class.getClassLoader()); + } catch (ClassNotFoundException e) { + log.debug("Can't find class '{}'", TASK_DESCRIPTION_CLASSNAME, e); + } + return null; + } + + private static MethodHandle getFieldGetter() { + Class cls = initClass(); + + try { + if (cls != null) { + Field field = cls.getDeclaredField("properties"); + field.setAccessible(true); + + return lookup.unreflectGetter(field); + } + + } catch (NoSuchFieldException | IllegalAccessException e) { + log.debug("Can't find and unreflect declared field for '{}'", TASK_DESCRIPTION_CLASSNAME); + } + + return null; + } + + static { + propertiesField_mh = getFieldGetter(); + } @Override protected String[] instrumentationNames() { @@ -34,18 +78,18 @@ public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner, Object t span.setTag("task_id", taskRunner.taskId()); span.setTag("task_thread_name", taskRunner.threadName()); - if (taskDescription != null) { + if (taskDescription != null && propertiesField_mh != null) { try { - Field prop = taskDescription.getClass().getDeclaredField("properties"); - prop.setAccessible(true); - Properties props = (Properties) prop.get(taskDescription); - String appName = props.getProperty(propSparkAppName); - if (appName != null) { - AgentTracer.get() - .getDataStreamsMonitoring() - .setThreadServiceName(taskRunner.getThreadId(), appName); + Properties props = (Properties) propertiesField_mh.invoke(taskDescription); + if (props != null) { + String appName = props.getProperty(propSparkAppName); + if (appName != null) { + AgentTracer.get() + .getDataStreamsMonitoring() + .setThreadServiceName(taskRunner.getThreadId(), appName); + } } - } catch (Exception ignored) { + } catch (Throwable ignored) { } } } From a6d89db8c8878d03825f74e6585455dd2dfa3349 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 8 Nov 2024 09:27:27 +0100 Subject: [PATCH 011/106] Simplify methodhandle initialization --- .../spark/SparkExecutorDecorator.java | 42 +++---------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java index 45a870e72ea..a5b4eea27aa 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java @@ -4,61 +4,31 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; +import datadog.trace.util.MethodHandles; import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Field; import java.util.Properties; import org.apache.spark.executor.Executor; import org.apache.spark.executor.TaskMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SparkExecutorDecorator extends BaseDecorator { - private static final Logger log = LoggerFactory.getLogger(SparkExecutorDecorator.class); - public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task"); public static final CharSequence SPARK = UTF8BytesString.create("spark"); public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator(); private final String propSparkAppName = "spark.app.name"; private static final String TASK_DESCRIPTION_CLASSNAME = "org.apache.spark.scheduler.TaskDescription"; - private static final MethodHandles.Lookup lookup = MethodHandles.lookup(); - private static final MethodHandle propertiesField_mh; - - private static Class initClass() { - try { - return Class.forName( - SparkExecutorDecorator.TASK_DESCRIPTION_CLASSNAME, - false, - SparkExecutorDecorator.class.getClassLoader()); - } catch (ClassNotFoundException e) { - log.debug("Can't find class '{}'", TASK_DESCRIPTION_CLASSNAME, e); - } - return null; - } + private static final MethodHandle propertiesField_mh = getFieldGetter(); private static MethodHandle getFieldGetter() { - Class cls = initClass(); - try { - if (cls != null) { - Field field = cls.getDeclaredField("properties"); - field.setAccessible(true); - - return lookup.unreflectGetter(field); - } - - } catch (NoSuchFieldException | IllegalAccessException e) { - log.debug("Can't find and unreflect declared field for '{}'", TASK_DESCRIPTION_CLASSNAME); + return new MethodHandles(Executor.class.getClassLoader()) + .privateFieldGetter(TASK_DESCRIPTION_CLASSNAME, "properties"); + } catch (Throwable ignored) { + // should be already logged } - return null; } - static { - propertiesField_mh = getFieldGetter(); - } - @Override protected String[] instrumentationNames() { return new String[] {"spark-executor"}; From c2eb6cfff1cb5893453dc3330b321da6a1f6413a Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:07:38 -0600 Subject: [PATCH 012/106] wip: Added unit test --- .../spark-executor/build.gradle | 11 +++ .../baseTest/groovy/SparkExecutorTest.groovy | 72 +++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dd-java-agent/instrumentation/spark-executor/build.gradle b/dd-java-agent/instrumentation/spark-executor/build.gradle index 4525dafc370..159f7b05907 100644 --- a/dd-java-agent/instrumentation/spark-executor/build.gradle +++ b/dd-java-agent/instrumentation/spark-executor/build.gradle @@ -33,13 +33,24 @@ ext { dependencies { compileOnly group: 'org.apache.spark', name: 'spark-core_2.12', version: '2.4.0' compileOnly group: 'org.apache.spark', name: 'spark-sql_2.12', version: '2.4.0' + compileOnly group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" baseTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: "2.4.0" baseTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "2.4.0" + baseTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "2.4.0" + baseTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" + testImplementation group: 'org.apache.kafka', name: 'kafka_2.12', version: '2.4.0' + testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0' + testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.4.0.RELEASE' + testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.4.0.RELEASE' latest212DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: '3.+' latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: '3.+' + latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "3.+" + latest212DepTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" latest213DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.13", version: '3.+' latest213DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: '3.+' + latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: "3.+" + latest212DepTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.13', version: "3.+" } diff --git a/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy b/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy index 7e9ae0951f5..16dec400604 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy +++ b/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy @@ -1,17 +1,38 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.bootstrap.instrumentation.api.Tags +import org.apache.kafka.clients.producer.ProducerRecord +import org.apache.spark.api.java.function.VoidFunction2 import org.apache.spark.sql.Dataset import org.apache.spark.sql.Row import org.apache.spark.sql.RowFactory import org.apache.spark.sql.SparkSession +import org.apache.spark.sql.streaming.Trigger import org.apache.spark.sql.types.StructType +import org.junit.ClassRule +import org.springframework.kafka.core.DefaultKafkaProducerFactory +import org.springframework.kafka.test.EmbeddedKafkaBroker +import org.springframework.kafka.test.rule.EmbeddedKafkaRule +import org.springframework.kafka.test.utils.KafkaTestUtils +import spock.lang.Shared + class SparkExecutorTest extends AgentTestRunner { + static final SOURCE_TOPIC = "source" + static final SINK_TOPIC = "sink" + + @Shared + @ClassRule + EmbeddedKafkaRule kafkaRule = new EmbeddedKafkaRule(1, false, 1, SOURCE_TOPIC, SINK_TOPIC) + EmbeddedKafkaBroker embeddedKafka = kafkaRule.embeddedKafka @Override void configurePreAgent() { super.configurePreAgent() injectSysConfig("dd.integration.spark-executor.enabled", "true") + injectSysConfig("dd.integration.spark.enabled", "true") + injectSysConfig("dd.integration.kafka.enabled", "true") + injectSysConfig("dd.data.streams.enabled", "true") + injectSysConfig("dd.trace.debug", "true") } private Dataset generateSampleDataframe(SparkSession spark) { @@ -23,6 +44,57 @@ class SparkExecutorTest extends AgentTestRunner { spark.createDataFrame(rows, structType) } + def "test dsm service name override"() { + setup: + def sparkSession = SparkSession.builder() + .config("spark.master", "local[2]") + .config("spark.driver.bindAddress", "localhost") + // .config("spark.sql.shuffle.partitions", "2") + .appName("test-app") + .getOrCreate() + + def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) + def producer = new DefaultKafkaProducerFactory(producerProps).createProducer() + + when: + for (int i = 0; i < 100; i++) { + producer.send(new ProducerRecord<>(SOURCE_TOPIC, i, i.toString())) + } + producer.flush() + + def df = sparkSession + .readStream() + .format("kafka") + .option("kafka.bootstrap.servers", embeddedKafka.getBrokersAsString()) + .option("startingOffsets", "earliest") + .option("failOnDataLoss", "false") + .option("subscribe", SOURCE_TOPIC) + .load() + + def query = df + .selectExpr("CAST(key AS STRING) as key", "CAST(value AS STRING) as value") + .writeStream() + .format("kafka") + .option("kafka.bootstrap.servers", embeddedKafka.getBrokersAsString()) + .option("checkpointLocation", "/tmp/" + System.currentTimeMillis().toString()) + .option("topic", SINK_TOPIC) + .trigger(Trigger.Once()) + .foreachBatch(new VoidFunction2, Long>() { + @Override + void call(Dataset rowDataset, Long aLong) throws Exception { + rowDataset.show() + rowDataset.write() + } + }) + .start() + + query.processAllAvailable() + + then: + query.stop() + producer.close() + } + def "generate spark task run spans"() { setup: def sparkSession = SparkSession.builder() From 8c26b7487b9a5ef328a17bbbdd8835f05086aa14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20=C3=81lvarez=20=C3=81lvarez?= Date: Thu, 14 Nov 2024 15:07:51 +0100 Subject: [PATCH 013/106] Add support for session tracking in jetty (#7837) Add support for session tracking in jetty --- .../appsec/gateway/AppSecRequestContext.java | 10 ++++ .../datadog/appsec/gateway/GatewayBridge.java | 9 +++- .../groovy/ArmeriaJetty11ServerTest.groovy | 5 ++ .../jetty11/RequestInstrumentation.java | 3 ++ .../jetty11/SetRequestedSessionIdAdvice.java | 43 +++++++++++++++++ .../src/test/groovy/Jetty11Test.groovy | 5 ++ .../test/groovy/JettyAsyncHandlerTest.groovy | 5 ++ .../testFixtures/groovy/JettyServer.groovy | 3 ++ .../instrumentation/jetty-12/build.gradle | 18 ++++++++ ...AbstractSessionManagerInstrumentation.java | 39 ++++++++++++++++ .../ResolveRequestedSessionIdAdvice.java | 46 +++++++++++++++++++ .../src/test/ee8/groovy/Jetty12Test.groovy | 5 ++ .../src/test/ee8/groovy/JettyServer.groovy | 9 +++- .../jetty70/RequestInstrumentation.java | 43 +++++++++++++++++ .../src/test/groovy/Jetty70Test.groovy | 10 +++- .../jetty76/RequestInstrumentation.java | 43 +++++++++++++++++ .../src/test/groovy/Jetty76Test.groovy | 10 +++- .../jetty10/RequestInstrumentation.java | 3 ++ .../jetty9/RequestInstrumentation.java | 43 +++++++++++++++++ .../jetty10/SetRequestedSessionIdAdvice.java | 43 +++++++++++++++++ .../instrumentation/jetty9/Jetty9Test.groovy | 10 +++- .../src/test/groovy/TestServlet2.groovy | 4 +- .../servlet3/TestServlet3.groovy | 12 ++--- .../servlet5/TestServlet5.groovy | 4 +- 24 files changed, 409 insertions(+), 16 deletions(-) create mode 100644 dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java create mode 100644 dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java create mode 100644 dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java create mode 100644 dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java index c31f7b2e9fb..503e71bacd1 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java @@ -125,6 +125,8 @@ public class AppSecRequestContext implements DataBundle, Closeable { // keep a reference to the last published usr.id private volatile String userId; + // keep a reference to the last published usr.session_id + private volatile String sessionId; private static final AtomicIntegerFieldUpdater TIMEOUTS_UPDATER = AtomicIntegerFieldUpdater.newUpdater(AppSecRequestContext.class, "timeouts"); @@ -433,6 +435,14 @@ public void setUserId(String userId) { this.userId = userId; } + public void setSessionId(String sessionId) { + this.sessionId = sessionId; + } + + public String getSessionId() { + return sessionId; + } + @Override public void close() { final AgentSpan span = AgentTracer.activeSpan(); diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java index 6ea1a9a37bc..e27848c39f0 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/GatewayBridge.java @@ -154,7 +154,7 @@ private TriFunction> on final Address address) { return (ctx_, mode, userId) -> { final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC); - if (ctx == null) { + if (userId == null || ctx == null) { return NoopFlow.INSTANCE; } final TraceSegment segment = ctx_.getTraceSegment(); @@ -203,9 +203,14 @@ private TriFunction> on private Flow onRequestSession(final RequestContext ctx_, final String sessionId) { final AppSecRequestContext ctx = ctx_.getData(RequestContextSlot.APPSEC); - if (ctx == null) { + if (sessionId == null || ctx == null) { + return NoopFlow.INSTANCE; + } + if (sessionId.equals(ctx.getSessionId())) { return NoopFlow.INSTANCE; } + // unlikely that multiple threads will update the value at the same time + ctx.setSessionId(sessionId); final TraceSegment segment = ctx_.getTraceSegment(); segment.setTagTop("usr.session_id", sessionId); while (true) { diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy b/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy index e0a92f5b12f..3891a6d74d3 100644 --- a/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy +++ b/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy @@ -114,4 +114,9 @@ class ArmeriaJetty11ServerTest extends HttpServerTest { boolean testEncodedPath() { return false } + + @Override + boolean testSessionId() { + true + } } diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java index b7cb8282bd3..99a39d79ac4 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java @@ -27,5 +27,8 @@ public void methodAdvice(MethodTransformer transformer) { .and(takesArgument(0, named("org.eclipse.jetty.server.handler.ContextHandler$Context"))) .and(takesArgument(1, String.class)), packageName + ".SetContextPathAdvice"); + transformer.applyAdvice( + named("setRequestedSessionId").and(takesArgument(0, String.class)), + packageName + ".SetRequestedSessionIdAdvice"); } } diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java new file mode 100644 index 00000000000..992c2bbe0bd --- /dev/null +++ b/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.jetty11; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; +import net.bytebuddy.asm.Advice; + +/** + * Because we are processing the initial request before the requestedSessionId is set, we must + * update it when it is actually set. + */ +@RequiresRequestContext(RequestContextSlot.APPSEC) +public class SetRequestedSessionIdAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void setRequestedSessionId( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Argument(0) final String requestedSessionId) { + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } +} diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy b/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy index ccfc6721012..7085b71aac3 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy +++ b/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy @@ -84,6 +84,11 @@ abstract class Jetty11Test extends HttpServerTest { boolean hasExtraErrorInformation() { true } + + @Override + boolean testSessionId() { + true + } } class Jetty11V0ForkedTest extends Jetty11Test implements TestingGenericHttpNamingConventions.ServerV0 { diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy b/dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy index b590197ded0..8cc1ebb30cf 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy +++ b/dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy @@ -15,6 +15,11 @@ class JettyAsyncHandlerTest extends Jetty11Test implements TestingGenericHttpNam new ContinuationTestHandler(super.handler()) } + @Override + boolean testSessionId() { + false // continuation test handler not working with sessions + } + static class ContinuationTestHandler implements Handler { @Delegate private final Handler delegate diff --git a/dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy index c2a735bdb97..01dd60631ca 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy +++ b/dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy @@ -11,6 +11,7 @@ import org.eclipse.jetty.server.Handler import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.ErrorHandler +import org.eclipse.jetty.server.session.SessionHandler import org.eclipse.jetty.servlet.FilterMapping import org.eclipse.jetty.servlet.ServletContextHandler @@ -47,6 +48,8 @@ class JettyServer implements HttpServer { static AbstractHandler servletHandler(Class servlet) { ServletContextHandler handler = new ServletContextHandler(null, "/context-path") + final sessionHandler = new SessionHandler() + handler.sessionHandler = sessionHandler handler.errorHandler = errorHandler handler.servletHandler.addFilterWithMapping(EnableMultipartFilter, '/*', FilterMapping.ALL) handler.servletHandler.addServletWithMapping(servlet, '/*') diff --git a/dd-java-agent/instrumentation/jetty-12/build.gradle b/dd-java-agent/instrumentation/jetty-12/build.gradle index 055b55347ef..b5b7ff50cad 100644 --- a/dd-java-agent/instrumentation/jetty-12/build.gradle +++ b/dd-java-agent/instrumentation/jetty-12/build.gradle @@ -7,6 +7,13 @@ muzzle { group = "org.eclipse.jetty" module = 'jetty-server' versions = "[12,]" + additionalDependencies = ['org.eclipse.jetty:jetty-session:12.0.0'] + } + pass { + name = 'jetty-session' + group = "org.eclipse.jetty" + module = 'jetty-session' + versions = "[12,]" } } @@ -32,13 +39,21 @@ addTestSuiteExtendingForDir('ee10LatestDepTest', 'latestDepTest', 'test/ee10') } } +forbiddenApisMain_java17 { + failOnMissingClasses = false +} + compileTestGroovy { javaLauncher = getJavaLauncherFor(17) } + dependencies { main_java17CompileOnly ("org.eclipse.jetty:jetty-server:12.0.0") { exclude group: 'org.slf4j', module: 'slf4j-api' } + main_java17CompileOnly ("org.eclipse.jetty:jetty-session:12.0.0") { + exclude group: 'org.slf4j', module: 'slf4j-api' + } main_java17Implementation project(':dd-java-agent:instrumentation:jetty-common') implementation project(':dd-java-agent:instrumentation:jetty-common') @@ -62,6 +77,9 @@ dependencies { latestDepTestImplementation ("org.eclipse.jetty:jetty-server:12.+") { exclude group: 'org.slf4j', module: 'slf4j-api' } + latestDepTestImplementation ("org.eclipse.jetty:jetty-session:12.+") { + exclude group: 'org.slf4j', module: 'slf4j-api' + } ee8TestImplementation group: 'org.eclipse.jetty.ee8', name: 'jetty-ee8-servlet', version: '12.0.0' , { exclude group: 'org.slf4j', module: 'slf4j-api' diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java new file mode 100644 index 00000000000..3a1db8a5f6e --- /dev/null +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java @@ -0,0 +1,39 @@ +package datadog.trace.instrumentation.jetty12; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isProtected; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; + +@AutoService(InstrumenterModule.class) +public final class AbstractSessionManagerInstrumentation extends InstrumenterModule.AppSec + implements Instrumenter.ForSingleType { + + public AbstractSessionManagerInstrumentation() { + super("jetty"); + } + + @Override + public String muzzleDirective() { + return "jetty-session"; + } + + @Override + public String instrumentedType() { + return "org.eclipse.jetty.session.AbstractSessionManager"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("resolveRequestedSessionId") + .and(isProtected()) + .and(takesArguments(1)) + .and(takesArgument(0, named("org.eclipse.jetty.server.Request"))), + packageName + ".ResolveRequestedSessionIdAdvice"); + } +} diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java new file mode 100644 index 00000000000..1ad0a38e8ef --- /dev/null +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java @@ -0,0 +1,46 @@ +package datadog.trace.instrumentation.jetty12; + +import static datadog.trace.api.gateway.Events.EVENTS; +import static org.eclipse.jetty.session.AbstractSessionManager.RequestedSession; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; +import net.bytebuddy.asm.Advice; + +/** + * Because we are processing the initial request before the requestedSession is set, we must update + * it when it is actually set. + */ +@RequiresRequestContext(RequestContextSlot.APPSEC) +public class ResolveRequestedSessionIdAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void resolveRequestedSessionId( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Return final RequestedSession requestedSession) { + final String requestedSessionId = + requestedSession == null ? null : requestedSession.sessionId(); + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } +} diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy b/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy index aecdac1b4e4..9dc09f282c1 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy +++ b/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy @@ -48,6 +48,11 @@ abstract class Jetty12Test extends HttpServerTest implements TestingGene boolean hasExtraErrorInformation() { true } + + @Override + boolean testSessionId() { + true + } } class Jetty12SyncTest extends Jetty12Test { diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy index 405a674fea4..38f2f7a5328 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy +++ b/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy @@ -5,8 +5,11 @@ import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import org.eclipse.jetty.ee8.nested.ErrorHandler import org.eclipse.jetty.ee8.servlet.ServletContextHandler +import org.eclipse.jetty.ee8.nested.SessionHandler as EE8SessionHandler import org.eclipse.jetty.server.Handler import org.eclipse.jetty.server.Server +import org.eclipse.jetty.session.SessionHandler + import javax.servlet.Servlet import javax.servlet.ServletException @@ -17,8 +20,11 @@ class JettyServer implements HttpServer { final server = new Server(0) // select random open port JettyServer(Handler handler) { - server.handler = handler + final sessionHandler = new SessionHandler() + sessionHandler.handler = handler + server.handler = sessionHandler server.addBean(errorHandler) + server.addBean(sessionHandler.sessionIdManager, true) } @Override @@ -46,6 +52,7 @@ class JettyServer implements HttpServer { static Handler servletHandler(Class servlet) { // defaults to jakarta servlet ServletContextHandler handler = new ServletContextHandler(null, "/context-path") + handler.sessionHandler = new EE8SessionHandler() handler.errorHandler = errorHandler HttpServerTest.ServerEndpoint.values() .findAll { !(it in [NOT_FOUND, UNKNOWN]) } diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java index def85eab2a4..a4751eec3ae 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.jetty70; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.api.gateway.Events.EVENTS; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_CONTEXT; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_PATH; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_DISPATCH_SPAN_ATTRIBUTE; @@ -10,9 +11,18 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; import net.bytebuddy.asm.Advice; import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.server.Request; @@ -38,6 +48,9 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("setServletPath").and(takesArgument(0, String.class)), RequestInstrumentation.class.getName() + "$SetServletPathAdvice"); + transformer.applyAdvice( + named("setRequestedSessionId").and(takesArgument(0, String.class)), + RequestInstrumentation.class.getName() + "$SetRequestedSessionId"); } /** @@ -81,4 +94,34 @@ private void muzzleCheck(HttpConnection connection) { connection.getGenerator(); } } + + /** + * Because we are processing the initial request before the requestedSessionId is set, we must + * update it when it is actually set. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class SetRequestedSessionId { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void updateContextPath( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Argument(0) final String requestedSessionId) { + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = + AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } + } } diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy b/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy index 1a0b4693d67..06d5d40c7b5 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy +++ b/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy @@ -6,6 +6,7 @@ import org.eclipse.jetty.server.Request import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.ErrorHandler +import org.eclipse.jetty.server.session.SessionHandler import javax.servlet.ServletException import javax.servlet.http.HttpServletRequest @@ -21,7 +22,9 @@ abstract class Jetty70Test extends HttpServerTest { final server = new Server(0) // select random open port JettyServer() { - server.setHandler(handler()) + final sessionHandler = new SessionHandler() + sessionHandler.handler = handler() + server.setHandler(sessionHandler) server.addBean(errorHandler) } @@ -123,6 +126,11 @@ abstract class Jetty70Test extends HttpServerTest { true } + @Override + boolean testSessionId() { + true + } + static class TestHandler extends AbstractHandler { private static final TestHandler INSTANCE = new TestHandler() diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java index ba75f817353..cee10cd945b 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.jetty76; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.api.gateway.Events.EVENTS; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_CONTEXT; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_PATH; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_DISPATCH_SPAN_ATTRIBUTE; @@ -10,9 +11,18 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; import net.bytebuddy.asm.Advice; import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; @@ -38,6 +48,9 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("setServletPath").and(takesArgument(0, String.class)), RequestInstrumentation.class.getName() + "$SetServletPathAdvice"); + transformer.applyAdvice( + named("setRequestedSessionId").and(takesArgument(0, String.class)), + RequestInstrumentation.class.getName() + "$SetRequestedSessionId"); } /** @@ -81,4 +94,34 @@ private void muzzleCheck(AbstractHttpConnection connection) { connection.getGenerator(); } } + + /** + * Because we are processing the initial request before the requestedSessionId is set, we must + * update it when it is actually set. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class SetRequestedSessionId { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void updateContextPath( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Argument(0) final String requestedSessionId) { + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = + AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } + } } diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy b/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy index 9a5747a5605..f9e984041c0 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy +++ b/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy @@ -6,6 +6,7 @@ import org.eclipse.jetty.server.Request import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.ErrorHandler +import org.eclipse.jetty.server.session.SessionHandler import javax.servlet.ServletException import javax.servlet.http.HttpServletRequest @@ -21,7 +22,9 @@ abstract class Jetty76Test extends HttpServerTest { final server = new Server(0) // select random open port JettyServer() { - server.setHandler(handler()) + final sessionHandler = new SessionHandler() + sessionHandler.handler = handler() + server.setHandler(sessionHandler) server.addBean(errorHandler) } @@ -124,6 +127,11 @@ abstract class Jetty76Test extends HttpServerTest { true } + @Override + boolean testSessionId() { + true + } + static class TestHandler extends AbstractHandler { private static final TestHandler INSTANCE = new TestHandler() diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java index f71fe929955..a47c2b7efe0 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java @@ -33,5 +33,8 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("setServletPath").and(takesArgument(0, String.class)), packageName + ".SetServletPathAdvice"); + transformer.applyAdvice( + named("setRequestedSessionId").and(takesArgument(0, String.class)), + packageName + ".SetRequestedSessionIdAdvice"); } } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java index 8d6d6d2cdb1..d06e238f496 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.jetty9; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.api.gateway.Events.EVENTS; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_CONTEXT; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.SERVLET_PATH; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_DISPATCH_SPAN_ATTRIBUTE; @@ -10,9 +11,18 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; import javax.servlet.http.HttpServletRequest; import net.bytebuddy.asm.Advice; import org.eclipse.jetty.http.HttpFields; @@ -45,6 +55,9 @@ public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( named("setServletPath").and(takesArgument(0, String.class)), RequestInstrumentation.class.getName() + "$SetServletPathAdvice"); + transformer.applyAdvice( + named("setRequestedSessionId").and(takesArgument(0, String.class)), + RequestInstrumentation.class.getName() + "$SetRequestedSessionIdAdvice"); } /** @@ -91,4 +104,34 @@ private void muzzleCheck( fields.getField(0); } } + + /** + * Because we are processing the initial request before the requestedSessionId is set, we must + * update it when it is actually set. + */ + @RequiresRequestContext(RequestContextSlot.APPSEC) + public static class SetRequestedSessionIdAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void updateContextPath( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Argument(0) final String requestedSessionId) { + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = + AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } + } } diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java new file mode 100644 index 00000000000..3a2a3655dc0 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.jetty10; + +import static datadog.trace.api.gateway.Events.EVENTS; + +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.advice.ActiveRequestContext; +import datadog.trace.advice.RequiresRequestContext; +import datadog.trace.api.gateway.CallbackProvider; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; +import net.bytebuddy.asm.Advice; + +/** + * Because we are processing the initial request before the requestedSessionId is set, we must + * update it when it is actually set. + */ +@RequiresRequestContext(RequestContextSlot.APPSEC) +public class SetRequestedSessionIdAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void setRequestedSessionId( + @ActiveRequestContext RequestContext reqCtx, + @Advice.Argument(0) final String requestedSessionId) { + if (requestedSessionId != null && reqCtx != null) { + final CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC); + if (cbp == null) { + return; + } + final BiFunction> addrCallback = + cbp.getCallback(EVENTS.requestSession()); + if (addrCallback == null) { + return; + } + final Flow flow = addrCallback.apply(reqCtx, requestedSessionId); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + throw new BlockingException("Blocked request (for sessionId)"); + } + } + } +} diff --git a/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy index 240bc5333cb..c556f23f912 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy +++ b/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy @@ -5,12 +5,15 @@ import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.AbstractHandler +import org.eclipse.jetty.server.session.SessionHandler abstract class Jetty9Test extends HttpServerTest { @Override HttpServer server() { - new JettyServer(handler()) + final sessionHandler = new SessionHandler() + sessionHandler.handler = handler() + new JettyServer(sessionHandler) } AbstractHandler handler() { @@ -77,6 +80,11 @@ abstract class Jetty9Test extends HttpServerTest { boolean testBodyMultipart() { true } + + @Override + boolean testSessionId() { + true + } } class Jetty9V0ForkedTest extends Jetty9Test implements TestingGenericHttpNamingConventions.ServerV0 { diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy b/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy index 90c679b705a..06674df52fd 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy +++ b/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy @@ -58,9 +58,9 @@ class TestServlet2 { case EXCEPTION: throw new Exception(endpoint.body) case SESSION_ID: - def session = req.getSession(true) + req.getSession(true) resp.status = endpoint.status - resp.writer.print(session.id) + resp.writer.print(req.requestedSessionId) break } } diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy index 785ff98cad1..8900bf4df89 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy +++ b/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy @@ -119,9 +119,9 @@ class TestServlet3 { case CUSTOM_EXCEPTION: throw new InputMismatchException(endpoint.body) case SESSION_ID: - def session = req.getSession(true) + req.getSession(true) resp.status = endpoint.status - resp.writer.print(session.id) + resp.writer.print(req.requestedSessionId) break } } @@ -204,9 +204,9 @@ class TestServlet3 { context.complete() break case SESSION_ID: - def session = req.getSession(true) + req.getSession(true) resp.status = endpoint.status - resp.writer.print(session.id) + resp.writer.print(req.requestedSessionId) context.complete() break } @@ -263,9 +263,9 @@ class TestServlet3 { resp.writer.print('should not be reached') break case SESSION_ID: - def session = req.getSession(true) + req.getSession(true) resp.status = endpoint.status - resp.writer.print(session.id) + resp.writer.print(req.requestedSessionId) break } } diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy index ea002d4aaab..51e7c974f6d 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy +++ b/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy @@ -98,9 +98,9 @@ class TestServlet5 extends HttpServlet { case CUSTOM_EXCEPTION: throw new InputMismatchException(endpoint.body) case SESSION_ID: - def session = req.getSession(true) + req.getSession(true) resp.status = endpoint.status - resp.writer.print(session.id) + resp.writer.print(req.requestedSessionId) break default: resp.status = NOT_FOUND.status From ea008a2aad0ffe1471af35c6755bc518e4861ce7 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 14 Nov 2024 15:25:04 +0100 Subject: [PATCH 014/106] Avoid DATADOG_API_KEY in test visibility upload (#7952) Co-authored-by: Bruce Bujon --- .circleci/upload_ciapp.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/upload_ciapp.sh b/.circleci/upload_ciapp.sh index 04a809dc80f..8f4bf0027a4 100755 --- a/.circleci/upload_ciapp.sh +++ b/.circleci/upload_ciapp.sh @@ -33,6 +33,9 @@ junit_upload() { ./results } +# Make sure we do not use DATADOG_API_KEY from the environment +unset DATADOG_API_KEY + # Upload test results to production environment like all other CI jobs junit_upload "$DATADOG_API_KEY_PROD" # And also upload to staging environment to benefit from the new features not yet released From 105c9dc224a4e4cebe112d9b383746e3f4446161 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 14 Nov 2024 17:31:01 +0100 Subject: [PATCH 015/106] Parallelize system-tests (#7954) --- .circleci/config.continue.yml.j2 | 39 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index e9c85dcafc7..d7e0c58a512 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -816,6 +816,7 @@ jobs: parameters: weblog-variant: type: string + parallelism: 3 steps: - setup_system_tests @@ -833,32 +834,38 @@ jobs: - run: name: Run - command: | - cd system-tests - DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh - - - run: - name: Run APM E2E default tests # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added. no_output_timeout: 5m command: | cd system-tests - DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh APM_TRACING_E2E + echo " + DEFAULT + APM_TRACING_E2E + APM_TRACING_E2E_SINGLE_SPAN + " | circleci tests split > scenarios.list + for scenario in $(>_dev.tar.gz -C system-tests logs logs_apm_tracing_e2e logs_apm_tracing_e2e_single_span + for log_dir in logs*; do + tar -cvzf ../artifacts/${log_dir}_<< parameters.weblog-variant >>.tar.gz $log_dir + done - store_artifacts: - path: logs_java_<< parameters.weblog-variant >>_dev.tar.gz + path: artifacts integrations-system-tests: machine: From f19e110341ac6c056bfdb82315c5ef915708a0ac Mon Sep 17 00:00:00 2001 From: Piotr WOLSKI Date: Thu, 14 Nov 2024 10:48:52 -0700 Subject: [PATCH 016/106] Fix Kafka lag instrumentation for version 2.7 of Kafka (#7941) Fix Kafka lag instrumentation for version 2.7 of Kafka --- .../kafka-clients-0.11/build.gradle | 3 - .../kafka-clients-0.11/gradle.lockfile | 9 +- .../groovy/KafkaClientTest.groovy | 1102 ----------------- .../groovy/KafkaClientTestBase.groovy | 446 +++++++ .../groovy/KafkaReactorForkedTest.groovy | 230 ---- .../groovy/TextMapExtractAdapterTest.groovy | 35 - .../KafkaConsumerInfoInstrumentation.java | 57 +- 7 files changed, 504 insertions(+), 1378 deletions(-) delete mode 100644 dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTest.groovy create mode 100644 dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy delete mode 100644 dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaReactorForkedTest.groovy delete mode 100644 dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/TextMapExtractAdapterTest.groovy diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle index 5560d1f6c4f..b549c29a734 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle @@ -38,11 +38,8 @@ dependencies { testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10') // Include latest version of kafka itself along with latest version of client libs. - // This seems to help with jar compatibility hell. - latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+' latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+' // latest depending to kafka client 2.x -> to be fixed when this instrumentation will test 3.x as well - latestDepTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.3.21' latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.+' latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.+' latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+' diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile index d857b1a16e8..7b3278902d1 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile @@ -80,10 +80,8 @@ io.netty:netty-resolver:4.1.63.Final=latestDepTestCompileClasspath,latestDepTest io.netty:netty-transport-native-epoll:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.kafka:reactor-kafka:1.3.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.4.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:11.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -203,8 +201,7 @@ org.ow2.asm:asm-util:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClas org.ow2.asm:asm-util:9.4=spotbugs org.ow2.asm:asm:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.4=spotbugs -org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.rocksdb:rocksdbjni:6.29.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.scala-lang.modules:scala-collection-compat_2.13:2.6.0=latestDepTestRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTest.groovy deleted file mode 100644 index 455c1f5bf4d..00000000000 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTest.groovy +++ /dev/null @@ -1,1102 +0,0 @@ -import datadog.trace.agent.test.AgentTestRunner -import datadog.trace.api.DDTags -import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.core.datastreams.StatsGroup -import datadog.trace.test.util.Flaky -import org.apache.kafka.clients.consumer.ConsumerConfig -import org.apache.kafka.clients.consumer.ConsumerRecord -import org.apache.kafka.clients.consumer.KafkaConsumer -import org.apache.kafka.clients.producer.KafkaProducer -import org.apache.kafka.clients.producer.Producer -import org.apache.kafka.clients.producer.ProducerConfig -import org.apache.kafka.clients.producer.ProducerRecord -import org.apache.kafka.common.TopicPartition -import org.apache.kafka.common.serialization.StringSerializer -import org.junit.Rule -import org.springframework.kafka.core.DefaultKafkaConsumerFactory -import org.springframework.kafka.core.DefaultKafkaProducerFactory -import org.springframework.kafka.core.KafkaTemplate -import org.springframework.kafka.listener.BatchMessageListener -import org.springframework.kafka.listener.KafkaMessageListenerContainer -import org.springframework.kafka.listener.MessageListener -import org.springframework.kafka.test.EmbeddedKafkaBroker -import org.springframework.kafka.test.rule.EmbeddedKafkaRule -import org.springframework.kafka.test.utils.ContainerTestUtils -import org.springframework.kafka.test.utils.KafkaTestUtils -import spock.util.concurrent.PollingConditions - -import java.util.concurrent.LinkedBlockingQueue -import java.util.concurrent.TimeUnit - -import static datadog.trace.agent.test.utils.TraceUtils.basicSpan -import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope - -@Flaky("https://github.com/DataDog/dd-trace-java/issues/3864") -class KafkaClientTest extends AgentTestRunner { - static final SHARED_TOPIC = "shared.topic" - - @Override - protected boolean isDataStreamsEnabled() { - return true - } - - @Override - boolean useStrictTraceWrites() { - // TODO fix this by making sure that spans get closed properly - return false - } - - @Rule - EmbeddedKafkaRule kafkaRule = new EmbeddedKafkaRule(1, true, SHARED_TOPIC) - EmbeddedKafkaBroker embeddedKafka = kafkaRule.embeddedKafka - - @Override - void configurePreAgent() { - super.configurePreAgent() - - injectSysConfig("dd.kafka.e2e.duration.enabled", "true") - } - - def "test kafka produce and consume"() { - setup: - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - Producer producer = new KafkaProducer<>(producerProps, new StringSerializer(), new StringSerializer()) - - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - - // create a Kafka consumer factory - def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) - - // set the topic that needs to be consumed - def containerProperties = containerProperties() - - // create a Kafka MessageListenerContainer - def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) - - // create a thread safe queue to store the received message - def records = new LinkedBlockingQueue>() - - // setup a Kafka message listener - container.setupMessageListener(new MessageListener() { - @Override - void onMessage(ConsumerRecord record) { - TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces - records.add(record) - } - }) - - // start the container and underlying message listener - container.start() - - // wait until the container has the required number of assigned partitions - ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) - - when: - String greeting = "Hello Spring Kafka Sender!" - runUnderTrace("parent") { - producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex -> - assert activeScope().isAsyncPropagating() - if (ex == null) { - runUnderTrace("producer callback") {} - } else { - runUnderTrace("producer exception: " + ex) {} - } - } - blockUntilChildSpansFinished(2) - } - TEST_DATA_STREAMS_WRITER.waitForGroups(2) - - then: - // check that the message was received - def received = records.poll(5, TimeUnit.SECONDS) - received.value() == greeting - received.key() == null - - assertTraces(2) { - trace(3) { - basicSpan(it, "parent") - basicSpan(it, "producer callback", span(0)) - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf span(0) - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - } - trace(1) { - // CONSUMER span 0 - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[2] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - // TODO - test with and without feature enabled once Config is easier to control - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled() }) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - def headers = received.headers() - headers.iterator().hasNext() - new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${TEST_WRITER[0][2].traceId}" - new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${TEST_WRITER[0][2].spanId}" - - String expectedKafkaClusterId = producer.metadata.fetch().clusterResource().clusterId() - - StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } - verifyAll(first) { - edgeTags == [ - "direction:out", - "kafka_cluster_id:" + expectedKafkaClusterId, - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 4 - payloadSize.minValue > 0.0 - } - - StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } - verifyAll(second) { - edgeTags == [ - "direction:in", - "group:sender", - "kafka_cluster_id:" + expectedKafkaClusterId, - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 5 - payloadSize.minValue > 0.0 - } - - cleanup: - producer.close() - container?.stop() - } - - def "test spring kafka template produce and consume"() { - setup: - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - producerProps.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, 1000) - def producerFactory = new DefaultKafkaProducerFactory(producerProps) - def kafkaTemplate = new KafkaTemplate(producerFactory) - String clusterId = waitForKafkaMetadataUpdate(kafkaTemplate) - - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - - // create a Kafka consumer factory - def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) - - // set the topic that needs to be consumed - def containerProperties = containerProperties() - - // create a Kafka MessageListenerContainer - def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) - - // create a thread safe queue to store the received message - def records = new LinkedBlockingQueue>() - - // setup a Kafka message listener - container.setupMessageListener(new MessageListener() { - @Override - void onMessage(ConsumerRecord record) { - TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces - records.add(record) - } - }) - - // start the container and underlying message listener - container.start() - - // wait until the container has the required number of assigned partitions - ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) - - when: - String greeting = "Hello Spring Kafka Sender!" - runUnderTrace("parent") { - kafkaTemplate.send(SHARED_TOPIC, greeting).addCallback({ - runUnderTrace("producer callback") {} - }, { ex -> - runUnderTrace("producer exception: " + ex) {} - }) - blockUntilChildSpansFinished(2) - } - TEST_DATA_STREAMS_WRITER.waitForGroups(2) - - then: - // check that the message was received - def received = records.poll(5, TimeUnit.SECONDS) - received.value() == greeting - received.key() == null - - assertTraces(2) { - trace(3) { - basicSpan(it, "parent") - basicSpan(it, "producer callback", span(0)) - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf span(0) - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - } - trace(1) { - // CONSUMER span 0 - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[2] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - // TODO - test with and without feature enabled once Config is easier to control - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - def headers = received.headers() - headers.iterator().hasNext() - new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${TEST_WRITER[0][2].traceId}" - new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${TEST_WRITER[0][2].spanId}" - - StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } - verifyAll(first) { - edgeTags == [ - "direction:out", - "kafka_cluster_id:$clusterId", - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 4 - payloadSize.minValue > 0.0 - } - - StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } - verifyAll(second) { - edgeTags == [ - "direction:in", - "group:sender", - "kafka_cluster_id:$clusterId", - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 5 - payloadSize.minValue > 0.0 - } - - cleanup: - producerFactory.destroy() - container?.stop() - } - - def "test pass through tombstone"() { - setup: - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - def producerFactory = new DefaultKafkaProducerFactory(producerProps) - def kafkaTemplate = new KafkaTemplate(producerFactory) - - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - - // create a Kafka consumer factory - def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) - - // set the topic that needs to be consumed - def containerProperties = containerProperties() - - // create a Kafka MessageListenerContainer - def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) - - // create a thread safe queue to store the received message - def records = new LinkedBlockingQueue>() - - // setup a Kafka message listener - container.setupMessageListener(new MessageListener() { - @Override - void onMessage(ConsumerRecord record) { - TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces - records.add(record) - } - }) - - // start the container and underlying message listener - container.start() - - // wait until the container has the required number of assigned partitions - ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) - - when: - kafkaTemplate.send(SHARED_TOPIC, null) - - - then: - // check that the message was received - def received = records.poll(5, TimeUnit.SECONDS) - received.value() == null - received.key() == null - - assertTraces(2) { - trace(1) { - // PRODUCER span 0 - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - parent() - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.TOMBSTONE" true - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - } - trace(1) { - // CONSUMER span 0 - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.TOMBSTONE" true - // TODO - test with and without feature enabled once Config is easier to control - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - cleanup: - producerFactory.destroy() - container?.stop() - } - - def "test records(TopicPartition) kafka consume"() { - setup: - - // set up the Kafka consumer properties - def kafkaPartition = 0 - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest") - def consumer = new KafkaConsumer(consumerProperties) - - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - def producer = new KafkaProducer(producerProps) - - consumer.assign(Arrays.asList(new TopicPartition(SHARED_TOPIC, kafkaPartition))) - - when: - def greeting = "Hello from MockConsumer!" - producer.send(new ProducerRecord(SHARED_TOPIC, kafkaPartition, null, greeting)) - - then: - TEST_WRITER.waitForTraces(1) - def records = new LinkedBlockingQueue>() - def pollResult = KafkaTestUtils.getRecords(consumer) - - def recs = pollResult.records(new TopicPartition(SHARED_TOPIC, kafkaPartition)).iterator() - - def first = null - if (recs.hasNext()) { - first = recs.next() - } - - then: - recs.hasNext() == false - first.value() == greeting - first.key() == null - - assertTraces(2) { - trace(1) { - // PRODUCER span 0 - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - parent() - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.PARTITION" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags(true) - } - } - } - trace(1) { - // CONSUMER span 0 - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - // TODO - test with and without feature enabled once Config is easier to control - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - cleanup: - consumer.close() - producer.close() - - } - - def "test iteration backwards over ConsumerRecords"() { - setup: - def kafkaPartition = 0 - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest") - def consumer = new KafkaConsumer(consumerProperties) - - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - def producer = new KafkaProducer(producerProps) - - consumer.assign(Arrays.asList(new TopicPartition(SHARED_TOPIC, kafkaPartition))) - - when: - def greetings = ["msg 1", "msg 2", "msg 3"] - greetings.each { - producer.send(new ProducerRecord(SHARED_TOPIC, kafkaPartition, null, it)) - } - - then: - TEST_WRITER.waitForTraces(3) - def pollRecords = KafkaTestUtils.getRecords(consumer) - - def listIter = - pollRecords.records(new TopicPartition(SHARED_TOPIC, kafkaPartition)).listIterator() - - then: - def receivedSet = greetings.toSet() - while (listIter.hasNext()) { - listIter.next() - } - while (listIter.hasPrevious()) { - def record = listIter.previous() - receivedSet.remove(record.value()) - assert record.key() == null - } - receivedSet.isEmpty() - - assertTraces(9) { - // producing traces - trace(1) { - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - parent() - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.PARTITION" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - parent() - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.PARTITION" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - parent() - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.PARTITION" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags(true) - } - } - } - - // iterating to the end of ListIterator: - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(1)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 1 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(2)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 2 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - - // backwards iteration over ListIterator to the beginning - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(2)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 2 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(1)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 1 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf trace(0)[0] - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - cleanup: - consumer.close() - producer.close() - - } - - def "test spring kafka template produce and batch consume"() { - setup: - def conditions = new PollingConditions(timeout: 10) - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - producerProps.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, 1000) - def producerFactory = new DefaultKafkaProducerFactory(producerProps) - def kafkaTemplate = new KafkaTemplate(producerFactory) - String clusterId = waitForKafkaMetadataUpdate(kafkaTemplate) - - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) - def containerProperties = containerProperties() - - - def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) - def records = new LinkedBlockingQueue>() - container.setupMessageListener(new BatchMessageListener() { - @Override - void onMessage(List> consumerRecords) { - TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces - consumerRecords.each { - records.add(it) - } - } - }) - container.start() - ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) - - when: - List greetings = ["msg 1", "msg 2", "msg 3"] - runUnderTrace("parent") { - for (g in greetings) { - kafkaTemplate.send(SHARED_TOPIC, g).addCallback({ - runUnderTrace("producer callback") {} - }, { ex -> - runUnderTrace("producer exception: " + ex) {} - }) - } - blockUntilChildSpansFinished(2 * greetings.size()) - } - TEST_DATA_STREAMS_WRITER.waitForGroups(2) - - then: - conditions.eventually { - assert !records.isEmpty() - } - def receivedSet = greetings.toSet() - greetings.eachWithIndex { g, i -> - def received = records.poll(5, TimeUnit.SECONDS) - receivedSet.remove(received.value()) //maybe received out of order in case several partitions - assert received.key() == null - - def headers = received.headers() - assert headers.iterator().hasNext() - - } - assert receivedSet.isEmpty() - - assertTraces(4) { - trace(7) { - basicSpan(it, "parent") - basicSpan(it, "producer callback", span(0)) - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf span(0) - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - basicSpan(it, "producer callback", span(0)) - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf span(0) - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - basicSpan(it, "producer callback", span(0)) - span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $SHARED_TOPIC" - spanType "queue" - errored false - childOf span(0) - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" producerProps.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" 0 - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" { it >= 0 && it < 2 } - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - trace(1) { - span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $SHARED_TOPIC" - spanType "queue" - errored false - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" { it >= 0 && it < 2 } - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" consumerProperties.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } - if ({ isDataStreamsEnabled()}) { - "$DDTags.PATHWAY_HASH" { String } - } - defaultTags(true) - } - } - } - } - - StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } - verifyAll(first) { - edgeTags == [ - "direction:out", - "kafka_cluster_id:$clusterId", - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 4 - payloadSize.minValue > 0.0 - } - - StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } - verifyAll(second) { - edgeTags == [ - "direction:in", - "group:sender", - "kafka_cluster_id:$clusterId", - "topic:$SHARED_TOPIC".toString(), - "type:kafka" - ] - edgeTags.size() == 5 - payloadSize.minValue > 0.0 - } - - cleanup: - producerFactory.destroy() - container?.stop() - } - - def "test kafka client header propagation manual config"() { - setup: - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - def producerFactory = new DefaultKafkaProducerFactory(producerProps) - def kafkaTemplate = new KafkaTemplate(producerFactory) - - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - - // create a Kafka consumer factory - def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) - - // set the topic that needs to be consumed - def containerProperties = containerProperties() - - // create a Kafka MessageListenerContainer - def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) - - // create a thread safe queue to store the received message - def records = new LinkedBlockingQueue>() - - // setup a Kafka message listener - container.setupMessageListener(new MessageListener() { - @Override - void onMessage(ConsumerRecord record) { - TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces - records.add(record) - } - }) - - // start the container and underlying message listener - container.start() - - // wait until the container has the required number of assigned partitions - ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) - - when: - String message = "Testing without headers" - injectSysConfig("kafka.client.propagation.enabled", value) - kafkaTemplate.send(SHARED_TOPIC, message) - - then: - // check that the message was received - def received = records.poll(5, TimeUnit.SECONDS) - - received.headers().iterator().hasNext() == expected - - cleanup: - producerFactory.destroy() - container?.stop() - - where: - value | expected - "false" | false - "true" | true - } - - - def containerProperties() { - try { - // Different class names for test and latestDepTest. - return Class.forName("org.springframework.kafka.listener.config.ContainerProperties").newInstance(SHARED_TOPIC) - } catch (ClassNotFoundException | NoClassDefFoundError e) { - return Class.forName("org.springframework.kafka.listener.ContainerProperties").newInstance(SHARED_TOPIC) - } - } - - - def waitForKafkaMetadataUpdate(KafkaTemplate kafkaTemplate) { - kafkaTemplate.flush() - Producer wrappedProducer = kafkaTemplate.getTheProducer() - assert(wrappedProducer instanceof DefaultKafkaProducerFactory.CloseSafeProducer) - Producer producer = wrappedProducer.delegate - assert(producer instanceof KafkaProducer) - String clusterId = producer.metadata.fetch().clusterResource().clusterId() - while (clusterId == null || clusterId.isEmpty()) { - Thread.sleep(1500) - clusterId = producer.metadata.fetch().clusterResource().clusterId() - } - return clusterId - } -} diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy new file mode 100644 index 00000000000..eb04ce38bc4 --- /dev/null +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy @@ -0,0 +1,446 @@ +import static datadog.trace.agent.test.utils.TraceUtils.basicSpan +import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope + +import datadog.trace.agent.test.asserts.TraceAssert +import datadog.trace.agent.test.naming.VersionedNamingTestBase +import datadog.trace.api.Config +import datadog.trace.api.DDTags +import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags +import datadog.trace.bootstrap.instrumentation.api.Tags +import datadog.trace.common.writer.ListWriter +import datadog.trace.core.DDSpan +import datadog.trace.core.datastreams.StatsGroup +import org.apache.kafka.clients.consumer.ConsumerConfig +import org.apache.kafka.clients.consumer.ConsumerRecord +import org.apache.kafka.clients.producer.KafkaProducer +import org.apache.kafka.clients.producer.ProducerConfig +import org.apache.kafka.clients.producer.ProducerRecord +import org.apache.kafka.common.serialization.StringSerializer +import org.junit.Rule +import org.springframework.kafka.core.DefaultKafkaConsumerFactory +import org.springframework.kafka.listener.KafkaMessageListenerContainer +import org.springframework.kafka.listener.MessageListener +import org.springframework.kafka.test.utils.ContainerTestUtils +import org.springframework.kafka.test.utils.KafkaTestUtils +import org.springframework.kafka.test.rule.EmbeddedKafkaRule +import org.springframework.kafka.test.EmbeddedKafkaBroker +import spock.lang.Shared + +import java.util.concurrent.LinkedBlockingQueue +import java.util.concurrent.TimeUnit + +abstract class KafkaClientTestBase extends VersionedNamingTestBase { + static final SHARED_TOPIC = "shared.topic" + + @Rule + EmbeddedKafkaRule kafkaRule = new EmbeddedKafkaRule(1, true, SHARED_TOPIC) + EmbeddedKafkaBroker embeddedKafka = kafkaRule.embeddedKafka + + @Override + void configurePreAgent() { + super.configurePreAgent() + + injectSysConfig("dd.kafka.e2e.duration.enabled", "true") + } + + public static final LinkedHashMap PRODUCER_PATHWAY_EDGE_TAGS + + // filter out Kafka poll, since the function is called in a loop, giving inconsistent results + @Shared + static final ListWriter.Filter DROP_KAFKA_POLL = new ListWriter.Filter() { + @Override + boolean accept(List trace) { + return !(trace.size() == 1 && + trace.get(0).getResourceName().toString().equals("kafka.poll")) + } + } + + final ListWriter.Filter dropEmptyKafkaPoll = new ListWriter.Filter() { + @Override + boolean accept(List trace) { + return !(trace.size() == 1 && + trace.get(0).getResourceName().toString().equals("kafka.poll") && + trace.get(0).getTag(InstrumentationTags.KAFKA_RECORDS_COUNT).equals(0)) + } + } + + // TraceID, start times & names changed based on the configuration, so overriding the sort to give consistent test results + private static class SortKafkaTraces implements Comparator> { + @Override + int compare(List o1, List o2) { + return rootSpanTrace(o1) - rootSpanTrace(o2) + } + + int rootSpanTrace(List trace) { + assert !trace.isEmpty() + def rootSpan = trace.get(0).localRootSpan + switch (rootSpan.operationName.toString()) { + case "parent": + return 3 + case "kafka.poll": + return 2 + default: + return 1 + } + } + } + + + static { + PRODUCER_PATHWAY_EDGE_TAGS = new LinkedHashMap<>(3) + PRODUCER_PATHWAY_EDGE_TAGS.put("direction", "out") + PRODUCER_PATHWAY_EDGE_TAGS.put("topic", SHARED_TOPIC) + PRODUCER_PATHWAY_EDGE_TAGS.put("type", "kafka") + } + + def setup() { + TEST_WRITER.setFilter(DROP_KAFKA_POLL) + } + + @Override + int version() { + 0 + } + + @Override + String operation() { + return null + } + + String operationForProducer() { + "kafka.produce" + } + + String operationForConsumer() { + "kafka.consume" + } + + String serviceForTimeInQueue() { + "kafka" + } + + abstract boolean hasQueueSpan() + + abstract boolean splitByDestination() + + @Override + protected boolean isDataStreamsEnabled() { + return true + } + + def "test kafka produce and consume"() { + setup: + def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) + if (isDataStreamsEnabled()) { + producerProps.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, 1000) + } + TEST_WRITER.setFilter(dropEmptyKafkaPoll) + KafkaProducer producer = new KafkaProducer<>(producerProps, new StringSerializer(), new StringSerializer()) + String clusterId = null + while (clusterId == null || clusterId.isEmpty()) { + Thread.sleep(1500) + clusterId = producer.metadata.fetch().clusterResource().clusterId() + } + + // set up the Kafka consumer properties + def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) + + // create a Kafka consumer factory + def consumerFactory = new DefaultKafkaConsumerFactory(consumerProperties) + + // set the topic that needs to be consumed + def containerProperties = containerProperties() + + // create a Kafka MessageListenerContainer + def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties) + + // create a thread safe queue to store the received message + def records = new LinkedBlockingQueue>() + + // setup a Kafka message listener + container.setupMessageListener(new MessageListener() { + @Override + void onMessage(ConsumerRecord record) { + TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces + records.add(record) + } + }) + + // start the container and underlying message listener + container.start() + + // wait until the container has the required number of assigned partitions + ContainerTestUtils.waitForAssignment(container, embeddedKafka.getPartitionsPerTopic()) + + when: + String greeting = "Hello Spring Kafka Sender!" + runUnderTrace("parent") { + producer.send(new ProducerRecord(SHARED_TOPIC, greeting)) { meta, ex -> + assert activeScope().isAsyncPropagating() + if (ex == null) { + runUnderTrace("producer callback") {} + } else { + runUnderTrace("producer exception: " + ex) {} + } + } + blockUntilChildSpansFinished(2) + } + if (isDataStreamsEnabled()) { + TEST_DATA_STREAMS_WRITER.waitForGroups(2) + // wait for produce offset 0, and commit offset 1 on 1 partition (Commit offset of 0 is not reported on partition 0 & 1) + TEST_DATA_STREAMS_WRITER.waitForBacklogs(2) + } + + then: + // check that the message was received + def received = records.poll(5, TimeUnit.SECONDS) + received.value() == greeting + received.key() == null + + int nTraces = isDataStreamsEnabled() ? 3 : 2 + int produceTraceIdx = nTraces - 1 + TEST_WRITER.waitForTraces(nTraces) + def traces = (Arrays.asList(TEST_WRITER.toArray()) as List>) + Collections.sort(traces, new SortKafkaTraces()) + assertTraces(nTraces, new SortKafkaTraces()) { + if (hasQueueSpan()) { + trace(2) { + consumerSpan(it, consumerProperties, span(1)) + queueSpan(it, trace(produceTraceIdx)[2]) + } + } else { + trace(1) { + consumerSpan(it, consumerProperties, trace(produceTraceIdx)[2]) + } + } + if (isDataStreamsEnabled()) { + trace(1, { + pollSpan(it) + }) + } + trace(3) { + basicSpan(it, "parent") + basicSpan(it, "producer callback", span(0)) + producerSpan(it, producerProps, span(0), false) + } + } + def headers = received.headers() + headers.iterator().hasNext() + new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${traces[produceTraceIdx][2].traceId}" + new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${traces[produceTraceIdx][2].spanId}" + + if (isDataStreamsEnabled()) { + StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } + verifyAll(first) { + edgeTags == ["direction:out", "kafka_cluster_id:$clusterId", "topic:$SHARED_TOPIC".toString(), "type:kafka"] + edgeTags.size() == 4 + } + + StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } + verifyAll(second) { + edgeTags == [ + "direction:in", + "group:sender", + "kafka_cluster_id:$clusterId", + "topic:$SHARED_TOPIC".toString(), + "type:kafka" + ] + edgeTags.size() == 5 + } + List produce = [ + "kafka_cluster_id:$clusterId", + "partition:" + received.partition(), + "topic:" + SHARED_TOPIC, + "type:kafka_produce" + ] + List commit = [ + "consumer_group:sender", + "kafka_cluster_id:$clusterId", + "partition:" + received.partition(), + "topic:" + SHARED_TOPIC, + "type:kafka_commit" + ] + verifyAll(TEST_DATA_STREAMS_WRITER.backlogs) { + contains(new AbstractMap.SimpleEntry, Long>(commit, 1).toString()) + contains(new AbstractMap.SimpleEntry, Long>(produce, 0).toString()) + } + } + + cleanup: + producer.close() + container?.stop() + } + + def containerProperties() { + try { + // Different class names for test and latestDepTest. + return Class.forName("org.springframework.kafka.listener.config.ContainerProperties").newInstance(SHARED_TOPIC) + } catch (ClassNotFoundException | NoClassDefFoundError e) { + return Class.forName("org.springframework.kafka.listener.ContainerProperties").newInstance(SHARED_TOPIC) + } + } + + def producerSpan( + TraceAssert trace, + Map config, + DDSpan parentSpan = null, + boolean partitioned = true, + boolean tombstone = false, + String schema = null + ) { + trace.span { + serviceName service() + operationName operationForProducer() + resourceName "Produce Topic $SHARED_TOPIC" + spanType "queue" + errored false + measured true + if (parentSpan) { + childOf parentSpan + } else { + parent() + } + tags { + "$Tags.COMPONENT" "java-kafka" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER + "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" config.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) + if (partitioned) { + "$InstrumentationTags.PARTITION" { it >= 0 } + } + if (tombstone) { + "$InstrumentationTags.TOMBSTONE" true + } + if ({ isDataStreamsEnabled() }) { + "$DDTags.PATHWAY_HASH" { String } + if (schema != null) { + "$DDTags.SCHEMA_DEFINITION" schema + "$DDTags.SCHEMA_WEIGHT" 1 + "$DDTags.SCHEMA_TYPE" "avro" + "$DDTags.SCHEMA_OPERATION" "serialization" + "$DDTags.SCHEMA_ID" "10810872322569724838" + } + } + peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) + defaultTags() + } + } + } + + def queueSpan( + TraceAssert trace, + DDSpan parentSpan = null + ) { + trace.span { + serviceName splitByDestination() ? "$SHARED_TOPIC" : serviceForTimeInQueue() + operationName "kafka.deliver" + resourceName "$SHARED_TOPIC" + spanType "queue" + errored false + measured true + if (parentSpan) { + childOf parentSpan + } else { + parent() + } + tags { + "$Tags.COMPONENT" "java-kafka" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_BROKER + defaultTags(true) + } + } + } + + def consumerSpan( + TraceAssert trace, + Map config, + DDSpan parentSpan = null, + Range offset = 0..0, + boolean tombstone = false, + boolean distributedRootSpan = !hasQueueSpan() + ) { + trace.span { + serviceName service() + operationName operationForConsumer() + resourceName "Consume Topic $SHARED_TOPIC" + spanType "queue" + errored false + measured true + if (parentSpan) { + childOf parentSpan + } else { + parent() + } + tags { + "$Tags.COMPONENT" "java-kafka" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER + "$InstrumentationTags.PARTITION" { it >= 0 } + "$InstrumentationTags.OFFSET" { offset.containsWithinBounds(it as int) } + "$InstrumentationTags.CONSUMER_GROUP" "sender" + "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" config.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) + "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } + "$InstrumentationTags.RECORD_END_TO_END_DURATION_MS" { it >= 0 } + if (tombstone) { + "$InstrumentationTags.TOMBSTONE" true + } + if ({ isDataStreamsEnabled() }) { + "$DDTags.PATHWAY_HASH" { String } + } + defaultTags(distributedRootSpan) + } + } + } + + def pollSpan( + TraceAssert trace, + int recordCount = 1, + DDSpan parentSpan = null, + Range offset = 0..0, + boolean tombstone = false, + boolean distributedRootSpan = !hasQueueSpan() + ) { + trace.span { + serviceName Config.get().getServiceName() + operationName "kafka.poll" + resourceName "kafka.poll" + errored false + measured false + tags { + "$InstrumentationTags.KAFKA_RECORDS_COUNT" recordCount + defaultTags(true) + } + } + } +} + +class KafkaClientLatestTest extends KafkaClientTestBase { + @Override + int version() { + 1 + } + + @Override + String operationForProducer() { + "kafka.send" + } + + @Override + String operationForConsumer() { + return "kafka.process" + } + + @Override + boolean hasQueueSpan() { + return false + } + + @Override + boolean splitByDestination() { + return false + } + + @Override + String service() { + return Config.get().getServiceName() + } +} diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaReactorForkedTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaReactorForkedTest.groovy deleted file mode 100644 index 0930c836fe8..00000000000 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaReactorForkedTest.groovy +++ /dev/null @@ -1,230 +0,0 @@ -import static datadog.trace.agent.test.utils.TraceUtils.basicSpan -import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace - -import datadog.trace.agent.test.AgentTestRunner -import datadog.trace.agent.test.asserts.TraceAssert -import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags -import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.common.writer.ListWriter -import datadog.trace.core.DDSpan -import org.apache.kafka.clients.consumer.ConsumerConfig -import org.apache.kafka.clients.consumer.ConsumerRecord -import org.apache.kafka.clients.producer.ProducerConfig -import org.apache.kafka.clients.producer.ProducerRecord -import org.junit.Rule -import org.springframework.kafka.test.EmbeddedKafkaBroker -import org.springframework.kafka.test.rule.EmbeddedKafkaRule -import org.springframework.kafka.test.utils.KafkaTestUtils -import reactor.core.publisher.Flux -import reactor.core.publisher.Mono -import reactor.core.scheduler.Schedulers -import reactor.kafka.receiver.KafkaReceiver -import reactor.kafka.receiver.ReceiverOptions -import reactor.kafka.sender.KafkaSender -import reactor.kafka.sender.SenderOptions -import reactor.kafka.sender.SenderRecord - -import java.util.concurrent.CountDownLatch -import java.util.concurrent.LinkedBlockingQueue -import java.util.concurrent.TimeUnit - -class KafkaReactorForkedTest extends AgentTestRunner { - @Rule - EmbeddedKafkaRule kafkaRule = new EmbeddedKafkaRule(1, true, 4, KafkaClientTest.SHARED_TOPIC) - EmbeddedKafkaBroker embeddedKafka = kafkaRule.embeddedKafka - - - @Override - boolean useStrictTraceWrites() { - false - } - - def setup() { - TEST_WRITER.setFilter(new ListWriter.Filter() { - @Override - boolean accept(List trace) { - return !(trace.size() == 1 && - trace.get(0).getResourceName().toString().equals("kafka.poll")) - } - }) - } - - def "test reactive produce and consume"() { - setup: - def senderProps = KafkaTestUtils.producerProps(embeddedKafka) - if (isDataStreamsEnabled()) { - senderProps.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, 1000) - } - - def kafkaSender = KafkaSender.create(SenderOptions.create(senderProps)) - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - def subscriptionReady = new CountDownLatch(embeddedKafka.getPartitionsPerTopic()) - - final KafkaReceiver kafkaReceiver = KafkaReceiver.create(ReceiverOptions. create(consumerProperties) - .subscription([KafkaClientTest.SHARED_TOPIC]) - .addAssignListener { - it.each { subscriptionReady.countDown() } - }) - - // create a thread safe queue to store the received message - def records = new LinkedBlockingQueue>() - kafkaReceiver.receive() - // publish on another thread to be sure we're propagating that receive span correctly - .publishOn(Schedulers.parallel()) - .flatMap { receiverRecord -> - { - records.add(receiverRecord) - receiverRecord.receiverOffset().commit() - } - }.subscribe() - - - // wait until the container has the required number of assigned partitions - subscriptionReady.await() - - when: - String greeting = "Hello Reactor Kafka Sender!" - runUnderTrace("parent") { - kafkaSender.send(Mono.just(SenderRecord.create(new ProducerRecord<>(KafkaClientTest.SHARED_TOPIC, greeting), null))) - .doOnError { ex -> runUnderTrace("producer exception: " + ex) {} } - .doOnNext { runUnderTrace("producer callback") {} } - .blockFirst() - blockUntilChildSpansFinished(2) - } - then: - // check that the message was received - def received = records.poll(5, TimeUnit.SECONDS) - received.value() == greeting - received.key() == null - - - assertTraces(2, SORT_TRACES_BY_START) { - trace(3) { - basicSpan(it, "parent") - basicSpan(it, "producer callback", span(0)) - producerSpan(it, senderProps, span(0)) - } - trace(1) { - consumerSpan(it, consumerProperties, trace(0)[2]) - } - } - } - - def "test reactive 100 msg produce and consume have only one parent"() { - setup: - def senderProps = KafkaTestUtils.producerProps(embeddedKafka) - if (isDataStreamsEnabled()) { - senderProps.put(ProducerConfig.METADATA_MAX_AGE_CONFIG, 1000) - } - - def kafkaSender = KafkaSender.create(SenderOptions.create(senderProps)) - // set up the Kafka consumer properties - def consumerProperties = KafkaTestUtils.consumerProps("sender", "false", embeddedKafka) - def subscriptionReady = new CountDownLatch(embeddedKafka.getPartitionsPerTopic()) - - final KafkaReceiver kafkaReceiver = KafkaReceiver.create(ReceiverOptions. create(consumerProperties) - .subscription([KafkaClientTest.SHARED_TOPIC]) - .addAssignListener { - it.each { subscriptionReady.countDown() } - }) - - // create a thread safe queue to store the received message - kafkaReceiver.receive() - // publish on another thread to be sure we're propagating that receive span correctly - .publishOn(Schedulers.parallel()) - .flatMap { receiverRecord -> - { - receiverRecord.receiverOffset().commit() - } - } - .subscribeOn(Schedulers.parallel()) - .subscribe() - - - // wait until the container has the required number of assigned partitions - subscriptionReady.await() - - when: - String greeting = "Hello Reactor Kafka Sender!" - Flux.range(0, 100) - .flatMap { kafkaSender.send(Mono.just(SenderRecord.create(new ProducerRecord<>(KafkaClientTest.SHARED_TOPIC, greeting), null))) } - .publishOn(Schedulers.parallel()) - .subscribe() - then: - // check that the all the consume (100) and the send (100) are reported - TEST_WRITER.waitForTraces(200) - Map> traces = TEST_WRITER.inject([:]) { map, entry -> - def key = entry.get(0).getTraceId().toString() - map[key] = (map[key] ?: []) + entry - return map - } - traces.values().each { - assert it.size() == 2 - int produceIndex = 0 - int consumeIndex = 1 - if ("kafka.produce".contentEquals(it.get(1).getOperationName().toString())) { - produceIndex = 1 - consumeIndex = 0 - } - //assert that the consumer has the producer as parent and that the producer is root - assert it.get(consumeIndex).getParentId() == it.get(produceIndex).getSpanId() - assert it.get(produceIndex).getParentId() == 0 - } - } - - def producerSpan( - TraceAssert trace, - Map config, - DDSpan parentSpan = null) { - trace.span { - serviceName "kafka" - operationName "kafka.produce" - resourceName "Produce Topic $KafkaClientTest.SHARED_TOPIC" - spanType "queue" - errored false - measured true - if (parentSpan) { - childOf parentSpan - } else { - parent() - } - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_PRODUCER - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" config.get(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG) - peerServiceFrom(InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS) - defaultTags() - } - } - } - - def consumerSpan( - TraceAssert trace, - Map config, - DDSpan parentSpan = null) { - trace.span { - serviceName "kafka" - operationName "kafka.consume" - resourceName "Consume Topic $KafkaClientTest.SHARED_TOPIC" - spanType "queue" - errored false - measured true - if (parentSpan) { - childOf parentSpan - } else { - parent() - } - tags { - "$Tags.COMPONENT" "java-kafka" - "$Tags.SPAN_KIND" Tags.SPAN_KIND_CONSUMER - "$InstrumentationTags.PARTITION" { it >= 0 } - "$InstrumentationTags.OFFSET" { Integer } - "$InstrumentationTags.CONSUMER_GROUP" "sender" - "$InstrumentationTags.KAFKA_BOOTSTRAP_SERVERS" config.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG) - "$InstrumentationTags.RECORD_QUEUE_TIME_MS" { it >= 0 } - defaultTags(true) - } - } - } -} diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/TextMapExtractAdapterTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/TextMapExtractAdapterTest.groovy deleted file mode 100644 index a6e227830c6..00000000000 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/TextMapExtractAdapterTest.groovy +++ /dev/null @@ -1,35 +0,0 @@ -import com.google.common.io.BaseEncoding -import datadog.trace.agent.test.AgentTestRunner -import datadog.trace.bootstrap.instrumentation.api.AgentPropagation -import datadog.trace.instrumentation.kafka_clients.TextMapExtractAdapter -import org.apache.kafka.common.header.Headers -import org.apache.kafka.common.header.internals.RecordHeader -import org.apache.kafka.common.header.internals.RecordHeaders - -import java.nio.charset.StandardCharsets - -class TextMapExtractAdapterTest extends AgentTestRunner { - - def "check can decode base64 mangled headers"() { - given: - def base64 = BaseEncoding.base64().encode("foo".getBytes(StandardCharsets.UTF_8)) - def expectedValue = base64Decode ? "foo" : base64 - Headers headers = new RecordHeaders(new RecordHeader("key", base64.getBytes(StandardCharsets.UTF_8))) - TextMapExtractAdapter adapter = new TextMapExtractAdapter(base64Decode) - when: - String extracted = null - adapter.forEachKey(headers, new AgentPropagation.KeyClassifier() { - @Override - boolean accept(String key, String value) { - extracted = value - return false - } - }) - - then: - extracted == expectedValue - - where: - base64Decode << [true, false] - } -} diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index 2ef11751691..2efda9bac08 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -76,7 +76,17 @@ public void methodAdvice(MethodTransformer transformer) { .and(takesArgument(0, named("org.apache.kafka.clients.consumer.ConsumerConfig"))) .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer"))) .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))), - KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdvice"); + KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdviceNot27"); + + // Note: On some Kafka versions, both constructors will be instrumented. This is OK as we will + // override the context, + // and the instrumentation will still work as expected. + transformer.applyAdvice( + isConstructor() + .and(takesArgument(0, Map.class)) + .and(takesArgument(1, named("org.apache.kafka.common.serialization.Deserializer"))) + .and(takesArgument(2, named("org.apache.kafka.common.serialization.Deserializer"))), + KafkaConsumerInfoInstrumentation.class.getName() + "$ConstructorAdvice27"); transformer.applyAdvice( isMethod() @@ -87,7 +97,7 @@ public void methodAdvice(MethodTransformer transformer) { KafkaConsumerInfoInstrumentation.class.getName() + "$RecordsAdvice"); } - public static class ConstructorAdvice { + public static class ConstructorAdviceNot27 { @Advice.OnMethodExit(suppress = Throwable.class) public static void captureGroup( @Advice.This KafkaConsumer consumer, @@ -131,6 +141,49 @@ public static void muzzleCheck(ConsumerRecord record) { } } + public static class ConstructorAdvice27 { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void captureGroup( + @Advice.This KafkaConsumer consumer, + @Advice.FieldValue("metadata") Metadata metadata, + @Advice.FieldValue("coordinator") ConsumerCoordinator coordinator, + @Advice.Argument(0) Map consumerConfig) { + Object groupID = consumerConfig.get(ConsumerConfig.GROUP_ID_CONFIG); + String consumerGroup = groupID instanceof String ? (String) groupID : null; + String normalizedConsumerGroup = + consumerGroup != null && !consumerGroup.isEmpty() ? consumerGroup : null; + + String bootstrapServers = null; + Object bootstrapServersObj = consumerConfig.get(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG); + if (bootstrapServersObj instanceof String) { + bootstrapServers = (String) bootstrapServersObj; + } + KafkaConsumerInfo kafkaConsumerInfo; + if (Config.get().isDataStreamsEnabled()) { + kafkaConsumerInfo = + new KafkaConsumerInfo(normalizedConsumerGroup, metadata, bootstrapServers); + } else { + kafkaConsumerInfo = new KafkaConsumerInfo(normalizedConsumerGroup, bootstrapServers); + } + + if (kafkaConsumerInfo.getConsumerGroup() != null + || kafkaConsumerInfo.getClientMetadata() != null) { + InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class) + .put(consumer, kafkaConsumerInfo); + if (coordinator != null) { + InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class) + .put(coordinator, kafkaConsumerInfo); + } + } + } + + public static void muzzleCheck(ConsumerRecord record) { + // KafkaConsumerInstrumentation only applies for kafka versions with headers + // Make an explicit call so KafkaConsumerGroupInstrumentation does the same + record.headers(); + } + } + /** * this method transfers the consumer group from the KafkaConsumer class key to the * ConsumerRecords key. This is necessary because in the poll method, we don't have access to the From 92eab56ab450f3b777004027e3b81a2685384010 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Fri, 15 Nov 2024 09:44:35 +0000 Subject: [PATCH 017/106] Remove internal `dd.trace.scope.inherit.async.propagation` feature flag (#7958) This flag was added in #1850 (v0.64.0) in case we needed to revert the fixed behaviour, but we have never needed to do that. --- .../src/test/groovy/TypeConverterTest.groovy | 2 +- .../src/test/groovy/TypeConverterTest.groovy | 2 +- .../src/test/groovy/TypeConverterTest.groovy | 2 +- .../trace/api/config/TracerConfig.java | 2 -- .../java/datadog/trace/core/CoreTracer.java | 1 - .../scopemanager/ContinuableScopeManager.java | 26 +++---------------- .../trace/core/PendingTraceBufferTest.groovy | 2 +- .../opentracing/TypeConverterTest.groovy | 2 +- .../main/java/datadog/trace/api/Config.java | 9 ------- 9 files changed, 9 insertions(+), 39 deletions(-) diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy index 35ff58ebe84..dbdb9476021 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy @@ -45,7 +45,7 @@ class TypeConverterTest extends AgentTestRunner { } def "should avoid extra allocation for a scope wrapper"() { - def scopeManager = new ContinuableScopeManager(0, false, true) + def scopeManager = new ContinuableScopeManager(0, false) def context = createTestSpanContext() def span1 = new DDSpan("test", 0, context, null) def span2 = new DDSpan("test", 0, context, null) diff --git a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy index 62be9f885a1..d819cc6c5cb 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy +++ b/dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy @@ -50,7 +50,7 @@ class TypeConverterTest extends AgentTestRunner { } def "should avoid extra allocation for a scope wrapper"() { - def scopeManager = new ContinuableScopeManager(0, false, true) + def scopeManager = new ContinuableScopeManager(0, false) def context = createTestSpanContext() def span1 = new DDSpan("test", 0, context, null) def span2 = new DDSpan("test", 0, context, null) diff --git a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy index 07f65561ff9..9497a78bc84 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy +++ b/dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy @@ -50,7 +50,7 @@ class TypeConverterTest extends AgentTestRunner { } def "should avoid extra allocation for a scope wrapper"() { - def scopeManager = new ContinuableScopeManager(0, false, true) + def scopeManager = new ContinuableScopeManager(0, false) def context = createTestSpanContext() def span1 = new DDSpan("test", 0, context, null) def span2 = new DDSpan("test", 0, context, null) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java index 9c0cdb07c81..cd48250cb27 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java @@ -76,8 +76,6 @@ public final class TracerConfig { public static final String SCOPE_DEPTH_LIMIT = "trace.scope.depth.limit"; public static final String SCOPE_STRICT_MODE = "trace.scope.strict.mode"; - public static final String SCOPE_INHERIT_ASYNC_PROPAGATION = - "trace.scope.inherit.async.propagation"; public static final String SCOPE_ITERATION_KEEP_ALIVE = "trace.scope.iteration.keep.alive"; public static final String PARTIAL_FLUSH_ENABLED = "trace.partial.flush.enabled"; public static final String PARTIAL_FLUSH_MIN_SPANS = "trace.partial.flush.min.spans"; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 9dd4d982a36..d4e01b3adfc 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -635,7 +635,6 @@ private CoreTracer( new ContinuableScopeManager( config.getScopeDepthLimit(), config.isScopeStrictMode(), - config.isScopeInheritAsyncPropagation(), profilingContextIntegration, healthMetrics); } else { diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index 8b589fbb702..be99fb21e54 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -48,7 +48,6 @@ public final class ContinuableScopeManager implements AgentScopeManager { final boolean strictMode; private final ScopeStackThreadLocal tlsScopeStack; private final int depthLimit; - private final boolean inheritAsyncPropagation; final HealthMetrics healthMetrics; private final ProfilingContextIntegration profilingContextIntegration; @@ -57,17 +56,9 @@ public final class ContinuableScopeManager implements AgentScopeManager { * * @param depthLimit The maximum scope depth limit, 0 for unlimited. * @param strictMode Whether check if the closed spans are the active ones or not. - * @param inheritAsyncPropagation Whether the next span should inherit the active span - * asyncPropagation flag. */ - public ContinuableScopeManager( - final int depthLimit, final boolean strictMode, final boolean inheritAsyncPropagation) { - this( - depthLimit, - strictMode, - inheritAsyncPropagation, - ProfilingContextIntegration.NoOp.INSTANCE, - HealthMetrics.NO_OP); + public ContinuableScopeManager(final int depthLimit, final boolean strictMode) { + this(depthLimit, strictMode, ProfilingContextIntegration.NoOp.INSTANCE, HealthMetrics.NO_OP); } /** @@ -75,18 +66,14 @@ public ContinuableScopeManager( * * @param depthLimit The maximum scope depth limit, 0 for unlimited. * @param strictMode Whether check if the closed spans are the active ones or not. - * @param inheritAsyncPropagation Whether the next span should inherit the active span - * asyncPropagation flag. */ public ContinuableScopeManager( final int depthLimit, final boolean strictMode, - final boolean inheritAsyncPropagation, final ProfilingContextIntegration profilingContextIntegration, final HealthMetrics healthMetrics) { this.depthLimit = depthLimit == 0 ? Integer.MAX_VALUE : depthLimit; this.strictMode = strictMode; - this.inheritAsyncPropagation = inheritAsyncPropagation; this.scopeListeners = new CopyOnWriteArrayList<>(); this.extendedScopeListeners = new CopyOnWriteArrayList<>(); this.healthMetrics = healthMetrics; @@ -141,9 +128,7 @@ private AgentScope activate( boolean asyncPropagation = overrideAsyncPropagation ? isAsyncPropagating - : inheritAsyncPropagation && top != null - ? top.isAsyncPropagating() - : DEFAULT_ASYNC_PROPAGATING; + : top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING; final ContinuableScope scope = new ContinuableScope(this, span, source, asyncPropagation, createScopeState(span)); @@ -219,10 +204,7 @@ public AgentScope activateNext(final AgentSpan span) { final ContinuableScope top = scopeStack.top; - boolean asyncPropagation = - inheritAsyncPropagation && top != null - ? top.isAsyncPropagating() - : DEFAULT_ASYNC_PROPAGATING; + boolean asyncPropagation = top != null ? top.isAsyncPropagating() : DEFAULT_ASYNC_PROPAGATING; final ContinuableScope scope = new ContinuableScope( diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy index 2c8b7dc82ec..c9062be094a 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/PendingTraceBufferTest.groovy @@ -31,7 +31,7 @@ class PendingTraceBufferTest extends DDSpecification { def tracer = Mock(CoreTracer) def traceConfig = Mock(CoreTracer.ConfigSnapshot) - def scopeManager = new ContinuableScopeManager(10, true, true) + def scopeManager = new ContinuableScopeManager(10, true) def factory = new PendingTrace.Factory(tracer, bufferSpy, SystemTimeSource.INSTANCE, false, HealthMetrics.NO_OP) List continuations = [] diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy index 42e12e237a5..53884e28797 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/TypeConverterTest.groovy @@ -52,7 +52,7 @@ class TypeConverterTest extends DDSpecification { } def "should avoid extra allocation for a scope wrapper"() { - def scopeManager = new ContinuableScopeManager(0, false, true) + def scopeManager = new ContinuableScopeManager(0, false) def context = createTestSpanContext() def span1 = new DDSpan("test", 0, context, null) def span2 = new DDSpan("test", 0, context, null) diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 5e757a807c7..6618a798569 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -174,7 +174,6 @@ public static String getHostName() { private final Set splitByTags; private final int scopeDepthLimit; private final boolean scopeStrictMode; - private final boolean scopeInheritAsyncPropagation; private final int scopeIterationKeepAlive; private final int partialFlushMinSpans; private final boolean traceStrictWritesEnabled; @@ -854,8 +853,6 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins scopeStrictMode = configProvider.getBoolean(SCOPE_STRICT_MODE, false); - scopeInheritAsyncPropagation = configProvider.getBoolean(SCOPE_INHERIT_ASYNC_PROPAGATION, true); - scopeIterationKeepAlive = configProvider.getInteger(SCOPE_ITERATION_KEEP_ALIVE, DEFAULT_SCOPE_ITERATION_KEEP_ALIVE); @@ -2073,10 +2070,6 @@ public boolean isScopeStrictMode() { return scopeStrictMode; } - public boolean isScopeInheritAsyncPropagation() { - return scopeInheritAsyncPropagation; - } - public int getScopeIterationKeepAlive() { return scopeIterationKeepAlive; } @@ -4168,8 +4161,6 @@ public String toString() { + scopeDepthLimit + ", scopeStrictMode=" + scopeStrictMode - + ", scopeInheritAsyncPropagation=" - + scopeInheritAsyncPropagation + ", scopeIterationKeepAlive=" + scopeIterationKeepAlive + ", partialFlushMinSpans=" From 2f767ab81db3e41163ebbb7f2f01e94fcadd42c5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Fri, 15 Nov 2024 19:22:25 +0100 Subject: [PATCH 018/106] Fix integer json parsing probe definition (#7957) Following #7676 issue, numbers parsed from the json probe definition are still considered as long value which still makes then unfittable to be used as key for Integer -> Integer map. Now we parse integers (without dot numbers) as long and see if they fit into an integer, then downgrade them as DSL value with integer type. --- .../datadog/debugger/el/JsonToExpressionConverter.java | 7 ++++++- .../java/com/datadog/debugger/el/ValueScriptTest.java | 9 ++++++++- .../src/test/resources/test_one_liner_value_expr_02.txt | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java index 1e0119c76b8..18e1c5d989c 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java @@ -317,7 +317,12 @@ public static ValueExpression asValueExpression(JsonReader reader) throws IOE if (numberStrValue.indexOf('.') > 0) { return DSL.value(Double.parseDouble(numberStrValue)); } - return DSL.value(Long.parseLong(numberStrValue)); + long longValue = Long.parseLong(numberStrValue); + // checks if the parsed number fits into integer range + if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) { + return DSL.value((int) longValue); + } + return DSL.value(longValue); } case STRING: { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java index 4644b40ad38..eefbca9956a 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java @@ -62,7 +62,14 @@ public void topLevelPrimitives() { "el", Values.NULL_OBJECT, Boolean.TRUE, - Boolean.FALSE + Boolean.FALSE, + 42, + Integer.MAX_VALUE, + -42, + Integer.MIN_VALUE, + 17315993717L, + -17315993717L, + 3.14 }; List lines = loadLinesFromResource("/test_one_liner_value_expr_02.txt"); int i = 0; diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt index e66198e4103..b94c325b7b8 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt @@ -12,3 +12,10 @@ {"dsl": "", "json": null} {"dsl": "", "json": true} {"dsl": "", "json": false} +{"dsl": "", "json": 42} +{"dsl": "", "json": 2147483647} +{"dsl": "", "json": -42} +{"dsl": "", "json": -2147483648} +{"dsl": "", "json": 17315993717} +{"dsl": "", "json": -17315993717} +{"dsl": "", "json": 3.14} From 0e9f3b6c9ae1d0a2ac2756f2a6f40292385887af Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:20:08 -0600 Subject: [PATCH 019/106] Added service name overrides to test writer --- .../datastreams/RecordingDatastreamsPayloadWriter.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy index 396985b24cd..cedcf14724b 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams/RecordingDatastreamsPayloadWriter.groovy @@ -18,9 +18,12 @@ class RecordingDatastreamsPayloadWriter implements DatastreamsPayloadWriter { @SuppressWarnings('UnusedPrivateField') private final Set backlogs = [] + private final Set serviceNameOverrides = [] + @Override synchronized void writePayload(Collection data, String serviceNameOverride) { log.info("payload written - {}", data) + serviceNameOverrides.add(serviceNameOverride) this.@payloads.addAll(data) data.each { this.@groups.addAll(it.groups) } for (StatsBucket bucket : data) { @@ -32,6 +35,10 @@ class RecordingDatastreamsPayloadWriter implements DatastreamsPayloadWriter { } } + synchronized List getServices() { + Collections.unmodifiableList(new ArrayList<>(this.@serviceNameOverrides)) + } + synchronized List getPayloads() { Collections.unmodifiableList(new ArrayList<>(this.@payloads)) } From 6856dc5a9068d4952961cbbe808d6dd9f0264640 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:50:42 -0600 Subject: [PATCH 020/106] Reverted instrumentation-specific code; switched to thread local --- .../spark-executor/build.gradle | 11 --- .../baseTest/groovy/SparkExecutorTest.groovy | 72 ------------------- .../spark/SparkExecutorDecorator.java | 39 +--------- .../spark/SparkExecutorInstrumentation.java | 6 +- .../DefaultDataStreamsMonitoring.java | 27 ++++--- .../datastreams/DataStreamsWritingTest.groovy | 4 +- .../api/AgentDataStreamsMonitoring.java | 13 ++-- .../instrumentation/api/AgentTracer.java | 4 +- 8 files changed, 24 insertions(+), 152 deletions(-) diff --git a/dd-java-agent/instrumentation/spark-executor/build.gradle b/dd-java-agent/instrumentation/spark-executor/build.gradle index 159f7b05907..4525dafc370 100644 --- a/dd-java-agent/instrumentation/spark-executor/build.gradle +++ b/dd-java-agent/instrumentation/spark-executor/build.gradle @@ -33,24 +33,13 @@ ext { dependencies { compileOnly group: 'org.apache.spark', name: 'spark-core_2.12', version: '2.4.0' compileOnly group: 'org.apache.spark', name: 'spark-sql_2.12', version: '2.4.0' - compileOnly group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" baseTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: "2.4.0" baseTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "2.4.0" - baseTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "2.4.0" - baseTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" - testImplementation group: 'org.apache.kafka', name: 'kafka_2.12', version: '2.4.0' - testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.4.0' - testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.4.0.RELEASE' - testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.4.0.RELEASE' latest212DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: '3.+' latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: '3.+' - latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "3.+" - latest212DepTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.12', version: "2.4.0" latest213DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.13", version: '3.+' latest213DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: '3.+' - latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: "3.+" - latest212DepTestImplementation group: 'org.apache.spark', name:'spark-sql-kafka-0-10_2.13', version: "3.+" } diff --git a/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy b/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy index 16dec400604..7e9ae0951f5 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy +++ b/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy @@ -1,38 +1,17 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.bootstrap.instrumentation.api.Tags -import org.apache.kafka.clients.producer.ProducerRecord -import org.apache.spark.api.java.function.VoidFunction2 import org.apache.spark.sql.Dataset import org.apache.spark.sql.Row import org.apache.spark.sql.RowFactory import org.apache.spark.sql.SparkSession -import org.apache.spark.sql.streaming.Trigger import org.apache.spark.sql.types.StructType -import org.junit.ClassRule -import org.springframework.kafka.core.DefaultKafkaProducerFactory -import org.springframework.kafka.test.EmbeddedKafkaBroker -import org.springframework.kafka.test.rule.EmbeddedKafkaRule -import org.springframework.kafka.test.utils.KafkaTestUtils -import spock.lang.Shared - class SparkExecutorTest extends AgentTestRunner { - static final SOURCE_TOPIC = "source" - static final SINK_TOPIC = "sink" - - @Shared - @ClassRule - EmbeddedKafkaRule kafkaRule = new EmbeddedKafkaRule(1, false, 1, SOURCE_TOPIC, SINK_TOPIC) - EmbeddedKafkaBroker embeddedKafka = kafkaRule.embeddedKafka @Override void configurePreAgent() { super.configurePreAgent() injectSysConfig("dd.integration.spark-executor.enabled", "true") - injectSysConfig("dd.integration.spark.enabled", "true") - injectSysConfig("dd.integration.kafka.enabled", "true") - injectSysConfig("dd.data.streams.enabled", "true") - injectSysConfig("dd.trace.debug", "true") } private Dataset generateSampleDataframe(SparkSession spark) { @@ -44,57 +23,6 @@ class SparkExecutorTest extends AgentTestRunner { spark.createDataFrame(rows, structType) } - def "test dsm service name override"() { - setup: - def sparkSession = SparkSession.builder() - .config("spark.master", "local[2]") - .config("spark.driver.bindAddress", "localhost") - // .config("spark.sql.shuffle.partitions", "2") - .appName("test-app") - .getOrCreate() - - def producerProps = KafkaTestUtils.producerProps(embeddedKafka.getBrokersAsString()) - def producer = new DefaultKafkaProducerFactory(producerProps).createProducer() - - when: - for (int i = 0; i < 100; i++) { - producer.send(new ProducerRecord<>(SOURCE_TOPIC, i, i.toString())) - } - producer.flush() - - def df = sparkSession - .readStream() - .format("kafka") - .option("kafka.bootstrap.servers", embeddedKafka.getBrokersAsString()) - .option("startingOffsets", "earliest") - .option("failOnDataLoss", "false") - .option("subscribe", SOURCE_TOPIC) - .load() - - def query = df - .selectExpr("CAST(key AS STRING) as key", "CAST(value AS STRING) as value") - .writeStream() - .format("kafka") - .option("kafka.bootstrap.servers", embeddedKafka.getBrokersAsString()) - .option("checkpointLocation", "/tmp/" + System.currentTimeMillis().toString()) - .option("topic", SINK_TOPIC) - .trigger(Trigger.Once()) - .foreachBatch(new VoidFunction2, Long>() { - @Override - void call(Dataset rowDataset, Long aLong) throws Exception { - rowDataset.show() - rowDataset.write() - } - }) - .start() - - query.processAllAvailable() - - then: - query.stop() - producer.close() - } - def "generate spark task run spans"() { setup: def sparkSession = SparkSession.builder() diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java index a5b4eea27aa..0f9519c696c 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java @@ -1,12 +1,8 @@ package datadog.trace.instrumentation.spark; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; -import datadog.trace.util.MethodHandles; -import java.lang.invoke.MethodHandle; -import java.util.Properties; import org.apache.spark.executor.Executor; import org.apache.spark.executor.TaskMetrics; @@ -14,20 +10,6 @@ public class SparkExecutorDecorator extends BaseDecorator { public static final CharSequence SPARK_TASK = UTF8BytesString.create("spark.task"); public static final CharSequence SPARK = UTF8BytesString.create("spark"); public static SparkExecutorDecorator DECORATE = new SparkExecutorDecorator(); - private final String propSparkAppName = "spark.app.name"; - private static final String TASK_DESCRIPTION_CLASSNAME = - "org.apache.spark.scheduler.TaskDescription"; - private static final MethodHandle propertiesField_mh = getFieldGetter(); - - private static MethodHandle getFieldGetter() { - try { - return new MethodHandles(Executor.class.getClassLoader()) - .privateFieldGetter(TASK_DESCRIPTION_CLASSNAME, "properties"); - } catch (Throwable ignored) { - // should be already logged - } - return null; - } @Override protected String[] instrumentationNames() { @@ -44,29 +26,12 @@ protected CharSequence component() { return SPARK; } - public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner, Object taskDescription) { + public void onTaskStart(AgentSpan span, Executor.TaskRunner taskRunner) { span.setTag("task_id", taskRunner.taskId()); span.setTag("task_thread_name", taskRunner.threadName()); - - if (taskDescription != null && propertiesField_mh != null) { - try { - Properties props = (Properties) propertiesField_mh.invoke(taskDescription); - if (props != null) { - String appName = props.getProperty(propSparkAppName); - if (appName != null) { - AgentTracer.get() - .getDataStreamsMonitoring() - .setThreadServiceName(taskRunner.getThreadId(), appName); - } - } - } catch (Throwable ignored) { - } - } } public void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) { - AgentTracer.get().getDataStreamsMonitoring().clearThreadServiceName(taskRunner.getThreadId()); - // task is set by spark in run() by deserializing the task binary coming from the driver if (taskRunner.task() == null) { return; @@ -85,7 +50,7 @@ public void onTaskEnd(AgentSpan span, Executor.TaskRunner taskRunner) { span.setTag("app_attempt_id", taskRunner.task().appAttemptId().get()); } span.setTag( - "application_name", taskRunner.task().localProperties().getProperty(propSparkAppName)); + "application_name", taskRunner.task().localProperties().getProperty("spark.app.name")); TaskMetrics metrics = taskRunner.task().metrics(); span.setMetric("spark.executor_deserialize_time", metrics.executorDeserializeTime()); diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java index 8de403a83bf..0a8a6532326 100644 --- a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java @@ -52,13 +52,11 @@ public void methodAdvice(MethodTransformer transformer) { public static final class RunAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( - @Advice.FieldValue("taskDescription") final Object taskDescription, - @Advice.This Executor.TaskRunner taskRunner) { + public static AgentScope enter(@Advice.This Executor.TaskRunner taskRunner) { final AgentSpan span = startSpan("spark-executor", SPARK_TASK); DECORATE.afterStart(span); - DECORATE.onTaskStart(span, taskRunner, taskDescription); + DECORATE.onTaskStart(span, taskRunner); return activateSpan(span); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index a966425f504..5398d420122 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -75,8 +75,7 @@ public class DefaultDataStreamsMonitoring implements DataStreamsMonitoring, Even private volatile boolean agentSupportsDataStreams = false; private volatile boolean configSupportsDataStreams = false; private final ConcurrentHashMap schemaSamplers; - private static final ConcurrentHashMap threadServiceNames = - new ConcurrentHashMap<>(); + private static final ThreadLocal serviceNameOverride = new ThreadLocal<>(); public DefaultDataStreamsMonitoring( Config config, @@ -188,29 +187,28 @@ public void setProduceCheckpoint(String type, String target) { } @Override - public void setThreadServiceName(Long threadId, String serviceName) { - // setting service name to null == removing the value + public void setThreadServiceName(String serviceName) { if (serviceName == null) { - clearThreadServiceName(threadId); + clearThreadServiceName(); return; } - threadServiceNames.put(threadId, serviceName); + serviceNameOverride.set(serviceName); } @Override - public void clearThreadServiceName(Long threadId) { - threadServiceNames.remove(threadId); + public void clearThreadServiceName() { + serviceNameOverride.remove(); } - private static String getThreadServiceNameOverride() { - return threadServiceNames.getOrDefault(Thread.currentThread().getId(), null); + private static String getThreadServiceName() { + return serviceNameOverride.get(); } @Override public PathwayContext newPathwayContext() { if (configSupportsDataStreams) { - return new DefaultPathwayContext(timeSource, hashOfKnownTags, getThreadServiceNameOverride()); + return new DefaultPathwayContext(timeSource, hashOfKnownTags, getThreadServiceName()); } else { return AgentTracer.NoopPathwayContext.INSTANCE; } @@ -219,7 +217,7 @@ public PathwayContext newPathwayContext() { @Override public HttpCodec.Extractor extractor(HttpCodec.Extractor delegate) { return new DataStreamContextExtractor( - delegate, timeSource, traceConfigSupplier, hashOfKnownTags, getThreadServiceNameOverride()); + delegate, timeSource, traceConfigSupplier, hashOfKnownTags, getThreadServiceName()); } @Override @@ -236,7 +234,7 @@ public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrie DataStreamsContextCarrierAdapter.INSTANCE, this.timeSource, this.hashOfKnownTags, - getThreadServiceNameOverride()); + getThreadServiceName()); ((DDSpan) span).context().mergePathwayContext(pathwayContext); } } @@ -250,8 +248,7 @@ public void trackBacklog(LinkedHashMap sortedTags, long value) { } tags.add(tag); } - inbox.offer( - new Backlog(tags, value, timeSource.getCurrentTimeNanos(), getThreadServiceNameOverride())); + inbox.offer(new Backlog(tags, value, timeSource.getCurrentTimeNanos(), getThreadServiceName())); } @Override diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index 51583ff8060..5f01afeafa7 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -79,14 +79,14 @@ class DataStreamsWritingTest extends DDCoreSpecification { when: def dataStreams = new DefaultDataStreamsMonitoring(fakeConfig, sharedCommObjects, timeSource, { traceConfig }) dataStreams.start() - dataStreams.setThreadServiceName(Thread.currentThread().getId(), serviceNameOverride) + dataStreams.setThreadServiceName(serviceNameOverride) dataStreams.add(new StatsPoint([], 9, 0, 10, timeSource.currentTimeNanos, 0, 0, 0, serviceNameOverride)) dataStreams.trackBacklog(new LinkedHashMap<>(["partition": "1", "topic": "testTopic", "type": "kafka_produce"]), 130) timeSource.advance(DEFAULT_BUCKET_DURATION_NANOS) // force flush dataStreams.report() dataStreams.close() - dataStreams.clearThreadServiceName(Thread.currentThread().getId()) + dataStreams.clearThreadServiceName() then: conditions.eventually { assert requestBodies.size() == 1 diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java index e6cb15603dc..660c9be04eb 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentDataStreamsMonitoring.java @@ -45,17 +45,12 @@ void setCheckpoint( /** * setServiceNameOverride is used override service name for all DataStreams payloads produced - * within given thread + * within Thread.currentThread() * - * @param threadId thread Id * @param serviceName new service name to use for DSM checkpoints. */ - void setThreadServiceName(Long threadId, String serviceName); + void setThreadServiceName(String serviceName); - /** - * clearThreadServiceName clears up threadId -> Service name mapping - * - * @param threadId thread Id - */ - void clearThreadServiceName(Long threadId); + /** clearThreadServiceName clears up service name override for Thread.currentThread() */ + void clearThreadServiceName(); } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index 5d113534179..88f2e4e2b99 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -1135,10 +1135,10 @@ public Schema getSchema(String schemaName, SchemaIterator iterator) { public void setProduceCheckpoint(String type, String target) {} @Override - public void setThreadServiceName(Long threadId, String serviceName) {} + public void setThreadServiceName(String serviceName) {} @Override - public void clearThreadServiceName(Long threadId) {} + public void clearThreadServiceName() {} @Override public void setConsumeCheckpoint( From 3fa464ae7bc66c1ad5e0183d5be2171a7bd2bdaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Mon, 18 Nov 2024 07:54:54 +0100 Subject: [PATCH 021/106] Mark AsmStandaloneBillingSamplingSmokeTest as flaky (#7965) --- .../AsmStandaloneBillingSamplingSmokeTest.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSamplingSmokeTest.groovy b/dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSamplingSmokeTest.groovy index b9e8b988483..27f037d4db1 100644 --- a/dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSamplingSmokeTest.groovy +++ b/dd-smoke-tests/asm-standalone-billing/src/test/groovy/datadog/smoketest/asmstandalonebilling/AsmStandaloneBillingSamplingSmokeTest.groovy @@ -1,9 +1,11 @@ package datadog.smoketest.asmstandalonebilling import datadog.trace.api.sampling.PrioritySampling +import datadog.trace.test.util.Flaky import groovy.json.JsonSlurper import okhttp3.Request +@Flaky class AsmStandaloneBillingSamplingSmokeTest extends AbstractAsmStandaloneBillingSmokeTest { @Override From 6519cf759c1c265cbcd41d12144664689d4c566c Mon Sep 17 00:00:00 2001 From: Julien Delange Date: Mon, 18 Nov 2024 02:30:44 -0500 Subject: [PATCH 022/106] Remove datadog-static-analysis prod workflow (#7967) --- .github/workflows/analyze-changes.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/analyze-changes.yaml b/.github/workflows/analyze-changes.yaml index c91acbc4e38..cbd6b12756b 100644 --- a/.github/workflows/analyze-changes.yaml +++ b/.github/workflows/analyze-changes.yaml @@ -16,18 +16,7 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # 4.1.6 with: submodules: 'recursive' - - name: Check code meets quality standards (production) - id: datadog-static-analysis - uses: DataDog/datadog-static-analyzer-github-action@c74aff158c8cc1c3e285660713bcaa5f9c6d696e # v1 - with: - dd_app_key: ${{ secrets.DATADOG_APP_KEY_PROD }} - dd_api_key: ${{ secrets.DATADOG_API_KEY_PROD }} - dd_site: "datadoghq.com" - dd_service: "dd-trace-java" - dd_env: "ci" - cpu_count: 2 - enable_performance_statistics: false - # Also run the static analysis on the staging environment to benefit from the new features not yet released + # Run the static analysis on the staging environment to benefit from the new features not yet released - name: Check code meets quality standards (staging) id: datadog-static-analysis-staging uses: DataDog/datadog-static-analyzer-github-action@c74aff158c8cc1c3e285660713bcaa5f9c6d696e # v1 From f3f2b15e963d08a937a7caa02acd5525b18881b4 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 18 Nov 2024 10:17:09 +0100 Subject: [PATCH 023/106] feat(tooling): Check back-ported PR do not contain merge commit (#7962) --- tooling/backport-pr-to-patch-release.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tooling/backport-pr-to-patch-release.sh b/tooling/backport-pr-to-patch-release.sh index 12b23b723ae..b3631684d36 100755 --- a/tooling/backport-pr-to-patch-release.sh +++ b/tooling/backport-pr-to-patch-release.sh @@ -55,6 +55,23 @@ if [ -z "$PR_COMMITS" ]; then echo "PR $PR_NUMBER does not exist" exit 1 fi +# Check PR does not contain merge commit +echo "- Checking PR does not contain merge commit" +for PR_COMMIT in $PR_COMMITS; do + PARENT_COUNT=$(git rev-list --parents -n 1 "$PR_COMMIT" | wc -w) + if [ "$PARENT_COUNT" -gt 2 ]; then + echo "PR $PR_NUMBER contains a merge commit: $PR_COMMIT" + echo "Merge commit changes: https://github.com/DataDog/dd-trace-java/commit/${PR_COMMIT}" + echo "PR commit list: https://github.com/DataDog/dd-trace-java/pull/${PR_NUMBER}/commits" + echo -n "Would you like to cherry-pick the PR ${PR_NUMBER} merge commit instead of each of its commits individually? (y/n) " + read -r ANSWER + if [ "$ANSWER" == "y" ]; then + PR_COMMITS=$(gh pr view "$PR_NUMBER" --json mergeCommit --jq '.mergeCommit.oid') + else + exit 1 + fi + fi +done PR_TITLE=$(gh pr view "$PR_NUMBER" --json title --jq '.title') PR_LABELS=$(gh pr view "$PR_NUMBER" --json labels --jq '[.labels[].name] | join(",")') From 8990f3f1dbe5ed051c6dc4d0c7057e7ca8671d43 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 18 Nov 2024 14:34:36 +0100 Subject: [PATCH 024/106] feat(ssi): Add JMXFetch to denylist (#7970) --- metadata/denied-arguments.tsv | 3 +++ metadata/requirements-block.json | 41 ++++++++++++++++++++++++++++++++ metadata/requirements.json | 17 +++++++++++++ 3 files changed, 61 insertions(+) diff --git a/metadata/denied-arguments.tsv b/metadata/denied-arguments.tsv index 01614d77e2a..2309ddb2b52 100644 --- a/metadata/denied-arguments.tsv +++ b/metadata/denied-arguments.tsv @@ -26,6 +26,9 @@ apache_solr8_start -Dsolr.solr.home=* apache_solr8_stop *solr/server/start.jar Skip Apache Solr 8 stop using path to jar apache_solr8_tools org.apache.solr.util.SolrCLI Skip Apache Solr 8 CLI tools +# DataDog JMXFetch +datadog_jmxfetch org.datadog.jmxfetch.App Skip DataDog JMXFetch + # Elastic Search 7+ elasticsearch7 -Des.path.home=* Skip Elastic Search 7+ commands diff --git a/metadata/requirements-block.json b/metadata/requirements-block.json index 54b0e78aacb..309c029ca19 100644 --- a/metadata/requirements-block.json +++ b/metadata/requirements-block.json @@ -197,5 +197,46 @@ "arch": "x64", "libc": "glibc:2.17" } + }, + { + "name": "should block JMXFetch instance from DataDog Agent", + "filepath": "/opt/java/openjdk/bin/java", + "args": [ + "java", + "-Djdk.attach.allowAttachSelf=true", + "-XX:+UseContainerSupport", + "-XX:MaxRAMPercentage=25.0000", + "-classpath", + "/opt/datadog-agent/bin/agent/dist/jmx/jmxfetch.jar", + "org.datadog.jmxfetch.App", + "--ipc_host", + "localhost", + "--ipc_port", + "5001", + "--check_period", + "15000", + "--thread_pool_size", + "3", + "--collection_timeout", + "60", + "--reconnection_timeout", + "60", + "--reconnection_thread_pool_size", + "3", + "--log_level", + "INFO", + "--reporter", + "statsd:unix:///var/run/datadog/statsd.sock", + "--statsd_queue_size", + "4096", + "--jmxfetch_telemetry", + "collect" + ], + "envars": [], + "host": { + "os": "linux", + "arch": "x64", + "libc": "glibc:2.17" + } } ] \ No newline at end of file diff --git a/metadata/requirements.json b/metadata/requirements.json index 28b7bc5c059..39c7868f035 100644 --- a/metadata/requirements.json +++ b/metadata/requirements.json @@ -303,6 +303,23 @@ ], "envars": null }, + { + "id": "datadog_jmxfetch", + "description": "Skip DataDog JMXFetch", + "os": null, + "cmds": [ + "**/java" + ], + "args": [ + { + "args": [ + "org.datadog.jmxfetch.App" + ], + "position": null + } + ], + "envars": null + }, { "id": "elasticsearch7", "description": "Skip Elastic Search 7+ commands", From c4bc3cc198760ab2f76f3de003520032c9aea038 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 18 Nov 2024 14:59:59 +0100 Subject: [PATCH 025/106] Add source line tags to test suites (#7964) --- .../civisibility/CiVisibilityServices.java | 15 ++- .../civisibility/CiVisibilitySystem.java | 8 +- .../domain/AbstractTestModule.java | 8 +- .../domain/AbstractTestSession.java | 8 +- .../trace/civisibility/domain/TestImpl.java | 12 +- .../civisibility/domain/TestSuiteImpl.java | 16 ++- .../buildsystem/BuildSystemModuleImpl.java | 6 +- .../buildsystem/BuildSystemSessionImpl.java | 8 +- .../domain/buildsystem/ProxyTestModule.java | 10 +- .../domain/buildsystem/ProxyTestSession.java | 10 +- .../domain/headless/HeadlessTestModule.java | 8 +- .../domain/headless/HeadlessTestSession.java | 8 +- .../domain/manualapi/ManualApiTestModule.java | 8 +- .../manualapi/ManualApiTestSession.java | 8 +- .../source/BestEffortLinesResolver.java | 37 ++++++ .../source/BestEffortMethodLinesResolver.java | 25 ---- ...solver.java => ByteCodeLinesResolver.java} | 21 ++-- .../source/CompilerAidedLinesResolver.java | 35 ++++++ .../CompilerAidedMethodLinesResolver.java | 21 ---- .../civisibility/source/LinesResolver.java | 55 ++++++++ .../source/MethodLinesResolver.java | 52 -------- .../civisibility/domain/TestImplTest.groovy | 9 +- .../domain/TestSuiteImplTest.groovy | 13 +- .../buildsystem/ProxyTestModuleTest.groovy | 4 +- .../headless/HeadlessTestModuleTest.groovy | 4 +- .../source/BestEffortLinesResolverTest.groovy | 119 ++++++++++++++++++ .../BestEffortMethodLinesResolverTest.groovy | 67 ---------- ...roovy => ByteCodeLinesResolverTest.groovy} | 28 +++-- .../CompilerAidedLinesResolverTest.groovy | 70 +++++++++++ ...ompilerAidedMethodLinesResolverTest.groovy | 40 ------ .../CiVisibilityInstrumentationTest.groovy | 13 +- .../datadog/trace/api/ConfigDefaults.java | 2 +- internal-api/build.gradle | 2 +- 33 files changed, 445 insertions(+), 305 deletions(-) create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java delete mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortMethodLinesResolver.java rename dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/{ByteCodeMethodLinesResolver.java => ByteCodeLinesResolver.java} (88%) create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java delete mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolver.java create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java delete mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/MethodLinesResolver.java create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortLinesResolverTest.groovy delete mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortMethodLinesResolverTest.groovy rename dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/{ByteCodeMethodLinesResolverTest.groovy => ByteCodeLinesResolverTest.groovy} (74%) create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedLinesResolverTest.groovy delete mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolverTest.groovy diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java index 407b142b261..6e30c5af715 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java @@ -23,10 +23,10 @@ import datadog.trace.civisibility.git.GitClientGitInfoBuilder; import datadog.trace.civisibility.git.tree.GitClient; import datadog.trace.civisibility.ipc.SignalClient; -import datadog.trace.civisibility.source.BestEffortMethodLinesResolver; -import datadog.trace.civisibility.source.ByteCodeMethodLinesResolver; -import datadog.trace.civisibility.source.CompilerAidedMethodLinesResolver; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.BestEffortLinesResolver; +import datadog.trace.civisibility.source.ByteCodeLinesResolver; +import datadog.trace.civisibility.source.CompilerAidedLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.index.*; import java.lang.reflect.Type; import java.net.InetSocketAddress; @@ -63,7 +63,7 @@ public class CiVisibilityServices { final CIProviderInfoFactory ciProviderInfoFactory; final GitClient.Factory gitClientFactory; final GitInfoProvider gitInfoProvider; - final MethodLinesResolver methodLinesResolver; + final LinesResolver linesResolver; final RepoIndexProvider.Factory repoIndexProviderFactory; @Nullable final SignalClient.Factory signalClientFactory; @@ -82,9 +82,8 @@ public class CiVisibilityServices { CiEnvironment environment = buildCiEnvironment(config, sco); this.ciProviderInfoFactory = new CIProviderInfoFactory(config, environment); - this.methodLinesResolver = - new BestEffortMethodLinesResolver( - new CompilerAidedMethodLinesResolver(), new ByteCodeMethodLinesResolver()); + this.linesResolver = + new BestEffortLinesResolver(new CompilerAidedLinesResolver(), new ByteCodeLinesResolver()); this.gitInfoProvider = gitInfoProvider; gitInfoProvider.registerGitInfoBuilder(new CIProviderGitInfoBuilder(config, environment)); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java index d28dc8b6d49..d8d6f2f9c00 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java @@ -215,7 +215,7 @@ private static BuildSystemSession.Factory buildSystemSessionFactory( testDecorator, repoServices.sourcePathResolver, repoServices.codeowners, - services.methodLinesResolver, + services.linesResolver, repoServices.executionSettingsFactory, signalServer, repoServices.repoIndexProvider, @@ -244,7 +244,7 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( testDecorator, repoServices.sourcePathResolver, repoServices.codeowners, - services.methodLinesResolver, + services.linesResolver, coverageServices.coverageStoreFactory, coverageServices.coverageReporter, services.signalClientFactory, @@ -275,7 +275,7 @@ private static TestFrameworkSession.Factory headlessTestFrameworkEssionFactory( testDecorator, repoServices.sourcePathResolver, repoServices.codeowners, - services.methodLinesResolver, + services.linesResolver, coverageServices.coverageStoreFactory, executionStrategy); }; @@ -303,7 +303,7 @@ private static CIVisibility.SessionFactory manualApiSessionFactory( testDecorator, repoServices.sourcePathResolver, repoServices.codeowners, - services.methodLinesResolver, + services.linesResolver, coverageServices.coverageStoreFactory); }; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java index eb590ca3880..559c7317f7a 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestModule.java @@ -12,7 +12,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; import datadog.trace.civisibility.decorator.TestDecorator; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import java.util.function.Consumer; import javax.annotation.Nullable; @@ -26,7 +26,7 @@ public abstract class AbstractTestModule { protected final TestDecorator testDecorator; protected final SourcePathResolver sourcePathResolver; protected final Codeowners codeowners; - protected final MethodLinesResolver methodLinesResolver; + protected final LinesResolver linesResolver; private final Consumer onSpanFinish; public AbstractTestModule( @@ -39,7 +39,7 @@ public AbstractTestModule( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, Consumer onSpanFinish) { this.moduleName = moduleName; this.config = config; @@ -47,7 +47,7 @@ public AbstractTestModule( this.testDecorator = testDecorator; this.sourcePathResolver = sourcePathResolver; this.codeowners = codeowners; - this.methodLinesResolver = methodLinesResolver; + this.linesResolver = linesResolver; this.onSpanFinish = onSpanFinish; AgentTracer.SpanBuilder spanBuilder = diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java index d669d633fd7..1eb3caaf9c6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java @@ -20,7 +20,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; import datadog.trace.civisibility.decorator.TestDecorator; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import java.util.ArrayList; import java.util.Collection; @@ -37,7 +37,7 @@ public abstract class AbstractTestSession { protected final TestDecorator testDecorator; protected final SourcePathResolver sourcePathResolver; protected final Codeowners codeowners; - protected final MethodLinesResolver methodLinesResolver; + protected final LinesResolver linesResolver; public AbstractTestSession( String projectName, @@ -49,7 +49,7 @@ public AbstractTestSession( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver) { + LinesResolver linesResolver) { this.ciProvider = ciProvider; this.instrumentationType = instrumentationType; this.config = config; @@ -57,7 +57,7 @@ public AbstractTestSession( this.testDecorator = testDecorator; this.sourcePathResolver = sourcePathResolver; this.codeowners = codeowners; - this.methodLinesResolver = methodLinesResolver; + this.linesResolver = linesResolver; // CI Test Cycle protocol requires session's trace ID and span ID to be the same IdGenerationStrategy idGenerationStrategy = config.getIdGenerationStrategy(); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 1d642749f48..45cacd63965 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -30,7 +30,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; import datadog.trace.civisibility.decorator.TestDecorator; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.source.SourceResolutionException; import java.lang.reflect.Method; @@ -69,7 +69,7 @@ public TestImpl( CiVisibilityMetricCollector metricCollector, TestDecorator testDecorator, SourcePathResolver sourcePathResolver, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, Codeowners codeowners, CoverageStore.Factory coverageStoreFactory, Consumer onSpanFinish) { @@ -121,7 +121,7 @@ public TestImpl( if (config.isCiVisibilitySourceDataEnabled()) { populateSourceDataTags( - span, testClass, testMethod, sourcePathResolver, methodLinesResolver, codeowners); + span, testClass, testMethod, sourcePathResolver, linesResolver, codeowners); } if (itrCorrelationId != null) { @@ -142,7 +142,7 @@ private void populateSourceDataTags( Class testClass, Method testMethod, SourcePathResolver sourcePathResolver, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, Codeowners codeowners) { if (testClass == null) { return; @@ -162,10 +162,10 @@ private void populateSourceDataTags( span.setTag(Tags.TEST_SOURCE_FILE, sourcePath); if (testMethod != null) { - MethodLinesResolver.MethodLines testMethodLines = methodLinesResolver.getLines(testMethod); + LinesResolver.Lines testMethodLines = linesResolver.getMethodLines(testMethod); if (testMethodLines.isValid()) { span.setTag(Tags.TEST_SOURCE_START, testMethodLines.getStartLineNumber()); - span.setTag(Tags.TEST_SOURCE_END, testMethodLines.getFinishLineNumber()); + span.setTag(Tags.TEST_SOURCE_END, testMethodLines.getEndLineNumber()); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index ef2a35a67a8..e7596f1334b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -18,7 +18,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; import datadog.trace.civisibility.decorator.TestDecorator; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.source.SourceResolutionException; import datadog.trace.civisibility.utils.SpanUtils; @@ -46,7 +46,7 @@ public class TestSuiteImpl implements DDTestSuite { private final TestDecorator testDecorator; private final SourcePathResolver sourcePathResolver; private final Codeowners codeowners; - private final MethodLinesResolver methodLinesResolver; + private final LinesResolver linesResolver; private final CoverageStore.Factory coverageStoreFactory; private final boolean parallelized; private final Consumer onSpanFinish; @@ -66,7 +66,7 @@ public TestSuiteImpl( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, Consumer onSpanFinish) { this.moduleSpanContext = moduleSpanContext; @@ -81,7 +81,7 @@ public TestSuiteImpl( this.testDecorator = testDecorator; this.sourcePathResolver = sourcePathResolver; this.codeowners = codeowners; - this.methodLinesResolver = methodLinesResolver; + this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; this.onSpanFinish = onSpanFinish; @@ -154,6 +154,12 @@ private void populateSourceDataTags( span.setTag(Tags.TEST_SOURCE_FILE, sourcePath); + LinesResolver.Lines testClassLines = linesResolver.getClassLines(testClass); + if (testClassLines.isValid()) { + span.setTag(Tags.TEST_SOURCE_START, testClassLines.getStartLineNumber()); + span.setTag(Tags.TEST_SOURCE_END, testClassLines.getEndLineNumber()); + } + Collection testCodeOwners = codeowners.getOwners(sourcePath); if (testCodeOwners != null) { span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners)); @@ -245,7 +251,7 @@ public TestImpl testStart( metricCollector, testDecorator, sourcePathResolver, - methodLinesResolver, + linesResolver, codeowners, coverageStoreFactory, SpanUtils.propagateCiVisibilityTagsTo(span)); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java index 5c7253a180a..a4a5384f2a2 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java @@ -26,7 +26,7 @@ import datadog.trace.civisibility.ipc.ModuleExecutionResult; import datadog.trace.civisibility.ipc.SignalResponse; import datadog.trace.civisibility.ipc.SignalType; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.utils.SpanUtils; import datadog.trace.util.Strings; @@ -62,7 +62,7 @@ public BuildSystemModuleImpl( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, ModuleSignalRouter moduleSignalRouter, CoverageCalculator.Factory coverageCalculatorFactory, T sessionCoverageCalculator, @@ -79,7 +79,7 @@ public BuildSystemModuleImpl( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, onSpanFinish); this.coverageCalculator = coverageCalculatorFactory.moduleCoverage( diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java index dea10e2b2f1..33d8e8d1d5e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java @@ -31,7 +31,7 @@ import datadog.trace.civisibility.ipc.SignalResponse; import datadog.trace.civisibility.ipc.SignalServer; import datadog.trace.civisibility.ipc.SignalType; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.source.index.RepoIndex; import datadog.trace.civisibility.source.index.RepoIndexProvider; @@ -67,7 +67,7 @@ public BuildSystemSessionImpl( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, ExecutionSettingsFactory executionSettingsFactory, SignalServer signalServer, RepoIndexProvider repoIndexProvider, @@ -82,7 +82,7 @@ public BuildSystemSessionImpl( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver); + linesResolver); this.startCommand = startCommand; this.moduleSignalRouter = moduleSignalRouter; this.executionSettingsFactory = executionSettingsFactory; @@ -167,7 +167,7 @@ public BuildSystemModuleImpl testModuleStart( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, moduleSignalRouter, coverageCalculatorFactory, coverageCalculator, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index a4f1d7f92e9..0758a693361 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -21,7 +21,7 @@ import datadog.trace.civisibility.ipc.ModuleSignal; import datadog.trace.civisibility.ipc.SignalClient; import datadog.trace.civisibility.ipc.TestFramework; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; import java.util.Collection; @@ -51,7 +51,7 @@ public class ProxyTestModule implements TestFrameworkModule { private final TestDecorator testDecorator; private final SourcePathResolver sourcePathResolver; private final Codeowners codeowners; - private final MethodLinesResolver methodLinesResolver; + private final LinesResolver linesResolver; private final CoverageStore.Factory coverageStoreFactory; private final Collection testFrameworks = ConcurrentHashMap.newKeySet(); @@ -64,7 +64,7 @@ public ProxyTestModule( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ChildProcessCoverageReporter childProcessCoverageReporter, SignalClient.Factory signalClientFactory) { @@ -78,7 +78,7 @@ public ProxyTestModule( this.testDecorator = testDecorator; this.sourcePathResolver = sourcePathResolver; this.codeowners = codeowners; - this.methodLinesResolver = methodLinesResolver; + this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; } @@ -171,7 +171,7 @@ public TestSuiteImpl testSuiteStart( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, this::propagateTestFrameworkData); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java index 52c9f5e814e..3ef61b75624 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java @@ -11,7 +11,7 @@ import datadog.trace.civisibility.domain.TestFrameworkModule; import datadog.trace.civisibility.domain.TestFrameworkSession; import datadog.trace.civisibility.ipc.SignalClient; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; import javax.annotation.Nullable; @@ -29,7 +29,7 @@ public class ProxyTestSession implements TestFrameworkSession { private final TestDecorator testDecorator; private final SourcePathResolver sourcePathResolver; private final Codeowners codeowners; - private final MethodLinesResolver methodLinesResolver; + private final LinesResolver linesResolver; private final CoverageStore.Factory coverageStoreFactory; private final ChildProcessCoverageReporter childProcessCoverageReporter; private final SignalClient.Factory signalClientFactory; @@ -42,7 +42,7 @@ public ProxyTestSession( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ChildProcessCoverageReporter childProcessCoverageReporter, SignalClient.Factory signalClientFactory, @@ -53,7 +53,7 @@ public ProxyTestSession( this.testDecorator = testDecorator; this.sourcePathResolver = sourcePathResolver; this.codeowners = codeowners; - this.methodLinesResolver = methodLinesResolver; + this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; this.childProcessCoverageReporter = childProcessCoverageReporter; this.signalClientFactory = signalClientFactory; @@ -79,7 +79,7 @@ public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long sta testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, childProcessCoverageReporter, signalClientFactory); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 662848bbd03..fc92ba099c2 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -18,7 +18,7 @@ import datadog.trace.civisibility.domain.InstrumentationType; import datadog.trace.civisibility.domain.TestFrameworkModule; import datadog.trace.civisibility.domain.TestSuiteImpl; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; import datadog.trace.civisibility.utils.SpanUtils; @@ -47,7 +47,7 @@ public HeadlessTestModule( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionStrategy executionStrategy, Consumer onSpanFinish) { @@ -61,7 +61,7 @@ public HeadlessTestModule( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, onSpanFinish); this.coverageStoreFactory = coverageStoreFactory; this.executionStrategy = executionStrategy; @@ -140,7 +140,7 @@ public TestSuiteImpl testSuiteStart( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, SpanUtils.propagateCiVisibilityTagsTo(span)); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 46a7959d4a4..070778f0ab9 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -15,7 +15,7 @@ import datadog.trace.civisibility.domain.AbstractTestSession; import datadog.trace.civisibility.domain.InstrumentationType; import datadog.trace.civisibility.domain.TestFrameworkSession; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; import datadog.trace.civisibility.utils.SpanUtils; @@ -44,7 +44,7 @@ public HeadlessTestSession( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionStrategy executionStrategy) { super( @@ -57,7 +57,7 @@ public HeadlessTestSession( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver); + linesResolver); this.executionStrategy = executionStrategy; this.coverageStoreFactory = coverageStoreFactory; } @@ -73,7 +73,7 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, executionStrategy, this::propagateModuleTags); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 588838cad5e..d33bb675c57 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -11,7 +11,7 @@ import datadog.trace.civisibility.domain.AbstractTestModule; import datadog.trace.civisibility.domain.InstrumentationType; import datadog.trace.civisibility.domain.TestSuiteImpl; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.utils.SpanUtils; import java.util.function.Consumer; @@ -34,7 +34,7 @@ public ManualApiTestModule( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, Consumer onSpanFinish) { super( @@ -47,7 +47,7 @@ public ManualApiTestModule( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, onSpanFinish); this.coverageStoreFactory = coverageStoreFactory; } @@ -73,7 +73,7 @@ public TestSuiteImpl testSuiteStart( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, SpanUtils.propagateCiVisibilityTagsTo(span)); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java index e0269b7b812..283e13f513b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java @@ -9,7 +9,7 @@ import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.domain.AbstractTestSession; import datadog.trace.civisibility.domain.InstrumentationType; -import datadog.trace.civisibility.source.MethodLinesResolver; +import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.utils.SpanUtils; import javax.annotation.Nullable; @@ -31,7 +31,7 @@ public ManualApiTestSession( TestDecorator testDecorator, SourcePathResolver sourcePathResolver, Codeowners codeowners, - MethodLinesResolver methodLinesResolver, + LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory) { super( projectName, @@ -43,7 +43,7 @@ public ManualApiTestSession( testDecorator, sourcePathResolver, codeowners, - methodLinesResolver); + linesResolver); this.coverageStoreFactory = coverageStoreFactory; } @@ -58,7 +58,7 @@ public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long sta testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, SpanUtils.propagateCiVisibilityTagsTo(span)); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java new file mode 100644 index 00000000000..fe63ea3b578 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortLinesResolver.java @@ -0,0 +1,37 @@ +package datadog.trace.civisibility.source; + +import java.lang.reflect.Method; +import javax.annotation.Nonnull; + +public class BestEffortLinesResolver implements LinesResolver { + + private final LinesResolver[] delegates; + + public BestEffortLinesResolver(LinesResolver... delegates) { + this.delegates = delegates; + } + + @Nonnull + @Override + public Lines getMethodLines(@Nonnull Method method) { + for (LinesResolver delegate : delegates) { + Lines lines = delegate.getMethodLines(method); + if (lines.isValid()) { + return lines; + } + } + return Lines.EMPTY; + } + + @Nonnull + @Override + public Lines getClassLines(@Nonnull Class clazz) { + for (LinesResolver delegate : delegates) { + Lines lines = delegate.getClassLines(clazz); + if (lines.isValid()) { + return lines; + } + } + return Lines.EMPTY; + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortMethodLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortMethodLinesResolver.java deleted file mode 100644 index 7a7f3b7be71..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/BestEffortMethodLinesResolver.java +++ /dev/null @@ -1,25 +0,0 @@ -package datadog.trace.civisibility.source; - -import java.lang.reflect.Method; -import javax.annotation.Nonnull; - -public class BestEffortMethodLinesResolver implements MethodLinesResolver { - - private final MethodLinesResolver[] delegates; - - public BestEffortMethodLinesResolver(MethodLinesResolver... delegates) { - this.delegates = delegates; - } - - @Nonnull - @Override - public MethodLines getLines(@Nonnull Method method) { - for (MethodLinesResolver delegate : delegates) { - MethodLines lines = delegate.getLines(method); - if (lines.isValid()) { - return lines; - } - } - return MethodLines.EMPTY; - } -} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeMethodLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java similarity index 88% rename from dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeMethodLinesResolver.java rename to dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java index 8d5d3d26411..c77a1f92e5d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeMethodLinesResolver.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/ByteCodeLinesResolver.java @@ -16,16 +16,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ByteCodeMethodLinesResolver implements MethodLinesResolver { +public class ByteCodeLinesResolver implements LinesResolver { - private static final Logger log = LoggerFactory.getLogger(ByteCodeMethodLinesResolver.class); + private static final Logger log = LoggerFactory.getLogger(ByteCodeLinesResolver.class); private final DDCache, ClassMethodLines> methodLinesCache = DDCaches.newFixedSizeIdentityCache(16); @Nonnull @Override - public MethodLines getLines(@Nonnull Method method) { + public Lines getMethodLines(@Nonnull Method method) { try { ClassMethodLines classMethodLines = methodLinesCache.computeIfAbsent(method.getDeclaringClass(), ClassMethodLines::parse); @@ -33,10 +33,16 @@ public MethodLines getLines(@Nonnull Method method) { } catch (Exception e) { log.error("Could not determine method borders for {}", method, e); - return MethodLines.EMPTY; + return Lines.EMPTY; } } + @Nonnull + @Override + public Lines getClassLines(@Nonnull Class clazz) { + return Lines.EMPTY; + } + static final class ClassMethodLines { private final Map recordersByMethodFingerprint = new HashMap<>(); @@ -46,14 +52,13 @@ public MethodLinesRecorder createRecorder(String methodFingerprint) { return recorder; } - public MethodLines get(Method method) { + public Lines get(Method method) { String methodFingerprint = getFingerprint(method); MethodLinesRecorder methodLinesRecorder = recordersByMethodFingerprint.get(methodFingerprint); if (methodLinesRecorder != null) { - return new MethodLines( - methodLinesRecorder.startLineNumber, methodLinesRecorder.finishLineNumber); + return new Lines(methodLinesRecorder.startLineNumber, methodLinesRecorder.finishLineNumber); } else { - return MethodLines.EMPTY; + return Lines.EMPTY; } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java new file mode 100644 index 00000000000..16f50ca982e --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedLinesResolver.java @@ -0,0 +1,35 @@ +package datadog.trace.civisibility.source; + +import datadog.compiler.utils.CompilerUtils; +import java.lang.reflect.Method; +import javax.annotation.Nonnull; + +public class CompilerAidedLinesResolver implements LinesResolver { + @Nonnull + @Override + public Lines getMethodLines(@Nonnull Method method) { + int startLine = CompilerUtils.getStartLine(method); + if (startLine <= 0) { + return Lines.EMPTY; + } + int endLine = CompilerUtils.getEndLine(method); + if (endLine <= 0) { + return Lines.EMPTY; + } + return new Lines(startLine, endLine); + } + + @Nonnull + @Override + public Lines getClassLines(@Nonnull Class clazz) { + int startLine = CompilerUtils.getStartLine(clazz); + if (startLine <= 0) { + return Lines.EMPTY; + } + int endLine = CompilerUtils.getEndLine(clazz); + if (endLine <= 0) { + return Lines.EMPTY; + } + return new Lines(startLine, endLine); + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolver.java deleted file mode 100644 index 15bdaae5b01..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolver.java +++ /dev/null @@ -1,21 +0,0 @@ -package datadog.trace.civisibility.source; - -import datadog.compiler.utils.CompilerUtils; -import java.lang.reflect.Method; -import javax.annotation.Nonnull; - -public class CompilerAidedMethodLinesResolver implements MethodLinesResolver { - @Nonnull - @Override - public MethodLines getLines(@Nonnull Method method) { - int startLine = CompilerUtils.getStartLine(method); - if (startLine <= 0) { - return MethodLines.EMPTY; - } - int endLine = CompilerUtils.getEndLine(method); - if (endLine <= 0) { - return MethodLines.EMPTY; - } - return new MethodLines(startLine, endLine); - } -} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java new file mode 100644 index 00000000000..25999afc891 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/LinesResolver.java @@ -0,0 +1,55 @@ +package datadog.trace.civisibility.source; + +import java.lang.reflect.Method; +import java.util.Objects; +import javax.annotation.Nonnull; + +public interface LinesResolver { + + @Nonnull + Lines getMethodLines(@Nonnull Method method); + + @Nonnull + Lines getClassLines(@Nonnull Class clazz); + + final class Lines { + public static final Lines EMPTY = new Lines(Integer.MAX_VALUE, Integer.MIN_VALUE); + + private final int startLineNumber; + private final int endLineNumber; + + public Lines(int startLineNumber, int endLineNumber) { + this.startLineNumber = startLineNumber; + this.endLineNumber = endLineNumber; + } + + public int getStartLineNumber() { + return startLineNumber; + } + + public int getEndLineNumber() { + return endLineNumber; + } + + public boolean isValid() { + return startLineNumber <= endLineNumber; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Lines that = (Lines) o; + return startLineNumber == that.startLineNumber && endLineNumber == that.endLineNumber; + } + + @Override + public int hashCode() { + return Objects.hash(startLineNumber, endLineNumber); + } + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/MethodLinesResolver.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/MethodLinesResolver.java deleted file mode 100644 index 0c046927f10..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/MethodLinesResolver.java +++ /dev/null @@ -1,52 +0,0 @@ -package datadog.trace.civisibility.source; - -import java.lang.reflect.Method; -import java.util.Objects; -import javax.annotation.Nonnull; - -public interface MethodLinesResolver { - - @Nonnull - MethodLines getLines(@Nonnull Method method); - - final class MethodLines { - public static final MethodLines EMPTY = new MethodLines(Integer.MAX_VALUE, Integer.MIN_VALUE); - - private final int startLineNumber; - private final int finishLineNumber; - - public MethodLines(int startLineNumber, int finishLineNumber) { - this.startLineNumber = startLineNumber; - this.finishLineNumber = finishLineNumber; - } - - public int getStartLineNumber() { - return startLineNumber; - } - - public int getFinishLineNumber() { - return finishLineNumber; - } - - public boolean isValid() { - return startLineNumber <= finishLineNumber; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - MethodLines that = (MethodLines) o; - return startLineNumber == that.startLineNumber && finishLineNumber == that.finishLineNumber; - } - - @Override - public int hashCode() { - return Objects.hash(startLineNumber, finishLineNumber); - } - } -} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index 0d18160e0bb..1eeff0387f1 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -13,7 +13,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentTracer import datadog.trace.civisibility.codeowners.NoCodeowners import datadog.trace.civisibility.decorator.TestDecoratorImpl -import datadog.trace.civisibility.source.MethodLinesResolver +import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.NoOpSourcePathResolver import datadog.trace.civisibility.telemetry.CiVisibilityMetricCollectorImpl import datadog.trace.civisibility.utils.SpanUtils @@ -98,7 +98,10 @@ class TestImplTest extends SpanWriterTest { def config = Config.get() def metricCollector = Stub(CiVisibilityMetricCollectorImpl) def testDecorator = new TestDecoratorImpl("component", "session-name", "test-command", [:]) - def methodLinesResolver = { it -> MethodLinesResolver.MethodLines.EMPTY } + + def linesResolver = Stub(LinesResolver) + linesResolver.getMethodLines(_) >> LinesResolver.Lines.EMPTY + def codeowners = NoCodeowners.INSTANCE new TestImpl( moduleSpanContext, @@ -117,7 +120,7 @@ class TestImplTest extends SpanWriterTest { metricCollector, testDecorator, NoOpSourcePathResolver.INSTANCE, - methodLinesResolver, + linesResolver, codeowners, coverageStoreFactory, SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy index e5493e41c66..a60cb54f512 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy @@ -11,13 +11,13 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.civisibility.codeowners.NoCodeowners import datadog.trace.civisibility.decorator.TestDecoratorImpl -import datadog.trace.civisibility.source.MethodLinesResolver +import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.SourcePathResolver import datadog.trace.civisibility.telemetry.CiVisibilityMetricCollectorImpl import datadog.trace.civisibility.utils.SpanUtils class TestSuiteImplTest extends SpanWriterTest { - def "test suite span is generated and test.codeowners populated"() { + def "test suite span is generated and tags populated"() { setup: def testSuite = givenATestSuite() @@ -31,6 +31,8 @@ class TestSuiteImplTest extends SpanWriterTest { spanType DDSpanTypes.TEST_SUITE_END tags(false) { "$Tags.TEST_CODEOWNERS" "[\"@global-owner1\",\"@global-owner2\"]" + "$Tags.TEST_SOURCE_START" 10 + "$Tags.TEST_SOURCE_END" 20 } } } @@ -52,7 +54,10 @@ class TestSuiteImplTest extends SpanWriterTest { def config = Config.get() def metricCollector = Stub(CiVisibilityMetricCollectorImpl) def testDecorator = new TestDecoratorImpl("component", "session-name", "test-command", [:]) - def methodLinesResolver = { it -> MethodLinesResolver.MethodLines.EMPTY } + + def linesResolver = Stub(LinesResolver) + def classLines = new LinesResolver.Lines(10, 20) + linesResolver.getClassLines(MyClass) >> classLines def resolver = Stub(SourcePathResolver) resolver.getSourcePath(MyClass) >> "MyClass.java" @@ -75,7 +80,7 @@ class TestSuiteImplTest extends SpanWriterTest { testDecorator, resolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS ) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy index a5cbe960caf..029e2886d2f 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy @@ -12,7 +12,7 @@ import datadog.trace.civisibility.config.ExecutionSettings import datadog.trace.civisibility.coverage.percentage.child.ChildProcessCoverageReporter import datadog.trace.civisibility.decorator.TestDecorator import datadog.trace.civisibility.ipc.SignalClient -import datadog.trace.civisibility.source.MethodLinesResolver +import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.SourcePathResolver import datadog.trace.civisibility.test.ExecutionStrategy import datadog.trace.test.util.DDSpecification @@ -48,7 +48,7 @@ class ProxyTestModuleTest extends DDSpecification { Stub(TestDecorator), Stub(SourcePathResolver), Stub(Codeowners), - Stub(MethodLinesResolver), + Stub(LinesResolver), Stub(CoverageStore.Factory), Stub(ChildProcessCoverageReporter), GroovyMock(SignalClient.Factory) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy index 669db4126db..cba3f63f529 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy @@ -9,7 +9,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.civisibility.codeowners.Codeowners import datadog.trace.civisibility.config.ExecutionSettings import datadog.trace.civisibility.decorator.TestDecorator -import datadog.trace.civisibility.source.MethodLinesResolver +import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.SourcePathResolver import datadog.trace.civisibility.test.ExecutionStrategy import datadog.trace.test.util.DDSpecification @@ -40,7 +40,7 @@ class HeadlessTestModuleTest extends DDSpecification { Stub(TestDecorator), Stub(SourcePathResolver), Stub(Codeowners), - Stub(MethodLinesResolver), + Stub(LinesResolver), Stub(CoverageStore.Factory), executionStrategy, (span) -> { } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortLinesResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortLinesResolverTest.groovy new file mode 100644 index 00000000000..5d12ff50d13 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortLinesResolverTest.groovy @@ -0,0 +1,119 @@ +package datadog.trace.civisibility.source + + +import spock.lang.Specification + +class BestEffortLinesResolverTest extends Specification { + + def "test get method source info from delegate"() { + setup: + def testMethod = TestClass.getDeclaredMethod("testMethod") + def expectedLines = new LinesResolver.Lines(42, 43) + + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getMethodLines(testMethod) >> expectedLines + secondDelegate.getMethodLines(testMethod) >> LinesResolver.Lines.EMPTY + + when: + def methodLines = resolver.getMethodLines(testMethod) + + then: + methodLines == expectedLines + } + + def "test get class source info from delegate"() { + setup: + def expectedLines = new LinesResolver.Lines(42, 43) + + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getClassLines(TestClass) >> expectedLines + secondDelegate.getClassLines(TestClass) >> LinesResolver.Lines.EMPTY + + when: + def classLines = resolver.getClassLines(TestClass) + + then: + classLines == expectedLines + } + + def "test get method source info from second delegate"() { + setup: + def testMethod = TestClass.getDeclaredMethod("testMethod") + def expectedLines = new LinesResolver.Lines(42, 43) + + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getMethodLines(testMethod) >> LinesResolver.Lines.EMPTY + secondDelegate.getMethodLines(testMethod) >> expectedLines + + when: + def methodLines = resolver.getMethodLines(testMethod) + + then: + methodLines == expectedLines + } + + def "test get class source info from second delegate"() { + setup: + def expectedLines = new LinesResolver.Lines(42, 43) + + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getClassLines(TestClass) >> LinesResolver.Lines.EMPTY + secondDelegate.getClassLines(TestClass) >> expectedLines + + when: + def classLines = resolver.getClassLines(TestClass) + + then: + classLines == expectedLines + } + + def "test failed to get method info from both delegates"() { + setup: + def testMethod = TestClass.getDeclaredMethod("testMethod") + + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getMethodLines(testMethod) >> LinesResolver.Lines.EMPTY + secondDelegate.getMethodLines(testMethod) >> LinesResolver.Lines.EMPTY + + when: + def methodLines = resolver.getMethodLines(testMethod) + + then: + methodLines == LinesResolver.Lines.EMPTY + } + + def "test failed to get class info from both delegates"() { + setup: + def delegate = Stub(LinesResolver) + def secondDelegate = Stub(LinesResolver) + def resolver = new BestEffortLinesResolver(delegate, secondDelegate) + + delegate.getClassLines(TestClass) >> LinesResolver.Lines.EMPTY + secondDelegate.getClassLines(TestClass) >> LinesResolver.Lines.EMPTY + + when: + def classLines = resolver.getClassLines(TestClass) + + then: + classLines == LinesResolver.Lines.EMPTY + } + + private static final class TestClass { + void testMethod() {} + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortMethodLinesResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortMethodLinesResolverTest.groovy deleted file mode 100644 index 4076a076279..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/BestEffortMethodLinesResolverTest.groovy +++ /dev/null @@ -1,67 +0,0 @@ -package datadog.trace.civisibility.source - - -import spock.lang.Specification - -class BestEffortMethodLinesResolverTest extends Specification { - - def "test get source info from delegate"() { - setup: - def testMethod = TestClass.getDeclaredMethod("testMethod") - def expectedLines = new MethodLinesResolver.MethodLines(42, 43) - - def delegate = Stub(MethodLinesResolver) - def secondDelegate = Stub(MethodLinesResolver) - def resolver = new BestEffortMethodLinesResolver(delegate, secondDelegate) - - delegate.getLines(testMethod) >> expectedLines - secondDelegate.getLines(testMethod) >> MethodLinesResolver.MethodLines.EMPTY - - when: - def lines = resolver.getLines(testMethod) - - then: - lines == expectedLines - } - - def "test get source info from second delegate"() { - setup: - def testMethod = TestClass.getDeclaredMethod("testMethod") - def expectedLines = new MethodLinesResolver.MethodLines(42, 43) - - def delegate = Stub(MethodLinesResolver) - def secondDelegate = Stub(MethodLinesResolver) - def resolver = new BestEffortMethodLinesResolver(delegate, secondDelegate) - - delegate.getLines(testMethod) >> MethodLinesResolver.MethodLines.EMPTY - secondDelegate.getLines(testMethod) >> expectedLines - - when: - def lines = resolver.getLines(testMethod) - - then: - lines == expectedLines - } - - def "test failed to get info from both delegates"() { - setup: - def testMethod = TestClass.getDeclaredMethod("testMethod") - - def delegate = Stub(MethodLinesResolver) - def secondDelegate = Stub(MethodLinesResolver) - def resolver = new BestEffortMethodLinesResolver(delegate, secondDelegate) - - delegate.getLines(testMethod) >> MethodLinesResolver.MethodLines.EMPTY - secondDelegate.getLines(testMethod) >> MethodLinesResolver.MethodLines.EMPTY - - when: - def lines = resolver.getLines(testMethod) - - then: - lines == MethodLinesResolver.MethodLines.EMPTY - } - - private static final class TestClass { - void testMethod() {} - } -} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeMethodLinesResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.groovy similarity index 74% rename from dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeMethodLinesResolverTest.groovy rename to dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.groovy index 9efb2399ed4..3c7afc5c994 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeMethodLinesResolverTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/ByteCodeLinesResolverTest.groovy @@ -1,23 +1,31 @@ package datadog.trace.civisibility.source - import org.spockframework.util.IoUtil import spock.lang.Specification -class ByteCodeMethodLinesResolverTest extends Specification { +class ByteCodeLinesResolverTest extends Specification { def "test method lines resolution"() { setup: def aTestMethod = NestedClass.getDeclaredMethod("aTestMethod") when: - def methodLinesResolver = new ByteCodeMethodLinesResolver() - def methodLines = methodLinesResolver.getLines(aTestMethod) + def linesResolver = new ByteCodeLinesResolver() + def methodLines = linesResolver.getMethodLines(aTestMethod) then: methodLines.isValid() methodLines.startLineNumber > 0 - methodLines.finishLineNumber > methodLines.startLineNumber + methodLines.endLineNumber > methodLines.startLineNumber + } + + def "test always invalid class lines resolution" () { + when: + def linesResolver = new ByteCodeLinesResolver() + def classLines = linesResolver.getClassLines(NestedClass) + + then: + !classLines.isValid() } def "test invalid method lines resolution"() { @@ -25,8 +33,8 @@ class ByteCodeMethodLinesResolverTest extends Specification { def aTestMethod = NestedClass.getDeclaredMethod("abstractMethod") when: - def methodLinesResolver = new ByteCodeMethodLinesResolver() - def methodLines = methodLinesResolver.getLines(aTestMethod) + def linesResolver = new ByteCodeLinesResolver() + def methodLines = linesResolver.getMethodLines(aTestMethod) then: !methodLines.isValid() @@ -46,8 +54,8 @@ class ByteCodeMethodLinesResolverTest extends Specification { def misbehavingMethod = misbehavingClass.getDeclaredMethod("aTestMethod") when: - def methodLinesResolver = new ByteCodeMethodLinesResolver() - def methodLines = methodLinesResolver.getLines(misbehavingMethod) + def linesResolver = new ByteCodeLinesResolver() + def methodLines = linesResolver.getMethodLines(misbehavingMethod) then: !methodLines.isValid() @@ -56,7 +64,7 @@ class ByteCodeMethodLinesResolverTest extends Specification { def "test returns empty method lines when unknown method is attempted to be resolved"() { setup: def aTestMethod = NestedClass.getDeclaredMethod("abstractMethod") - def classMethodLines = new ByteCodeMethodLinesResolver.ClassMethodLines() + def classMethodLines = new ByteCodeLinesResolver.ClassMethodLines() when: def methodLines = classMethodLines.get(aTestMethod) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedLinesResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedLinesResolverTest.groovy new file mode 100644 index 00000000000..a4948d2d6b2 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedLinesResolverTest.groovy @@ -0,0 +1,70 @@ +package datadog.trace.civisibility.source + +import datadog.compiler.annotations.SourceLines +import spock.lang.Specification + +class CompilerAidedLinesResolverTest extends Specification { + + def "test source info retrieval for #methodName"() { + setup: + def resolver = new CompilerAidedLinesResolver() + def method = TestClass.getDeclaredMethod(methodName) + + when: + def lines = resolver.getMethodLines(method) + + then: + lines.valid == expectedValid + + if (lines.valid) { + lines.startLineNumber == expectedStart + lines.endLineNumber == expectedFinish + } + + where: + methodName | expectedValid | expectedStart | expectedFinish + "methodWithNoLinesInfoInjected" | false | -1 | -1 + "methodWithLinesInfoInjected" | true | 10 | 20 + "methodWithUnknownLinesInfoInjected" | false | -1 | -1 + } + + def "test source info retrieval for #ClassTested"() { + setup: + def resolver = new CompilerAidedLinesResolver() + + when: + def lines = resolver.getClassLines(ClassTested) + + then: + lines.valid == expectedValid + + if (lines.valid) { + lines.startLineNumber == expectedStart + lines.endLineNumber == expectedFinish + } + + where: + ClassTested | expectedValid | expectedStart | expectedFinish + ClassWithNoLinesInfoInjected | false | -1 | -1 + ClassWithLinesInfoInjected | true | 10 | 20 + ClassWithUnknownLinesInfoInjected | false | -1 | -1 + } + + private static final class TestClass { + void methodWithNoLinesInfoInjected() {} + + @SourceLines(start = 10, end = 20) + void methodWithLinesInfoInjected() {} + + @SourceLines(start = -1, end = -1) + void methodWithUnknownLinesInfoInjected() {} + } + + private static final class ClassWithNoLinesInfoInjected {} + + @SourceLines(start = 10, end = 20) + private static final class ClassWithLinesInfoInjected {} + + @SourceLines(start = -1, end = -1) + private static final class ClassWithUnknownLinesInfoInjected {} +} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolverTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolverTest.groovy deleted file mode 100644 index 390f3309447..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/CompilerAidedMethodLinesResolverTest.groovy +++ /dev/null @@ -1,40 +0,0 @@ -package datadog.trace.civisibility.source - -import datadog.compiler.annotations.MethodLines -import spock.lang.Specification - -class CompilerAidedMethodLinesResolverTest extends Specification { - - def "test source info retrieval for #methodName"() { - setup: - def resolver = new CompilerAidedMethodLinesResolver() - def method = TestClass.getDeclaredMethod(methodName) - - when: - def lines = resolver.getLines(method) - - then: - lines.valid == expectedValid - - if (lines.valid) { - lines.startLineNumber == expectedStart - lines.finishLineNumber == expectedFinish - } - - where: - methodName | expectedValid | expectedStart | expectedFinish - "methodWithNoLinesInfoInjected" | false | -1 | -1 - "methodWithLinesInfoInjected" | true | 10 | 20 - "methodWithUnknownLinesInfoInjected" | false | -1 | -1 - } - - private static final class TestClass { - void methodWithNoLinesInfoInjected() {} - - @MethodLines(start = 10, end = 20) - void methodWithLinesInfoInjected() {} - - @MethodLines(start = -1, end = -1) - void methodWithUnknownLinesInfoInjected() {} - } -} diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 0a373384f6c..c232f6e4551 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -36,7 +36,7 @@ import datadog.trace.civisibility.domain.headless.HeadlessTestSession import datadog.trace.civisibility.events.BuildEventsHandlerImpl import datadog.trace.civisibility.events.TestEventsHandlerImpl import datadog.trace.civisibility.ipc.SignalServer -import datadog.trace.civisibility.source.MethodLinesResolver +import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.SourcePathResolver import datadog.trace.civisibility.source.index.RepoIndexBuilder import datadog.trace.civisibility.telemetry.CiVisibilityMetricCollectorImpl @@ -62,6 +62,8 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { static final String DUMMY_SOURCE_PATH = "dummy_source_path" static final int DUMMY_TEST_METHOD_START = 12 static final int DUMMY_TEST_METHOD_END = 18 + static final int DUMMY_TEST_CLASS_START = 11 + static final int DUMMY_TEST_CLASS_END = 19 static final Collection DUMMY_CODE_OWNERS = ["owner1", "owner2"] private static Path agentKeyFile @@ -93,8 +95,9 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { def codeowners = Stub(Codeowners) codeowners.getOwners(DUMMY_SOURCE_PATH) >> DUMMY_CODE_OWNERS - def methodLinesResolver = Stub(MethodLinesResolver) - methodLinesResolver.getLines(_ as Method) >> new MethodLinesResolver.MethodLines(DUMMY_TEST_METHOD_START, DUMMY_TEST_METHOD_END) + def linesResolver = Stub(LinesResolver) + linesResolver.getMethodLines(_ as Method) >> new LinesResolver.Lines(DUMMY_TEST_METHOD_START, DUMMY_TEST_METHOD_END) + linesResolver.getClassLines(_ as Class) >> new LinesResolver.Lines(DUMMY_TEST_CLASS_START, DUMMY_TEST_CLASS_END) def executionSettingsFactory = new ExecutionSettingsFactory() { @Override @@ -139,7 +142,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, coverageStoreFactory, new ExecutionStrategy(config, executionSettingsFactory.create(JvmInfo.CURRENT_JVM, "")) ) @@ -165,7 +168,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { testDecorator, sourcePathResolver, codeowners, - methodLinesResolver, + linesResolver, executionSettingsFactory, signalServer, repoIndexBuilder, diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index 8c549a3ee13..5319aa9a18f 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -141,7 +141,7 @@ public final class ConfigDefaults { static final boolean DEFAULT_CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED = true; static final boolean DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED = true; static final boolean DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_AUTO_CONFIGURATION_ENABLED = true; - static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.2.0"; + static final String DEFAULT_CIVISIBILITY_COMPILER_PLUGIN_VERSION = "0.2.2"; static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_VERSION = "0.8.12"; static final String DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES = "datadog.trace.*:org.apache.commons.*:org.mockito.*"; diff --git a/internal-api/build.gradle b/internal-api/build.gradle index 5f681af689b..7176c43d500 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -209,7 +209,7 @@ dependencies { // has to be loaded by system classloader: // it contains annotations that are also present in the instrumented application classes - api "com.datadoghq:dd-javac-plugin-client:0.1.7" + api "com.datadoghq:dd-javac-plugin-client:0.2.2" testImplementation project(":utils:test-utils") testImplementation("org.assertj:assertj-core:3.20.2") From 4dfa40455bcc969bbe62b055b089561a9b257411 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 19 Nov 2024 11:15:30 +0100 Subject: [PATCH 026/106] Do not reset IAST concurrent request counter (#7963) --- .../iast/overhead/OverheadController.java | 32 +++++++++++++++---- .../overhead/OverheadControllerTest.groovy | 4 +-- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java index 33fe12d10a5..0cd4575056a 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/overhead/OverheadController.java @@ -9,6 +9,7 @@ import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.iast.IastContext; +import datadog.trace.api.telemetry.LogCollector; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.util.AgentTaskScheduler; @@ -127,6 +128,8 @@ private int getAvailableQuote(@Nullable final AgentSpan span) { class OverheadControllerImpl implements OverheadController { + private static final Logger LOGGER = LoggerFactory.getLogger(OverheadControllerImpl.class); + private static final int RESET_PERIOD_SECONDS = 30; private final int sampling; @@ -141,6 +144,8 @@ class OverheadControllerImpl implements OverheadController { final AtomicLong cumulativeCounter; + private volatile long lastAcquiredTimestamp = Long.MAX_VALUE; + final OverheadContext globalContext = new OverheadContext(Config.get().getIastVulnerabilitiesPerRequest()); @@ -165,7 +170,11 @@ public boolean acquireRequest() { long newValue = prevValue + sampling; if (newValue / 100 == prevValue / 100 + 1) { // Sample request - return availableRequests.acquire(); + final boolean acquired = availableRequests.acquire(); + if (acquired) { + lastAcquiredTimestamp = System.currentTimeMillis(); + } + return acquired; } // Skipped by sampling return false; @@ -222,11 +231,22 @@ static NonBlockingSemaphore maxConcurrentRequests(final int max) { @Override public void reset() { globalContext.reset(); - // Periodic reset of maximum concurrent requests. This guards us against exhausting concurrent - // requests if some bug led us to lose a request end event. This will lead to periodically - // going above the max concurrent requests. But overall, it should be self-stabilizing. So for - // practical purposes, the max concurrent requests is a hint. - availableRequests.reset(); + if (lastAcquiredTimestamp != Long.MAX_VALUE + && System.currentTimeMillis() - lastAcquiredTimestamp > 1000 * 60 * 60) { + // If the last time a request was acquired is longer than 1h, we check the number of + // available requests. If it + // is zero, we might have lost request end events, leading to IAST not being able to acquire + // new requests. + // We report it to telemetry for further investigation. + if (availableRequests.available() == 0) { + LOGGER.debug( + LogCollector.SEND_TELEMETRY, + "IAST cannot acquire new requests, end of request events might be missing."); + // Once starved, do not report this again, unless this is recovered and then starved + // again. + lastAcquiredTimestamp = Long.MAX_VALUE; + } + } } } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy index 123487cf4d4..875789e7466 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy @@ -247,7 +247,7 @@ class OverheadControllerTest extends DDSpecification { executorService?.shutdown() } - def 'acquireRequest works for max concurrent request per reset'() { + def 'acquireRequest never exceeds max concurrent requests even after reset'() { setup: def taskSchedler = Stub(AgentTaskScheduler) injectSysConfig("dd.iast.request-sampling", "100") @@ -270,7 +270,7 @@ class OverheadControllerTest extends DDSpecification { lastAcquired = overheadController.acquireRequest() then: - acquiredValues.every { it == true } + acquiredValues.every { it == false } !lastAcquired when: From ff8ee85501f2d17a15a3903d2d3f776734435f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20=C3=81lvarez=20=C3=81lvarez?= Date: Tue, 19 Nov 2024 11:30:26 +0100 Subject: [PATCH 027/106] Reset iast request context on root span published (#7969) --- .../com/datadog/iast/IastGlobalContext.java | 4 ++ .../com/datadog/iast/IastOptOutContext.java | 5 ++ .../com/datadog/iast/IastRequestContext.java | 36 ++++++++++---- .../iast/IastRequestContextTest.groovy | 47 +++++++++++++++++++ .../com/datadog/iast/IastSystemTest.groovy | 1 + .../iast/test/IastAgentTestRunner.groovy | 15 ++---- .../IastRequestContextPreparationTrait.groovy | 14 +++--- .../iast/KafkaIastDeserializerTest.groovy | 20 ++++---- .../KafkaIastDeserializerForkedTest.groovy | 20 ++++---- .../agent/test/base/HttpServerTest.groovy | 6 +++ .../datadog/trace/api/iast/IastContext.java | 3 +- 11 files changed, 124 insertions(+), 47 deletions(-) diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java index 40c0457857a..44be00c59be 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java @@ -3,6 +3,7 @@ import com.datadog.iast.taint.TaintedMap; import com.datadog.iast.taint.TaintedObjects; import datadog.trace.api.iast.IastContext; +import java.io.IOException; import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -22,6 +23,9 @@ public TaintedObjects getTaintedObjects() { return taintedObjects; } + @Override + public void close() throws IOException {} + public static class Provider extends IastContext.Provider { // (16384 * 4) buckets: approx 256K diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java index ea7597cc337..ad91165da20 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java @@ -2,12 +2,14 @@ import com.datadog.iast.taint.TaintedObjects; import datadog.trace.api.iast.IastContext; +import java.io.IOException; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.jetbrains.annotations.NotNull; public class IastOptOutContext implements IastContext { + @Nonnull @SuppressWarnings("unchecked") @NotNull @Override @@ -15,6 +17,9 @@ public TaintedObjects getTaintedObjects() { return TaintedObjects.NoOp.INSTANCE; } + @Override + public void close() throws IOException {} + public static class Provider extends IastContext.Provider { final IastContext optOutContext = new IastOptOutContext(); diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java index 4279b72a1c7..d237935ac01 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java @@ -15,8 +15,10 @@ import datadog.trace.api.iast.telemetry.IastMetricCollector.HasMetricCollector; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.io.IOException; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; +import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -27,6 +29,7 @@ public class IastRequestContext implements IastContext, HasMetricCollector { private final VulnerabilityBatch vulnerabilityBatch; private final OverheadContext overheadContext; private TaintedObjects taintedObjects; + @Nullable private Consumer release; @Nullable private IastMetricCollector collector; @Nullable private volatile String strictTransportSecurity; @Nullable private volatile String xContentTypeOptions; @@ -124,12 +127,20 @@ public void setTaintedObjects(@Nonnull final TaintedObjects taintedObjects) { this.taintedObjects = taintedObjects; } + @Override + public void close() throws IOException { + if (release != null) { + release.accept(this); + release = null; + } + } + public static class Provider extends IastContext.Provider { // 16384 buckets: approx 64K static final int MAP_SIZE = TaintedMap.DEFAULT_CAPACITY; - final Queue pool = + private final Queue pool = new ArrayBlockingQueue<>( Math.max( Config.get().getIastMaxConcurrentRequests(), DEFAULT_IAST_MAX_CONCURRENT_REQUESTS)); @@ -154,19 +165,28 @@ public IastContext buildRequestContext() { if (taintedObjects == null) { taintedObjects = TaintedObjects.build(TaintedMap.build(MAP_SIZE)); } - return new IastRequestContext(taintedObjects); + final IastRequestContext ctx = new IastRequestContext(taintedObjects); + ctx.release = this::releaseRequestContext; + return ctx; } @SuppressWarnings("unchecked") @Override public void releaseRequestContext(@Nonnull final IastContext context) { - final TaintedObjects taintedObjects = context.getTaintedObjects(); + final IastRequestContext iastCtx = (IastRequestContext) context; + + // reset tainted objects map + final TaintedObjects taintedObjects = iastCtx.getTaintedObjects(); taintedObjects.clear(); - // add the root instance to the pool - if (taintedObjects instanceof Wrapper) { - pool.offer(((Wrapper) taintedObjects).unwrap()); - } else { - pool.offer(taintedObjects); + + // return to pool and update internal ref + final TaintedObjects unwrapped = + taintedObjects instanceof Wrapper + ? ((Wrapper) taintedObjects).unwrap() + : taintedObjects; + if (unwrapped != TaintedObjects.NoOp.INSTANCE) { + pool.offer(unwrapped); + iastCtx.setTaintedObjects(TaintedObjects.NoOp.INSTANCE); } } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastRequestContextTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastRequestContextTest.groovy index 24ba8db2731..5d7fe0dde7c 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastRequestContextTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastRequestContextTest.groovy @@ -2,6 +2,7 @@ package com.datadog.iast import com.datadog.iast.model.Range import com.datadog.iast.taint.TaintedObjects +import datadog.trace.api.Config import datadog.trace.api.gateway.RequestContext import datadog.trace.api.gateway.RequestContextSlot import datadog.trace.bootstrap.instrumentation.api.AgentSpan @@ -53,6 +54,15 @@ class IastRequestContextTest extends DDSpecification { then: 1 * tracer.activeSpan() >> span + 1 * span.getRequestContext() >> null + resolved == null + + when: + resolved = provider.resolve() + + then: + 1 * tracer.activeSpan() >> span + 1 * span.getRequestContext() >> reqCtx resolved === initialCtx } @@ -72,5 +82,42 @@ class IastRequestContextTest extends DDSpecification { then: to.count() == 0 provider.pool.size() == 1 + + when: + final maxPoolSize = Config.get().getIastMaxConcurrentRequests() + final list = (1..2 * maxPoolSize).collect { + provider.buildRequestContext() + } + + then: + provider.pool.size() == 0 + + when: + list.each { provider.releaseRequestContext(it) } + + then: + provider.pool.size() == maxPoolSize + } + + void 'ensure that the context releases all tainted objects on close'() { + setup: + final ctx = provider.buildRequestContext() as IastRequestContext + + when: + ctx.withCloseable { + it.taintedObjects.taint(UUID.randomUUID(), [] as Range[]) + } + + then: + ctx.taintedObjects.count() == 0 + + when: + ctx.withCloseable { + it.taintedObjects.taint(UUID.randomUUID(), [] as Range[]) + assert it.taintedObjects.count() == 0 + } + + then: + ctx.taintedObjects.count() == 0 } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy index acd16131c07..71914a424a2 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastSystemTest.groovy @@ -73,6 +73,7 @@ class IastSystemTest extends DDSpecification { then: 1 * iastContext.getTaintedObjects() + 1 * iastContext.setTaintedObjects(_) 1 * iastContext.getMetricCollector() 1 * traceSegment.setTagTop('_dd.iast.enabled', 1) 1 * iastContext.getxContentTypeOptions() >> 'nosniff' diff --git a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy index 97387598a53..0ef01944533 100644 --- a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy +++ b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy @@ -6,7 +6,6 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.tooling.bytebuddy.iast.TaintableVisitor import datadog.trace.api.gateway.CallbackProvider import datadog.trace.api.gateway.Events -import datadog.trace.api.gateway.Flow import datadog.trace.api.gateway.RequestContextSlot import datadog.trace.api.iast.IastContext import datadog.trace.api.iast.SourceTypes @@ -15,7 +14,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer import datadog.trace.bootstrap.instrumentation.api.TagContext import datadog.trace.core.DDSpan -import java.util.function.Supplier class IastAgentTestRunner extends AgentTestRunner implements IastRequestContextPreparationTrait { public static final EMPTY_SOURCE = new Source(SourceTypes.NONE, '', '') @@ -40,18 +38,10 @@ class IastAgentTestRunner extends AgentTestRunner implements IastRequestContextP IastContext.Provider.get().taintedObjects } - protected TaintedObjectCollection getLocalTaintedObjectCollection() { - new TaintedObjectCollection(localTaintedObjects) - } - - protected TaintedObjectCollection getTaintedObjectCollection(DDSpan span) { - final IastContext ctx = span.getRequestContext().getData(RequestContextSlot.IAST) - return new TaintedObjectCollection(ctx.getTaintedObjects()) - } - protected DDSpan runUnderIastTrace(Closure cl) { CallbackProvider iastCbp = TEST_TRACER.getCallbackProvider(RequestContextSlot.IAST) - Supplier> reqStartCb = iastCbp.getCallback(Events.EVENTS.requestStarted()) + def reqStartCb = iastCbp.getCallback(Events.EVENTS.requestStarted()) + def reqEndCb = iastCbp.getCallback(Events.EVENTS.requestEnded()) def iastCtx = reqStartCb.get().result def ddctx = new TagContext().withRequestContextDataIast(iastCtx) @@ -59,6 +49,7 @@ class IastAgentTestRunner extends AgentTestRunner implements IastRequestContextP try { AgentTracer.activateSpan(span).withCloseable cl } finally { + reqEndCb.apply(span.requestContext, span) span.finish() } diff --git a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy index 353cf322d07..86fedac3cf2 100644 --- a/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy +++ b/dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy @@ -19,7 +19,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.get trait IastRequestContextPreparationTrait { static void iastSystemSetup(Closure reqEndAction = null) { - def ss = AgentTracer.get().getSubscriptionService(RequestContextSlot.IAST) + final tracer = AgentTracer.get() + def ss = tracer.getSubscriptionService(RequestContextSlot.IAST) IastSystem.start(ss, new NoopOverheadController()) EventType>> requestStarted = Events.get().requestStarted() @@ -27,17 +28,18 @@ trait IastRequestContextPreparationTrait { Events.get().requestEnded() // get original callbacks - CallbackProvider provider = AgentTracer.get().getCallbackProvider(RequestContextSlot.IAST) + CallbackProvider provider = tracer.getCallbackProvider(RequestContextSlot.IAST) def origRequestStarted = provider.getCallback(requestStarted) def origRequestEnded = provider.getCallback(requestEnded) // wrap the original IG callbacks ss.reset() ss.registerCallback(requestStarted, new TaintedMapSaveStrongRefsRequestStarted(orig: origRequestStarted)) - if (reqEndAction != null) { - ss.registerCallback(requestEnded, new TaintedMapSavingRequestEnded( - original: origRequestEnded, beforeAction: reqEndAction)) - } + ss.registerCallback( + requestEnded, + reqEndAction == null + ? origRequestEnded + : new TaintedMapSavingRequestEnded(original: origRequestEnded, beforeAction: reqEndAction)) } static void iastSystemCleanup() { diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/iastLatestDepTest3/groovy/iast/KafkaIastDeserializerTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/iastLatestDepTest3/groovy/iast/KafkaIastDeserializerTest.groovy index d92d70ecd55..3b2c0c41f22 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/iastLatestDepTest3/groovy/iast/KafkaIastDeserializerTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/iastLatestDepTest3/groovy/iast/KafkaIastDeserializerTest.groovy @@ -1,7 +1,7 @@ package iast import com.datadog.iast.propagation.PropagationModuleImpl -import com.datadog.iast.test.IastAgentTestRunner +import com.datadog.iast.test.IastRequestTestRunner import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.SourceTypes import org.apache.kafka.common.header.internals.RecordHeaders @@ -16,7 +16,7 @@ import java.nio.ByteBuffer import static org.hamcrest.CoreMatchers.instanceOf import static org.hamcrest.core.IsEqual.equalTo -class KafkaIastDeserializerTest extends IastAgentTestRunner { +class KafkaIastDeserializerTest extends IastRequestTestRunner { private static final int BUFF_OFFSET = 10 @@ -31,13 +31,13 @@ class KafkaIastDeserializerTest extends IastAgentTestRunner { final deserializer = new StringDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) test.method.deserialize(deserializer, "test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value('Hello World!') range(0, 12, source(origin)) @@ -58,13 +58,13 @@ class KafkaIastDeserializerTest extends IastAgentTestRunner { final deserializer = new ByteArrayDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) test.method.deserialize(deserializer, "test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(equalTo(payload)) range(0, Integer.MAX_VALUE, source(origin)) @@ -85,13 +85,13 @@ class KafkaIastDeserializerTest extends IastAgentTestRunner { final deserializer = new ByteBufferDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) test.method.deserialize(deserializer, "test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(instanceOf(ByteBuffer)) range(0, Integer.MAX_VALUE, source(origin)) @@ -113,13 +113,13 @@ class KafkaIastDeserializerTest extends IastAgentTestRunner { final deserializer = new JsonDeserializer(TestBean) when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) test.method.deserialize(deserializer, 'test', payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(instanceOf(TestBean)) range(0, Integer.MAX_VALUE, source(origin as byte)) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/iast/KafkaIastDeserializerForkedTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/iast/KafkaIastDeserializerForkedTest.groovy index fefca9feee0..d8dfeabce50 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/iast/KafkaIastDeserializerForkedTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/iast/KafkaIastDeserializerForkedTest.groovy @@ -1,7 +1,7 @@ package iast import com.datadog.iast.propagation.PropagationModuleImpl -import com.datadog.iast.test.IastAgentTestRunner +import com.datadog.iast.test.IastRequestTestRunner import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.SourceTypes import org.apache.kafka.common.serialization.ByteArrayDeserializer @@ -14,7 +14,7 @@ import java.nio.ByteBuffer import static org.hamcrest.CoreMatchers.equalTo import static org.hamcrest.CoreMatchers.instanceOf -class KafkaIastDeserializerForkedTest extends IastAgentTestRunner { +class KafkaIastDeserializerForkedTest extends IastRequestTestRunner { void 'test string deserializer'() { given: @@ -26,13 +26,13 @@ class KafkaIastDeserializerForkedTest extends IastAgentTestRunner { final deserializer = new StringDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) deserializer.deserialize("test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value('Hello World!') range(0, 12, source(origin as byte)) @@ -54,13 +54,13 @@ class KafkaIastDeserializerForkedTest extends IastAgentTestRunner { final deserializer = new ByteArrayDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) deserializer.deserialize("test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(equalTo(payload)) range(0, Integer.MAX_VALUE, source(origin as byte)) @@ -82,13 +82,13 @@ class KafkaIastDeserializerForkedTest extends IastAgentTestRunner { final deserializer = new ByteBufferDeserializer() when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) deserializer.deserialize("test", payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(instanceOf(ByteBuffer)) range(0, Integer.MAX_VALUE, source(origin as byte)) @@ -111,13 +111,13 @@ class KafkaIastDeserializerForkedTest extends IastAgentTestRunner { final deserializer = new JsonDeserializer(TestBean) when: - final span = runUnderIastTrace { + runUnderIastTrace { deserializer.configure([:], origin == SourceTypes.KAFKA_MESSAGE_KEY) deserializer.deserialize('test', payload) } then: - final to = getTaintedObjectCollection(span) + final to = finReqTaintedObjects to.hasTaintedObject { value(instanceOf(TestBean)) range(0, Integer.MAX_VALUE, source(origin as byte)) diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index dc86233533f..22d8dd0028e 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -2231,10 +2231,16 @@ abstract class HttpServerTest extends WithHttpServer { class IastIGCallbacks { static class Context implements IastContext { + @Nonnull @Override TO getTaintedObjects() { throw new UnsupportedOperationException() } + + @Override + void close() throws IOException { + // ignore + } } final Supplier> requestStartedCb = diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java index 0f2f777aebb..28e899a8030 100644 --- a/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java +++ b/internal-api/src/main/java/datadog/trace/api/iast/IastContext.java @@ -4,11 +4,12 @@ import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.io.Closeable; import javax.annotation.Nonnull; import javax.annotation.Nullable; /** Encapsulation for the IAST context, */ -public interface IastContext { +public interface IastContext extends Closeable { /** * Get the tainted objects dictionary linked to the context, since we have no visibility over the From 137948ff5931ef94ee37e6a0dfdcdebcfccdb046 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 19 Nov 2024 14:14:32 +0100 Subject: [PATCH 028/106] fix(iast): Fix test name uniqueness (#7960) --- .../decorator/HttpServerDecoratorTest.groovy | 19 +++++++++--------- .../datadog/iast/util/IteratorsTest.groovy | 2 +- .../agent/tooling/csi/BaseCallSiteTest.groovy | 5 +++++ .../SerializingMetricWriterTest.groovy | 2 +- .../sampling/RuleBasedSamplingTest.groovy | 15 +++++++++++--- .../common/writer/SerializationTest.groovy | 20 ++++--------------- .../core/histogram/HistogramsTest.groovy | 2 +- .../datadog/trace/api/FunctionsTest.groovy | 6 +++--- .../cache/QualifiedClassNameCacheTest.groovy | 2 +- .../api/iast/telemetry/IastMetricTest.groovy | 6 +++--- .../metric/MetricPeriodicActionTest.groovy | 4 ++-- 11 files changed, 43 insertions(+), 40 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy index fcbba105a5a..7c453155330 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy @@ -422,7 +422,8 @@ class HttpServerDecoratorTest extends ServerDecoratorTest { def ig = new InstrumentationGateway() def ss = ig.getSubscriptionService(RequestContextSlot.APPSEC) def cbpAppSec = ig.getCallbackProvider(RequestContextSlot.APPSEC) - def callbacks = new IGCallBacks(reqData) + def data = reqData ? new Object() : null + def callbacks = new IGCallBacks(data) if (reqStarted) { ss.registerCallback(EVENTS.requestStarted(), callbacks) } @@ -434,7 +435,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest { } Map headers = ["foo": "bar", "some": "thing", "another": "value"] def reqCtxt = Mock(RequestContext) { - getData(RequestContextSlot.APPSEC) >> reqData + getData(RequestContextSlot.APPSEC) >> data } def mSpan = Mock(AgentSpan) { getRequestContext() >> reqCtxt @@ -461,13 +462,13 @@ class HttpServerDecoratorTest extends ServerDecoratorTest { where: // spotless:off - reqStarted | reqData | reqHeader | reqHeaderDone | reqStartedCount | reqHeaderCount | reqHeaderDoneCount - false | null | false | false | 0 | 0 | 0 - false | new Object() | false | false | 0 | 0 | 0 - true | null | false | false | 1 | 0 | 0 - true | new Object() | false | false | 1 | 0 | 0 - true | new Object() | true | false | 1 | 3 | 0 - true | new Object() | true | true | 1 | 3 | 1 + reqStarted | reqData | reqHeader | reqHeaderDone | reqStartedCount | reqHeaderCount | reqHeaderDoneCount + false | false | false | false | 0 | 0 | 0 + false | true | false | false | 0 | 0 | 0 + true | false | false | false | 1 | 0 | 0 + true | true | false | false | 1 | 0 | 0 + true | true | true | false | 1 | 3 | 0 + true | true | true | true | 1 | 3 | 1 // spotless:on } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/IteratorsTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/IteratorsTest.groovy index d5510a39ebb..9b3c0006071 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/IteratorsTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/IteratorsTest.groovy @@ -60,7 +60,7 @@ class IteratorsTest extends Specification { ['hello', 'World', '!'] | ['hello', 'World', '!'] } - void 'joined iterator'() { + void 'joined iterator #iterationIndex'() { when: final iterator = Iterators.join(iterators as Iterator[]) diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy index e28d0d43ae1..8c69fc0bd21 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy @@ -184,5 +184,10 @@ class BaseCallSiteTest extends DDSpecification { String type String method String descriptor + + @Override + String toString() { + return descriptor + } } } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy index 1ba3c8b761c..5b6ce8bee3d 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy @@ -14,7 +14,7 @@ import static java.util.concurrent.TimeUnit.SECONDS class SerializingMetricWriterTest extends DDSpecification { - def "should produce correct message" () { + def "should produce correct message #iterationIndex" () { setup: long startTime = MILLISECONDS.toNanos(System.currentTimeMillis()) long duration = SECONDS.toNanos(10) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy index a8539edcc8d..c56e7ddfedb 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/sampling/RuleBasedSamplingTest.groovy @@ -328,9 +328,9 @@ class RuleBasedSamplingTest extends DDCoreSpecification { "*" | "anything..." | true "*" | null | false "*" | new StringBuilder("foo") | true - "*" | new Object() {} | true - "**" | new Object() {} | true - "?" | new Object() {} | false + "*" | object() | true + "**" | object() | true + "?" | object() | false "*" | "foo" | true "**" | "foo" | true "**" | true | true @@ -485,4 +485,13 @@ class RuleBasedSamplingTest extends DDCoreSpecification { static bigDecimal(str) { return new BigDecimal(str) } + + static object() { + return new Object() { + @Override + String toString() { + return 'object' + } + } + } } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy index 3ede3f626b1..ba273ca3e16 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/SerializationTest.groovy @@ -5,19 +5,13 @@ import com.fasterxml.jackson.databind.ObjectMapper import datadog.trace.test.util.DDSpecification import org.msgpack.core.MessagePack import org.msgpack.jackson.dataformat.MessagePackFactory -import spock.lang.Shared import static java.util.Collections.singletonMap class SerializationTest extends DDSpecification { - @Shared - def jsonMapper = new ObjectMapper() - @Shared - def mpMapper = new ObjectMapper(new MessagePackFactory()) - - def "test json mapper serialization"() { setup: + def mapper = new ObjectMapper() def map = ["key1": "val1"] def serializedMap = mapper.writeValueAsBytes(map) def serializedList = "[${new String(serializedMap)}]".getBytes() @@ -28,13 +22,13 @@ class SerializationTest extends DDSpecification { then: result == [map] new String(serializedList) == '[{"key1":"val1"}]' - - where: - mapper = jsonMapper } def "test msgpack mapper serialization"() { setup: + def mapper = new ObjectMapper(new MessagePackFactory()) + // GStrings get odd results in the serializer. + def input = (1..1).collect { singletonMap("key$it".toString(), "val$it".toString()) } def serializedMaps = input.collect { mapper.writeValueAsBytes(it) } @@ -51,11 +45,5 @@ class SerializationTest extends DDSpecification { then: result == input - - where: - mapper = mpMapper - - // GStrings get odd results in the serializer. - input = (1..1).collect { singletonMap("key$it".toString(), "val$it".toString()) } } } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/histogram/HistogramsTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/histogram/HistogramsTest.groovy index 5461dc69d6c..70a275964d7 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/histogram/HistogramsTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/histogram/HistogramsTest.groovy @@ -36,7 +36,7 @@ class HistogramsTest extends DDSpecification { @Shared Double[] quantiles = [0.5D, 0.75D, 0.9D, 0.95D, 0.99D] - def "test quantiles have 1% relative error"() { + def "test quantiles have 1% relative error #iterationIndex"() { setup: def histogram diff --git a/internal-api/src/test/groovy/datadog/trace/api/FunctionsTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/FunctionsTest.groovy index 87cef1ebb7b..c15545b2ce7 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/FunctionsTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/FunctionsTest.groovy @@ -11,7 +11,7 @@ import java.util.function.Function class FunctionsTest extends DDSpecification { - def "test common string functions"() { + def "test common string functions #iterationIndex"() { when: CharSequence output = fn.apply(input) then: @@ -46,14 +46,14 @@ class FunctionsTest extends DDSpecification { "value" | "value.test" } - def "test join strings"() { + def "test join strings #iterationIndex"() { when: CharSequence output = fn.apply(left, right) then: String.valueOf(output) == expected where: fn | left | right | expected - Functions.PrefixJoin.of("~", Function.identity()) | "x" | "y" | "x~y" + Functions.PrefixJoin.of("~", Function.identity()) | "x" | "y" | "x~y" Functions.PrefixJoin.of("~") | "x" | "y" | "x~y" Functions.SuffixJoin.of("~", Function.identity()) | "x" | "y" | "x~y" Functions.SuffixJoin.of("~") | "x" | "y" | "x~y" diff --git a/internal-api/src/test/groovy/datadog/trace/api/cache/QualifiedClassNameCacheTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/cache/QualifiedClassNameCacheTest.groovy index 35b5f95cc17..f9376c4d720 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/cache/QualifiedClassNameCacheTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/cache/QualifiedClassNameCacheTest.groovy @@ -7,7 +7,7 @@ import java.util.function.Function class QualifiedClassNameCacheTest extends DDSpecification { - def "test cached string operations"() { + def "test cached string operations #iterationIndex"() { when: QualifiedClassNameCache cache = new QualifiedClassNameCache(new Function, String>() { @Override diff --git a/internal-api/src/test/groovy/datadog/trace/api/iast/telemetry/IastMetricTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/iast/telemetry/IastMetricTest.groovy index 9220f205a71..ab7376c2e31 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/iast/telemetry/IastMetricTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/iast/telemetry/IastMetricTest.groovy @@ -9,7 +9,7 @@ import static datadog.trace.api.iast.telemetry.IastMetric.TRACE_METRIC_PREFIX class IastMetricTest extends Specification { - void 'test iast metrics attributes'() { + void 'test iast metrics attributes #metric.name()'() { given: final verbosity = Config.get().getIastTelemetryVerbosity() @@ -29,7 +29,7 @@ class IastMetricTest extends Specification { metric << (IastMetric.values() as List) } - void 'test unwrapping of tags'() { + void 'test unwrapping of tags #iterationIndex'() { when: final result = metricTag.unwrap(tag) @@ -46,7 +46,7 @@ class IastMetricTest extends Specification { IastMetric.Tag.SOURCE_TYPE | SourceTypes.REQUEST_PARAMETER_VALUE | null } - void 'test metric tags'() { + void 'test metric tags #metric.name()'() { when: final telemetryTags = [] final spanTags = [] diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy index e1bf4d978bf..d9e757b00e8 100644 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy +++ b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy @@ -12,7 +12,7 @@ import spock.lang.Specification class MetricPeriodicActionTest extends Specification { - void 'test that common metrics are joined before being sent to telemetry'() { + void 'test that common metrics are joined before being sent to telemetry #iterationIndex'() { given: final service = Mock(TelemetryService) final MetricCollector metricCollector = Mock(MetricCollector) @@ -43,7 +43,7 @@ class MetricPeriodicActionTest extends Specification { [col(counter: 2L, tags: ['a:b', 'c:d']), col(counter: 6L, tags: ['a:b', 'c:d'])] | [tel(points: [[_, 2L], [_, 6L]], tags: ['a:b', 'c:d'])] } - void 'test that common distribution series are joined before being sent to telemetry'() { + void 'test that common distribution series are joined before being sent to telemetry #iterationIndex'() { given: final service = Mock(TelemetryService) final MetricCollector metricCollector = Mock(MetricCollector) From 3cad274b5029f83ec6d4ac697b94852c08a41685 Mon Sep 17 00:00:00 2001 From: ValentinZakharov Date: Wed, 20 Nov 2024 08:58:55 +0100 Subject: [PATCH 029/106] Updated ASM rules to 1.13.3 (#7976) --- .../src/main/resources/default_config.json | 508 ++++++++++++------ 1 file changed, 353 insertions(+), 155 deletions(-) diff --git a/dd-java-agent/appsec/src/main/resources/default_config.json b/dd-java-agent/appsec/src/main/resources/default_config.json index d0e486c6731..2f53276c7e5 100644 --- a/dd-java-agent/appsec/src/main/resources/default_config.json +++ b/dd-java-agent/appsec/src/main/resources/default_config.json @@ -1,7 +1,7 @@ { "version": "2.2", "metadata": { - "rules_version": "1.13.2" + "rules_version": "1.13.3" }, "rules": [ { @@ -9,7 +9,8 @@ "name": "Block IP Addresses", "tags": { "type": "block_ip", - "category": "security_response" + "category": "security_response", + "module": "network-acl" }, "conditions": [ { @@ -34,7 +35,8 @@ "name": "Block User Addresses", "tags": { "type": "block_user", - "category": "security_response" + "category": "security_response", + "module": "authentication-acl" }, "conditions": [ { @@ -64,7 +66,8 @@ "tool_name": "Acunetix", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -98,7 +101,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -162,7 +166,8 @@ "category": "attack_attempt", "cwe": "176", "capec": "1000/255/153/267/71", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -191,7 +196,8 @@ "crs_id": "921110", "category": "attack_attempt", "cwe": "444", - "capec": "1000/210/272/220/33" + "capec": "1000/210/272/220/33", + "module": "waf" }, "conditions": [ { @@ -228,7 +234,8 @@ "crs_id": "921160", "category": "attack_attempt", "cwe": "113", - "capec": "1000/210/272/220/105" + "capec": "1000/210/272/220/105", + "module": "waf" }, "conditions": [ { @@ -263,7 +270,8 @@ "category": "attack_attempt", "cwe": "22", "capec": "1000/255/153/126", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -297,7 +305,8 @@ "category": "attack_attempt", "cwe": "22", "capec": "1000/255/153/126", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -1803,7 +1812,8 @@ "category": "attack_attempt", "cwe": "98", "capec": "1000/152/175/253/193", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -1831,7 +1841,8 @@ "crs_id": "931120", "category": "attack_attempt", "cwe": "98", - "capec": "1000/152/175/253/193" + "capec": "1000/152/175/253/193", + "module": "waf" }, "conditions": [ { @@ -1876,7 +1887,8 @@ "category": "attack_attempt", "cwe": "77", "capec": "1000/152/248/88", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2388,7 +2400,8 @@ "category": "attack_attempt", "cwe": "77", "capec": "1000/152/248/88", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2436,7 +2449,8 @@ "category": "attack_attempt", "cwe": "706", "capec": "1000/225/122/17/177", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2500,7 +2514,8 @@ "category": "attack_attempt", "cwe": "434", "capec": "1000/225/122/17/650", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2553,7 +2568,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/225/122/17/650", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2620,7 +2636,8 @@ "crs_id": "933131", "category": "attack_attempt", "cwe": "94", - "capec": "1000/225/122/17/650" + "capec": "1000/225/122/17/650", + "module": "waf" }, "conditions": [ { @@ -2665,7 +2682,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/225/122/17/650", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2709,7 +2727,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/225/122/17/650", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2799,7 +2818,8 @@ "crs_id": "933160", "category": "attack_attempt", "cwe": "94", - "capec": "1000/225/122/17/650" + "capec": "1000/225/122/17/650", + "module": "waf" }, "conditions": [ { @@ -2824,7 +2844,7 @@ "address": "graphql.server.resolver" } ], - "regex": "\\b(?:s(?:e(?:t(?:_(?:e(?:xception|rror)_handler|magic_quotes_runtime|include_path)|defaultstub)|ssion_s(?:et_save_handler|tart))|qlite_(?:(?:(?:unbuffered|single|array)_)?query|create_(?:aggregate|function)|p?open|exec)|tr(?:eam_(?:context_create|socket_client)|ipc?slashes|rev)|implexml_load_(?:string|file)|ocket_c(?:onnect|reate)|h(?:ow_sourc|a1_fil)e|pl_autoload_register|ystem)|p(?:r(?:eg_(?:replace(?:_callback(?:_array)?)?|match(?:_all)?|split)|oc_(?:(?:terminat|clos|nic)e|get_status|open)|int_r)|o(?:six_(?:get(?:(?:e[gu]|g)id|login|pwnam)|mk(?:fifo|nod)|ttyname|kill)|pen)|hp(?:_(?:strip_whitespac|unam)e|version|info)|g_(?:(?:execut|prepar)e|connect|query)|a(?:rse_(?:ini_file|str)|ssthru)|utenv)|r(?:unkit_(?:function_(?:re(?:defin|nam)e|copy|add)|method_(?:re(?:defin|nam)e|copy|add)|constant_(?:redefine|add))|e(?:(?:gister_(?:shutdown|tick)|name)_function|ad(?:(?:gz)?file|_exif_data|dir))|awurl(?:de|en)code)|i(?:mage(?:createfrom(?:(?:jpe|pn)g|x[bp]m|wbmp|gif)|(?:jpe|pn)g|g(?:d2?|if)|2?wbmp|xbm)|s_(?:(?:(?:execut|write?|read)ab|fi)le|dir)|ni_(?:get(?:_all)?|set)|terator_apply|ptcembed)|g(?:et(?:_(?:c(?:urrent_use|fg_va)r|meta_tags)|my(?:[gpu]id|inode)|(?:lastmo|cw)d|imagesize|env)|z(?:(?:(?:defla|wri)t|encod|fil)e|compress|open|read)|lob)|a(?:rray_(?:u(?:intersect(?:_u?assoc)?|diff(?:_u?assoc)?)|intersect_u(?:assoc|key)|diff_u(?:assoc|key)|filter|reduce|map)|ssert(?:_options)?|tob)|h(?:tml(?:specialchars(?:_decode)?|_entity_decode|entities)|(?:ash(?:_(?:update|hmac))?|ighlight)_file|e(?:ader_register_callback|x2bin))|f(?:i(?:le(?:(?:[acm]tim|inod)e|(?:_exist|perm)s|group)?|nfo_open)|tp_(?:nb_(?:ge|pu)|connec|ge|pu)t|(?:unction_exis|pu)ts|write|open)|o(?:b_(?:get_(?:c(?:ontents|lean)|flush)|end_(?:clean|flush)|clean|flush|start)|dbc_(?:result(?:_all)?|exec(?:ute)?|connect)|pendir)|m(?:b_(?:ereg(?:_(?:replace(?:_callback)?|match)|i(?:_replace)?)?|parse_str)|(?:ove_uploaded|d5)_file|ethod_exists|ysql_query|kdir)|e(?:x(?:if_(?:t(?:humbnail|agname)|imagetype|read_data)|ec)|scapeshell(?:arg|cmd)|rror_reporting|val)|c(?:url_(?:file_create|exec|init)|onvert_uuencode|reate_function|hr)|u(?:n(?:serialize|pack)|rl(?:de|en)code|[ak]?sort)|b(?:(?:son_(?:de|en)|ase64_en)code|zopen|toa)|(?:json_(?:de|en)cod|debug_backtrac|tmpfil)e|var_dump)(?:\\s|/\\*.*\\*/|//.*|#.*|\\\"|')*\\((?:(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:\\$\\w+|[A-Z\\d]\\w*|\\w+\\(.*\\)|\\\\?\"(?:[^\"]|\\\\\"|\"\"|\"\\+\")*\\\\?\"|\\\\?'(?:[^']|''|'\\+')*\\\\?')(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:(?:::|\\.|->)(?:\\s|/\\*.*\\*/|//.*|#.*)*\\w+(?:\\(.*\\))?)?,)*(?:(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:\\$\\w+|[A-Z\\d]\\w*|\\w+\\(.*\\)|\\\\?\"(?:[^\"]|\\\\\"|\"\"|\"\\+\")*\\\\?\"|\\\\?'(?:[^']|''|'\\+')*\\\\?')(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:(?:::|\\.|->)(?:\\s|/\\*.*\\*/|//.*|#.*)*\\w+(?:\\(.*\\))?)?)?\\)", + "regex": "\\b(?:s(?:e(?:t(?:_(?:e(?:xception|rror)_handler|magic_quotes_runtime|include_path)|defaultstub)|ssion_s(?:et_save_handler|tart))|qlite_(?:(?:(?:unbuffered|single|array)_)?query|create_(?:aggregate|function)|p?open|exec)|tr(?:eam_(?:context_create|socket_client)|ipc?slashes|rev)|implexml_load_(?:string|file)|ocket_c(?:onnect|reate)|h(?:ow_sourc|a1_fil)e|pl_autoload_register|ystem)|p(?:r(?:eg_(?:replace(?:_callback(?:_array)?)?|match(?:_all)?|split)|oc_(?:(?:terminat|clos|nic)e|get_status|open)|int_r)|o(?:six_(?:get(?:(?:e[gu]|g)id|login|pwnam)|mk(?:fifo|nod)|ttyname|kill)|pen)|hp(?:_(?:strip_whitespac|unam)e|version|info)|g_(?:(?:execut|prepar)e|connect|query)|a(?:rse_(?:ini_file|str)|ssthru)|utenv)|r(?:unkit_(?:function_(?:re(?:defin|nam)e|copy|add)|method_(?:re(?:defin|nam)e|copy|add)|constant_(?:redefine|add))|e(?:(?:gister_(?:shutdown|tick)|name)_function|ad(?:(?:gz)?file|_exif_data|dir))|awurl(?:de|en)code)|i(?:mage(?:createfrom(?:(?:jpe|pn)g|x[bp]m|wbmp|gif)|(?:jpe|pn)g|g(?:d2?|if)|2?wbmp|xbm)|s_(?:(?:(?:execut|write?|read)ab|fi)le|dir)|ni_(?:get(?:_all)?|set)|terator_apply|ptcembed)|g(?:et(?:_(?:c(?:urrent_use|fg_va)r|meta_tags)|my(?:[gpu]id|inode)|(?:lastmo|cw)d|imagesize|env)|z(?:(?:(?:defla|wri)t|encod|fil)e|compress|open|read)|lob)|a(?:rray_(?:u(?:intersect(?:_u?assoc)?|diff(?:_u?assoc)?)|intersect_u(?:assoc|key)|diff_u(?:assoc|key)|filter|reduce|map)|ssert(?:_options)?|tob)|h(?:tml(?:specialchars(?:_decode)?|_entity_decode|entities)|(?:ash(?:_(?:update|hmac))?|ighlight)_file|e(?:ader_register_callback|x2bin))|f(?:i(?:le(?:(?:[acm]tim|inod)e|(?:_exist|perm)s|group)?|nfo_open)|tp_(?:nb_(?:ge|pu)|connec|ge|pu)t|(?:unction_exis|pu)ts|write|open)|o(?:b_(?:get_(?:c(?:ontents|lean)|flush)|end_(?:clean|flush)|clean|flush|start)|dbc_(?:result(?:_all)?|exec(?:ute)?|connect)|pendir)|m(?:b_(?:ereg(?:_(?:replace(?:_callback)?|match)|i(?:_replace)?)?|parse_str)|(?:ove_uploaded|d5)_file|ethod_exists|ysql_query|kdir)|e(?:x(?:if_(?:t(?:humbnail|agname)|imagetype|read_data)|ec)|scapeshell(?:arg|cmd)|rror_reporting|val)|c(?:url_(?:file_create|exec|init)|onvert_uuencode|reate_function|hr)|u(?:n(?:serialize|pack)|rl(?:de|en)code|[ak]?sort)|b(?:(?:son_(?:de|en)|ase64_en)code|zopen|toa)|(?:json_(?:de|en)cod|debug_backtrac|tmpfil)e|var_dump)(?:\\s|/\\*.*\\*/|//.*|#.*|\\\"|')*\\((?:(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:\\$\\w+|[A-Z\\d]\\w*|\\w+\\(.*\\)|\\\\?\"(?:[^\"]|\\\\\"|\"\"|\"\\+\")*\\\\?\"|\\\\?'(?:[^']|''|'\\+')*\\\\?')(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:(?:::|\\.|->)(?:\\s|/\\*.*\\*/|//.*|#.*)*\\w+(?:\\(.*\\))?)?,)*(?:(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:\\$\\w+|[A-Z\\d]\\w*|\\w+\\(.*\\)|\\\\?\"(?:[^\"]|\\\\\"|\"\"|\"\\+\")*\\\\?\"|\\\\?'(?:[^']|''|'\\+')*\\\\?')(?:\\s|/\\*.*\\*/|//.*|#.*)*(?:(?:::|\\.|->)(?:\\s|/\\*.*\\*/|//.*|#.*)*\\w+(?:\\(.*\\))?)?)?\\)\\s*(?:[;\\.)}\\]|\\\\]|\\?>|%>|$)", "options": { "case_sensitive": true, "min_length": 5 @@ -2844,7 +2864,8 @@ "category": "attack_attempt", "cwe": "502", "capec": "1000/152/586", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -2891,7 +2912,8 @@ "crs_id": "933200", "category": "attack_attempt", "cwe": "502", - "capec": "1000/152/586" + "capec": "1000/152/586", + "module": "waf" }, "conditions": [ { @@ -2937,7 +2959,8 @@ "crs_id": "934100", "category": "attack_attempt", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -2982,7 +3005,8 @@ "category": "attack_attempt", "confidence": "1", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -3024,7 +3048,8 @@ "category": "attack_attempt", "cwe": "80", "capec": "1000/152/242/63/591", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3081,7 +3106,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3140,7 +3166,8 @@ "category": "attack_attempt", "cwe": "84", "capec": "1000/152/242/63/591/244", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3199,7 +3226,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3257,7 +3285,8 @@ "crs_id": "941180", "category": "attack_attempt", "cwe": "79", - "capec": "1000/152/242/63/591" + "capec": "1000/152/242/63/591", + "module": "waf" }, "conditions": [ { @@ -3311,7 +3340,8 @@ "category": "attack_attempt", "cwe": "80", "capec": "1000/152/242/63/591", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3358,7 +3388,8 @@ "category": "attack_attempt", "cwe": "80", "capec": "1000/152/242/63/591", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3405,7 +3436,8 @@ "category": "attack_attempt", "cwe": "80", "capec": "1000/152/242/63/591", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3452,7 +3484,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3498,7 +3531,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3545,7 +3579,8 @@ "crs_id": "941270", "category": "attack_attempt", "cwe": "83", - "capec": "1000/152/242/63/591/243" + "capec": "1000/152/242/63/591/243", + "module": "waf" }, "conditions": [ { @@ -3588,7 +3623,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3634,7 +3670,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3680,7 +3717,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3726,7 +3764,8 @@ "category": "attack_attempt", "cwe": "87", "capec": "1000/152/242/63/591/199", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3770,7 +3809,8 @@ "crs_id": "941360", "category": "attack_attempt", "cwe": "87", - "capec": "1000/152/242/63/591/199" + "capec": "1000/152/242/63/591/199", + "module": "waf" }, "conditions": [ { @@ -3815,7 +3855,8 @@ "category": "attack_attempt", "confidence": "1", "cwe": "79", - "capec": "1000/152/242/63/591" + "capec": "1000/152/242/63/591", + "module": "waf" }, "conditions": [ { @@ -3859,7 +3900,8 @@ "crs_id": "942100", "category": "attack_attempt", "cwe": "89", - "capec": "1000/152/248/66" + "capec": "1000/152/248/66", + "module": "waf" }, "conditions": [ { @@ -3898,7 +3940,8 @@ "category": "attack_attempt", "cwe": "89", "capec": "1000/152/248/66/7", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3943,7 +3986,8 @@ "category": "attack_attempt", "cwe": "89", "capec": "1000/152/248/66/7", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -3986,7 +4030,8 @@ "crs_id": "942250", "category": "attack_attempt", "cwe": "89", - "capec": "1000/152/248/66" + "capec": "1000/152/248/66", + "module": "waf" }, "conditions": [ { @@ -4030,7 +4075,8 @@ "crs_id": "942270", "category": "attack_attempt", "cwe": "89", - "capec": "1000/152/248/66" + "capec": "1000/152/248/66", + "module": "waf" }, "conditions": [ { @@ -4074,7 +4120,8 @@ "category": "attack_attempt", "cwe": "89", "capec": "1000/152/248/66/7", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4117,7 +4164,8 @@ "crs_id": "942290", "category": "attack_attempt", "cwe": "943", - "capec": "1000/152/248/676" + "capec": "1000/152/248/676", + "module": "waf" }, "conditions": [ { @@ -4163,7 +4211,8 @@ "crs_id": "942360", "category": "attack_attempt", "cwe": "89", - "capec": "1000/152/248/66/470" + "capec": "1000/152/248/66/470", + "module": "waf" }, "conditions": [ { @@ -4206,7 +4255,8 @@ "crs_id": "942500", "category": "attack_attempt", "cwe": "89", - "capec": "1000/152/248/66" + "capec": "1000/152/248/66", + "module": "waf" }, "conditions": [ { @@ -4251,7 +4301,8 @@ "category": "attack_attempt", "cwe": "384", "capec": "1000/225/21/593/61", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4296,7 +4347,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/152/242", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4344,7 +4396,8 @@ "type": "java_code_injection", "category": "attack_attempt", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -4391,7 +4444,8 @@ "crs_id": "944130", "category": "attack_attempt", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -4529,7 +4583,8 @@ "type": "nosql_injection", "category": "attack_attempt", "cwe": "943", - "capec": "1000/152/248/676" + "capec": "1000/152/248/676", + "module": "waf" }, "conditions": [ { @@ -4573,7 +4628,8 @@ "type": "java_code_injection", "category": "attack_attempt", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -4619,7 +4675,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/152/242", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4695,7 +4752,8 @@ "category": "attack_attempt", "cwe": "1321", "capec": "1000/152/242", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4725,7 +4783,8 @@ "category": "attack_attempt", "cwe": "1321", "capec": "1000/152/242", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4769,7 +4828,8 @@ "category": "attack_attempt", "cwe": "1336", "capec": "1000/152/242/19", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4813,7 +4873,8 @@ "tool_name": "BurpCollaborator", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4857,7 +4918,8 @@ "tool_name": "Qualys", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -4901,7 +4963,8 @@ "tool_name": "Probely", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -4944,7 +5007,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -4987,7 +5051,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5031,7 +5096,8 @@ "tool_name": "Rapid7", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5075,7 +5141,8 @@ "tool_name": "interact.sh", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5119,7 +5186,8 @@ "tool_name": "Netsparker", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5167,7 +5235,8 @@ "tool_name": "WhiteHatSecurity", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5215,7 +5284,8 @@ "tool_name": "Nessus", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5263,7 +5333,8 @@ "tool_name": "Watchtowr", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5311,7 +5382,8 @@ "tool_name": "AppCheckNG", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5358,7 +5430,8 @@ "category": "attack_attempt", "cwe": "287", "capec": "1000/225/115", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5392,7 +5465,8 @@ "category": "attack_attempt", "cwe": "98", "capec": "1000/152/175/253/193", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5436,7 +5510,8 @@ "category": "attack_attempt", "cwe": "77", "capec": "1000/152/248/88", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -5483,7 +5558,8 @@ "category": "attack_attempt", "cwe": "91", "capec": "1000/152/248/250", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5521,7 +5597,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5579,7 +5656,8 @@ "category": "attack_attempt", "cwe": "83", "capec": "1000/152/242/63/591/243", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5866,7 +5944,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5908,7 +5987,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5950,7 +6030,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -5992,7 +6073,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6034,7 +6116,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6059,7 +6142,7 @@ "address": "server.request.uri.raw" } ], - "regex": "\\.(cgi|bat|dll|exe|key|cert|crt|pem|der|pkcs|pkcs|pkcs[0-9]*|nsf|jsa|war|java|class|vb|vba|so|git|svn|hg|cvs)([^a-zA-Z0-9_]|$)", + "regex": "\\.(cgi|bat|dll|exe|key|cert|crt|pem|der|pkcs|pkcs|pkcs[0-9]*|nsf|jsa|war|java|class|vb|vba|so|git|svn|hg|cvs)([?#&/]|$)", "options": { "case_sensitive": false } @@ -6076,7 +6159,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6118,7 +6202,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6160,7 +6245,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6202,7 +6288,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -6276,7 +6363,7 @@ } ] }, - "operator": "lfi_detector" + "operator": "lfi_detector@v2" } ], "transformers": [], @@ -6286,7 +6373,7 @@ }, { "id": "rasp-932-100", - "name": "Command injection exploit", + "name": "Shell command injection exploit", "tags": { "type": "command_injection", "category": "vulnerability_trigger", @@ -6332,6 +6419,54 @@ "stack_trace" ] }, + { + "id": "rasp-932-110", + "name": "OS command injection exploit", + "tags": { + "type": "command_injection", + "category": "vulnerability_trigger", + "cwe": "77", + "capec": "1000/152/248/88", + "confidence": "0", + "module": "rasp" + }, + "conditions": [ + { + "parameters": { + "resource": [ + { + "address": "server.sys.exec.cmd" + } + ], + "params": [ + { + "address": "server.request.query" + }, + { + "address": "server.request.body" + }, + { + "address": "server.request.path_params" + }, + { + "address": "grpc.server.request.message" + }, + { + "address": "graphql.server.all_resolvers" + }, + { + "address": "graphql.server.resolver" + } + ] + }, + "operator": "cmdi_detector" + } + ], + "transformers": [], + "on_match": [ + "stack_trace" + ] + }, { "id": "rasp-934-100", "name": "Server-side request forgery exploit", @@ -6438,7 +6573,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6482,7 +6618,8 @@ "type": "js_code_injection", "category": "attack_attempt", "cwe": "94", - "capec": "1000/152/242" + "capec": "1000/152/242", + "module": "waf" }, "conditions": [ { @@ -6527,7 +6664,8 @@ "category": "attack_attempt", "cwe": "78", "capec": "1000/152/248/88", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6570,7 +6708,8 @@ "category": "attack_attempt", "cwe": "78", "capec": "1000/152/248/88", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6615,7 +6754,8 @@ "category": "attack_attempt", "cwe": "78", "capec": "1000/152/248/88", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6658,7 +6798,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6701,7 +6842,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -6743,7 +6885,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -6785,7 +6928,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6828,7 +6972,8 @@ "category": "attack_attempt", "cwe": "918", "capec": "1000/225/115/664", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -6870,7 +7015,8 @@ "category": "attack_attempt", "cwe": "94", "capec": "1000/152/242", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6916,7 +7062,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Joomla exploitation tool", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6945,7 +7092,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nessus", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -6974,7 +7122,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Arachni", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7003,7 +7152,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Jorgee", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7032,7 +7182,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Probely", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -7061,7 +7212,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Metis", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7090,7 +7242,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "SQLPowerInjector", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7119,7 +7272,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "N-Stealth", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7148,7 +7302,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Brutus", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7176,7 +7331,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7205,7 +7361,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Netsparker", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -7234,7 +7391,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "JAASCois", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7263,7 +7421,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nsauditor", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7292,7 +7451,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Paros", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7321,7 +7481,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "DirBuster", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7350,7 +7511,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Pangolin", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7379,7 +7541,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Qualys", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -7408,7 +7571,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "SQLNinja", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7437,7 +7601,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nikto", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7466,7 +7631,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "BlackWidow", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7495,7 +7661,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Grendel-Scan", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7524,7 +7691,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Havij", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7553,7 +7721,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "w3af", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7582,7 +7751,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nmap", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7611,7 +7781,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nessus", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7640,7 +7811,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "EvilScanner", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7669,7 +7841,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "WebFuck", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7698,7 +7871,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "OpenVAS", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7727,7 +7901,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Spider-Pig", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7756,7 +7931,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Zgrab", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7785,7 +7961,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Zmeu", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7814,7 +7991,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "GoogleSecurityScanner", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -7843,7 +8021,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Commix", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7872,7 +8051,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Gobuster", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7901,7 +8081,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "CGIchk", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7930,7 +8111,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "FFUF", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7959,7 +8141,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nuclei", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -7988,7 +8171,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Tsunami", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8017,7 +8201,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Nimbostratus", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8046,7 +8231,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Datadog Canary Test", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8081,7 +8267,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Datadog Canary Test", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8119,7 +8306,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "AlertLogic", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -8148,7 +8336,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "wfuzz", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8177,7 +8366,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Detectify", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -8206,7 +8396,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "BSQLBF", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8235,7 +8426,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "masscan", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8264,7 +8456,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "WPScan", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8293,7 +8486,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Aon", - "confidence": "0" + "confidence": "0", + "module": "waf" }, "conditions": [ { @@ -8322,7 +8516,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "feroxbuster", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8350,7 +8545,8 @@ "category": "attack_attempt", "cwe": "200", "capec": "1000/118/169", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8382,7 +8578,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "SQLmap", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { @@ -8411,7 +8608,8 @@ "cwe": "200", "capec": "1000/118/169", "tool_name": "Skipfish", - "confidence": "1" + "confidence": "1", + "module": "waf" }, "conditions": [ { From e5aa8fa0198e4eeb35b247ca16b566ce832f6fbf Mon Sep 17 00:00:00 2001 From: cecile <32452337+cecile75@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:10:06 +0100 Subject: [PATCH 030/106] Fix baggages mapping configuration when only keys are provided (#7972) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix BAGGAGE_MAPPING * spotless * add tests * fix test --------- Co-authored-by: Cecile Terpin <“cecile.terpin@datadoghq.com”> --- .../src/main/java/datadog/trace/api/Config.java | 2 +- .../test/groovy/datadog/trace/api/ConfigTest.groovy | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 6618a798569..4a15cefcada 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -761,7 +761,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins requestHeaderTagsCommaAllowed = configProvider.getBoolean(REQUEST_HEADER_TAGS_COMMA_ALLOWED, true); - baggageMapping = configProvider.getMergedMap(BAGGAGE_MAPPING); + baggageMapping = configProvider.getMergedMapWithOptionalMappings(null, true, BAGGAGE_MAPPING); spanAttributeSchemaVersion = schemaVersionFromConfig(); diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy index 19f888c08a8..8abf3daf450 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy @@ -184,7 +184,7 @@ class ConfigTest extends DDSpecification { prop.setProperty(SPAN_TAGS, "c:3") prop.setProperty(JMX_TAGS, "d:4") prop.setProperty(HEADER_TAGS, "e:five") - prop.setProperty(BAGGAGE_MAPPING, "f:six") + prop.setProperty(BAGGAGE_MAPPING, "f:six,g") prop.setProperty(HTTP_SERVER_ERROR_STATUSES, "123-456,457,124-125,122") prop.setProperty(HTTP_CLIENT_ERROR_STATUSES, "111") prop.setProperty(HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, "true") @@ -273,7 +273,7 @@ class ConfigTest extends DDSpecification { config.mergedSpanTags == [b: "2", c: "3"] config.mergedJmxTags == [b: "2", d: "4", (RUNTIME_ID_TAG): config.getRuntimeId(), (SERVICE_TAG): config.serviceName] config.requestHeaderTags == [e: "five"] - config.baggageMapping == [f: "six"] + config.baggageMapping == [f: "six", g: "g"] config.httpServerErrorStatuses == toBitSet((122..457)) config.httpClientErrorStatuses == toBitSet((111..111)) config.httpClientSplitByDomain == true @@ -365,7 +365,7 @@ class ConfigTest extends DDSpecification { System.setProperty(PREFIX + SPAN_TAGS, "c:3") System.setProperty(PREFIX + JMX_TAGS, "d:4") System.setProperty(PREFIX + HEADER_TAGS, "e:five") - System.setProperty(PREFIX + BAGGAGE_MAPPING, "f:six") + System.setProperty(PREFIX + BAGGAGE_MAPPING, "f:six,g") System.setProperty(PREFIX + HTTP_SERVER_ERROR_STATUSES, "123-456,457,124-125,122") System.setProperty(PREFIX + HTTP_CLIENT_ERROR_STATUSES, "111") System.setProperty(PREFIX + HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, "true") @@ -453,7 +453,7 @@ class ConfigTest extends DDSpecification { config.mergedSpanTags == [b: "2", c: "3"] config.mergedJmxTags == [b: "2", d: "4", (RUNTIME_ID_TAG): config.getRuntimeId(), (SERVICE_TAG): config.serviceName] config.requestHeaderTags == [e: "five"] - config.baggageMapping == [f: "six"] + config.baggageMapping == [f: "six", g: "g"] config.httpServerErrorStatuses == toBitSet((122..457)) config.httpClientErrorStatuses == toBitSet((111..111)) config.httpClientSplitByDomain == true @@ -706,7 +706,7 @@ class ConfigTest extends DDSpecification { properties.setProperty(SPAN_TAGS, "c:3") properties.setProperty(JMX_TAGS, "d:4") properties.setProperty(HEADER_TAGS, "e:five") - properties.setProperty(BAGGAGE_MAPPING, "f:six") + properties.setProperty(BAGGAGE_MAPPING, "f:six,g") properties.setProperty(HTTP_SERVER_ERROR_STATUSES, "123-456,457,124-125,122") properties.setProperty(HTTP_CLIENT_ERROR_STATUSES, "111") properties.setProperty(HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN, "true") @@ -739,7 +739,7 @@ class ConfigTest extends DDSpecification { config.mergedSpanTags == [b: "2", c: "3"] config.mergedJmxTags == [b: "2", d: "4", (RUNTIME_ID_TAG): config.getRuntimeId(), (SERVICE_TAG): config.serviceName] config.requestHeaderTags == [e: "five"] - config.baggageMapping == [f: "six"] + config.baggageMapping == [f: "six",g: "g"] config.httpServerErrorStatuses == toBitSet((122..457)) config.httpClientErrorStatuses == toBitSet((111..111)) config.httpClientSplitByDomain == true From f4163fabad68a7e9f6b9c25107c3e33b45af1d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez=20Garc=C3=ADa?= Date: Wed, 20 Nov 2024 14:45:19 +0100 Subject: [PATCH 031/106] Extend support for SSRF in exploit prevention (#7376) What Does This Do Add SSRF exploit prevention check to HttpClientDecorator Modify http client instrumentations that relay on CallDepthThreadLocalMap to avoid issues with blocking exception (only blocks the first time) -> Fix call depth counter for sqli blocking #7522 Add smoke tests for other libraries Motivation improve Exploit prevention for SSRF coverage --- .../decorator/HttpClientDecorator.java | 76 ++++++- .../decorator/HttpClientDecoratorTest.groovy | 54 +++++ .../ApacheHttpClientInstrumentation.java | 68 ++++-- .../apachehttpclient/HelperMethods.java | 4 + .../ApacheHttpClientInstrumentation.java | 37 +++- .../apachehttpclient5/HelperMethods.java | 4 + .../CommonsHttpClientInstrumentation.java | 34 +-- .../httpclient/SendAdvice.java | 36 ++-- .../httpclient/SendAsyncAdvice.java | 42 ++-- dd-smoke-tests/appsec/springboot/build.gradle | 6 + .../springboot/controller/WebController.java | 63 +++++- .../appsec/SpringBootSmokeTest.groovy | 10 +- .../springboot/controller/SsrfController.java | 12 +- .../AppSecSpringBootSmokeTest.groovy | 203 ++++++++++++++++++ 14 files changed, 562 insertions(+), 87 deletions(-) create mode 100644 dd-smoke-tests/springboot-java-11/src/test/groovy/datadog/smoketest/springboot/AppSecSpringBootSmokeTest.groovy diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java index 834ab82e41c..e4c8cf4138f 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java @@ -1,17 +1,24 @@ package datadog.trace.bootstrap.instrumentation.decorator; import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS; +import static datadog.trace.api.gateway.Events.EVENTS; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.api.Config; import datadog.trace.api.DDTags; import datadog.trace.api.InstrumenterConfig; import datadog.trace.api.ProductActivation; +import datadog.trace.api.gateway.BlockResponseFunction; +import datadog.trace.api.gateway.Flow; +import datadog.trace.api.gateway.RequestContext; +import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.iast.InstrumentationBridge; import datadog.trace.api.iast.sink.SsrfModule; import datadog.trace.api.naming.SpanNaming; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.URIUtils; @@ -21,6 +28,7 @@ import java.util.BitSet; import java.util.LinkedHashMap; import java.util.Map; +import java.util.function.BiFunction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,6 +50,8 @@ public abstract class HttpClientDecorator extends UriBasedCli private static final boolean CLIENT_TAG_HEADERS = Config.get().isHttpClientTagHeaders(); + private static final boolean APPSEC_RASP_ENABLED = Config.get().isAppSecRaspEnabled(); + protected abstract String method(REQUEST request); protected abstract URI url(REQUEST request) throws URISyntaxException; @@ -68,9 +78,20 @@ protected boolean shouldSetResourceName() { public AgentSpan onRequest(final AgentSpan span, final REQUEST request) { if (request != null) { + String method = method(request); span.setTag(Tags.HTTP_METHOD, method); + if (CLIENT_TAG_HEADERS) { + for (Map.Entry headerTag : + traceConfig(span).getRequestHeaderTags().entrySet()) { + String headerValue = getRequestHeader(request, headerTag.getKey()); + if (null != headerValue) { + span.setTag(headerTag.getValue(), headerValue); + } + } + } + // Copy of HttpServerDecorator url handling try { final URI url = url(request); @@ -86,24 +107,15 @@ public AgentSpan onRequest(final AgentSpan span, final REQUEST request) { if (shouldSetResourceName()) { HTTP_RESOURCE_DECORATOR.withClientPath(span, method, url.getPath()); } + // SSRF exploit prevention check + onNetworkConnection(url.toString()); } else if (shouldSetResourceName()) { span.setResourceName(DEFAULT_RESOURCE_NAME); } } catch (final Exception e) { log.debug("Error tagging url", e); } - ssrfIastCheck(request); - - if (CLIENT_TAG_HEADERS) { - for (Map.Entry headerTag : - traceConfig(span).getRequestHeaderTags().entrySet()) { - String headerValue = getRequestHeader(request, headerTag.getKey()); - if (null != headerValue) { - span.setTag(headerTag.getValue(), headerValue); - } - } - } } return span; } @@ -175,6 +187,48 @@ public long getResponseContentLength(final RESPONSE response) { return 0; } + private void onNetworkConnection(final String networkConnection) { + if (!APPSEC_RASP_ENABLED) { + return; + } + if (networkConnection == null) { + return; + } + final BiFunction> networkConnectionCallback = + AgentTracer.get() + .getCallbackProvider(RequestContextSlot.APPSEC) + .getCallback(EVENTS.networkConnection()); + + if (networkConnectionCallback == null) { + return; + } + + final AgentSpan span = AgentTracer.get().activeSpan(); + if (span == null) { + return; + } + + final RequestContext ctx = span.getRequestContext(); + if (ctx == null) { + return; + } + + Flow flow = networkConnectionCallback.apply(ctx, networkConnection); + Flow.Action action = flow.getAction(); + if (action instanceof Flow.Action.RequestBlockingAction) { + BlockResponseFunction brf = ctx.getBlockResponseFunction(); + if (brf != null) { + Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; + brf.tryCommitBlockingResponse( + ctx.getTraceSegment(), + rba.getStatusCode(), + rba.getBlockingContentType(), + rba.getExtraHeaders()); + } + throw new BlockingException("Blocked request (for SSRF attempt)"); + } + } + /* This method must be overriden after making the proper propagations to the client before **/ protected Object sourceUrl(REQUEST request) { return null; diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy index 70b8d10d363..61c5e651598 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecoratorTest.groovy @@ -1,6 +1,12 @@ package datadog.trace.bootstrap.instrumentation.decorator import datadog.trace.api.DDTags +import datadog.trace.api.config.AppSecConfig +import datadog.trace.api.gateway.CallbackProvider +import static datadog.trace.api.gateway.Events.EVENTS +import datadog.trace.api.gateway.RequestContext +import datadog.trace.api.gateway.RequestContextSlot +import datadog.trace.api.internal.TraceSegment import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.sink.SsrfModule import datadog.trace.bootstrap.instrumentation.api.AgentSpan @@ -12,11 +18,39 @@ import spock.lang.Shared import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_TAG_QUERY_STRING +import java.util.function.BiFunction + class HttpClientDecoratorTest extends ClientDecoratorTest { @Shared def testUrl = new URI("http://myhost:123/somepath") + @Shared + protected static final ORIGINAL_TRACER = AgentTracer.get() + + protected traceSegment + protected reqCtx + protected span2 + protected tracer + + void setup() { + traceSegment = Stub(TraceSegment) + reqCtx = Stub(RequestContext) { + getTraceSegment() >> traceSegment + } + span2 = Stub(AgentSpan) { + getRequestContext() >> reqCtx + } + tracer = Stub(AgentTracer.TracerAPI) { + activeSpan() >> span2 + } + AgentTracer.forceRegister(tracer) + } + + void cleanup() { + AgentTracer.forceRegister(ORIGINAL_TRACER) + } + def span = Mock(AgentSpan) def "test onRequest"() { @@ -199,6 +233,26 @@ class HttpClientDecoratorTest extends ClientDecoratorTest { 'false' | [method: "test-method", url: testUrl, path: '/somepath'] } + void "test SSRF Exploit prevention onResponse"(){ + setup: + injectSysConfig(AppSecConfig.APPSEC_ENABLED, 'true') + injectSysConfig(AppSecConfig.APPSEC_RASP_ENABLED, 'true') + + final callbackProvider = Mock(CallbackProvider) + final listener = Mock(BiFunction) + tracer.getCallbackProvider(RequestContextSlot.APPSEC) >> callbackProvider + + final decorator = newDecorator() + final req = [method: "GET", url: new URI("http://localhost:1234/somepath")] + + when: + decorator.onRequest(span2, req) + + then: + 1 * callbackProvider.getCallback(EVENTS.networkConnection()) >> listener + 1 * listener.apply(reqCtx, _ as String) + } + @Override def newDecorator(String serviceName = "test-service") { return new HttpClientDecorator() { diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java index e6abdc53c97..157dab1824d 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java @@ -7,6 +7,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.instrumentation.api.AgentScope; @@ -153,7 +154,13 @@ public void methodAdvice(MethodTransformer transformer) { public static class UriRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) { - return HelperMethods.doMethodEnter(request); + try { + return HelperMethods.doMethodEnter(request); + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -176,12 +183,20 @@ public static AgentScope methodEnter( typing = Assigner.Typing.DYNAMIC, readOnly = false) Object handler) { - final AgentScope scope = HelperMethods.doMethodEnter(request); - // Wrap the handler so we capture the status code - if (null != scope && handler instanceof ResponseHandler) { - handler = new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + + try { + final AgentScope scope = HelperMethods.doMethodEnter(request); + // Wrap the handler so we capture the status code + if (null != scope && handler instanceof ResponseHandler) { + handler = + new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + } + return scope; + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; } - return scope; } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -197,10 +212,16 @@ public static class RequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) { - if (request instanceof HttpUriRequest) { - return HelperMethods.doMethodEnter((HttpUriRequest) request); - } else { - return HelperMethods.doMethodEnter(host, request); + try { + if (request instanceof HttpUriRequest) { + return HelperMethods.doMethodEnter((HttpUriRequest) request); + } else { + return HelperMethods.doMethodEnter(host, request); + } + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; } } @@ -225,17 +246,24 @@ public static AgentScope methodEnter( typing = Assigner.Typing.DYNAMIC, readOnly = false) Object handler) { - final AgentScope scope; - if (request instanceof HttpUriRequest) { - scope = HelperMethods.doMethodEnter((HttpUriRequest) request); - } else { - scope = HelperMethods.doMethodEnter(host, request); - } - // Wrap the handler so we capture the status code - if (null != scope && handler instanceof ResponseHandler) { - handler = new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + try { + final AgentScope scope; + if (request instanceof HttpUriRequest) { + scope = HelperMethods.doMethodEnter((HttpUriRequest) request); + } else { + scope = HelperMethods.doMethodEnter(host, request); + } + // Wrap the handler so we capture the status code + if (null != scope && handler instanceof ResponseHandler) { + handler = + new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + } + return scope; + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; } - return scope; } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java index 959510b9699..ea4064a1cc0 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java @@ -73,4 +73,8 @@ public static void doMethodExit( CallDepthThreadLocalMap.reset(HttpClient.class); } } + + public static void onBlockingRequest() { + CallDepthThreadLocalMap.reset(HttpClient.class); + } } diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java index 66de5f8fcc0..a62d439fa61 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java @@ -7,6 +7,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.instrumentation.api.AgentScope; @@ -115,7 +116,13 @@ public void methodAdvice(MethodTransformer transformer) { public static class RequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) { - return HelperMethods.doMethodEnter(request); + try { + return HelperMethods.doMethodEnter(request); + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -132,7 +139,13 @@ public static class HostRequestAdvice { public static AgentScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final ClassicHttpRequest request) { - return HelperMethods.doMethodEnter(host, request); + try { + return HelperMethods.doMethodEnter(host, request); + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -157,14 +170,20 @@ public static AgentScope methodEnter( typing = Assigner.Typing.DYNAMIC, readOnly = false) Object handler) { - final AgentScope scope = HelperMethods.doMethodEnter(host, request); - // Wrap the handler so we capture the status code - if (null != scope && handler instanceof HttpClientResponseHandler) { - handler = - new WrappingStatusSettingResponseHandler( - scope.span(), (HttpClientResponseHandler) handler); + try { + final AgentScope scope = HelperMethods.doMethodEnter(host, request); + // Wrap the handler so we capture the status code + if (null != scope && handler instanceof HttpClientResponseHandler) { + handler = + new WrappingStatusSettingResponseHandler( + scope.span(), (HttpClientResponseHandler) handler); + } + return scope; + } catch (BlockingException e) { + HelperMethods.onBlockingRequest(); + // re-throw blocking exceptions + throw e; } - return scope; } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java index ebbde1b1ba6..64e03fd1b94 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java @@ -73,4 +73,8 @@ public static void doMethodExit( CallDepthThreadLocalMap.reset(HttpClient.class); } } + + public static void onBlockingRequest() { + CallDepthThreadLocalMap.reset(HttpClient.class); + } } diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java index 984bd66edd3..6e3cc1bfe14 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java @@ -12,6 +12,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.CallDepthThreadLocalMap; @@ -55,22 +56,29 @@ public void methodAdvice(MethodTransformer transformer) { public static class ExecAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) { - final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); - if (callDepth > 0) { - return null; - } - final AgentSpan span = startSpan(HTTP_REQUEST); - final AgentScope scope = activateSpan(span); + try { + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); + if (callDepth > 0) { + return null; + } + + final AgentSpan span = startSpan(HTTP_REQUEST); + final AgentScope scope = activateSpan(span); - DECORATE.afterStart(span); - DECORATE.onRequest(span, httpMethod); - propagate().inject(span, httpMethod, SETTER); - propagate() - .injectPathwayContext( - span, httpMethod, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS); + DECORATE.afterStart(span); + DECORATE.onRequest(span, httpMethod); + propagate().inject(span, httpMethod, SETTER); + propagate() + .injectPathwayContext( + span, httpMethod, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS); - return scope; + return scope; + } catch (BlockingException e) { + CallDepthThreadLocalMap.reset(HttpClient.class); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java b/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java index 0be9fd7b415..0adddd530d5 100644 --- a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java +++ b/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.DECORATE; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -15,22 +16,29 @@ public class SendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpRequest httpRequest) { - // Here we avoid having the advice applied twice in case we have nested call of this intercepted - // method. - // In this particular case, in HttpClientImpl the send method is calling sendAsync under the - // hood and we do not want to instrument twice. - final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); - if (callDepth > 0) { - return null; - } - final AgentSpan span = startSpan(JavaNetClientDecorator.OPERATION_NAME); - final AgentScope scope = activateSpan(span); + try { + // Here we avoid having the advice applied twice in case we have nested call of this + // intercepted + // method. + // In this particular case, in HttpClientImpl the send method is calling sendAsync under the + // hood and we do not want to instrument twice. + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); + if (callDepth > 0) { + return null; + } + final AgentSpan span = startSpan(JavaNetClientDecorator.OPERATION_NAME); + final AgentScope scope = activateSpan(span); - DECORATE.afterStart(span); - DECORATE.onRequest(span, httpRequest); + DECORATE.afterStart(span); + DECORATE.onRequest(span, httpRequest); - // propagation is done by another instrumentation since Headers are immutable - return scope; + // propagation is done by another instrumentation since Headers are immutable + return scope; + } catch (BlockingException e) { + CallDepthThreadLocalMap.reset(HttpClient.class); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java index e8af4685307..e3fe04d665c 100644 --- a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java +++ b/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.DECORATE; +import datadog.appsec.api.blocking.BlockingException; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -19,25 +20,32 @@ public class SendAsyncAdvice { public static AgentScope methodEnter( @Advice.Argument(value = 0) final HttpRequest httpRequest, @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler bodyHandler) { - // Here we avoid having the advice applied twice in case we have nested call of this intercepted - // method. - // In this particular case, in HttpClientImpl the send method is calling sendAsync under the - // hood and we do not want to instrument twice. - final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); - if (callDepth > 0) { - return null; - } - final AgentSpan span = AgentTracer.startSpan(JavaNetClientDecorator.OPERATION_NAME); - final AgentScope scope = activateSpan(span, true); - if (bodyHandler != null) { - bodyHandler = new BodyHandlerWrapper<>(bodyHandler, captureSpan(span)); - } + try { + // Here we avoid having the advice applied twice in case we have nested call of this + // intercepted + // method. + // In this particular case, in HttpClientImpl the send method is calling sendAsync under the + // hood and we do not want to instrument twice. + final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); + if (callDepth > 0) { + return null; + } + final AgentSpan span = AgentTracer.startSpan(JavaNetClientDecorator.OPERATION_NAME); + final AgentScope scope = activateSpan(span, true); + if (bodyHandler != null) { + bodyHandler = new BodyHandlerWrapper<>(bodyHandler, captureSpan(span)); + } - DECORATE.afterStart(span); - DECORATE.onRequest(span, httpRequest); + DECORATE.afterStart(span); + DECORATE.onRequest(span, httpRequest); - // propagation is done by another instrumentation since Headers are immutable - return scope; + // propagation is done by another instrumentation since Headers are immutable + return scope; + } catch (BlockingException e) { + CallDepthThreadLocalMap.reset(HttpClient.class); + // re-throw blocking exceptions + throw e; + } } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-smoke-tests/appsec/springboot/build.gradle b/dd-smoke-tests/appsec/springboot/build.gradle index 3dd2fc106d5..76aa63dfba6 100644 --- a/dd-smoke-tests/appsec/springboot/build.gradle +++ b/dd-smoke-tests/appsec/springboot/build.gradle @@ -18,6 +18,12 @@ dependencies { implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.6.0') implementation group: 'com.h2database', name: 'h2', version: '2.1.212' + // ssrf + implementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0' + implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' + implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0' + implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' + testImplementation project(':dd-smoke-tests:appsec') } diff --git a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java index 14f84b7d1ac..6f69f9dd29f 100644 --- a/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java +++ b/dd-smoke-tests/appsec/springboot/src/main/java/datadog/smoketest/appsec/springboot/controller/WebController.java @@ -1,5 +1,7 @@ package datadog.smoketest.appsec.springboot.controller; +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; import datadog.smoketest.appsec.springboot.service.AsyncService; import java.io.File; import java.net.URL; @@ -8,6 +10,11 @@ import java.sql.DriverManager; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpMethod; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -65,7 +72,7 @@ public String sqliHeader(@RequestHeader("x-custom-header") String id) throws Exc } @GetMapping("/ssrf/query") - public String ssrfQuery(@RequestParam("domain") String domain) { + public String ssrfQuery(@RequestParam("domain") final String domain) { try { new URL("http://" + domain).openStream().close(); } catch (Throwable e) { @@ -74,6 +81,60 @@ public String ssrfQuery(@RequestParam("domain") String domain) { return "EXECUTED"; } + @GetMapping("/ssrf/apache-httpclient4") + public String apacheHttpClient4(@RequestParam("domain") final String domain) { + final DefaultHttpClient client = new DefaultHttpClient(); + try { + final HttpGet request = new HttpGet("http://" + domain); + client.execute(request); + } catch (Exception e) { + // ignore errors opening connection + } + client.getConnectionManager().shutdown(); + return "EXECUTED"; + } + + @GetMapping("/ssrf/commons-httpclient2") + public String commonsHttpClient2(@RequestParam("domain") final String domain) { + final HttpClient client = new HttpClient(); + final HttpMethod method = new GetMethod("http://" + domain); + try { + client.executeMethod(method); + } catch (final Exception e) { + // ignore errors opening connection + } + method.releaseConnection(); + return "EXECUTED"; + } + + @GetMapping("/ssrf/okHttp2") + public String okHttp2(@RequestParam(value = "domain") final String domain) { + final OkHttpClient client = new OkHttpClient(); + final Request request = new Request.Builder().url("http://" + domain).build(); + try { + client.newCall(request).execute(); + } catch (final Exception e) { + // ignore errors opening connection + } + client.getDispatcher().getExecutorService().shutdown(); + client.getConnectionPool().evictAll(); + return "EXECUTED"; + } + + @GetMapping("/ssrf/okHttp3") + public String okHttp3(@RequestParam("domain") final String domain) { + final okhttp3.OkHttpClient client = new okhttp3.OkHttpClient(); + final okhttp3.Request request = new okhttp3.Request.Builder().url("http://" + domain).build(); + try { + client.newCall(request).execute(); + } catch (final Exception e) { + // ignore errors opening connection + } + client.dispatcher().executorService().shutdown(); + client.connectionPool().evictAll(); + return "EXECUTED"; + } + @GetMapping("/lfi/file") public String lfiFile(@RequestParam("path") String path) { new File(path); diff --git a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy index 77fbf0097e5..4942c15911a 100644 --- a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy +++ b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy @@ -385,7 +385,7 @@ class SpringBootSmokeTest extends AbstractAppSecServerSmokeTest { void 'rasp blocks on SSRF'() { when: - String url = "http://localhost:${httpPort}/ssrf/query?domain=169.254.169.254" + String url = "http://localhost:${httpPort}/ssrf/${variant}?domain=169.254.169.254" def request = new Request.Builder() .url(url) .get() @@ -414,6 +414,14 @@ class SpringBootSmokeTest extends AbstractAppSecServerSmokeTest { } } assert trigger != null, 'test trigger not found' + + where: + variant | _ + 'query' | _ + 'okHttp3' | _ + 'okHttp2' | _ + 'apache-httpclient4' | _ + 'commons-httpclient2' | _ } void 'rasp blocks on LFI for #variant'() { diff --git a/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java b/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java index 832f2bad295..9cf1dc620bf 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java +++ b/dd-smoke-tests/iast-util/iast-util-11/src/main/java/datadog/smoketest/springboot/controller/SsrfController.java @@ -20,8 +20,9 @@ public String javaNet( @RequestParam(value = "promise", required = false) final boolean promise) { HttpClient httpClient = HttpClient.newBuilder().build(); try { - HttpRequest httpRequest = HttpRequest.newBuilder().uri(new URI(url)).build(); + String uri = url.startsWith("http") ? url : "http://" + url; if (async) { + HttpRequest httpRequest = HttpRequest.newBuilder().uri(new URI(uri)).build(); if (promise) { httpClient.sendAsync( httpRequest, @@ -31,9 +32,18 @@ public String javaNet( httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString()); } } else { + HttpRequest httpRequest = + HttpRequest.newBuilder() + .uri(new URI(uri)) + .timeout( + java.time.Duration.ofSeconds( + 1)) // prevents Idle timeout expired in jetty servers when the client is not + // responding in sync mode + .build(); httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString()); } } catch (Exception e) { + // Do nothing } return "ok"; } diff --git a/dd-smoke-tests/springboot-java-11/src/test/groovy/datadog/smoketest/springboot/AppSecSpringBootSmokeTest.groovy b/dd-smoke-tests/springboot-java-11/src/test/groovy/datadog/smoketest/springboot/AppSecSpringBootSmokeTest.groovy new file mode 100644 index 00000000000..cf19d67685c --- /dev/null +++ b/dd-smoke-tests/springboot-java-11/src/test/groovy/datadog/smoketest/springboot/AppSecSpringBootSmokeTest.groovy @@ -0,0 +1,203 @@ +package datadog.smoketest.springboot + +import datadog.smoketest.AbstractServerSmokeTest +import datadog.trace.test.agent.decoder.DecodedSpan +import datadog.trace.test.agent.decoder.DecodedTrace +import datadog.trace.test.agent.decoder.Decoder +import groovy.json.JsonGenerator +import groovy.json.JsonSlurper +import okhttp3.FormBody +import okhttp3.Request +import org.apache.commons.io.IOUtils +import spock.lang.Shared + +import java.nio.charset.StandardCharsets +import java.util.concurrent.BlockingQueue +import java.util.concurrent.LinkedBlockingQueue +import java.util.jar.JarFile + +class AppSecSpringBootSmokeTest extends AbstractServerSmokeTest { + + static class RootSpan { + DecodedSpan span + + Map getMeta() { + span.meta + } + + List> getTriggers() { + def appsecJSON = meta.get("_dd.appsec.json") + if (appsecJSON) { + JsonSlurper jsonParser = new JsonSlurper() + Map attack = jsonParser.parse(appsecJSON.toCharArray()) as Map + Map triggers = attack.get("triggers") as Map + if (triggers) { + return triggers + } + } + [] + } + } + + @Shared + protected BlockingQueue rootSpans = new LinkedBlockingQueue<>() + + @Shared + protected String[] defaultAppSecProperties = [ + "-Ddd.appsec.enabled=true", + "-Ddd.profiling.enabled=false", + "-Ddd.appsec.trace.rate.limit=-1", + '-Ddd.remote_config.enabled=false', + '-Ddd.trace.debug=true' + ] + + @Override + Closure decodedTracesCallback() { + return { List tr -> + tr.forEach { + // The appsec report json is on the root span + def root = Decoder.sortByStart(it.spans).head() + rootSpans << new RootSpan(span: root) + } + } + } + + def setup() { + rootSpans.clear() + } + + def cleanup() { + rootSpans.clear() + } + + /** + * This method fetches default ruleset included in the agent and merges the selected rules, then it points + * the {@code dd.appsec.rules} variable to the new file + */ + void mergeRules(final String path, final List> customRules) { + // Prepare a file with the new rules + final jarFile = new JarFile(shadowJarPath) + final zipEntry = jarFile.getEntry("appsec/default_config.json") + final content = IOUtils.toString(jarFile.getInputStream(zipEntry), StandardCharsets.UTF_8) + final json = new JsonSlurper().parseText(content) as Map + final rules = json.rules as List> + + // remove already existing rules for merge + List customRulesNames = customRules.collect { it.id } + rules.removeIf { it.id in customRulesNames } + + rules.addAll(customRules) + final gen = new JsonGenerator.Options().build() + IOUtils.write(gen.toJson(json), new FileOutputStream(path, false), StandardCharsets.UTF_8) + + // Add a new property pointing to the new ruleset + defaultAppSecProperties += "-Ddd.appsec.rules=${path}" as String + } + + @Shared + String buildDir = new File(System.getProperty("datadog.smoketest.builddir")).absolutePath + @Shared + String customRulesPath = "${buildDir}/appsec_custom_rules.json" + + def prepareCustomRules() { + // Prepare ruleset with additional test rules + mergeRules( + customRulesPath, + [ + [ + id : '__test_ssrf_block', + name : 'Server-side request forgery exploit', + enable : 'true', + tags : [ + type : 'ssrf', + category : 'vulnerability_trigger', + cwe : '918', + capec : '1000/225/115/664', + confidence: '0', + module : 'rasp' + ], + conditions : [ + [ + parameters: [ + resource: [[address: 'server.io.net.url']], + params : [[address: 'server.request.body']], + ], + operator : "ssrf_detector", + ], + ], + transformers: [], + on_match : ['block'] + ] + ]) + } + + @Override + ProcessBuilder createProcessBuilder() { + // We run this here to ensure it runs before starting the process. Child setupSpec runs after parent setupSpec, + // so it is not a valid location. + + prepareCustomRules() + + String springBootShadowJar = System.getProperty('datadog.smoketest.springboot.shadowJar.path') + + List command = new ArrayList<>() + command.add(javaPath()) + command.addAll(defaultJavaProperties) + command.addAll(defaultAppSecProperties) + command.addAll((String[]) ["-jar", springBootShadowJar, "--server.port=${httpPort}"]) + ProcessBuilder processBuilder = new ProcessBuilder(command) + processBuilder.directory(new File(buildDirectory)) + // Spring will print all environment variables to the log, which may pollute it and affect log assertions. + processBuilder.environment().clear() + return processBuilder + } + + + + void 'ssrf is present (java-net)'() { + setup: + final url = "http://localhost:${httpPort}/ssrf/java-net" + final body = new FormBody.Builder() + .add("url" , "169.254.169.254") + .add("async", async) + .add("promise", promise ).build() + final request = new Request.Builder().url(url).post(body).build() + + when: + def response = client.newCall(request).execute() + + then: + response.code() == 403 + response.body().string().contains('You\'ve been blocked') + + when: + waitForTraceCount(1) + + then: + def rootSpans = this.rootSpans.toList() + rootSpans.size() == 1 + def rootSpan = rootSpans[0] + assert rootSpan.meta.get('appsec.blocked') == 'true', 'appsec.blocked is not set' + assert rootSpan.meta.get('_dd.appsec.json') != null, '_dd.appsec.json is not set' + def trigger = null + for (t in rootSpan.triggers) { + if (t['rule']['id'] == '__test_ssrf_block') { + trigger = t + break + } + } + assert trigger != null, 'test trigger not found' + + where: + async | promise + "false" | "false" + "true" | "false" + "true" | "true" + } + + @Override + def logLevel() { + return "debug" + } + +} From 270a82d63a1fde3c9fce6ebe26ccea8d897a406e Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 20 Nov 2024 09:12:06 -0500 Subject: [PATCH 032/106] Standardize some of the profiler sampling frequencies (#7961) * Standardize some of the profiler sampling frequencies * Allow override of 50ms J9 CPU default * Touchups --- .../com/datadog/profiling/ddprof/DatadogProfiler.java | 9 ++++++++- .../java/datadog/trace/api/config/ProfilingConfig.java | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index c4c49d82731..6ed1454b255 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -36,6 +36,7 @@ import com.datadog.profiling.utils.ProfilingMode; import com.datadoghq.profiler.ContextSetter; import com.datadoghq.profiler.JavaProfiler; +import datadog.trace.api.Platform; import datadog.trace.api.config.ProfilingConfig; import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; @@ -268,7 +269,13 @@ String cmdStartProfiling(Path file) throws IllegalStateException { } } else { // using cpu time schedule - cmd.append(",cpu=").append(getCpuInterval(configProvider)).append('m'); + int interval = getCpuInterval(); + if (Platform.isJ9()) + interval = + interval == ProfilingConfig.PROFILING_DATADOG_PROFILER_CPU_INTERVAL_DEFAULT + ? ProfilingConfig.PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT + : interval; + cmd.append(",cpu=").append(interval).append('m'); } } if (profilingModes.contains(WALL)) { diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java index 4d5c10f7fb1..5907b57214a 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java @@ -106,7 +106,9 @@ public final class ProfilingConfig { public static final boolean PROFILING_DATADOG_PROFILER_WALL_ENABLED_DEFAULT = true; public static final String PROFILING_DATADOG_PROFILER_WALL_INTERVAL = "profiling.ddprof.wall.interval.ms"; - public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 10; + public static final int PROFILING_DATADOG_PROFILER_WALL_INTERVAL_DEFAULT = 50; + + public static final int PROFILING_DATADOG_PROFILER_J9_CPU_INTERVAL_DEFAULT = 50; public static final String PROFILING_DATADOG_PROFILER_WALL_COLLAPSING = "profiling.ddprof.wall.collapsing"; From df51f63bab082d841bf08dff4dece02ba22be36d Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Wed, 20 Nov 2024 18:03:36 +0100 Subject: [PATCH 033/106] feat(api): Remove Strings.join API in favor of JDK String.join (#7974) --- .../civisibility/git/tree/GitClient.java | 2 +- .../utils/ShellCommandExecutor.java | 5 +- .../trace/agent/tooling/HelperInjector.java | 5 +- .../agent/tooling/InstrumenterState.java | 3 +- .../java/com/datadog/appsec/AppSecSystem.java | 3 +- .../TransportActionListener.java | 5 +- .../TransportActionListener.java | 5 +- .../TransportActionListener.java | 5 +- .../TransportActionListener.java | 5 +- .../TransportActionListener.java | 5 +- .../DistributedObjectDecorator.java | 3 +- .../ClientInvocationDecorator.java | 3 +- .../hazelcast4/HazelcastDecorator.java | 3 +- .../opensearch/TransportActionListener.java | 3 +- .../redisson/RedissonInstrumentation.java | 3 +- .../redisson23/RedissonInstrumentation.java | 3 +- .../redisson30/RedissonInstrumentation.java | 3 +- .../trace/core/flare/TracerFlareService.java | 4 +- .../trace/api/naming/v1/CloudNamingV1.java | 3 +- .../main/java/datadog/trace/util/Strings.java | 40 -------------- .../datadog/trace/util/StringsTest.groovy | 54 +++++++------------ 21 files changed, 46 insertions(+), 119 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java index dd2c3de03e0..2f8d73815d3 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitClient.java @@ -484,7 +484,7 @@ public Path createPackFiles(List objectHashes) return executeCommand( Command.PACK_OBJECTS, () -> { - byte[] input = Strings.join("\n", objectHashes).getBytes(Charset.defaultCharset()); + byte[] input = String.join("\n", objectHashes).getBytes(Charset.defaultCharset()); Path tempDirectory = createTempDirectory(); String basename = Strings.random(8); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java index 5943e734f6f..345bbb3939b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java @@ -5,7 +5,6 @@ import datadog.trace.context.TraceScope; import datadog.trace.util.AgentThreadFactory; import datadog.trace.util.AgentThreadFactory.AgentThread; -import datadog.trace.util.Strings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -124,7 +123,7 @@ private T executeCommand( throw new ShellCommandFailedException( exitValue, "Command '" - + Strings.join(" ", command) + + String.join(" ", command) + "' failed with exit code " + exitValue + ": " @@ -147,7 +146,7 @@ private T executeCommand( terminate(p); throw new TimeoutException( "Timeout while waiting for '" - + Strings.join(" ", command) + + String.join(" ", command) + "'; " + IOUtils.readFully(errorStreamConsumer.read(), Charset.defaultCharset())); } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java index f83f0e18f96..e0662c2c94b 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java @@ -2,7 +2,6 @@ import static datadog.trace.bootstrap.AgentClassLoading.INJECTING_HELPERS; -import datadog.trace.util.Strings; import java.io.IOException; import java.lang.ref.WeakReference; import java.security.CodeSource; @@ -101,7 +100,7 @@ public DynamicType.Builder transform( if (classLoader == null) { throw new UnsupportedOperationException( "Cannot inject helper classes onto boot-class-path; move " - + Strings.join(",", helperClassNames) + + String.join(",", helperClassNames) + " to agent-bootstrap"); } @@ -112,7 +111,7 @@ public DynamicType.Builder transform( "Injecting helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.helper_classes=[{}]", requestingName, classLoader, - Strings.join(",", helperClassNames)); + String.join(",", helperClassNames)); } final Map classnameToBytes = getHelperMap(); diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java index 53d1e824936..c6956f6d652 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterState.java @@ -2,7 +2,6 @@ import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; -import datadog.trace.util.Strings; import java.util.Arrays; import java.util.concurrent.atomic.AtomicLongArray; import org.slf4j.Logger; @@ -130,7 +129,7 @@ public static void blockInstrumentation(int instrumentationId) { public static String describe(int instrumentationId) { if (instrumentationId >= 0 && instrumentationId < instrumentationNames.length) { return "instrumentation.names=[" - + Strings.join(",", instrumentationNames[instrumentationId]) + + String.join(",", instrumentationNames[instrumentationId]) + "] instrumentation.class=" + instrumentationClasses[instrumentationId]; } else { diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java index aede2cdbca7..ea37e9c5c74 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java @@ -23,7 +23,6 @@ import datadog.trace.api.telemetry.ProductChange; import datadog.trace.api.telemetry.ProductChangeCollector; import datadog.trace.bootstrap.ActiveSubsystems; -import datadog.trace.util.Strings; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -104,7 +103,7 @@ private static void doStart(SubscriptionService gw, SharedCommunicationObjects s STARTED.set(true); - String startedAppSecModules = Strings.join(", ", STARTED_MODULES_INFO.values()); + String startedAppSecModules = String.join(", ", STARTED_MODULES_INFO.values()); if (appSecEnabledConfig == ProductActivation.FULLY_ENABLED) { log.info("AppSec is {} with {}", appSecEnabledConfig, startedAppSecModules); } else { diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java index 60424a7693a..db8144f8a22 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/TransportActionListener.java @@ -4,7 +4,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.util.Strings; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; @@ -32,12 +31,12 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("elasticsearch.request.indices", Strings.join(",", req.indices())); + span.setTag("elasticsearch.request.indices", String.join(",", req.indices())); } } if (request instanceof SearchRequest) { final SearchRequest req = (SearchRequest) request; - span.setTag("elasticsearch.request.search.types", Strings.join(",", req.types())); + span.setTag("elasticsearch.request.search.types", String.join(",", req.types())); } if (request instanceof DocumentRequest) { final DocumentRequest req = (DocumentRequest) request; diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java index d703a3777b8..f3d0e613650 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java @@ -4,7 +4,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.util.Strings; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; @@ -34,12 +33,12 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("elasticsearch.request.indices", Strings.join(",", req.indices())); + span.setTag("elasticsearch.request.indices", String.join(",", req.indices())); } } if (request instanceof SearchRequest) { final SearchRequest req = (SearchRequest) request; - span.setTag("elasticsearch.request.search.types", Strings.join(",", req.types())); + span.setTag("elasticsearch.request.search.types", String.join(",", req.types())); } if (request instanceof DocWriteRequest) { final DocWriteRequest req = (DocWriteRequest) request; diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java index 00a9d5471cf..826cb940e37 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java @@ -4,7 +4,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.util.Strings; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; @@ -37,12 +36,12 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("elasticsearch.request.indices", Strings.join(",", req.indices())); + span.setTag("elasticsearch.request.indices", String.join(",", req.indices())); } } if (request instanceof SearchRequest) { final SearchRequest req = (SearchRequest) request; - span.setTag("elasticsearch.request.search.types", Strings.join(",", req.types())); + span.setTag("elasticsearch.request.search.types", String.join(",", req.types())); } if (request instanceof DocumentRequest) { final DocumentRequest req = (DocumentRequest) request; diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java index 0016f838e27..da6c206ba11 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java @@ -3,7 +3,6 @@ import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.util.Strings; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; @@ -37,12 +36,12 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("elasticsearch.request.indices", Strings.join(",", req.indices())); + span.setTag("elasticsearch.request.indices", String.join(",", req.indices())); } } if (request instanceof SearchRequest) { final SearchRequest req = (SearchRequest) request; - span.setTag("elasticsearch.request.search.types", Strings.join(",", req.types())); + span.setTag("elasticsearch.request.search.types", String.join(",", req.types())); } if (request instanceof DocWriteRequest) { final DocWriteRequest req = (DocWriteRequest) request; diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java index 949883a822f..e2cdff49789 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java +++ b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/TransportActionListener.java @@ -3,7 +3,6 @@ import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.util.Strings; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionResponse; @@ -34,12 +33,12 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("elasticsearch.request.indices", Strings.join(",", req.indices())); + span.setTag("elasticsearch.request.indices", String.join(",", req.indices())); } } if (request instanceof SearchRequest) { final SearchRequest req = (SearchRequest) request; - span.setTag("elasticsearch.request.search.types", Strings.join(",", req.types())); + span.setTag("elasticsearch.request.search.types", String.join(",", req.types())); } if (request instanceof DocWriteRequest) { final DocWriteRequest req = (DocWriteRequest) request; diff --git a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java index d4823ac7aec..0f60adcc6c4 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java +++ b/dd-java-agent/instrumentation/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectDecorator.java @@ -15,7 +15,6 @@ import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.ClientDecorator; -import datadog.trace.util.Strings; import java.util.function.Function; /** Decorate Hazelcast distributed object span's with relevant contextual information. */ @@ -84,7 +83,7 @@ public AgentSpan onServiceExecution( QUALIFIED_NAME_CACHE.computeIfAbsent( Pair.of(object.getServiceName(), object.getName()), COMPUTE_QUALIFIED_NAME); - span.setResourceName(UTF8BytesString.create(Strings.join(".", objectName, methodName))); + span.setResourceName(UTF8BytesString.create(String.join(".", objectName, methodName))); span.setTag(HAZELCAST_SERVICE, object.getServiceName()); span.setTag(HAZELCAST_OPERATION, methodName); diff --git a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java index 095c9a200fc..5cf340edebf 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java +++ b/dd-java-agent/instrumentation/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationDecorator.java @@ -13,7 +13,6 @@ import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.ClientDecorator; -import datadog.trace.util.Strings; /** Decorate Hazelcast client invocations with relevant contextual information. */ public class ClientInvocationDecorator extends ClientDecorator { @@ -51,7 +50,7 @@ public AgentSpan onServiceExecution( long correlationId) { if (objectName != null) { - span.setResourceName(UTF8BytesString.create(Strings.join(" ", operationName, objectName))); + span.setResourceName(UTF8BytesString.create(String.join(" ", operationName, objectName))); span.setTag(HAZELCAST_NAME, objectName); } else { span.setResourceName(UTF8BytesString.create(operationName)); diff --git a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java index 5e10c98fe40..42448833c74 100644 --- a/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java +++ b/dd-java-agent/instrumentation/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/HazelcastDecorator.java @@ -12,7 +12,6 @@ import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.ClientDecorator; -import datadog.trace.util.Strings; /** Decorate Hazelcast distributed object span's with relevant contextual information. */ public class HazelcastDecorator extends ClientDecorator { @@ -51,7 +50,7 @@ public AgentSpan onServiceExecution( if (objectName != null) { span.setResourceName( - UTF8BytesString.create(Strings.join(" ", operationName, objectName.toString()))); + UTF8BytesString.create(String.join(" ", operationName, objectName.toString()))); span.setTag(HAZELCAST_NAME, objectName.toString()); } else { span.setResourceName(UTF8BytesString.create(operationName)); diff --git a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java index 2991412e6a1..2b2c2d44217 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java +++ b/dd-java-agent/instrumentation/opensearch/transport/src/main/java/datadog/trace/instrumentation/opensearch/TransportActionListener.java @@ -3,7 +3,6 @@ import static datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.util.Strings; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; @@ -32,7 +31,7 @@ private void onRequest(final ActionRequest request) { if (request instanceof IndicesRequest) { final IndicesRequest req = (IndicesRequest) request; if (req.indices() != null) { - span.setTag("opensearch.request.indices", Strings.join(",", req.indices())); + span.setTag("opensearch.request.indices", String.join(",", req.indices())); } } if (request instanceof DocWriteRequest) { diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java index 72c4d09f9e9..ebc202baac2 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java @@ -14,7 +14,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import datadog.trace.util.Strings; import java.util.ArrayList; import java.util.List; import net.bytebuddy.asm.Advice; @@ -100,7 +99,7 @@ public static AgentScope onEnter( for (CommandData commandData : command.getCommands()) { commandResourceNames.add(commandData.getCommand().getName()); } - DECORATE.onStatement(span, Strings.join(";", commandResourceNames)); + DECORATE.onStatement(span, String.join(";", commandResourceNames)); command.getPromise().addListener(new SpanFinishListener(AgentTracer.captureSpan(span))); return activateSpan(span); } diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java index 9c438256dc3..e66a8ca480f 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java @@ -13,7 +13,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import datadog.trace.util.Strings; import java.util.ArrayList; import java.util.List; import net.bytebuddy.asm.Advice; @@ -101,7 +100,7 @@ public static AgentScope onEnter( for (CommandData commandData : command.getCommands()) { commandResourceNames.add(commandData.getCommand().getName()); } - RedissonClientDecorator.DECORATE.onStatement(span, Strings.join(";", commandResourceNames)); + RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames)); ((RFuture) command.getPromise()) .addListener(new SpanFinishListener(AgentTracer.captureSpan(span))); return activateSpan(span); diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java index cb5fdf37476..da41ed813c3 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java @@ -13,7 +13,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import datadog.trace.util.Strings; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletionStage; @@ -111,7 +110,7 @@ public static AgentScope onEnter( for (CommandData commandData : command.getCommands()) { commandResourceNames.add(commandData.getCommand().getName()); } - RedissonClientDecorator.DECORATE.onStatement(span, Strings.join(";", commandResourceNames)); + RedissonClientDecorator.DECORATE.onStatement(span, String.join(";", commandResourceNames)); promise.whenComplete(new SpanFinishListener(AgentTracer.captureSpan(span))); return activateSpan(span); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java index f21b94e3abe..7b64f1fe1c2 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java @@ -13,7 +13,6 @@ import datadog.trace.logging.LogLevel; import datadog.trace.util.AgentTaskScheduler; import datadog.trace.util.AgentTaskScheduler.Scheduled; -import datadog.trace.util.Strings; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -239,8 +238,7 @@ private void addConfig(ZipOutputStream zip) throws IOException { private void addRuntime(ZipOutputStream zip) throws IOException { try { RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean(); - TracerFlare.addText( - zip, "jvm_args.txt", Strings.join(" ", runtimeMXBean.getInputArguments())); + TracerFlare.addText(zip, "jvm_args.txt", String.join(" ", runtimeMXBean.getInputArguments())); TracerFlare.addText(zip, "classpath.txt", runtimeMXBean.getClassPath()); TracerFlare.addText(zip, "library_path.txt", runtimeMXBean.getLibraryPath()); if (runtimeMXBean.isBootClassPathSupported()) { diff --git a/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java b/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java index e1c513bd2a9..2798506b2bb 100644 --- a/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java +++ b/internal-api/src/main/java/datadog/trace/api/naming/v1/CloudNamingV1.java @@ -2,7 +2,6 @@ import datadog.trace.api.naming.NamingSchema; import datadog.trace.api.naming.SpanNaming; -import datadog.trace.util.Strings; import java.util.Locale; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -34,7 +33,7 @@ public String operationForRequest( return SpanNaming.instance().namingSchema().messaging().outboundOperation("sns"); default: final String lowercaseService = cloudService.toLowerCase(Locale.ROOT); - return Strings.join(".", provider, lowercaseService, "request"); // aws.s3.request + return String.join(".", provider, lowercaseService, "request"); // aws.s3.request } } diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java index bb4f2a3388f..666eee21d77 100644 --- a/internal-api/src/main/java/datadog/trace/util/Strings.java +++ b/internal-api/src/main/java/datadog/trace/util/Strings.java @@ -118,46 +118,6 @@ public static String getPackageName(final String className) { return lastDot < 0 ? "" : className.substring(0, lastDot); } - public static String join(CharSequence joiner, Iterable strings) { - if (strings == null) { - return ""; - } - - Iterator it = strings.iterator(); - // no elements - if (!it.hasNext()) { - return ""; - } - - // first element - CharSequence first = it.next(); - if (!it.hasNext()) { - return first.toString(); - } - - // remaining elements with joiner - StringBuilder sb = new StringBuilder(first); - while (it.hasNext()) { - sb.append(joiner).append(it.next()); - } - return sb.toString(); - } - - public static String join(CharSequence joiner, CharSequence... strings) { - int len = strings.length; - if (len > 0) { - if (len == 1) { - return strings[0].toString(); - } - StringBuilder sb = new StringBuilder(strings[0]); - for (int i = 1; i < len; ++i) { - sb.append(joiner).append(strings[i]); - } - return sb.toString(); - } - return ""; - } - // reimplementation of string functions without regex public static String replace(String str, String delimiter, String replacement) { StringBuilder sb = new StringBuilder(str); diff --git a/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy b/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy index d0801a247f0..503922c724f 100644 --- a/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy @@ -12,9 +12,11 @@ class StringsTest extends DDSpecification { s == expected where: // spotless:off - className | expected - "foo.bar.Class" | "foo/bar/Class.class" - "Class" | "Class.class" + className | expected + "foo.bar.Class" | "foo/bar/Class.class" + "foo/bar/Class.class" | "foo/bar/Class.class" + "Class" | "Class.class" + "Class.class" | "Class.class" // spotless:on } @@ -27,57 +29,41 @@ class StringsTest extends DDSpecification { // spotless:off resourceName | expected "foo/bar/Class.class" | "foo.bar.Class" + "foo.bar.Class" | "foo.bar.Class" "Class.class" | "Class" + "Class" | "Class" // spotless:on } - def "test package name from class"() { + def "test internal name from class name"() { when: - String s = Strings.getPackageName(className) + String s = Strings.getInternalName(resourceName) then: s == expected where: // spotless:off - className | expected - "foo.bar.Class" | "foo.bar" - "Class" | "" + resourceName | expected + "foo.bar.Class" | "foo/bar/Class" + "Class" | "Class" // spotless:on } - def "test envvar from property"() { - expect: - "FOO_BAR_QUX" == Strings.toEnvVar("foo.bar-qux") - } - - def "test join strings"() { + def "test package name from class"() { when: - String s = Strings.join(joiner, strings) + String s = Strings.getPackageName(className) then: s == expected where: // spotless:off - joiner | strings | expected - "," | ["a", "b", "c"] | "a,b,c" - "," | ["a", "b"] | "a,b" - "," | ["a"] | "a" - "," | [] | "" + className | expected + "foo.bar.Class" | "foo.bar" + "Class" | "" // spotless:on } - def "test join strings varargs"() { - when: - // apparently groovy doesn't like this but it runs as if it's java - String s = Strings.join(joiner, strings.toArray(new CharSequence[0])) - then: - s == expected - where: - // spotless:off - joiner | strings | expected - "," | ["a", "b", "c"] | "a,b,c" - "," | ["a", "b"] | "a,b" - "," | ["a"] | "a" - "," | [] | "" - // spotless:on + def "test envvar from property"() { + expect: + "FOO_BAR_QUX" == Strings.toEnvVar("foo.bar-qux") } def "test replace strings"() { From d36ef9adc33088612676b490165ea15890431ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:51:12 +0100 Subject: [PATCH 034/106] Add propagation to StringBuilder substring methods (#7980) --- .../iast/propagation/StringModuleImpl.java | 2 +- .../iast/propagation/StringModuleTest.groovy | 67 ++++++++++--------- .../com/datadog/iast/taint/TaintUtils.groovy | 7 ++ .../java/lang/StringBuilderCallSite.java | 33 +++++++++ .../lang/StringBuilderCallSiteTest.groovy | 40 +++++++++++ .../java/foo/bar/TestStringBuilderSuite.java | 14 ++++ .../api/iast/propagation/StringModule.java | 2 +- 7 files changed, 132 insertions(+), 33 deletions(-) diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java index 774d0190303..b31d7ca15fb 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java @@ -185,7 +185,7 @@ public void onStringConcatFactory( @Override @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ") public void onStringSubSequence( - @Nonnull String self, int beginIndex, int endIndex, @Nullable CharSequence result) { + @Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result) { if (self == result || !canBeTainted(result)) { return; } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy index 617dc4aa499..63c56202132 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy @@ -481,37 +481,42 @@ class StringModuleTest extends IastModuleImplTestBase { } where: - self | beginIndex | endIndex | expected - "==>0123<==" | 0 | 4 | "==>0123<==" - "0123==>456<==78" | 0 | 5 | "0123==>4<==" - "01==>234<==5==>678<==90" | 0 | 8 | "01==>234<==5==>67<==" - "==>0123<==" | 0 | 3 | "==>012<==" - "==>0123<==" | 1 | 4 | "==>123<==" - "==>0123<==" | 1 | 3 | "==>12<==" - "0123==>456<==78" | 1 | 8 | "123==>456<==7" - "0123==>456<==78" | 0 | 4 | "0123" - "0123==>456<==78" | 7 | 9 | "78" - "0123==>456<==78" | 1 | 5 | "123==>4<==" - "0123==>456<==78" | 1 | 6 | "123==>45<==" - "0123==>456<==78" | 4 | 7 | "==>456<==" - "0123==>456<==78" | 6 | 8 | "==>6<==7" - "0123==>456<==78" | 5 | 8 | "==>56<==7" - "0123==>456<==78" | 4 | 6 | "==>45<==" - "01==>234<==5==>678<==90" | 1 | 10 | "1==>234<==5==>678<==9" - "01==>234<==5==>678<==90" | 1 | 2 | "1" - "01==>234<==5==>678<==90" | 5 | 6 | "5" - "01==>234<==5==>678<==90" | 9 | 10 | "9" - "01==>234<==5==>678<==90" | 1 | 4 | "1==>23<==" - "01==>234<==5==>678<==90" | 2 | 4 | "==>23<==" - "01==>234<==5==>678<==90" | 2 | 5 | "==>234<==" - "01==>234<==5==>678<==90" | 1 | 8 | "1==>234<==5==>67<==" - "01==>234<==5==>678<==90" | 2 | 8 | "==>234<==5==>67<==" - "01==>234<==5==>678<==90" | 2 | 9 | "==>234<==5==>678<==" - "01==>234<==5==>678<==90" | 5 | 8 | "5==>67<==" - "01==>234<==5==>678<==90" | 6 | 8 | "==>67<==" - "01==>234<==5==>678<==90" | 6 | 9 | "==>678<==" - "01==>234<==5==>678<==90" | 4 | 9 | "==>4<==5==>678<==" - "01==>234<==5==>678<==90" | 4 | 8 | "==>4<==5==>67<==" + self | beginIndex | endIndex | expected + "==>0123<==" | 0 | 4 | "==>0123<==" + "0123==>456<==78" | 0 | 5 | "0123==>4<==" + "01==>234<==5==>678<==90" | 0 | 8 | "01==>234<==5==>67<==" + "==>0123<==" | 0 | 3 | "==>012<==" + "==>0123<==" | 1 | 4 | "==>123<==" + "==>0123<==" | 1 | 3 | "==>12<==" + "0123==>456<==78" | 1 | 8 | "123==>456<==7" + "0123==>456<==78" | 0 | 4 | "0123" + "0123==>456<==78" | 7 | 9 | "78" + "0123==>456<==78" | 1 | 5 | "123==>4<==" + "0123==>456<==78" | 1 | 6 | "123==>45<==" + "0123==>456<==78" | 4 | 7 | "==>456<==" + "0123==>456<==78" | 6 | 8 | "==>6<==7" + "0123==>456<==78" | 5 | 8 | "==>56<==7" + "0123==>456<==78" | 4 | 6 | "==>45<==" + "01==>234<==5==>678<==90" | 1 | 10 | "1==>234<==5==>678<==9" + "01==>234<==5==>678<==90" | 1 | 2 | "1" + "01==>234<==5==>678<==90" | 5 | 6 | "5" + "01==>234<==5==>678<==90" | 9 | 10 | "9" + "01==>234<==5==>678<==90" | 1 | 4 | "1==>23<==" + "01==>234<==5==>678<==90" | 2 | 4 | "==>23<==" + "01==>234<==5==>678<==90" | 2 | 5 | "==>234<==" + "01==>234<==5==>678<==90" | 1 | 8 | "1==>234<==5==>67<==" + "01==>234<==5==>678<==90" | 2 | 8 | "==>234<==5==>67<==" + "01==>234<==5==>678<==90" | 2 | 9 | "==>234<==5==>678<==" + "01==>234<==5==>678<==90" | 5 | 8 | "5==>67<==" + "01==>234<==5==>678<==90" | 6 | 8 | "==>67<==" + "01==>234<==5==>678<==90" | 6 | 9 | "==>678<==" + "01==>234<==5==>678<==90" | 4 | 9 | "==>4<==5==>678<==" + "01==>234<==5==>678<==90" | 4 | 8 | "==>4<==5==>67<==" + sb("==>0123<==") | 0 | 4 | "==>0123<==" + sb("0123==>456<==78") | 0 | 5 | "0123==>4<==" + sb("01==>234<==5==>678<==90") | 0 | 8 | "01==>234<==5==>67<==" + sb("0123==>456<==78") | 4 | 6 | "==>45<==" + sb("01==>234<==5==>678<==90") | 4 | 8 | "==>4<==5==>67<==" } void 'onStringJoin without null delimiter or elements (#delimiter, #elements)'() { diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy index 68c75091209..c064b767b1d 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy @@ -74,6 +74,13 @@ class TaintUtils { new String(s.replace(OPEN_MARK, "").replace(CLOSE_MARK, "")) } + static String getStringFromTaintFormat(final Appendable appendable) { + if (appendable == null) { + return null + } + getStringFromTaintFormat(appendable.toString()) + } + static E taint(final TaintedObjects tos, final E value) { if (value instanceof String) { return addFromTaintFormat(tos, value as String) diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java index 327df118d10..4a85301d4fd 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java @@ -101,4 +101,37 @@ public static String afterToString( } return result; } + + @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int)") + public static String afterSubstring( + @CallSite.This final CharSequence self, + @CallSite.Argument final int beginIndex, + @CallSite.Return final String result) { + final StringModule module = InstrumentationBridge.STRING; + if (module != null) { + try { + module.onStringSubSequence(self, beginIndex, self.length(), result); + } catch (final Throwable e) { + module.onUnexpectedException("afterSubstring threw", e); + } + } + return result; + } + + @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int, int)") + public static String afterSubstring( + @CallSite.This final CharSequence self, + @CallSite.Argument final int beginIndex, + @CallSite.Argument final int endIndex, + @CallSite.Return final String result) { + final StringModule module = InstrumentationBridge.STRING; + if (module != null) { + try { + module.onStringSubSequence(self, beginIndex, endIndex, result); + } catch (final Throwable e) { + module.onUnexpectedException("afterSubstring threw", e); + } + } + return result; + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy index 109262fab2f..9c53242b939 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy @@ -174,6 +174,42 @@ class StringBuilderCallSiteTest extends AgentTestRunner { ex.stackTrace.find { it.className == StringBuilderCallSite.name } == null } + def 'test string builder substring call site'() { + setup: + final iastModule = Mock(StringModule) + InstrumentationBridge.registerIastModule(iastModule) + + when: + final result = TestStringBuilderSuite.substring(param, beginIndex) + + then: + result == expected + 1 * iastModule.onStringSubSequence(param, beginIndex, param.length(), expected) + 0 * _ + + where: + param | beginIndex | expected + sb('012345') | 1 | '12345' + } + + def 'test string builder substring with endIndex call site'() { + setup: + final iastModule = Mock(StringModule) + InstrumentationBridge.registerIastModule(iastModule) + + when: + final result = TestStringBuilderSuite.substring(param, beginIndex, endIndex) + + then: + result == expected + 1 * iastModule.onStringSubSequence(param, beginIndex, endIndex, expected) + 0 * _ + + where: + param | beginIndex | endIndex | expected + sb('012345') | 1 | 5 | '1234' + } + private static class BrokenToString { @Override String toString() { @@ -186,4 +222,8 @@ class StringBuilderCallSiteTest extends AgentTestRunner { super(message) } } + + private static StringBuilder sb(final String string) { + return new StringBuilder(string) + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java index 04a3c9b215f..1edd8b1500b 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java @@ -76,4 +76,18 @@ public String plus(final Object... items) { LOGGER.debug("After string builder toString {}", result); return result; } + + public static String substring(StringBuilder self, int beginIndex, int endIndex) { + LOGGER.debug("Before string builder substring {} from {} to {}", self, beginIndex, endIndex); + final String result = self.substring(beginIndex, endIndex); + LOGGER.debug("After string builder substring {}", result); + return result; + } + + public static String substring(StringBuilder self, int beginIndex) { + LOGGER.debug("Before string builder substring {} from {}", self, beginIndex); + final String result = self.substring(beginIndex); + LOGGER.debug("After string builder substring {}", result); + return result; + } } diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java index c282b8a93de..37a28f2a0a3 100644 --- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java +++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java @@ -23,7 +23,7 @@ void onStringConcatFactory( @Nonnull int[] recipeOffsets); void onStringSubSequence( - @Nonnull String self, int beginIndex, int endIndex, @Nullable CharSequence result); + @Nonnull CharSequence self, int beginIndex, int endIndex, @Nullable CharSequence result); void onStringJoin( @Nullable String result, @Nonnull CharSequence delimiter, @Nonnull CharSequence[] elements); From acbeca2041ebcac09b6de0e5c55207ec4562d169 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Thu, 21 Nov 2024 09:54:00 +0100 Subject: [PATCH 035/106] fix(ci): Fix PR label checks (#7983) --- .github/workflows/check-pull-requests.yaml | 2 +- .../payload-pull-request-instrumentation.json | 15 +++++++++++++++ .../check-pull-requests/test-pull-request.sh | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tests/check-pull-requests/payload-pull-request-instrumentation.json diff --git a/.github/workflows/check-pull-requests.yaml b/.github/workflows/check-pull-requests.yaml index da8a69e5683..96c17b996dc 100644 --- a/.github/workflows/check-pull-requests.yaml +++ b/.github/workflows/check-pull-requests.yaml @@ -27,7 +27,7 @@ jobs: const ignoreReleaseNotes = labels.filter(label => label == 'tag: no release notes').length > 0 const hasTypeLabel = labels.filter(label => label.startsWith('type:')).length > 0 const hasComponentLabel = labels.filter(label => label.startsWith('comp:')).length > 0 - const hasInstrumentationLabel = labels.filter(label => label.startsWith('instr:')).length > 0 + const hasInstrumentationLabel = labels.filter(label => label.startsWith('inst:')).length > 0 const labelsCheckFailed = !ignoreReleaseNotes && (!hasTypeLabel || (!hasComponentLabel && !hasInstrumentationLabel)); if (labelsCheckFailed) { core.setFailed('Please add at least one type, and one component or instrumentation label to the pull request.') diff --git a/.github/workflows/tests/check-pull-requests/payload-pull-request-instrumentation.json b/.github/workflows/tests/check-pull-requests/payload-pull-request-instrumentation.json new file mode 100644 index 00000000000..dbdf611baad --- /dev/null +++ b/.github/workflows/tests/check-pull-requests/payload-pull-request-instrumentation.json @@ -0,0 +1,15 @@ +{ + "pull_request": { + "number": 7884, + "draft": false, + "labels": [ + { + "name": "inst: java" + }, + { + "name": "type: bug" + } + ], + "title": "Adding some new features" + } +} diff --git a/.github/workflows/tests/check-pull-requests/test-pull-request.sh b/.github/workflows/tests/check-pull-requests/test-pull-request.sh index 431826a8eeb..47a58f18bad 100755 --- a/.github/workflows/tests/check-pull-requests/test-pull-request.sh +++ b/.github/workflows/tests/check-pull-requests/test-pull-request.sh @@ -1,6 +1,7 @@ #!/bin/bash source "$(dirname "$0")/../env.sh" testworkflow pull_request && \ +testworkflow pull_request instrumentation && \ testworkflow pull_request draft && \ testworkflow pull_request no-release-notes && \ ! testworkflow pull_request missing-label && \ From 8353161a0c51ebaff1008ceba2b8d5b7a2e5791b Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 21 Nov 2024 10:46:31 +0100 Subject: [PATCH 036/106] Unique test names for okhttp (#7989) --- .../okhttp-2/src/test/groovy/OkHttp2AsyncTest.groovy | 2 +- .../okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/OkHttp2AsyncTest.groovy b/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/OkHttp2AsyncTest.groovy index a6a86bf2f4e..c2ae5c06a6f 100644 --- a/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/OkHttp2AsyncTest.groovy +++ b/dd-java-agent/instrumentation/okhttp-2/src/test/groovy/OkHttp2AsyncTest.groovy @@ -49,7 +49,7 @@ abstract class OkHttp2AsyncTest extends OkHttp2Test { return responseRef.get().code() } - def "callbacks should carry context" () { + def "callbacks should carry context with error = #error" () { when: def captured = AgentTracer.noopSpan() diff --git a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy index bec7334f60b..335c778bf7b 100644 --- a/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy +++ b/dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3AsyncTest.groovy @@ -49,7 +49,7 @@ abstract class OkHttp3AsyncTest extends OkHttp3Test { return responseRef.get().code() } - def "callbacks should carry context" () { + def "callbacks should carry context with error = #error" () { when: def captured = AgentTracer.noopSpan() From 9bd12516bb6948da47e68c112bf7caabc1b14952 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 21 Nov 2024 10:47:32 +0100 Subject: [PATCH 037/106] Update system-tests to 67fe30ac7504997685859d31feae1782f3527f39 (#7990) --- .circleci/config.continue.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index d7e0c58a512..ec456a985bc 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core" profiling_modules: &profiling_modules "dd-java-agent/agent-profiling" -default_system_tests_commit: &default_system_tests_commit 53d9b2c43876a39e5c0426f4df4dd5fd79d062e8 +default_system_tests_commit: &default_system_tests_commit 67fe30ac7504997685859d31feae1782f3527f39 parameters: nightly: From cd1b746d93b0bd00c807efbb15184b2514e2f92e Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 21 Nov 2024 14:38:07 +0100 Subject: [PATCH 038/106] Add smoke tests for telemetry (#7955) --- .../SpringBootWebmvcIntegrationTest.groovy | 5 ++ ...SpringBootNativeInstrumentationTest.groovy | 5 ++ .../SpringBootWebmvcIntegrationTest.groovy | 5 ++ .../SpringBootWebmvcIntegrationTest.groovy | 5 ++ .../SpringBootOpenLibertySmokeTest.groovy | 5 ++ ...otOpenLibertySmokeVulnerabilityTest.groovy | 5 ++ .../SpringBootOpenLibertySmokeTest.groovy | 5 ++ ...otOpenLibertySmokeVulnerabilityTest.groovy | 5 ++ .../smoketest/AbstractServerSmokeTest.groovy | 51 ++++++++++++++++ .../smoketest/AbstractSmokeTest.groovy | 60 +++++++++++++++++++ .../groovy/datadog/smoketest/RunLast.groovy | 19 ++++++ .../datadog/smoketest/RunLastExtension.groovy | 13 ++++ 12 files changed, 183 insertions(+) create mode 100644 dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLast.groovy create mode 100644 dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLastExtension.groovy diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy index 04fe5a66951..297b44bf382 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy @@ -86,4 +86,9 @@ class SpringBootWebmvcIntegrationTest extends AbstractServerSmokeTest { response.code() == 404 waitForTraceCount(1) } + + @Override + List expectedTelemetryDependencies() { + ['org.eclipse.jetty:jetty-client'] + } } diff --git a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy index 61d93f8aeb1..3d1aeb427cb 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy +++ b/dd-smoke-tests/spring-boot-3.0-native/src/test/groovy/SpringBootNativeInstrumentationTest.groovy @@ -55,6 +55,11 @@ class SpringBootNativeInstrumentationTest extends AbstractServerSmokeTest { return ["[servlet.request[spring.handler[WebController.doHello[WebController.sayHello]]]]"] } + @Override + boolean testTelemetry() { + false + } + def "check native instrumentation"() { setup: String url = "http://localhost:${httpPort}/hello" diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy b/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy index e1be966627a..362a365a00f 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy @@ -78,4 +78,9 @@ class SpringBootWebmvcIntegrationTest extends AbstractServerSmokeTest { responseBodyStr.contains("banana") waitForTraceCount(1) } + + @Override + List expectedTelemetryDependencies() { + ['spring-core'] + } } diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy b/dd-smoke-tests/spring-boot-3.3-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy index e1be966627a..362a365a00f 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/src/test/groovy/SpringBootWebmvcIntegrationTest.groovy @@ -78,4 +78,9 @@ class SpringBootWebmvcIntegrationTest extends AbstractServerSmokeTest { responseBodyStr.contains("banana") waitForTraceCount(1) } + + @Override + List expectedTelemetryDependencies() { + ['spring-core'] + } } diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index d6a761d39f7..600a81d2359 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -61,6 +61,11 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { ].toSet() } + @Override + boolean testTelemetry() { + false + } + def "Test concurrent requests to Spring Boot running Open Liberty"() { setup: def url = "http://localhost:${httpPort}/connect" diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index b77111f1c74..84c9a4ebff6 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -59,6 +59,11 @@ class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTes return {} // force traces decoding } + @Override + boolean testTelemetry() { + false + } + private static boolean contains(String s) { System.out.println("Checking span:" + s) return s.contains("MD5") diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index 78c4d9c415c..a19b1a7989c 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -68,6 +68,11 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { ].toSet() } + @Override + boolean testTelemetry() { + false + } + def "Test concurrent requests to Spring Boot running Open Liberty"() { setup: def url = "http://localhost:${httpPort}/connect" diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index b77111f1c74..84c9a4ebff6 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -59,6 +59,11 @@ class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTes return {} // force traces decoding } + @Override + boolean testTelemetry() { + false + } + private static boolean contains(String s) { System.out.println("Checking span:" + s) return s.contains("MD5") diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy index 13baba60481..a71b32de9cb 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy @@ -5,6 +5,7 @@ import datadog.trace.agent.test.utils.OkHttpUtils import datadog.trace.agent.test.utils.PortUtils import okhttp3.OkHttpClient import spock.lang.Shared +import static org.junit.Assume.assumeTrue import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger @@ -116,4 +117,54 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest { } return remaining } + + @RunLast + void 'receive telemetry app-started'() { + when: + assumeTrue(testTelemetry()) + waitForTelemetryCount(1) + + then: + telemetryMessages.size() >= 1 + Object msg = telemetryMessages.get(0) + msg['request_type'] == 'app-started' + } + + List expectedTelemetryDependencies() { + [] + } + + @RunLast + @SuppressWarnings('UnnecessaryBooleanExpression') + void 'receive telemetry app-dependencies-loaded'() { + when: + assumeTrue(testTelemetry()) + // app-started + 3 message-batch + waitForTelemetryCount(4) + waitForTelemetryFlat { it.get('request_type') == 'app-dependencies-loaded' } + + then: 'received some dependencies' + def dependenciesLoaded = telemetryFlatMessages.findAll { it.get('request_type') == 'app-dependencies-loaded' } + def dependencies = [] + dependenciesLoaded.each { + def payload = it.get('payload') as Map + dependencies.addAll(payload.get('dependencies')) } + dependencies.size() > 0 + + Set dependencyNames = dependencies.collect { + def dependency = it as Map + dependency.get('name') as String + }.toSet() + + and: 'received tracer dependencies' + // Not exhaustive list of tracer dependencies. + Set missingDependencyNames = ['com.github.jnr:jnr-ffi', 'net.bytebuddy:byte-buddy-agent',].toSet() + missingDependencyNames.removeAll(dependencyNames) || true + missingDependencyNames.isEmpty() + + and: 'received application dependencies' + Set missingExtraDependencyNames = expectedTelemetryDependencies().toSet() + missingExtraDependencyNames.removeAll(dependencyNames) || true + missingExtraDependencyNames.isEmpty() + } } diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index ea79551487d..092c5b84fb9 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -7,6 +7,7 @@ import datadog.trace.test.agent.decoder.Decoder import datadog.trace.test.agent.decoder.DecodedMessage import datadog.trace.test.agent.decoder.DecodedTrace import datadog.trace.util.Strings +import groovy.json.JsonSlurper import java.nio.charset.StandardCharsets import java.util.concurrent.CopyOnWriteArrayList @@ -37,6 +38,15 @@ abstract class AbstractSmokeTest extends ProcessManager { @Shared private Throwable traceDecodingFailure = null + @Shared + protected CopyOnWriteArrayList> telemetryMessages = new CopyOnWriteArrayList() + + @Shared + protected CopyOnWriteArrayList> telemetryFlatMessages = new CopyOnWriteArrayList() + + @Shared + private Throwable telemetryDecodingFailure = null + @Shared protected TestHttpServer.Headers lastTraceRequestHeaders = null @@ -119,6 +129,23 @@ abstract class AbstractSmokeTest extends ProcessManager { response.status(200).send(remoteConfigResponse) } prefix("/telemetry/proxy/api/v2/apmtelemetry") { + try { + byte[] body = request.getBody() + if (body != null) { + Map msg = new JsonSlurper().parseText(new String(body, StandardCharsets.UTF_8)) as Map + telemetryMessages.add(msg) + if (msg.get("request_type") == "message-batch") { + msg.get("payload")?.each { telemetryFlatMessages.add(it as Map) } + } else { + telemetryFlatMessages.add(msg) + } + } + } catch (Throwable t) { + println("=== Failure during telemetry decoding ===") + t.printStackTrace(System.out) + telemetryDecodingFailure = t + throw t + } response.status(202).send() } } @@ -160,6 +187,9 @@ abstract class AbstractSmokeTest extends ProcessManager { if (inferServiceName()) { ret += "-Ddd.service.name=${SERVICE_NAME}" } + if (testTelemetry()) { + ret += "-Ddd.telemetry.heartbeat.interval=5" + } ret as String[] } @@ -172,6 +202,11 @@ abstract class AbstractSmokeTest extends ProcessManager { return !Platform.isJ9() } + + boolean testTelemetry() { + return true + } + def setup() { traceCount.set(0) decodeTraces.clear() @@ -272,6 +307,31 @@ abstract class AbstractSmokeTest extends ProcessManager { } } + void waitForTelemetryCount(final int count) { + def conditions = new PollingConditions(timeout: 30, initialDelay: 0, delay: 1, factor: 1) + waitForTelemetryCount(conditions, count) + } + + void waitForTelemetryCount(final PollingConditions poll, final int count) { + poll.eventually { + telemetryMessages.size() >= count + } + } + + void waitForTelemetryFlat(final Function, Boolean> predicate) { + def conditions = new PollingConditions(timeout: 30, initialDelay: 0, delay: 1, factor: 1) + waitForTelemetryFlat(conditions, predicate) + } + + void waitForTelemetryFlat(final PollingConditions poll, final Function, Boolean> predicate) { + poll.eventually { + if (telemetryDecodingFailure != null) { + throw telemetryDecodingFailure + } + assert telemetryFlatMessages.find { predicate.apply(it) } != null + } + } + List getTraces() { decodeTraces } diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLast.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLast.groovy new file mode 100644 index 00000000000..07c751a4ede --- /dev/null +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLast.groovy @@ -0,0 +1,19 @@ +package datadog.smoketest + +import org.spockframework.runtime.extension.ExtensionAnnotation + +import java.lang.annotation.ElementType +import java.lang.annotation.Retention +import java.lang.annotation.RetentionPolicy +import java.lang.annotation.Target + +/** + * Spock test methods annotated with this will be executed last. + * This is useful for tests that need to wait for some test to settle while other tests run (e.g. telemetry), so it is + * more efficient to run them at the end. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target([ElementType.METHOD]) +@ExtensionAnnotation(RunLastExtension) +@interface RunLast { +} diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLastExtension.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLastExtension.groovy new file mode 100644 index 00000000000..40bdd408156 --- /dev/null +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/RunLastExtension.groovy @@ -0,0 +1,13 @@ +package datadog.smoketest + +import org.spockframework.runtime.extension.IAnnotationDrivenExtension +import org.spockframework.runtime.model.FeatureInfo + +class RunLastExtension implements IAnnotationDrivenExtension { + @Override + void visitFeatureAnnotations(List annotations, FeatureInfo feature) { + if (!annotations.isEmpty()) { + feature.setExecutionOrder(Integer.MAX_VALUE) + } + } +} From 3618cef1f539ca58e40e4e66e50f1e6dad9e7b4f Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Thu, 21 Nov 2024 16:30:32 +0100 Subject: [PATCH 039/106] fix(crashtracking): Fix case when Bash associative array are not supported (#7956) Associative arrays require Bash 4. I replaced them with dynamic variable names. --- .../com/datadog/crashtracking/notify_oome.sh | 17 +++++++++------ .../com/datadog/crashtracking/upload_crash.sh | 21 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh b/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh index 2d0eace2d6e..85ee5ef08ca 100644 --- a/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh +++ b/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/notify_oome.sh @@ -22,20 +22,25 @@ fi # The expected contents are: # - agent: Path to the agent jar # - tags: Comma-separated list of tags to be sent with the OOME event; key:value pairs are supported -declare -A config while IFS="=" read -r key value; do - config["$key"]="$value" + declare "config_$key"="$value" done < "$configFile" +# Exiting early if configuration is missing +if [ -z "${config_agent}" ] || [ -z "${config_tags}" ]; then + echo "Error: Missing configuration" + exit 1 +fi + # Debug: Print the loaded values (Optional) -echo "Agent Jar: ${config[agent]}" -echo "Tags: ${config[tags]}" +echo "Agent Jar: ${config_agent}" +echo "Tags: ${config_tags}" echo "PID: $PID" # Execute the Java command with the loaded values -java -Ddd.dogstatsd.start-delay=0 -jar "${config[agent]}" sendOomeEvent "${config[tags]}" +java -Ddd.dogstatsd.start-delay=0 -jar "${config_agent}" sendOomeEvent "${config_tags}" RC=$? -rm -f ${configFile} # Remove the configuration file +rm -f "${configFile}" # Remove the configuration file if [ $RC -eq 0 ]; then echo "OOME Event generated successfully" diff --git a/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.sh b/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.sh index 160609e259d..7b417dcc1be 100644 --- a/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.sh +++ b/dd-java-agent/agent-crashtracking/src/main/resources/com/datadog/crashtracking/upload_crash.sh @@ -30,24 +30,29 @@ fi # The expected contents are: # - agent: Path to the agent jar # - hs_err: Path to the hs_err log file -declare -A config while IFS="=" read -r key value; do - config["$key"]="$value" + declare "config_$key"="$value" done < "$configFile" +# Exiting early if configuration is missing +if [ -z "${config_agent}" ] || [ -z "${config_hs_err}" ]; then + echo "Error: Missing configuration" + exit 1 +fi + # Debug: Print the loaded values (Optional) -echo "Agent Jar: ${config[agent]}" -echo "Error Log: ${config[hs_err]}" +echo "Agent Jar: ${config_agent}" +echo "Error Log: ${config_hs_err}" echo "PID: $PID" # Execute the Java command with the loaded values -java -jar "${config[agent]}" uploadCrash "${config[hs_err]}" +java -jar "${config_agent}" uploadCrash "${config_hs_err}" RC=$? -rm -f ${configFile} # Remove the configuration file +rm -f "${configFile}" # Remove the configuration file if [ $RC -eq 0 ]; then - echo "Error file ${config[hs_err]} was uploaded successfully" + echo "Error file ${config_hs_err} was uploaded successfully" else - echo "Error: Failed to upload error file ${config[hs_err]}" + echo "Error: Failed to upload error file ${config_hs_err}" exit $RC fi From 603ef416b67d56b257500a6c9f52a5ee79f30f1e Mon Sep 17 00:00:00 2001 From: ValentinZakharov Date: Thu, 21 Nov 2024 16:33:47 +0100 Subject: [PATCH 040/106] Upgrade to libddwaf 1.21.0 (#7993) --- dd-java-agent/appsec/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 553e17b03f9..f501d453cec 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation project(':internal-api') implementation project(':communication') implementation project(':telemetry') - implementation group: 'io.sqreen', name: 'libsqreen', version: '11.1.0' + implementation group: 'io.sqreen', name: 'libsqreen', version: '11.2.0' implementation libs.moshi testImplementation libs.bytebuddy From 58de7ff6c6ae74a7a8d2b63fc6c7247c19ac1f25 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 21 Nov 2024 17:34:15 +0100 Subject: [PATCH 041/106] Unique test names in StackUtilsTest (#7995) --- .../test/java/datadog/trace/util/stacktrace/StackUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java index 1fb68fbd680..329d77bf68c 100644 --- a/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java +++ b/internal-api/src/test/java/datadog/trace/util/stacktrace/StackUtilsTest.java @@ -105,7 +105,7 @@ private static Stream test_generateUserCodeStackTrace_Params() { true)); } - @ParameterizedTest + @ParameterizedTest(name = "[{index}]") @MethodSource("test_generateUserCodeStackTrace_Params") public void test_generateUserCodeStackTrace( final Predicate filter, final boolean expected) { From 5a08588074b9627e686faca8834ccde4d2dc2423 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Fri, 22 Nov 2024 10:35:38 +0100 Subject: [PATCH 042/106] fix(core): Fix test name uniqueness (#7998) --- .../datadog/trace/core/monitor/HealthMetricsTest.groovy | 4 ++-- .../test/groovy/datadog/trace/core/monitor/TimingTest.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/HealthMetricsTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/HealthMetricsTest.groovy index 005e2d68398..d182a8e322b 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/HealthMetricsTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/HealthMetricsTest.groovy @@ -175,7 +175,7 @@ class HealthMetricsTest extends DDSpecification { 0 * _ } - def "test onSend"() { + def "test onSend #iterationIndex"() { setup: def latch = new CountDownLatch(3 + (response.exception() ? 1 : 0) + (response.status() ? 1 : 0)) def healthMetrics = new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS) @@ -212,7 +212,7 @@ class HealthMetricsTest extends DDSpecification { sendSize = ThreadLocalRandom.current().nextInt(1, 100) } - def "test onFailedSend"() { + def "test onFailedSend #iterationIndex"() { setup: def latch = new CountDownLatch(3 + (response.exception() ? 1 : 0) + (response.status() ? 1 : 0)) def healthMetrics = new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/TimingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/TimingTest.groovy index 4a8002146c8..a956038c7a2 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/TimingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/monitor/TimingTest.groovy @@ -43,7 +43,7 @@ class TimingTest extends DDSpecification { 0 * _ } - def "reset timer"() { + def "reset timer #iterationIndex"() { setup: StatsDClient statsd = Mock(StatsDClient) MonitoringImpl monitoring = new MonitoringImpl(statsd, 100, MILLISECONDS) @@ -75,7 +75,7 @@ class TimingTest extends DDSpecification { Monitoring.DISABLED.newThreadLocalTimer("foo") instanceof NoOpRecording } - def "no ops are safe to use"() { + def "no ops are safe to use #iterationIndex"() { expect: try { recording.start().stop() From c5cda3f183fdb40fe03a674635aabcd5288e74dc Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Fri, 22 Nov 2024 10:45:06 +0100 Subject: [PATCH 043/106] Run system-tests scenarios related to RASP (#7947) * Add system-tests scenarios related to RASP * Exclude appsec scenarios from native image weblogs * Allow empty artifacts when no scenario is evaluated --- .circleci/config.continue.yml.j2 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index ec456a985bc..7976b31ac8f 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -816,7 +816,7 @@ jobs: parameters: weblog-variant: type: string - parallelism: 3 + parallelism: 4 steps: - setup_system_tests @@ -838,11 +838,22 @@ jobs: no_output_timeout: 5m command: | cd system-tests + ( echo " DEFAULT APM_TRACING_E2E APM_TRACING_E2E_SINGLE_SPAN - " | circleci tests split > scenarios.list + " + if ! [[ << parameters.weblog-variant >> =~ .*native ]]; then + echo " + APPSEC_BLOCKING + APPSEC_REQUEST_BLOCKING + APPSEC_RASP + APPSEC_RUNTIME_ACTIVATION + REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD + " + fi + ) | circleci tests split > scenarios.list for scenario in $(>.tar.gz $log_dir done From adf9784bfd2871526be4e594d443e5affc87e484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:40:14 +0100 Subject: [PATCH 044/106] Add propagation to StringBuffer substring methods (#7992) --- .../iast/propagation/StringModuleTest.groovy | 81 ++++++++++--------- .../com/datadog/iast/taint/TaintUtils.groovy | 9 ++- .../java/lang/StringBuilderCallSite.java | 5 ++ .../lang/StringBuilderCallSiteTest.groovy | 14 +++- .../java/foo/bar/TestStringBuilderSuite.java | 14 ++++ 5 files changed, 81 insertions(+), 42 deletions(-) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy index 63c56202132..6a96cdd1603 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy @@ -481,42 +481,47 @@ class StringModuleTest extends IastModuleImplTestBase { } where: - self | beginIndex | endIndex | expected - "==>0123<==" | 0 | 4 | "==>0123<==" - "0123==>456<==78" | 0 | 5 | "0123==>4<==" - "01==>234<==5==>678<==90" | 0 | 8 | "01==>234<==5==>67<==" - "==>0123<==" | 0 | 3 | "==>012<==" - "==>0123<==" | 1 | 4 | "==>123<==" - "==>0123<==" | 1 | 3 | "==>12<==" - "0123==>456<==78" | 1 | 8 | "123==>456<==7" - "0123==>456<==78" | 0 | 4 | "0123" - "0123==>456<==78" | 7 | 9 | "78" - "0123==>456<==78" | 1 | 5 | "123==>4<==" - "0123==>456<==78" | 1 | 6 | "123==>45<==" - "0123==>456<==78" | 4 | 7 | "==>456<==" - "0123==>456<==78" | 6 | 8 | "==>6<==7" - "0123==>456<==78" | 5 | 8 | "==>56<==7" - "0123==>456<==78" | 4 | 6 | "==>45<==" - "01==>234<==5==>678<==90" | 1 | 10 | "1==>234<==5==>678<==9" - "01==>234<==5==>678<==90" | 1 | 2 | "1" - "01==>234<==5==>678<==90" | 5 | 6 | "5" - "01==>234<==5==>678<==90" | 9 | 10 | "9" - "01==>234<==5==>678<==90" | 1 | 4 | "1==>23<==" - "01==>234<==5==>678<==90" | 2 | 4 | "==>23<==" - "01==>234<==5==>678<==90" | 2 | 5 | "==>234<==" - "01==>234<==5==>678<==90" | 1 | 8 | "1==>234<==5==>67<==" - "01==>234<==5==>678<==90" | 2 | 8 | "==>234<==5==>67<==" - "01==>234<==5==>678<==90" | 2 | 9 | "==>234<==5==>678<==" - "01==>234<==5==>678<==90" | 5 | 8 | "5==>67<==" - "01==>234<==5==>678<==90" | 6 | 8 | "==>67<==" - "01==>234<==5==>678<==90" | 6 | 9 | "==>678<==" - "01==>234<==5==>678<==90" | 4 | 9 | "==>4<==5==>678<==" - "01==>234<==5==>678<==90" | 4 | 8 | "==>4<==5==>67<==" - sb("==>0123<==") | 0 | 4 | "==>0123<==" - sb("0123==>456<==78") | 0 | 5 | "0123==>4<==" - sb("01==>234<==5==>678<==90") | 0 | 8 | "01==>234<==5==>67<==" - sb("0123==>456<==78") | 4 | 6 | "==>45<==" - sb("01==>234<==5==>678<==90") | 4 | 8 | "==>4<==5==>67<==" + self | beginIndex | endIndex | expected + "==>0123<==" | 0 | 4 | "==>0123<==" + "0123==>456<==78" | 0 | 5 | "0123==>4<==" + "01==>234<==5==>678<==90" | 0 | 8 | "01==>234<==5==>67<==" + "==>0123<==" | 0 | 3 | "==>012<==" + "==>0123<==" | 1 | 4 | "==>123<==" + "==>0123<==" | 1 | 3 | "==>12<==" + "0123==>456<==78" | 1 | 8 | "123==>456<==7" + "0123==>456<==78" | 0 | 4 | "0123" + "0123==>456<==78" | 7 | 9 | "78" + "0123==>456<==78" | 1 | 5 | "123==>4<==" + "0123==>456<==78" | 1 | 6 | "123==>45<==" + "0123==>456<==78" | 4 | 7 | "==>456<==" + "0123==>456<==78" | 6 | 8 | "==>6<==7" + "0123==>456<==78" | 5 | 8 | "==>56<==7" + "0123==>456<==78" | 4 | 6 | "==>45<==" + "01==>234<==5==>678<==90" | 1 | 10 | "1==>234<==5==>678<==9" + "01==>234<==5==>678<==90" | 1 | 2 | "1" + "01==>234<==5==>678<==90" | 5 | 6 | "5" + "01==>234<==5==>678<==90" | 9 | 10 | "9" + "01==>234<==5==>678<==90" | 1 | 4 | "1==>23<==" + "01==>234<==5==>678<==90" | 2 | 4 | "==>23<==" + "01==>234<==5==>678<==90" | 2 | 5 | "==>234<==" + "01==>234<==5==>678<==90" | 1 | 8 | "1==>234<==5==>67<==" + "01==>234<==5==>678<==90" | 2 | 8 | "==>234<==5==>67<==" + "01==>234<==5==>678<==90" | 2 | 9 | "==>234<==5==>678<==" + "01==>234<==5==>678<==90" | 5 | 8 | "5==>67<==" + "01==>234<==5==>678<==90" | 6 | 8 | "==>67<==" + "01==>234<==5==>678<==90" | 6 | 9 | "==>678<==" + "01==>234<==5==>678<==90" | 4 | 9 | "==>4<==5==>678<==" + "01==>234<==5==>678<==90" | 4 | 8 | "==>4<==5==>67<==" + sb("==>0123<==") | 0 | 4 | "==>0123<==" + sb("0123==>456<==78") | 0 | 5 | "0123==>4<==" + sb("01==>234<==5==>678<==90") | 0 | 8 | "01==>234<==5==>67<==" + sb("0123==>456<==78") | 4 | 6 | "==>45<==" + sb("01==>234<==5==>678<==90") | 4 | 8 | "==>4<==5==>67<==" + sbf("==>0123<==") | 0 | 4 | "==>0123<==" + sbf("0123==>456<==78") | 0 | 5 | "0123==>4<==" + sbf("01==>234<==5==>678<==90") | 0 | 8 | "01==>234<==5==>67<==" + sbf("0123==>456<==78") | 4 | 6 | "==>45<==" + sbf("01==>234<==5==>678<==90") | 4 | 8 | "==>4<==5==>67<==" } void 'onStringJoin without null delimiter or elements (#delimiter, #elements)'() { @@ -1263,4 +1268,8 @@ class StringModuleTest extends IastModuleImplTestBase { private static StringBuilder sb(final String string) { return new StringBuilder(string) } + + private static StringBuffer sbf(final String string) { + return new StringBuffer(string) + } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy index c064b767b1d..863ec96ce18 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy @@ -103,13 +103,18 @@ class TaintUtils { return resultString } - static StringBuilder addFromTaintFormat(final TaintedObjects tos, final StringBuilder sb) { + static Appendable addFromTaintFormat(final TaintedObjects tos, final Appendable sb) { final String s = sb.toString() final ranges = fromTaintFormat(s) if (ranges == null || ranges.length == 0) { return sb } - final result = new StringBuilder(getStringFromTaintFormat(s)) + def result + if (sb instanceof StringBuffer) { + result = new StringBuffer(getStringFromTaintFormat(s)) + } else { + result = new StringBuilder(getStringFromTaintFormat(s)) + } tos.taint(result, ranges) return result } diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java index 4a85301d4fd..80feb171f2a 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java @@ -10,6 +10,9 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +/** + * This class provides instrumentation for {@link StringBuilder} and {@link StringBuffer} methods. + */ @Propagation @CallSite(spi = IastCallSites.class) public class StringBuilderCallSite { @@ -103,6 +106,7 @@ public static String afterToString( } @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int)") + @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int)") public static String afterSubstring( @CallSite.This final CharSequence self, @CallSite.Argument final int beginIndex, @@ -119,6 +123,7 @@ public static String afterSubstring( } @CallSite.After("java.lang.String java.lang.StringBuilder.substring(int, int)") + @CallSite.After("java.lang.String java.lang.StringBuffer.substring(int, int)") public static String afterSubstring( @CallSite.This final CharSequence self, @CallSite.Argument final int beginIndex, diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy index 9c53242b939..8080c140d0a 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy @@ -188,8 +188,9 @@ class StringBuilderCallSiteTest extends AgentTestRunner { 0 * _ where: - param | beginIndex | expected - sb('012345') | 1 | '12345' + param | beginIndex | expected + sb('012345') | 1 | '12345' + sbf('012345') | 1 | '12345' } def 'test string builder substring with endIndex call site'() { @@ -206,8 +207,9 @@ class StringBuilderCallSiteTest extends AgentTestRunner { 0 * _ where: - param | beginIndex | endIndex | expected - sb('012345') | 1 | 5 | '1234' + param | beginIndex | endIndex | expected + sb('012345') | 1 | 5 | '1234' + sbf('012345') | 1 | 5 | '1234' } private static class BrokenToString { @@ -226,4 +228,8 @@ class StringBuilderCallSiteTest extends AgentTestRunner { private static StringBuilder sb(final String string) { return new StringBuilder(string) } + + private static StringBuffer sbf(final String string) { + return new StringBuffer(string) + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java index 1edd8b1500b..59280cb09ae 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java @@ -90,4 +90,18 @@ public static String substring(StringBuilder self, int beginIndex) { LOGGER.debug("After string builder substring {}", result); return result; } + + public static String substring(StringBuffer self, int beginIndex, int endIndex) { + LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex); + final String result = self.substring(beginIndex, endIndex); + LOGGER.debug("After string buffer substring {}", result); + return result; + } + + public static String substring(StringBuffer self, int beginIndex) { + LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex); + final String result = self.substring(beginIndex); + LOGGER.debug("After string buffer substring {}", result); + return result; + } } From bdfcc9b81f8d0ae49a201e172e3e8142b3c2a7da Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Fri, 22 Nov 2024 12:52:33 +0100 Subject: [PATCH 045/106] Mute some static analysis rules (#7999) --- static-analysis.datadog.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/static-analysis.datadog.yml b/static-analysis.datadog.yml index e236c667b23..d5df1c6ba26 100644 --- a/static-analysis.datadog.yml +++ b/static-analysis.datadog.yml @@ -16,11 +16,26 @@ rulesets: - "**" forloop-variable-count: max-variables: 2 + literals-first-in-comparison: + ignore: + - "**" + one-declaration-per-line: + ignore: + - "**" + redundant-initializer: + ignore: + - "**" - java-code-style: rules: + avoid-dollar-signs: + ignore: + - "**" boolean-get-method-name: ignore: - "**" + control-statement-braces: + ignore: + - "**" generics-naming: ignore: - "**" From 9078a8c473715936b0d550d497d5b56ba6005571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:55:30 +0100 Subject: [PATCH 046/106] Refactor tests of StringBuffer substring (#8000) --- .../lang/StringBuilderCallSiteTest.groovy | 34 +++++++++++++++++++ .../java/foo/bar/TestStringBufferSuite.java | 14 ++++++++ .../java/foo/bar/TestStringBuilderSuite.java | 14 -------- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy index 8080c140d0a..a9680db938f 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy @@ -190,6 +190,23 @@ class StringBuilderCallSiteTest extends AgentTestRunner { where: param | beginIndex | expected sb('012345') | 1 | '12345' + } + + def 'test string buffer substring call site'() { + setup: + final iastModule = Mock(StringModule) + InstrumentationBridge.registerIastModule(iastModule) + + when: + final result = TestStringBufferSuite.substring(param, beginIndex) + + then: + result == expected + 1 * iastModule.onStringSubSequence(param, beginIndex, param.length(), expected) + 0 * _ + + where: + param | beginIndex | expected sbf('012345') | 1 | '12345' } @@ -209,6 +226,23 @@ class StringBuilderCallSiteTest extends AgentTestRunner { where: param | beginIndex | endIndex | expected sb('012345') | 1 | 5 | '1234' + } + + def 'test string buffer substring with endIndex call site'() { + setup: + final iastModule = Mock(StringModule) + InstrumentationBridge.registerIastModule(iastModule) + + when: + final result = TestStringBufferSuite.substring(param, beginIndex, endIndex) + + then: + result == expected + 1 * iastModule.onStringSubSequence(param, beginIndex, endIndex, expected) + 0 * _ + + where: + param | beginIndex | endIndex | expected sbf('012345') | 1 | 5 | '1234' } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java index 2ebe00bd791..94b7f04e732 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java @@ -51,4 +51,18 @@ public String toString(final StringBuffer buffer) { LOGGER.debug("After string buffer toString {}", result); return result; } + + public static String substring(StringBuffer self, int beginIndex, int endIndex) { + LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex); + final String result = self.substring(beginIndex, endIndex); + LOGGER.debug("After string buffer substring {}", result); + return result; + } + + public static String substring(StringBuffer self, int beginIndex) { + LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex); + final String result = self.substring(beginIndex); + LOGGER.debug("After string buffer substring {}", result); + return result; + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java index 59280cb09ae..1edd8b1500b 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java @@ -90,18 +90,4 @@ public static String substring(StringBuilder self, int beginIndex) { LOGGER.debug("After string builder substring {}", result); return result; } - - public static String substring(StringBuffer self, int beginIndex, int endIndex) { - LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex); - final String result = self.substring(beginIndex, endIndex); - LOGGER.debug("After string buffer substring {}", result); - return result; - } - - public static String substring(StringBuffer self, int beginIndex) { - LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex); - final String result = self.substring(beginIndex); - LOGGER.debug("After string buffer substring {}", result); - return result; - } } From 79ca6e471f2f7881a6b0b7562f16bb3efef8d99f Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Fri, 22 Nov 2024 16:46:05 +0100 Subject: [PATCH 047/106] Common temporary location manager for profiling product (#7971) --- .../controller/openjdk/OpenJdkController.java | 109 +---- .../controller/TempLocationManager.java | 379 ++++++++++++++++++ .../controller/TempLocationManagerTest.java | 258 ++++++++++++ .../profiling/ddprof/DatadogProfiler.java | 19 +- .../profiling/ddprof/JavaProfilerLoader.java | 18 +- .../trace/api/config/ProfilingConfig.java | 12 +- .../java/datadog/trace/util/PidHelper.java | 35 +- 7 files changed, 720 insertions(+), 110 deletions(-) create mode 100644 dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java create mode 100644 dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/TempLocationManagerTest.java diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java index dbe3c15bb84..c1ec6e12844 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkController.java @@ -18,8 +18,6 @@ import static com.datadog.profiling.controller.ProfilingSupport.*; import static com.datadog.profiling.controller.ProfilingSupport.isObjectCountParallelized; import static datadog.trace.api.Platform.isJavaVersionAtLeast; -import static datadog.trace.api.config.ProfilingConfig.PROFILING_DEBUG_CLEANUP_REPO; -import static datadog.trace.api.config.ProfilingConfig.PROFILING_DEBUG_CLEANUP_REPO_DEFAULT; import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED; import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_ENABLED_DEFAULT; import static datadog.trace.api.config.ProfilingConfig.PROFILING_HEAP_HISTOGRAM_MODE; @@ -33,6 +31,7 @@ import com.datadog.profiling.controller.ConfigurationException; import com.datadog.profiling.controller.Controller; import com.datadog.profiling.controller.ControllerContext; +import com.datadog.profiling.controller.TempLocationManager; import com.datadog.profiling.controller.jfr.JFRAccess; import com.datadog.profiling.controller.jfr.JfpUtils; import com.datadog.profiling.controller.openjdk.events.AvailableProcessorCoresEvent; @@ -42,19 +41,13 @@ import datadog.trace.bootstrap.config.provider.ConfigProvider; import datadog.trace.bootstrap.instrumentation.jfr.backpressure.BackpressureProfiling; import datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionProfiling; -import datadog.trace.util.PidHelper; import de.thetaphi.forbiddenapis.SuppressForbidden; import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.FileVisitor; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.attribute.BasicFileAttributes; import java.time.Duration; import java.util.Collections; import java.util.Map; -import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,14 +85,8 @@ public OpenJdkController(final ConfigProvider configProvider) // configure the JFR stackdepth before we try to load any JFR classes int requestedStackDepth = getConfiguredStackDepth(configProvider); this.jfrStackDepthApplied = JFRAccess.instance().setStackDepth(requestedStackDepth); - boolean shouldCleanupJfrRepository = - configProvider.getBoolean( - PROFILING_DEBUG_CLEANUP_REPO, PROFILING_DEBUG_CLEANUP_REPO_DEFAULT); - String jfrRepositoryBase = null; - if (shouldCleanupJfrRepository) { - jfrRepositoryBase = getJfrRepositoryBase(configProvider); - JFRAccess.instance().setBaseLocation(jfrRepositoryBase + "/pid_" + PidHelper.getPid()); - } + String jfrRepositoryBase = getJfrRepositoryBase(configProvider); + JFRAccess.instance().setBaseLocation(jfrRepositoryBase); // Make sure we can load JFR classes before declaring that we have successfully created // factory and can use it. Class.forName("jdk.jfr.Recording"); @@ -112,10 +99,6 @@ public OpenJdkController(final ConfigProvider configProvider) Map recordingSettings; try { - if (shouldCleanupJfrRepository) { - cleanupJfrRepositories(Paths.get(jfrRepositoryBase)); - } - recordingSettings = JfpUtils.readNamedJfpResource( ultraMinimal ? JfpUtils.SAFEPOINTS_JFP : JfpUtils.DEFAULT_JFP); @@ -270,21 +253,27 @@ && isEventEnabled(recordingSettings, "jdk.NativeMethodSample")) { } private static String getJfrRepositoryBase(ConfigProvider configProvider) { - return configProvider.getString( - ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, - ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT); - } - - private static void cleanupJfrRepositories(Path repositoryBase) { - try { - Files.walkFileTree(repositoryBase, new JfrCleanupVisitor(repositoryBase)); - } catch (IOException e) { - if (log.isDebugEnabled()) { - log.warn("Unable to cleanup old JFR repositories", e); - } else { - log.warn("Unable to cleanup old JFR repositories"); + String legacy = + configProvider.getString( + ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, + ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT); + if (!legacy.equals(ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE_DEFAULT)) { + log.warn( + "The configuration key {} is deprecated. Please use {} instead.", + ProfilingConfig.PROFILING_JFR_REPOSITORY_BASE, + ProfilingConfig.PROFILING_TEMP_DIR); + } + Path repositoryPath = TempLocationManager.getInstance().getTempDir().resolve("jfr"); + if (!Files.exists(repositoryPath)) { + try { + Files.createDirectories(repositoryPath); + } catch (IOException e) { + log.error("Failed to create JFR repository directory: {}", repositoryPath, e); + throw new IllegalStateException( + "Failed to create JFR repository directory: " + repositoryPath, e); } } + return repositoryPath.toString(); } int getMaxSize() { @@ -331,58 +320,4 @@ private int getConfiguredStackDepth(ConfigProvider configProvider) { return configProvider.getInteger( ProfilingConfig.PROFILING_STACKDEPTH, ProfilingConfig.PROFILING_STACKDEPTH_DEFAULT); } - - private static class JfrCleanupVisitor implements FileVisitor { - private boolean shouldClean = false; - - private final Path root; - private final Set pidSet = PidHelper.getJavaPids(); - - JfrCleanupVisitor(Path root) { - this.root = root; - } - - @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) - throws IOException { - if (dir.equals(root)) { - return FileVisitResult.CONTINUE; - } - String fileName = dir.getFileName().toString(); - // the JFR repository directories are under /pid_ - String pid = fileName.startsWith("pid_") ? fileName.substring(4) : null; - shouldClean |= pid != null && !pidSet.contains(pid); - if (shouldClean) { - log.debug("Cleaning JFR repository under {}", dir); - } - return shouldClean ? FileVisitResult.CONTINUE : FileVisitResult.SKIP_SUBTREE; - } - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - if (file.toString().toLowerCase().endsWith(".jfr")) { - Files.delete(file); - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { - if (log.isDebugEnabled() && file.toString().toLowerCase().endsWith(".jfr")) { - log.debug("Failed to delete file {}", file, exc); - } - return FileVisitResult.CONTINUE; - } - - @Override - public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { - if (shouldClean) { - Files.delete(dir); - String fileName = dir.getFileName().toString(); - // reset the flag only if we are done cleaning the top-level directory - shouldClean = !fileName.startsWith("pid_"); - } - return FileVisitResult.CONTINUE; - } - } } diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java new file mode 100644 index 00000000000..f82806f4ef0 --- /dev/null +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java @@ -0,0 +1,379 @@ +package com.datadog.profiling.controller; + +import datadog.trace.api.config.ProfilingConfig; +import datadog.trace.bootstrap.config.provider.ConfigProvider; +import datadog.trace.util.PidHelper; +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.FileVisitor; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.PosixFilePermissions; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A manager class for temporary locations used by the profiling product. The temporary location is + * keyed by the process ID and allows for cleanup of orphaned temporary files on startup by querying + * the list of running Java processes and cleaning up any temporary locations that do not correspond + * to a running Java process. Also, the temporary location is cleaned up on shutdown. + */ +public final class TempLocationManager { + private static final Logger log = LoggerFactory.getLogger(TempLocationManager.class); + + private static final class SingletonHolder { + private static final TempLocationManager INSTANCE = new TempLocationManager(); + } + + interface CleanupHook extends FileVisitor { + CleanupHook EMPTY = new CleanupHook() {}; + + @Override + default FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) + throws IOException { + return null; + } + + @Override + default FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + return null; + } + + @Override + default FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { + return null; + } + + @Override + default FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + return null; + } + + default void onCleanupStart(boolean selfCleanup, long timeout, TimeUnit unit) {} + } + + private class CleanupVisitor implements FileVisitor { + private boolean shouldClean; + + private final Set pidSet = PidHelper.getJavaPids(); + + private final boolean cleanSelf; + private final Instant cutoff; + private final Instant timeoutTarget; + + private boolean terminated; + + CleanupVisitor(boolean cleanSelf, long timeout, TimeUnit unit) { + this.cleanSelf = cleanSelf; + this.cutoff = Instant.now().minus(cutoffSeconds, ChronoUnit.SECONDS); + this.timeoutTarget = + timeout > -1 + ? Instant.now().plus(TimeUnit.MILLISECONDS.convert(timeout, unit), ChronoUnit.MILLIS) + : null; + } + + boolean isTerminated() { + return terminated; + } + + private boolean isTimedOut() { + return timeoutTarget != null && Instant.now().isAfter(timeoutTarget); + } + + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) + throws IOException { + if (isTimedOut()) { + log.debug("Cleaning task timed out"); + terminated = true; + return FileVisitResult.TERMINATE; + } + cleanupTestHook.preVisitDirectory(dir, attrs); + + if (dir.equals(baseTempDir)) { + return FileVisitResult.CONTINUE; + } + String fileName = dir.getFileName().toString(); + // the JFR repository directories are under /pid_ + String pid = fileName.startsWith("pid_") ? fileName.substring(4) : null; + boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid()); + shouldClean |= (cleanSelf && isSelfPid) || (!cleanSelf && !pidSet.contains(pid)); + if (shouldClean) { + log.debug("Cleaning temporary location {}", dir); + } + return shouldClean ? FileVisitResult.CONTINUE : FileVisitResult.SKIP_SUBTREE; + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + if (isTimedOut()) { + log.debug("Cleaning task timed out"); + terminated = true; + return FileVisitResult.TERMINATE; + } + cleanupTestHook.visitFile(file, attrs); + try { + if (Files.getLastModifiedTime(file).toInstant().isAfter(cutoff)) { + return FileVisitResult.SKIP_SUBTREE; + } + Files.delete(file); + } catch (NoSuchFileException ignored) { + // another process has already cleaned it; ignore + } + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { + if (isTimedOut()) { + log.debug("Cleaning task timed out"); + terminated = true; + return FileVisitResult.TERMINATE; + } + cleanupTestHook.visitFileFailed(file, exc); + // do not log files/directories removed by another process running concurrently + if (!(exc instanceof NoSuchFileException) && log.isDebugEnabled()) { + log.debug("Failed to delete file {}", file, exc); + } + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + if (isTimedOut()) { + log.debug("Cleaning task timed out"); + terminated = true; + return FileVisitResult.TERMINATE; + } + cleanupTestHook.postVisitDirectory(dir, exc); + if (exc instanceof NoSuchFileException) { + return FileVisitResult.CONTINUE; + } + if (shouldClean) { + try { + Files.delete(dir); + } catch (NoSuchFileException ignored) { + // another process has already cleaned it; ignore + } + String fileName = dir.getFileName().toString(); + // reset the flag only if we are done cleaning the top-level directory + shouldClean = !fileName.startsWith("pid_"); + } + return FileVisitResult.CONTINUE; + } + } + + private final Path baseTempDir; + private final Path tempDir; + private final long cutoffSeconds; + + private final CompletableFuture cleanupTask; + + private final CleanupHook cleanupTestHook; + + /** + * Get the singleton instance of the TempLocationManager. It will run the cleanup task in the + * background. + * + * @return the singleton instance of the TempLocationManager + */ + public static TempLocationManager getInstance() { + return getInstance(false); + } + + /** + * Get the singleton instance of the TempLocationManager. + * + * @param waitForCleanup if true, wait for the cleanup task to finish before returning + * @return the singleton instance of the TempLocationManager + */ + static TempLocationManager getInstance(boolean waitForCleanup) { + TempLocationManager instance = SingletonHolder.INSTANCE; + if (waitForCleanup) { + try { + instance.waitForCleanup(5, TimeUnit.SECONDS); + } catch (TimeoutException ignored) { + + } + } + return instance; + } + + private TempLocationManager() { + this(ConfigProvider.getInstance()); + } + + TempLocationManager(ConfigProvider configProvider) { + this(configProvider, CleanupHook.EMPTY); + } + + TempLocationManager(ConfigProvider configProvider, CleanupHook testHook) { + cleanupTestHook = testHook; + + // In order to avoid racy attempts to clean up files which are currently being processed in a + // JVM which is being shut down (the JVMs far in the shutdown routine may not be reported by + // 'jps' but still can be eg. processing JFR chunks) we will not clean up any files not older + // than '2 * PROFILING_UPLOAD_PERIOD' seconds. + // The reasoning is that even if the file is created immediately at JVM startup once it is + // 'PROFILING_UPLOAD_PERIOD' seconds old it gets processed to upload the final profile data and + // this processing will not take longer than another `PROFILING_UPLOAD_PERIOD' seconds. + // This is just an assumption but as long as the profiled application is working normally (eg. + // OS is not stalling) this assumption will hold. + cutoffSeconds = + configProvider.getLong( + ProfilingConfig.PROFILING_UPLOAD_PERIOD, + ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT); + Path configuredTempDir = + Paths.get( + configProvider.getString( + ProfilingConfig.PROFILING_TEMP_DIR, ProfilingConfig.PROFILING_TEMP_DIR_DEFAULT)); + if (!Files.exists(configuredTempDir)) { + log.warn( + "Base temp directory, as defined in '" + + ProfilingConfig.PROFILING_TEMP_DIR + + "' does not exist: " + + configuredTempDir); + throw new IllegalStateException( + "Base temp directory, as defined in '" + + ProfilingConfig.PROFILING_TEMP_DIR + + "' does not exist: " + + configuredTempDir); + } + + String pid = PidHelper.getPid(); + + baseTempDir = configuredTempDir.resolve("ddprof"); + baseTempDir.toFile().deleteOnExit(); + + tempDir = baseTempDir.resolve("pid_" + pid); + cleanupTask = CompletableFuture.runAsync(() -> cleanup(false)); + + Thread selfCleanup = + new Thread( + () -> { + try { + waitForCleanup(1, TimeUnit.SECONDS); + } catch (TimeoutException e) { + log.info( + "Cleanup task timed out. {} temp directory might not have been cleaned up properly", + tempDir); + } finally { + cleanup(true); + } + }, + "Temp Location Manager Cleanup"); + Runtime.getRuntime().addShutdownHook(selfCleanup); + } + + /** + * Get the temporary directory for the current process. The directory will be removed at JVM exit. + * + * @return the temporary directory for the current process + */ + public Path getTempDir() { + return getTempDir(null); + } + + /** + * Get the temporary subdirectory for the current process. The directory will be removed at JVM + * exit. + * + * @param subPath the relative subdirectory path, may be {@literal null} + * @return the temporary subdirectory for the current process + */ + public Path getTempDir(Path subPath) { + return getTempDir(subPath, true); + } + + /** + * Get the temporary subdirectory for the current process. + * + * @param subPath the relative subdirectory path, may be {@literal null} + * @param create if true, create the directory if it does not exist + * @return the temporary directory for the current process + * @throws IllegalStateException if the directory could not be created + */ + public Path getTempDir(Path subPath, boolean create) { + Path rslt = + subPath != null && !subPath.toString().isEmpty() ? tempDir.resolve(subPath) : tempDir; + if (create && !Files.exists(rslt)) { + try { + Files.createDirectories( + rslt, + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + } catch (Exception e) { + log.warn("Failed to create temp directory: {}", tempDir, e); + throw new IllegalStateException("Failed to create temp directory: " + tempDir, e); + } + } + return rslt; + } + + /** + * Walk the base temp directory recursively and remove all inactive per-process entries. No + * timeout is applied. + * + * @param cleanSelf {@literal true} will call only this process' temp directory, {@literal false} + * only the other processes will be cleaned up + * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (eg. + * interruption etc.) + */ + boolean cleanup(boolean cleanSelf) { + return cleanup(cleanSelf, -1, TimeUnit.SECONDS); + } + + /** + * Walk the base temp directory recursively and remove all inactive per-process entries + * + * @param cleanSelf {@literal true} will call only this process' temp directory, {@literal false} + * only the other processes will be cleaned up + * @param timeout the task timeout; may be {@literal -1} to signal no timeout + * @param unit the task timeout unit + * @return {@literal true} if cleanup fully succeeded or {@literal false} otherwise (timeout, + * interruption etc.) + */ + boolean cleanup(boolean cleanSelf, long timeout, TimeUnit unit) { + try { + cleanupTestHook.onCleanupStart(cleanSelf, timeout, unit); + CleanupVisitor visitor = new CleanupVisitor(cleanSelf, timeout, unit); + Files.walkFileTree(baseTempDir, visitor); + return !visitor.isTerminated(); + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.warn("Unable to cleanup temp location {}", baseTempDir, e); + } else { + log.warn("Unable to cleanup temp location {}", baseTempDir); + } + } + return false; + } + + // accessible for tests + void waitForCleanup(long timeout, TimeUnit unit) throws TimeoutException { + try { + cleanupTask.get(timeout, unit); + } catch (InterruptedException e) { + cleanupTask.cancel(true); + Thread.currentThread().interrupt(); + } catch (TimeoutException e) { + cleanupTask.cancel(true); + throw e; + } catch (ExecutionException e) { + if (log.isDebugEnabled()) { + log.debug("Failed to cleanup temp directory: {}", tempDir, e); + } else { + log.debug("Failed to cleanup temp directory: {}", tempDir); + } + } + } +} diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/TempLocationManagerTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/TempLocationManagerTest.java new file mode 100644 index 00000000000..fdc839ffaae --- /dev/null +++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/TempLocationManagerTest.java @@ -0,0 +1,258 @@ +package com.datadog.profiling.controller; + +import static org.junit.jupiter.api.Assertions.*; + +import datadog.trace.api.config.ProfilingConfig; +import datadog.trace.bootstrap.config.provider.ConfigProvider; +import datadog.trace.util.PidHelper; +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.PosixFilePermissions; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.UUID; +import java.util.concurrent.Phaser; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.LockSupport; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; + +public class TempLocationManagerTest { + @ParameterizedTest + @ValueSource(strings = {"", "test1"}) + void testDefault(String subPath) throws Exception { + TempLocationManager tempLocationManager = TempLocationManager.getInstance(true); + Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath)); + assertNotNull(tempDir); + assertTrue(Files.exists(tempDir)); + assertTrue(Files.isDirectory(tempDir)); + assertTrue(Files.isWritable(tempDir)); + assertTrue(Files.isReadable(tempDir)); + assertTrue(Files.isExecutable(tempDir)); + assertTrue(tempDir.toString().contains("pid_" + PidHelper.getPid())); + } + + @ParameterizedTest + @ValueSource(strings = {"", "test1"}) + void testFromConfig(String subPath) throws Exception { + Path myDir = + Files.createTempDirectory( + "ddprof-test-", + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + myDir.toFile().deleteOnExit(); + Properties props = new Properties(); + props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString()); + ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props); + TempLocationManager tempLocationManager = new TempLocationManager(configProvider); + Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath)); + assertNotNull(tempDir); + assertTrue(tempDir.toString().startsWith(myDir.toString())); + } + + @Test + void testFromConfigInvalid() { + Path myDir = Paths.get(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); + // do not create the directory - it should trigger an exception + Properties props = new Properties(); + props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString()); + ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props); + assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider)); + } + + @Test + void testFromConfigNotWritable() throws Exception { + Path myDir = + Files.createTempDirectory( + "ddprof-test-", + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("r-x------"))); + myDir.toFile().deleteOnExit(); + Properties props = new Properties(); + props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString()); + ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props); + TempLocationManager tempLocationManager = new TempLocationManager(configProvider); + assertThrows(IllegalStateException.class, tempLocationManager::getTempDir); + } + + @ParameterizedTest + @ValueSource(strings = {"", "test1"}) + void testCleanup(String subPath) throws Exception { + Path myDir = + Files.createTempDirectory( + "ddprof-test-", + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + myDir.toFile().deleteOnExit(); + Properties props = new Properties(); + props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString()); + props.put( + ProfilingConfig.PROFILING_UPLOAD_PERIOD, + "0"); // to force immediate cleanup; must be a string value! + ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props); + TempLocationManager tempLocationManager = new TempLocationManager(configProvider); + Path tempDir = tempLocationManager.getTempDir(Paths.get(subPath)); + assertNotNull(tempDir); + + // fake temp location + Path fakeTempDir = tempDir.getParent(); + while (fakeTempDir != null && !fakeTempDir.endsWith("ddprof")) { + fakeTempDir = fakeTempDir.getParent(); + } + fakeTempDir = fakeTempDir.resolve("pid_0000"); + Files.createDirectories(fakeTempDir); + Path tmpFile = Files.createFile(fakeTempDir.resolve("test.txt")); + tmpFile.toFile().deleteOnExit(); // make sure this is deleted at exit + fakeTempDir.toFile().deleteOnExit(); // also this one + tempLocationManager.cleanup(false); + // fake temp location should be deleted + // real temp location should be kept + assertFalse(Files.exists(fakeTempDir)); + assertTrue(Files.exists(tempDir)); + } + + @ParameterizedTest + @ValueSource(strings = {"preVisitDirectory", "visitFile", "postVisitDirectory"}) + void testConcurrentCleanup(String section) throws Exception { + /* This test simulates concurrent cleanup + It utilizes a special hook to create synchronization points in the filetree walking routine, + allowing to delete the files at various points of execution. + The test makes sure that the cleanup is not interrupted and the file and directory being deleted + stays deleted. + */ + Path baseDir = + Files.createTempDirectory( + "ddprof-test-", + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + + Path fakeTempDir = baseDir.resolve("ddprof/pid_1234/scratch"); + Files.createDirectories(fakeTempDir); + Path fakeTempFile = fakeTempDir.resolve("libxxx.so"); + Files.createFile(fakeTempFile); + + fakeTempDir.toFile().deleteOnExit(); + fakeTempFile.toFile().deleteOnExit(); + + Phaser phaser = new Phaser(2); + + TempLocationManager.CleanupHook blocker = + new TempLocationManager.CleanupHook() { + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) + throws IOException { + if (section.equals("preVisitDirectory") && dir.equals(fakeTempDir)) { + phaser.arriveAndAwaitAdvance(); + phaser.arriveAndAwaitAdvance(); + } + return null; + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException { + if (section.equals("visitFile") && file.equals(fakeTempFile)) { + phaser.arriveAndAwaitAdvance(); + phaser.arriveAndAwaitAdvance(); + } + return null; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + if (section.equals("postVisitDirectory") && dir.equals(fakeTempDir)) { + phaser.arriveAndAwaitAdvance(); + phaser.arriveAndAwaitAdvance(); + } + return null; + } + }; + + TempLocationManager mgr = instance(baseDir, blocker); + + // wait for the cleanup start + phaser.arriveAndAwaitAdvance(); + Files.deleteIfExists(fakeTempFile); + phaser.arriveAndAwaitAdvance(); + mgr.waitForCleanup(30, TimeUnit.SECONDS); + + assertFalse(Files.exists(fakeTempFile)); + assertFalse(Files.exists(fakeTempDir)); + } + + @ParameterizedTest + @MethodSource("timeoutTestArguments") + void testCleanupWithTimeout(boolean selfCleanup, String section) throws Exception { + long timeoutMs = 500; + TempLocationManager.CleanupHook delayer = + new TempLocationManager.CleanupHook() { + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) + throws IOException { + if (section.equals("preVisitDirectory")) { + LockSupport.parkNanos(timeoutMs * 1_000_000); + } + return TempLocationManager.CleanupHook.super.preVisitDirectory(dir, attrs); + } + + @Override + public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException { + if (section.equals("visitFileFailed")) { + LockSupport.parkNanos(timeoutMs * 1_000_000); + } + return TempLocationManager.CleanupHook.super.visitFileFailed(file, exc); + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException { + if (section.equals("postVisitDirectory")) { + LockSupport.parkNanos(timeoutMs * 1_000_000); + } + return TempLocationManager.CleanupHook.super.postVisitDirectory(dir, exc); + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException { + if (section.equals("visitFile")) { + LockSupport.parkNanos(timeoutMs * 1_000_000); + } + return TempLocationManager.CleanupHook.super.visitFile(file, attrs); + } + }; + Path baseDir = + Files.createTempDirectory( + "ddprof-test-", + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + TempLocationManager instance = instance(baseDir, delayer); + boolean rslt = instance.cleanup(selfCleanup, timeoutMs, TimeUnit.MILLISECONDS); + assertTrue(rslt); + } + + private static Stream timeoutTestArguments() { + List argumentsList = new ArrayList<>(); + for (boolean selfCleanup : new boolean[] {true, false}) { + for (String intercepted : + new String[] {"preVisitDirectory", "visitFile", "postVisitDirectory"}) { + argumentsList.add(Arguments.of(selfCleanup, intercepted)); + } + } + return argumentsList.stream(); + } + + private TempLocationManager instance(Path baseDir, TempLocationManager.CleanupHook cleanupHook) + throws IOException { + Properties props = new Properties(); + props.put(ProfilingConfig.PROFILING_TEMP_DIR, baseDir.toString()); + props.put( + ProfilingConfig.PROFILING_UPLOAD_PERIOD, + "0"); // to force immediate cleanup; must be a string value! + + return new TempLocationManager(ConfigProvider.withPropertiesOverride(props), cleanupHook); + } +} diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index 6ed1454b255..5bec75d9436 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -33,6 +33,7 @@ import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT; import com.datadog.profiling.controller.OngoingRecording; +import com.datadog.profiling.controller.TempLocationManager; import com.datadog.profiling.utils.ProfilingMode; import com.datadoghq.profiler.ContextSetter; import com.datadoghq.profiler.JavaProfiler; @@ -44,6 +45,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.attribute.PosixFilePermissions; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -107,6 +109,8 @@ public static DatadogProfiler newInstance(ConfigProvider configProvider) { private final long queueTimeThresholdMillis; + private final Path recordingsPath; + private DatadogProfiler(ConfigProvider configProvider) { this(configProvider, getContextAttributes(configProvider)); } @@ -149,6 +153,19 @@ private DatadogProfiler(ConfigProvider configProvider) { configProvider.getLong( PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS, PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT); + + this.recordingsPath = TempLocationManager.getInstance().getTempDir().resolve("recordings"); + if (!Files.exists(recordingsPath)) { + try { + Files.createDirectories( + recordingsPath, + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"))); + } catch (IOException e) { + log.warn("Failed to create recordings directory: {}", recordingsPath, e); + throw new IllegalStateException( + "Failed to create recordings directory: " + recordingsPath, e); + } + } } void addThread() { @@ -213,7 +230,7 @@ String executeProfilerCmd(String cmd) throws IOException { Path newRecording() throws IOException, IllegalStateException { if (recordingFlag.compareAndSet(false, true)) { - Path recFile = Files.createTempFile("dd-profiler-", ".jfr"); + Path recFile = Files.createTempFile(recordingsPath, "dd-profiler-", ".jfr"); String cmd = cmdStartProfiling(recFile); try { String rslt = executeProfilerCmd(cmd); diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/JavaProfilerLoader.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/JavaProfilerLoader.java index a2b24925b54..654bd63f904 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/JavaProfilerLoader.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/JavaProfilerLoader.java @@ -1,8 +1,12 @@ package com.datadog.profiling.ddprof; +import com.datadog.profiling.controller.TempLocationManager; import com.datadoghq.profiler.JavaProfiler; import datadog.trace.api.config.ProfilingConfig; import datadog.trace.bootstrap.config.provider.ConfigProvider; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.PosixFilePermissions; /** * Only loading the profiler itself needs to be protected as a singleton. Separating the loading @@ -17,12 +21,20 @@ public class JavaProfilerLoader { Throwable reasonNotLoaded = null; try { ConfigProvider configProvider = ConfigProvider.getInstance(); + String scratch = configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH); + if (scratch == null) { + Path scratchPath = TempLocationManager.getInstance().getTempDir().resolve("scratch"); + if (!Files.exists(scratchPath)) { + Files.createDirectories( + scratchPath, + PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-xr-x"))); + } + scratch = scratchPath.toString(); + } profiler = JavaProfiler.getInstance( configProvider.getString(ProfilingConfig.PROFILING_DATADOG_PROFILER_LIBPATH), - configProvider.getString( - ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH, - ProfilingConfig.PROFILING_DATADOG_PROFILER_SCRATCH_DEFAULT)); + scratch); // sanity test - force load Datadog profiler to catch it not being available early profiler.execute("status"); } catch (Throwable t) { diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java index 5907b57214a..21910db3ce5 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java @@ -72,9 +72,6 @@ public final class ProfilingConfig { public static final String PROFILING_JFR_REPOSITORY_BASE_DEFAULT = System.getProperty("java.io.tmpdir") + "/dd/jfr"; - public static final String PROFILING_JFR_REPOSITORY_CLEANUP = "profiling.jfr.repository.cleanup"; - public static final boolean PROFILING_JFR_REPOSITORY_CLEANUP_DEFAULT = true; - public static final String PROFILING_DATADOG_PROFILER_ENABLED = "profiling.ddprof.enabled"; public static final String PROFILING_DIRECT_ALLOCATION_ENABLED = @@ -87,8 +84,7 @@ public final class ProfilingConfig { // Java profiler lib needs to be extracted from JAR and placed into the scratch location // By default the scratch is the os temp directory but can be overridden by user public static final String PROFILING_DATADOG_PROFILER_SCRATCH = "profiling.ddprof.scratch"; - public static final String PROFILING_DATADOG_PROFILER_SCRATCH_DEFAULT = - System.getProperty("java.io.tmpdir"); + public static final String PROFILING_DATADOG_PROFILER_LIBPATH = "profiling.ddprof.debug.lib"; public static final String PROFILING_DATADOG_PROFILER_ALLOC_ENABLED = "profiling.ddprof.alloc.enabled"; @@ -184,6 +180,9 @@ public final class ProfilingConfig { public static final String PROFILING_UPLOAD_SUMMARY_ON_413 = "profiling.upload.summary-on-413"; public static final boolean PROFILING_UPLOAD_SUMMARY_ON_413_DEFAULT = false; + public static final String PROFILING_TEMP_DIR = "profiling.tempdir"; + public static final String PROFILING_TEMP_DIR_DEFAULT = System.getProperty("java.io.tmpdir"); + // Not intended for production use public static final String PROFILING_AGENTLESS = "profiling.agentless"; public static final boolean PROFILING_AGENTLESS_DEFAULT = false; @@ -194,9 +193,6 @@ public final class ProfilingConfig { public static final String PROFILING_DEBUG_DUMP_PATH = "profiling.debug.dump_path"; public static final String PROFILING_DEBUG_JFR_DISABLED = "profiling.debug.jfr.disabled"; - public static final String PROFILING_DEBUG_CLEANUP_REPO = "profiling.debug.cleanup.jfr.repo"; - public static final boolean PROFILING_DEBUG_CLEANUP_REPO_DEFAULT = false; - public static final String PROFILING_CONTEXT_ATTRIBUTES = "profiling.context.attributes"; public static final String PROFILING_CONTEXT_ATTRIBUTES_SPAN_NAME_ENABLED = diff --git a/internal-api/src/main/java/datadog/trace/util/PidHelper.java b/internal-api/src/main/java/datadog/trace/util/PidHelper.java index eacce63374b..4121d9da68d 100644 --- a/internal-api/src/main/java/datadog/trace/util/PidHelper.java +++ b/internal-api/src/main/java/datadog/trace/util/PidHelper.java @@ -5,10 +5,12 @@ import datadog.trace.context.TraceScope; import de.thetaphi.forbiddenapis.SuppressForbidden; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.lang.management.ManagementFactory; import java.util.Collections; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import org.slf4j.Logger; @@ -70,22 +72,33 @@ public static Set getJavaPids() { ProcessBuilder pb = new ProcessBuilder("jps"); try (TraceScope ignored = AgentTracer.get().muteTracing()) { Process p = pb.start(); - if (p.waitFor(500, TimeUnit.MILLISECONDS)) { + // start draining the subcommand's pipes asynchronously to avoid flooding them + CompletableFuture> collecting = + CompletableFuture.supplyAsync( + () -> { + try (BufferedReader br = + new BufferedReader(new InputStreamReader(p.getInputStream()))) { + return br.lines() + .filter(l -> !l.contains("jps")) + .map( + l -> { + int idx = l.indexOf(' '); + return l.substring(0, idx); + }) + .collect(java.util.stream.Collectors.toSet()); + } catch (IOException e) { + log.debug("Unable to list java processes via 'jps'", e); + return Collections.emptySet(); + } + }); + if (p.waitFor(1200, TimeUnit.MILLISECONDS)) { if (p.exitValue() == 0) { - try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()))) { - return br.lines() - .filter(l -> !l.contains("jps")) - .map( - l -> { - int idx = l.indexOf(' '); - return l.substring(0, idx); - }) - .collect(java.util.stream.Collectors.toSet()); - } + return collecting.get(); } else { log.debug("Execution of 'jps' failed with exit code {}", p.exitValue()); } } else { + p.destroyForcibly(); log.debug("Execution of 'jps' timed out"); } } catch (Exception e) { From c8030bdceb39361240032f488db1098044bf0899 Mon Sep 17 00:00:00 2001 From: Nicholas Hulston Date: Fri, 22 Nov 2024 16:30:36 -0500 Subject: [PATCH 048/106] Increase lambda extension request timeout (#7986) --- .../src/main/java/datadog/trace/lambda/LambdaHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java index e11dbb8c29e..7d50726090b 100644 --- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java +++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaHandler.java @@ -44,7 +44,7 @@ public class LambdaHandler { private static final String START_INVOCATION = "/lambda/start-invocation"; private static final String END_INVOCATION = "/lambda/end-invocation"; - private static final Long REQUEST_TIMEOUT_IN_S = 1L; + private static final Long REQUEST_TIMEOUT_IN_S = 3L; private static final int MAX_IDLE_CONNECTIONS = 5; private static final Long KEEP_ALIVE_DURATION = 300L; From 4925a5023343e7abf918bef4738b708ef61f20c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20=C3=81lvarez=20=C3=81lvarez?= Date: Mon, 25 Nov 2024 00:13:11 +0100 Subject: [PATCH 049/106] Fix issue with call sites in super calls to constructor (#7991) Fix issue with call sites in super calls to constructor --- .../plugin/csi/impl/AdviceGeneratorImpl.java | 6 +- .../csi/impl/AdviceGeneratorTest.groovy | 20 ++--- .../bytebuddy/csi/CallSiteTransformer.java | 85 ++++++++++++++++++- .../tooling/bytebuddy/csi/CallSiteUtils.java | 13 ++- .../agent/tooling/csi/CallSiteAdvice.java | 10 ++- .../agent/tooling/csi/BaseCallSiteTest.groovy | 17 ++++ .../csi/CallSiteInstrumentationTest.groovy | 46 ++++++++++ .../tooling/csi/CallSiteUtilsTest.groovy | 38 +++++++++ .../agent/tooling/csi/SuperInCtorExample.java | 10 +++ .../java/io/StringReaderCallSiteTest.groovy | 28 +++++- .../java/foo/bar/TestCustomStringReader.java | 14 +++ .../controller/IastWebController.java | 17 ++++ .../AbstractIastSpringBootTest.groovy | 11 +++ 13 files changed, 293 insertions(+), 22 deletions(-) create mode 100644 dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java create mode 100644 dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java diff --git a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java index 9bab598ffdc..04c7a9be704 100644 --- a/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java +++ b/buildSrc/call-site-instrumentation-plugin/src/main/java/datadog/trace/plugin/csi/impl/AdviceGeneratorImpl.java @@ -344,12 +344,10 @@ private static void writeAdviceMethodCall( final MethodCallExpr invokeStatic = new MethodCallExpr() .setScope(new NameExpr("handler")) - .setName("method") - .addArgument(opCode("INVOKESTATIC")) + .setName("advice") .addArgument(new StringLiteralExpr(method.getOwner().getInternalName())) .addArgument(new StringLiteralExpr(method.getMethodName())) - .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor())) - .addArgument(new BooleanLiteralExpr(false)); + .addArgument(new StringLiteralExpr(method.getMethodType().getDescriptor())); body.addStatement(invokeStatic); } if (requiresCast(advice)) { diff --git a/buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.groovy b/buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.groovy index dcc5dc8559a..a0b3e15e2cc 100644 --- a/buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.groovy +++ b/buildSrc/call-site-instrumentation-plugin/src/test/groovy/datadog/trace/plugin/csi/impl/AdviceGeneratorTest.groovy @@ -47,7 +47,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { pointcut('java/security/MessageDigest', 'getInstance', '(Ljava/lang/String;)Ljava/security/MessageDigest;') statements( 'handler.dupParameters(descriptor, StackDupMode.COPY);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$BeforeAdvice", "before", "(Ljava/lang/String;)V", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$BeforeAdvice", "before", "(Ljava/lang/String;)V");', 'handler.method(opcode, owner, name, descriptor, isInterface);' ) } @@ -78,7 +78,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { advices(0) { pointcut('java/lang/String', 'replaceAll', '(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;') statements( - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AroundAdvice", "around", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", false);' + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AroundAdvice", "around", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");' ) } } @@ -110,7 +110,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'handler.dupInvoke(owner, descriptor, StackDupMode.COPY);', 'handler.method(opcode, owner, name, descriptor, isInterface);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdvice", "after", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdvice", "after", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");', ) } } @@ -142,7 +142,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);', 'handler.method(opcode, owner, name, descriptor, isInterface);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceCtor", "after", "([Ljava/lang/Object;Ljava/net/URL;)Ljava/net/URL;", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$AfterAdviceCtor", "after", "([Ljava/lang/Object;Ljava/net/URL;)Ljava/net/URL;");', ) } } @@ -208,7 +208,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);', 'handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAfterAdvice", "after", "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;", false);' + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicAfterAdvice", "after", "([Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/String;");' ) } } @@ -297,7 +297,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { 'handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY);', 'handler.invokeDynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);', 'handler.loadConstantArray(bootstrapMethodArguments);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicWithConstantsAdvice", "after", "([Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;", false);' + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$InvokeDynamicWithConstantsAdvice", "after", "([Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");' ) } } @@ -393,7 +393,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'int[] parameterIndices = new int[] { 0 };', 'handler.dupParameters(descriptor, parameterIndices, owner);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "(Ljava/lang/String;)V", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "(Ljava/lang/String;)V");', 'handler.method(opcode, owner, name, descriptor, isInterface);', ) } @@ -402,7 +402,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'int[] parameterIndices = new int[] { 1 };', 'handler.dupParameters(descriptor, parameterIndices, null);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "([Ljava/lang/Object;)V", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "([Ljava/lang/Object;)V");', 'handler.method(opcode, owner, name, descriptor, isInterface);', ) } @@ -411,7 +411,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'int[] parameterIndices = new int[] { 0 };', 'handler.dupInvoke(owner, descriptor, parameterIndices);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "(Ljava/lang/String;I)V", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$PartialArgumentsBeforeAdvice", "before", "(Ljava/lang/String;I)V");', 'handler.method(opcode, owner, name, descriptor, isInterface);', ) } @@ -443,7 +443,7 @@ final class AdviceGeneratorTest extends BaseCsiPluginTest { statements( 'handler.dupParameters(descriptor, StackDupMode.PREPEND_ARRAY_CTOR);', 'handler.method(opcode, owner, name, descriptor, isInterface);', - 'handler.method(Opcodes.INVOKESTATIC, "datadog/trace/plugin/csi/impl/AdviceGeneratorTest$SuperTypeReturnAdvice", "after", "([Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false);', + 'handler.advice("datadog/trace/plugin/csi/impl/AdviceGeneratorTest$SuperTypeReturnAdvice", "after", "([Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");', 'handler.instruction(Opcodes.CHECKCAST, "java/lang/StringBuilder");' ) } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java index a56a4954e3f..991523069c1 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteTransformer.java @@ -1,5 +1,6 @@ package datadog.trace.agent.tooling.bytebuddy.csi; +import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; import static net.bytebuddy.jar.asm.ClassWriter.COMPUTE_MAXS; import datadog.trace.agent.tooling.HelperInjector; @@ -9,6 +10,8 @@ import datadog.trace.agent.tooling.csi.InvokeAdvice; import datadog.trace.agent.tooling.csi.InvokeDynamicAdvice; import java.security.ProtectionDomain; +import java.util.Deque; +import java.util.LinkedList; import javax.annotation.Nonnull; import net.bytebuddy.asm.AsmVisitorWrapper; import net.bytebuddy.description.field.FieldDescription; @@ -24,9 +27,13 @@ import net.bytebuddy.jar.asm.Type; import net.bytebuddy.pool.TypePool; import net.bytebuddy.utility.JavaModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CallSiteTransformer implements Instrumenter.TransformingAdvice { + private static Logger LOGGER = LoggerFactory.getLogger(CallSiteTransformer.class); + private static final Instrumenter.TransformingAdvice NO_OP = (builder, typeDescription, classLoader, module, pd) -> builder; @@ -111,7 +118,9 @@ public MethodVisitor visitMethod( final String[] exceptions) { final MethodVisitor delegated = super.visitMethod(access, name, descriptor, signature, exceptions); - return new CallSiteMethodVisitor(advices, delegated); + return "".equals(name) + ? new CallSiteCtorMethodVisitor(advices, delegated) + : new CallSiteMethodVisitor(advices, delegated); } } @@ -132,6 +141,7 @@ public void visitMethodInsn( final String name, final String descriptor, final boolean isInterface) { + CallSiteAdvice advice = advices.findAdvice(owner, name, descriptor); if (advice instanceof InvokeAdvice) { ((InvokeAdvice) advice).apply(this, opcode, owner, name, descriptor, isInterface); @@ -197,6 +207,11 @@ public void method( mv.visitMethodInsn(opcode, owner, name, descriptor, isInterface); } + @Override + public void advice(String owner, String name, String descriptor) { + mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false); + } + @Override public void invokeDynamic( final String name, @@ -265,4 +280,72 @@ private Type[] methodParamTypesWithThis(String owner, String methodDescriptor) { return methodParameterTypesWithThis; } } + + private static class CallSiteCtorMethodVisitor extends CallSiteMethodVisitor { + + private final Deque newInvocations = new LinkedList<>(); + private boolean isSuperCall = false; + + private CallSiteCtorMethodVisitor( + @Nonnull final Advices advices, @Nonnull final MethodVisitor delegated) { + super(advices, delegated); + } + + @Override + public void visitEnd() { + super.visitEnd(); + if (!newInvocations.isEmpty()) { + LOGGER.debug( + SEND_TELEMETRY, + "There is an issue handling NEW bytecodes, remaining types {}", + newInvocations); + } + } + + @Override + public void visitTypeInsn(final int opcode, final String type) { + if (opcode == Opcodes.NEW) { + newInvocations.addLast(type); + } + super.visitTypeInsn(opcode, type); + } + + @Override + public void visitMethodInsn( + final int opcode, + final String owner, + final String name, + final String descriptor, + final boolean isInterface) { + try { + if (opcode == Opcodes.INVOKESPECIAL && "".equals(name)) { + if (owner.equals(newInvocations.peekLast())) { + newInvocations.removeLast(); + isSuperCall = false; + } else { + // no new before call to + isSuperCall = true; + } + } + super.visitMethodInsn(opcode, owner, name, descriptor, isInterface); + } finally { + isSuperCall = false; + } + } + + @Override + public void advice(final String owner, final String name, final String descriptor) { + if (isSuperCall) { + // append this to the stack after super call + mv.visitIntInsn(Opcodes.ALOAD, 0); + } + mv.visitMethodInsn(Opcodes.INVOKESTATIC, owner, name, descriptor, false); + } + + @Override + public void dupParameters(final String methodDescriptor, final StackDupMode mode) { + super.dupParameters( + methodDescriptor, isSuperCall ? StackDupMode.PREPEND_ARRAY_SUPER_CTOR : mode); + } + } } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java index d2b6a28cb74..39511a60a76 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/csi/CallSiteUtils.java @@ -151,6 +151,7 @@ public static void dup(final MethodVisitor mv, final Type[] parameters, final St break; case PREPEND_ARRAY: case PREPEND_ARRAY_CTOR: + case PREPEND_ARRAY_SUPER_CTOR: case APPEND_ARRAY: dupN(mv, parameters, mode); break; @@ -280,11 +281,21 @@ private static void dupN( mv.visitInsn(POP); break; case PREPEND_ARRAY_CTOR: - // move the array before the NEW and DUP opcodes + // move the array before the uninitialized entry created by NEW and DUP + // stack start = [uninitialized, uninitialized, arg_0, ..., arg_n] + // stack end = [array, uninitialized, uninitialized, arg_0, ..., arg_n] mv.visitInsn(DUP_X2); loadArray(mv, arraySize, parameters); mv.visitInsn(POP); break; + case PREPEND_ARRAY_SUPER_CTOR: + // move the array before the uninitialized entry + // stack start = [uninitialized, arg_0, ..., arg_n] + // stack end = [array, uninitialized, arg_0, ..., arg_n] + mv.visitInsn(DUP_X1); + loadArray(mv, arraySize, parameters); + mv.visitInsn(POP); + break; case APPEND_ARRAY: loadArray(mv, arraySize, parameters); break; diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java index 28c41fb820d..0e43f3602e8 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/csi/CallSiteAdvice.java @@ -27,6 +27,9 @@ interface MethodHandler { /** Performs a method invocation (static, special, virtual, interface...) */ void method(int opcode, String owner, String name, String descriptor, boolean isInterface); + /** Performs an advice invocation (always static) */ + void advice(String owner, String name, String descriptor); + /** Performs a dynamic method invocation */ void invokeDynamic( String name, @@ -62,11 +65,10 @@ enum StackDupMode { COPY, /** Copies the parameters in an array and prepends it */ PREPEND_ARRAY, - /** - * Copies the parameters in an array, prepends it and swaps the array with the uninitialized - * instance in a ctor - */ + /** Copies the parameters in an array and adds it between NEW and DUP opcodes */ PREPEND_ARRAY_CTOR, + /** Copies the parameters in an array and adds it before the uninitialized instance in a ctor */ + PREPEND_ARRAY_SUPER_CTOR, /** Copies the parameters in an array and appends it */ APPEND_ARRAY } diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy index 8c69fc0bd21..2ee1e555758 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy @@ -15,6 +15,8 @@ import net.bytebuddy.jar.asm.Type import net.bytebuddy.matcher.ElementMatcher import net.bytebuddy.utility.JavaModule import net.bytebuddy.utility.nullability.MaybeNull + +import java.lang.reflect.Constructor import java.security.MessageDigest @@ -81,6 +83,10 @@ class BaseCallSiteTest extends DDSpecification { return buildPointcut(String.getDeclaredMethod('concat', String)) } + protected static Pointcut stringReaderPointcut() { + return buildPointcut(StringReader.getDeclaredConstructor(String)) + } + protected static Pointcut messageDigestGetInstancePointcut() { return buildPointcut(MessageDigest.getDeclaredMethod('getInstance', String)) } @@ -100,6 +106,10 @@ class BaseCallSiteTest extends DDSpecification { return buildPointcut(Type.getType(executable.getDeclaringClass()).internalName, executable.name, Type.getType(executable).descriptor) } + protected static Pointcut buildPointcut(final Constructor executable) { + return buildPointcut(Type.getType(executable.getDeclaringClass()).internalName, "", Type.getType(executable).descriptor) + } + protected static Pointcut buildPointcut(final String type, final String method, final String descriptor) { return new Pointcut(type: type, method: method, descriptor: descriptor) } @@ -157,6 +167,13 @@ class BaseCallSiteTest extends DDSpecification { return clazz.getConstructor().newInstance() } + protected static Class loadClass(final Type type, + final byte[] data, + final ClassLoader loader = Thread.currentThread().contextClassLoader) { + final classLoader = new ByteArrayClassLoader(loader, [(type.className): data]) + return classLoader.loadClass(type.className) + } + protected static byte[] transformType(final Type source, final Type target, final CallSiteTransformer transformer, diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy index 0823d9b419e..b56b94779ad 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteInstrumentationTest.groovy @@ -1,8 +1,14 @@ package datadog.trace.agent.tooling.csi +import datadog.trace.agent.tooling.bytebuddy.csi.CallSiteTransformer import net.bytebuddy.asm.AsmVisitorWrapper import net.bytebuddy.description.type.TypeDescription import net.bytebuddy.dynamic.DynamicType +import net.bytebuddy.jar.asm.Type + +import java.util.concurrent.atomic.AtomicInteger + +import static datadog.trace.agent.tooling.csi.CallSiteAdvice.StackDupMode.PREPEND_ARRAY_CTOR class CallSiteInstrumentationTest extends BaseCallSiteTest { @@ -60,6 +66,36 @@ class CallSiteInstrumentationTest extends BaseCallSiteTest { 0 * builder.visit(_ as AsmVisitorWrapper) >> builder } + void 'test call site transformer with super call in ctor'() { + setup: + SuperInCtorExampleAdvice.CALLS.set(0) + final source = Type.getType(SuperInCtorExample) + final target = renameType(source, 'Test') + final pointcut = stringReaderPointcut() + final InvokeAdvice advice = new InvokeAdvice() { + @Override + void apply(CallSiteAdvice.MethodHandler handler, int opcode, String owner, String name, String descriptor, boolean isInterface) { + handler.dupParameters(descriptor, PREPEND_ARRAY_CTOR) + handler.method(opcode, owner, name, descriptor, isInterface) + handler.advice( + Type.getType(SuperInCtorExampleAdvice).internalName, + 'onInvoke', + Type.getMethodType(Type.getType(StringReader), Type.getType(Object[]), Type.getType(StringReader)).getDescriptor(), + ) + } + } + final callSiteTransformer = new CallSiteTransformer(mockAdvices([mockCallSites(advice, pointcut)])) + + when: + final transformedClass = transformType(source, target, callSiteTransformer) + final transformed = loadClass(target, transformedClass) + final reader = transformed.newInstance("test") + + then: + reader != null + SuperInCtorExampleAdvice.CALLS.get() > 0 + } + static class StringCallSites implements CallSites, TestCallSites { @Override @@ -82,4 +118,14 @@ class CallSiteInstrumentationTest extends BaseCallSiteTest { handler.method(opcode, owner, name, descriptor, isInterface) } } + + static class SuperInCtorExampleAdvice { + + private static final AtomicInteger CALLS = new AtomicInteger(0) + + static StringReader onInvoke(Object[] args, StringReader result) { + CALLS.incrementAndGet() + return result + } + } } diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteUtilsTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteUtilsTest.groovy index 6a345b4b868..e3703981457 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteUtilsTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/CallSiteUtilsTest.groovy @@ -240,6 +240,44 @@ class CallSiteUtilsTest extends DDSpecification { ] | items.subList(2, items.size()) } + void 'test stack dup with array before super ctor of #items'() { + setup: + final stack = buildStack(items) + final visitor = mockMethodVisitor(stack) + + when: + CallSiteUtils.dup(visitor, expected*.type as Type[], PREPEND_ARRAY_SUPER_CTOR) + + then: 'the first element of the stack should be an array with the parameters' + final arrayFromStack = stack.remove(0) + arrayFromStack.type.descriptor == '[Ljava/lang/Object;' + final array = (arrayFromStack.value as Object[]).toList() as List + [array, expected].transpose().each { arrayItem, expectedItem -> + assert arrayItem.value == expectedItem.value // some of the items might be boxed so be careful + } + + then: 'the rest of the stack should contain the original values' + final result = fromStack(stack) + result == items + + where: + items | expected + [forObject('uninitialized'), forInt(1)] | items.subList(1, items.size()) + [forObject('uninitialized'), forInt(1), forInt(2)] | items.subList(1, items.size()) + [forObject('uninitialized'), forLong(1L)] | items.subList(1, items.size()) + [forObject('uninitialized'), forLong(1L), forLong(2L)] | items.subList(1, items.size()) + [forObject('uninitialized'), forInt(1), forLong(2L)] | items.subList(1, items.size()) + [forObject('uninitialized'), forInt(1), forInt(2), forLong(3L)] | items.subList(1, items.size()) + [forObject('uninitialized'), forInt(1), forInt(2), forInt(3), forLong(4L)] | items.subList(1, items.size()) + [ + forObject('uninitialized'), + forObject('PI = '), + forDouble(3.14D), + forChar((char) '?'), + forBoolean(true) + ] | items.subList(1, items.size()) + } + private MethodVisitor mockMethodVisitor(final List stack) { return Mock(MethodVisitor) { visitInsn(Opcodes.DUP) >> { handleDUP(stack) } diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java new file mode 100644 index 00000000000..b3d5356ecf4 --- /dev/null +++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/csi/SuperInCtorExample.java @@ -0,0 +1,10 @@ +package datadog.trace.agent.tooling.csi; + +import java.io.StringReader; + +public class SuperInCtorExample extends StringReader { + + public SuperInCtorExample(String s) { + super(s + new StringReader(s + "Test" + new StringBuilder("another test"))); + } +} diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy index 914801845a0..e106adfb98f 100644 --- a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy @@ -2,11 +2,12 @@ package datadog.trace.instrumentation.java.io import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.propagation.PropagationModule +import foo.bar.TestCustomStringReader import foo.bar.TestStringReaderSuite -class StringReaderCallSiteTest extends BaseIoCallSiteTest{ +class StringReaderCallSiteTest extends BaseIoCallSiteTest { - void 'test StringReader.'(){ + void 'test StringReader.'() { given: PropagationModule iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -18,4 +19,27 @@ class StringReaderCallSiteTest extends BaseIoCallSiteTest{ then: 1 * iastModule.taintObjectIfTainted(_ as StringReader, input) } + + void 'test super call to StringReader.'() { + given: + PropagationModule iastModule = Mock(PropagationModule) + InstrumentationBridge.registerIastModule(iastModule) + final input = 'Test input' + + when: + new TestCustomStringReader(input) + + then: + // new StringReader + 3 * iastModule.taintObjectIfTainted( + { it -> !(it instanceof TestCustomStringReader) }, + { String it -> + it.startsWith("New") } + ) + + // super(...) + 1 * iastModule.taintObjectIfTainted( + { it instanceof TestCustomStringReader }, + { String it -> it.startsWith("Super") }) + } } diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java new file mode 100644 index 00000000000..34082f66ad8 --- /dev/null +++ b/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java @@ -0,0 +1,14 @@ +package foo.bar; + +import java.io.StringReader; + +public class TestCustomStringReader extends StringReader { + + public TestCustomStringReader(String s) { + super( + "Super " + + s + + (new StringReader( + "New_1" + new StringReader("New_2" + new StringReader("New_3" + s))))); + } +} diff --git a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java index f92723bb2b1..3cfd1ca77f0 100644 --- a/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java +++ b/dd-smoke-tests/iast-util/src/main/java/datadog/smoketest/springboot/controller/IastWebController.java @@ -2,6 +2,7 @@ import com.google.gson.Gson; import com.google.gson.JsonParser; +import datadog.communication.util.IOUtils; import datadog.smoketest.springboot.TestBean; import ddtest.client.sources.Hasher; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -413,6 +414,11 @@ public String untrustedDeserializationSnakeYaml(@RequestParam("yaml") String par return "OK"; } + @GetMapping("/test_custom_string_reader") + public String testCustomStringReader(@RequestParam("param") String param) throws IOException { + return String.join("", IOUtils.readLines(new CustomStringReader(param))); + } + private void withProcess(final Operation op) { Process process = null; try { @@ -429,4 +435,15 @@ private void withProcess(final Operation op) { private interface Operation { E run() throws Throwable; } + + public static class CustomStringReader extends StringReader { + + public CustomStringReader(String s) { + super( + "Super " + + s + + (new StringReader( + "New_1" + new StringReader("New_2" + new StringReader("New_3" + s))))); + } + } } diff --git a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy index e5bd0a58e84..96b5dcaabe3 100644 --- a/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy +++ b/dd-smoke-tests/iast-util/src/testFixtures/groovy/datadog/smoketest/AbstractIastSpringBootTest.groovy @@ -1184,5 +1184,16 @@ abstract class AbstractIastSpringBootTest extends AbstractIastServerSmokeTest { hasVulnerability { vul -> vul.type == 'UNTRUSTED_DESERIALIZATION' } } + void 'test custom string reader'() { + setup: + final url = "http://localhost:${httpPort}/test_custom_string_reader?param=Test" + final request = new Request.Builder().url(url).get().build() + + when: + final response = client.newCall(request).execute() + + then: + response.body().string().contains("Test") + } } From 52cf79111613e781fb42daa56a0833fc6725c5e9 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Mon, 25 Nov 2024 10:27:22 +0100 Subject: [PATCH 050/106] Fix the temp location manager on J9 (#8002) (due to a different mechanism to retrieve running JVM processes) --- .../com/datadog/profiling/controller/TempLocationManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java index f82806f4ef0..c749b555cdf 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java @@ -71,7 +71,7 @@ private class CleanupVisitor implements FileVisitor { private final Instant cutoff; private final Instant timeoutTarget; - private boolean terminated; + private boolean terminated = false; CleanupVisitor(boolean cleanSelf, long timeout, TimeUnit unit) { this.cleanSelf = cleanSelf; @@ -107,7 +107,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) // the JFR repository directories are under /pid_ String pid = fileName.startsWith("pid_") ? fileName.substring(4) : null; boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid()); - shouldClean |= (cleanSelf && isSelfPid) || (!cleanSelf && !pidSet.contains(pid)); + shouldClean |= cleanSelf ? isSelfPid : !isSelfPid && !pidSet.contains(pid); if (shouldClean) { log.debug("Cleaning temporary location {}", dir); } From b36006cd69e524879f9c76b5ebaa494ffd4db8e4 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Mon, 25 Nov 2024 09:29:08 +0000 Subject: [PATCH 051/106] Use existence of MetadataRecoveryStrategy to decide whether to apply pre-3.8 or post-3.8 kafka-clients instrumentation (#8006) One exception: IAST's KafkaDeserializerInstrumentation is compatible with all 3.x versions of kafka-clients --- .../instrumentation/kafka-clients-0.11/build.gradle | 8 ++++++++ .../ConsumerCoordinatorInstrumentation.java | 12 ++++++++++++ .../KafkaConsumerInfoInstrumentation.java | 13 +++++++++++++ .../kafka_clients/KafkaConsumerInstrumentation.java | 13 +++++++++++++ .../KafkaDeserializerInstrumentation.java | 5 +++++ .../kafka_clients/KafkaProducerInstrumentation.java | 13 +++++++++++++ .../kafka_clients/MetadataInstrumentation.java | 12 ++++++++++++ .../instrumentation/kafka-clients-3.8/build.gradle | 2 +- .../ConsumerCoordinatorInstrumentation.java | 7 +++++++ .../KafkaConsumerInfoInstrumentation.java | 6 ++++++ .../KafkaConsumerInstrumentation.java | 7 +++++++ .../KafkaProducerInstrumentation.java | 7 +++++++ .../LegacyKafkaConsumerInfoInstrumentation.java | 6 ++++++ .../kafka_clients38/MetadataInstrumentation.java | 6 ++++++ .../OffsetCommitCallbackInvokerInstrumentation.java | 7 +++++++ 15 files changed, 123 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle index b549c29a734..1fa13c7d2af 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle @@ -1,10 +1,18 @@ muzzle { pass { + name = "since-0.11" group = "org.apache.kafka" module = "kafka-clients" versions = "[0.11.0.0,)" assertInverse = true } + pass { + name = "before-3.8" + group = "org.apache.kafka" + module = "kafka-clients" + versions = "[0.11.0.0,3.8.0)" + assertInverse = true + } } apply from: "$rootDir/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java index 5a299a30bda..c5bbbbd9941 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.core.datastreams.TagsProcessor.CONSUMER_GROUP_TAG; import static datadog.trace.core.datastreams.TagsProcessor.KAFKA_CLUSTER_ID_TAG; @@ -17,6 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import net.bytebuddy.asm.Advice; +import net.bytebuddy.matcher.ElementMatcher; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.OffsetAndMetadata; @@ -32,6 +34,16 @@ public ConsumerCoordinatorInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "before-3.8"; + } + + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index 2efda9bac08..e05c69cd525 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; @@ -9,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -24,6 +26,7 @@ import java.util.List; import java.util.Map; import net.bytebuddy.asm.Advice; +import net.bytebuddy.matcher.ElementMatcher; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -43,6 +46,16 @@ public KafkaConsumerInfoInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "before-3.8"; + } + + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index 6d488d3a759..3b47a29ddbb 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -1,10 +1,12 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.CONSUMER_DECORATE; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.KAFKA_CONSUME; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -18,6 +20,7 @@ import java.util.List; import java.util.Map; import net.bytebuddy.asm.Advice; +import net.bytebuddy.matcher.ElementMatcher; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; @@ -30,6 +33,16 @@ public KafkaConsumerInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "before-3.8"; + } + + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(2); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java index 23690c63b8f..269a5118f16 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaDeserializerInstrumentation.java @@ -44,6 +44,11 @@ public KafkaDeserializerInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "since-0.11"; + } + @Override public String hierarchyMarkerType() { return DESERIALIZER_CLASS; diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 6366973f63e..9fb7ddf8ef1 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; @@ -18,6 +19,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPrivate; import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; @@ -33,6 +35,7 @@ import java.util.LinkedHashMap; import java.util.Map; import net.bytebuddy.asm.Advice; +import net.bytebuddy.matcher.ElementMatcher; import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.clients.Metadata; import org.apache.kafka.clients.producer.Callback; @@ -49,6 +52,16 @@ public KafkaProducerInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "before-3.8"; + } + + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8 + } + @Override public String instrumentedType() { return "org.apache.kafka.clients.producer.KafkaProducer"; diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java index e9a10abd035..07d557a4131 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java @@ -1,9 +1,11 @@ package datadog.trace.instrumentation.kafka_clients; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; @@ -27,6 +29,16 @@ public MetadataInstrumentation() { super("kafka"); } + @Override + public String muzzleDirective() { + return "before-3.8"; + } + + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return not(hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy")); // < 3.8 + } + @Override public String hierarchyMarkerType() { return "org.apache.kafka.clients.Metadata"; diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle index c662f285fcd..fceec499038 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle @@ -6,7 +6,7 @@ muzzle { group = "org.apache.kafka" module = "kafka-clients" versions = "[3.8.0,)" - assertInverse = false + assertInverse = true } } diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java index b8b902e7c8a..b155458081b 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.*; @@ -9,6 +10,7 @@ import datadog.trace.api.Config; import java.util.HashMap; import java.util.Map; +import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumenterModule.class) public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule.Tracing @@ -23,6 +25,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(2); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java index 5e9cbe89b6f..d8b873ae8bb 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; @@ -36,6 +37,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(4); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java index 3b279b6e5c2..ca3fedfc6e2 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -16,6 +17,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumenterModule.class) public final class KafkaConsumerInstrumentation extends InstrumenterModule.Tracing @@ -30,6 +32,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(2); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java index 03850a34fd2..708476f8409 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -12,6 +13,7 @@ import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.Config; import java.util.Map; +import net.bytebuddy.matcher.ElementMatcher; @AutoService(InstrumenterModule.class) public final class KafkaProducerInstrumentation extends InstrumenterModule.Tracing @@ -26,6 +28,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public String instrumentedType() { return "org.apache.kafka.clients.producer.KafkaProducer"; diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java index 6390a9c0d4f..7a64e285e8b 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; @@ -36,6 +37,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public Map contextStore() { Map contextStores = new HashMap<>(4); diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java index 21e486f5bf5..fef52fa2282 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static java.util.Collections.singletonMap; @@ -27,6 +28,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public String hierarchyMarkerType() { return "org.apache.kafka.clients.Metadata"; diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java index a62238dd8ae..1aebb37f1f2 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java @@ -1,11 +1,13 @@ package datadog.trace.instrumentation.kafka_clients38; +import static datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers.hasClassNamed; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.Config; +import net.bytebuddy.matcher.ElementMatcher; // new - this instrumentation is completely new. // the purpose of this class is to provide us with information on consumer group and cluster ID @@ -20,6 +22,11 @@ public boolean isEnabled() { return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); } + @Override + public ElementMatcher.Junction classLoaderMatcher() { + return hasClassNamed("org.apache.kafka.clients.MetadataRecoveryStrategy"); // since 3.8 + } + @Override public String instrumentedType() { return "org.apache.kafka.clients.consumer.internals.OffsetCommitCallbackInvoker"; From b0553764bcadc7bb002f0c12c8a31072427d6cda Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:11:32 +0100 Subject: [PATCH 052/106] Instrument Gradle Launcher to avoid overwriting org.gradle.jvmargs property (#8001) --- .../trace/civisibility/ProcessHierarchy.java | 16 ++++- .../civisibility/test/ExecutionStrategy.java | 5 +- .../gradle/GradleDaemonInjectionUtils.java | 33 ++++++++++ .../gradle/GradleLauncherInstrumentation.java | 63 +++++++++++++++++++ 4 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java create mode 100644 dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java index e3bb987e894..a8265815bb0 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java @@ -50,13 +50,21 @@ public boolean isChild() { * not one of the supported build system processes. */ public boolean isHeadless() { - return !isChild() && !isParent(); + return !isChild() && !isParent() && !isWrapper(); } private boolean isParent() { return isMavenParent() || isGradleDaemon(); } + /** + * Determines if current process is a wrapper that starts the build system. In other words a + * process that is not a build system, and not a JVM that runs tests. + */ + private boolean isWrapper() { + return isGradleLauncher(); + } + private boolean isMavenParent() { return System.getProperty("maven.home") != null && System.getProperty("classworlds.conf") != null; @@ -70,6 +78,12 @@ private boolean isGradleDaemon() { && System.getProperties().getProperty("org.gradle.internal.worker.tmpdir") == null; } + private boolean isGradleLauncher() { + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + return contextClassLoader.getResource("org/gradle/launcher/Main.class") != null + || contextClassLoader.getResource("org/gradle/launcher/GradleMain.class") != null; + } + @Nullable public InetSocketAddress getSignalServerAddress() { // System.getProperty is used rather than Config, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java index eb548e6c1e4..12639864f4b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java @@ -99,8 +99,11 @@ public TestRetryPolicy retryPolicy(TestIdentifier test) { public boolean isEarlyFlakeDetectionLimitReached() { int detectionsUsed = earlyFlakeDetectionsUsed.get(); Collection knownTests = executionSettings.getKnownTests(); - int totalTests = knownTests.size() + detectionsUsed; + if (knownTests == null) { + return false; + } + int totalTests = knownTests.size() + detectionsUsed; EarlyFlakeDetectionSettings earlyFlakeDetectionSettings = executionSettings.getEarlyFlakeDetectionSettings(); int threshold = diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java new file mode 100644 index 00000000000..cebfcff24d3 --- /dev/null +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java @@ -0,0 +1,33 @@ +package datadog.trace.instrumentation.gradle; + +import datadog.trace.api.Config; +import java.io.File; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +public class GradleDaemonInjectionUtils { + + public static Map addJavaagentToGradleDaemonProperties( + Map jvmOptions) { + File agentJar = Config.get().getCiVisibilityAgentJarFile(); + Path agentJarPath = agentJar.toPath(); + + StringBuilder agentArg = new StringBuilder("-javaagent:").append(agentJarPath).append('='); + + Properties systemProperties = System.getProperties(); + for (Map.Entry e : systemProperties.entrySet()) { + String propertyName = (String) e.getKey(); + Object propertyValue = e.getValue(); + if (propertyName.startsWith(Config.PREFIX)) { + agentArg.append(propertyName).append('=').append(propertyValue).append(','); + } + } + + // creating a new map in case jvmOptions is immutable + Map updatedJvmOptions = new HashMap<>(jvmOptions); + updatedJvmOptions.merge("org.gradle.jvmargs", agentArg.toString(), (o, n) -> o + " " + n); + return updatedJvmOptions; + } +} diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java new file mode 100644 index 00000000000..631ce6ae7d8 --- /dev/null +++ b/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java @@ -0,0 +1,63 @@ +package datadog.trace.instrumentation.gradle; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Map; +import net.bytebuddy.asm.Advice; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.matcher.ElementMatcher; + +/** + * This instrumentation targets Gradle Launcher, which is the process that is started with + * `gradle`/`gradlew` commands. The launcher starts Gradle Daemon (if not started yet), which is a + * long-lived process that actually runs builds. The instrumentation injects the tracer and its + * config properties into Gradle Daemon JVM settings when the daemon is started. + */ +@AutoService(InstrumenterModule.class) +public class GradleLauncherInstrumentation extends InstrumenterModule.CiVisibility + implements Instrumenter.ForTypeHierarchy { + + public GradleLauncherInstrumentation() { + super("gradle", "gradle-daemon-jvm-options"); + } + + @Override + public String hierarchyMarkerType() { + return "org.gradle.launcher.configuration.AllProperties"; + } + + @Override + public ElementMatcher hierarchyMatcher() { + return implementsInterface(named(hierarchyMarkerType())); + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("getProperties"), + GradleLauncherInstrumentation.class.getName() + "$PropertiesAugmentationAdvice"); + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".GradleDaemonInjectionUtils", + }; + } + + @SuppressFBWarnings( + value = "UC_USELESS_OBJECT", + justification = "jvmOptions is the return value of the original method") + public static class PropertiesAugmentationAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void addJavaagentToGradleDaemonProperties( + @Advice.Return(readOnly = false) Map jvmOptions) { + jvmOptions = GradleDaemonInjectionUtils.addJavaagentToGradleDaemonProperties(jvmOptions); + } + } +} From 565afcd1fd9c8dd576b12d86e7370fb1a9bff87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:30:48 +0100 Subject: [PATCH 053/106] Add propagation to String constructors with StringBuffer and StringBuilder (#7966) --- .../iast/propagation/StringModuleImpl.java | 2 +- .../iast/propagation/StringModuleTest.groovy | 45 +++++++++++++++++++ .../java/lang/StringCallSite.java | 4 +- .../java/lang/StringCallSiteTest.groovy | 10 ++++- .../test/java/foo/bar/TestStringSuite.java | 14 ++++++ .../api/iast/propagation/StringModule.java | 2 +- 6 files changed, 72 insertions(+), 5 deletions(-) diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java index b31d7ca15fb..a5f8d0f883f 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java @@ -403,7 +403,7 @@ public void onStringTrim(@Nonnull final String self, @Nullable final String resu } @Override - public void onStringConstructor(@Nonnull String self, @Nonnull String result) { + public void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result) { if (!canBeTainted(self)) { return; } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy index 6a96cdd1603..f880a31bb2f 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy @@ -810,6 +810,47 @@ class StringModuleTest extends IastModuleImplTestBase { "A==>\u00cc\u00cc\u00cc<==B" | "a==>ììì<==b" | "en" | 5 | 5 | [[1, 3]] } + void 'onStringConstructor (#input)'() { + given: + final taintedObjects = ctx.getTaintedObjects() + final self = addFromTaintFormat(taintedObjects, input) + final result = new String(self) + + when: + module.onStringConstructor(self, result) + def taintedObject = taintedObjects.get(result) + + then: + 1 * tracer.activeSpan() >> span + taintFormat(result, taintedObject.getRanges()) == expected + + where: + input | expected + "==>123<==" | "==>123<==" + sb("==>123<==") | "==>123<==" + sbf("==>123<==") | "==>123<==" + } + + void 'onStringConstructor empty (#input)'() { + given: + final taintedObjects = ctx.getTaintedObjects() + final self = addFromTaintFormat(taintedObjects, input) + final result = new String(self) + + when: + module.onStringConstructor(self, result) + + then: + null == taintedObjects.get(result) + result == expected + + where: + input | expected + "" | "" + sb("") | "" + sbf("") | "" + } + void 'test trim and make sure IastRequestContext is called'() { given: final taintedObjects = ctx.getTaintedObjects() @@ -1269,6 +1310,10 @@ class StringModuleTest extends IastModuleImplTestBase { return new StringBuilder(string) } + private static StringBuilder sbf() { + return sbf('') + } + private static StringBuffer sbf(final String string) { return new StringBuffer(string) } diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java index 9d845256077..75669f20c9a 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java @@ -201,13 +201,15 @@ public static String afterTrim( } @CallSite.After("void java.lang.String.(java.lang.String)") + @CallSite.After("void java.lang.String.(java.lang.StringBuffer)") + @CallSite.After("void java.lang.String.(java.lang.StringBuilder)") public static String afterStringConstructor( @CallSite.AllArguments @Nonnull final Object[] params, @CallSite.Return @Nonnull final String result) { final StringModule module = InstrumentationBridge.STRING; try { if (module != null) { - module.onStringConstructor((String) params[0], result); + module.onStringConstructor((CharSequence) params[0], result); } } catch (final Throwable e) { module.onUnexpectedException("afterStringConstructor threw", e); diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy index 24c4f7b1b26..0bb3fe70a13 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy @@ -176,12 +176,18 @@ class StringCallSiteTest extends AgentTestRunner { InstrumentationBridge.registerIastModule(module) when: - final result = TestStringSuite.stringConstructor("hello") + final result = TestStringSuite.stringConstructor(param) then: - result == 'hello' + result == expected 1 * module.onStringConstructor(_, _) 0 * _ + + where: + param | expected + 'hello' | 'hello' + new StringBuilder('hello') | 'hello' + new StringBuffer('hello') | 'hello' } void 'test string format'() { diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java index 2e1c00f4f50..b25b6de9aae 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java @@ -92,6 +92,20 @@ public static String stringConstructor(String self) { return result; } + public static String stringConstructor(StringBuffer self) { + LOGGER.debug("Before string stringConstructor {}", self); + final String result = new String(self); + LOGGER.debug("After string stringConstructor {}", result); + return result; + } + + public static String stringConstructor(StringBuilder self) { + LOGGER.debug("Before string stringConstructor {}", self); + final String result = new String(self); + LOGGER.debug("After string stringConstructor {}", result); + return result; + } + public static String stringConstructor(final byte[] value) { LOGGER.debug("Before string stringConstructor {}", value); final String result = new String(value); diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java index 37a28f2a0a3..a42df53652c 100644 --- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java +++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java @@ -36,7 +36,7 @@ void onStringJoin( void onStringRepeat(@Nonnull String self, int count, @Nonnull String result); - void onStringConstructor(@Nonnull String self, @Nonnull String result); + void onStringConstructor(@Nonnull CharSequence self, @Nonnull String result); void onStringFormat(@Nonnull String pattern, @Nonnull Object[] params, @Nonnull String result); From f2d21ae588914936699f7d59dd4dbc8cb9a08086 Mon Sep 17 00:00:00 2001 From: Nayeem Kamal Date: Mon, 25 Nov 2024 06:04:10 -0500 Subject: [PATCH 054/106] Reenable kafka 3.8 by default (#8007) And add aliases to disambiguate the old and new Kafka instrumentations --------- Co-authored-by: Stuart McCulloch --- .../kafka_clients/ConsumerCoordinatorInstrumentation.java | 2 +- .../kafka_clients/KafkaConsumerInfoInstrumentation.java | 2 +- .../kafka_clients/KafkaConsumerInstrumentation.java | 2 +- .../kafka_clients/KafkaProducerInstrumentation.java | 2 +- .../kafka_clients/MetadataInstrumentation.java | 2 +- .../ConsumerCoordinatorInstrumentation.java | 8 +------- .../kafka_clients38/KafkaConsumerInfoInstrumentation.java | 8 +------- .../kafka_clients38/KafkaConsumerInstrumentation.java | 8 +------- .../kafka_clients38/KafkaProducerInstrumentation.java | 8 +------- .../LegacyKafkaConsumerInfoInstrumentation.java | 8 +------- .../kafka_clients38/MetadataInstrumentation.java | 8 +------- .../OffsetCommitCallbackInvokerInstrumentation.java | 8 +------- .../groovy/KafkaClientCustomPropagationConfigTest.groovy | 1 - .../src/test/groovy/KafkaClientTestBase.groovy | 1 - .../trace/api/config/TraceInstrumentationConfig.java | 2 -- internal-api/src/main/java/datadog/trace/api/Config.java | 7 ------- 16 files changed, 12 insertions(+), 65 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java index c5bbbbd9941..0f76d75745e 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java @@ -31,7 +31,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule implements Instrumenter.ForSingleType { public ConsumerCoordinatorInstrumentation() { - super("kafka"); + super("kafka", "kafka-0.11"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index e05c69cd525..e8b25c01277 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -43,7 +43,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T implements Instrumenter.ForSingleType { public KafkaConsumerInfoInstrumentation() { - super("kafka"); + super("kafka", "kafka-0.11"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index 3b47a29ddbb..3028c03de9c 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -30,7 +30,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci implements Instrumenter.ForSingleType { public KafkaConsumerInstrumentation() { - super("kafka"); + super("kafka", "kafka-0.11"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 9fb7ddf8ef1..3e5e42119f3 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -49,7 +49,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci implements Instrumenter.ForSingleType { public KafkaProducerInstrumentation() { - super("kafka"); + super("kafka", "kafka-0.11"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java index 07d557a4131..be39d61dd96 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java @@ -26,7 +26,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing implements Instrumenter.ForTypeHierarchy { public MetadataInstrumentation() { - super("kafka"); + super("kafka", "kafka-0.11"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java index b155458081b..05fd44cd273 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/ConsumerCoordinatorInstrumentation.java @@ -7,7 +7,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.HashMap; import java.util.Map; import net.bytebuddy.matcher.ElementMatcher; @@ -17,12 +16,7 @@ public final class ConsumerCoordinatorInstrumentation extends InstrumenterModule implements Instrumenter.ForSingleType { public ConsumerCoordinatorInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java index d8b873ae8bb..832389b03a0 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInfoInstrumentation.java @@ -14,7 +14,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.HashMap; import java.util.Map; import net.bytebuddy.description.type.TypeDescription; @@ -29,12 +28,7 @@ public final class KafkaConsumerInfoInstrumentation extends InstrumenterModule.T implements Instrumenter.ForTypeHierarchy { public KafkaConsumerInfoInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java index ca3fedfc6e2..53d7bf6c989 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaConsumerInstrumentation.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -24,12 +23,7 @@ public final class KafkaConsumerInstrumentation extends InstrumenterModule.Traci implements Instrumenter.ForSingleType { public KafkaConsumerInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java index 708476f8409..120c08ce19c 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/KafkaProducerInstrumentation.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.Map; import net.bytebuddy.matcher.ElementMatcher; @@ -20,12 +19,7 @@ public final class KafkaProducerInstrumentation extends InstrumenterModule.Traci implements Instrumenter.ForSingleType { public KafkaProducerInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java index 7a64e285e8b..e430f3d6207 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/LegacyKafkaConsumerInfoInstrumentation.java @@ -14,7 +14,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.HashMap; import java.util.Map; import net.bytebuddy.description.type.TypeDescription; @@ -29,12 +28,7 @@ public final class LegacyKafkaConsumerInfoInstrumentation extends InstrumenterMo implements Instrumenter.ForTypeHierarchy { public LegacyKafkaConsumerInfoInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java index fef52fa2282..b8757e50752 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/MetadataInstrumentation.java @@ -10,7 +10,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import java.util.Map; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -20,12 +19,7 @@ public class MetadataInstrumentation extends InstrumenterModule.Tracing implements Instrumenter.ForTypeHierarchy { public MetadataInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java index 1aebb37f1f2..83631de92b7 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java/datadog/trace/instrumentation/kafka_clients38/OffsetCommitCallbackInvokerInstrumentation.java @@ -6,7 +6,6 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Config; import net.bytebuddy.matcher.ElementMatcher; // new - this instrumentation is completely new. @@ -14,12 +13,7 @@ public class OffsetCommitCallbackInvokerInstrumentation extends InstrumenterModule.Tracing implements Instrumenter.ForSingleType { public OffsetCommitCallbackInvokerInstrumentation() { - super("kafka"); - } - - @Override - public boolean isEnabled() { - return super.isEnabled() && Config.get().isExperimentalKafkaEnabled(); + super("kafka", "kafka-3.8"); } @Override diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy index 3270c6eb371..5db495e5904 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy @@ -52,7 +52,6 @@ class KafkaClientCustomPropagationConfigTest extends AgentTestRunner { super.configurePreAgent() injectSysConfig("dd.kafka.e2e.duration.enabled", "true") - injectSysConfig("dd.trace.experimental.kafka.enabled","true") } @Flaky diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy index 369e1c3c649..6476c47f84f 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy @@ -66,7 +66,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { super.configurePreAgent() injectSysConfig("dd.kafka.e2e.duration.enabled", "true") - injectSysConfig("dd.trace.experimental.kafka.enabled","true") } public static final LinkedHashMap PRODUCER_PATHWAY_EDGE_TAGS diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java index 1936ab4fccd..0d81bf0ca85 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java @@ -159,7 +159,5 @@ public final class TraceInstrumentationConfig { /** If set, the instrumentation will set its resource name on the local root too. */ public static final String AXIS_PROMOTE_RESOURCE_NAME = "trace.axis.promote.resource-name"; - public static final String EXPERIMENTAL_KAFKA_ENABLED = "trace.experimental.kafka.enabled"; - private TraceInstrumentationConfig() {} } diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 4a15cefcada..a67d0c519bb 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -414,8 +414,6 @@ public static String getHostName() { private final boolean kafkaClientPropagationEnabled; private final Set kafkaClientPropagationDisabledTopics; private final boolean kafkaClientBase64DecodingEnabled; - // enable the Kafka-3.8 instrumentation manually until testing issues are resolved. - private final boolean experimentalKafkaEnabled; private final boolean jmsPropagationEnabled; private final Set jmsPropagationDisabledTopics; @@ -1569,7 +1567,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) tryMakeImmutableSet(configProvider.getList(KAFKA_CLIENT_PROPAGATION_DISABLED_TOPICS)); kafkaClientBase64DecodingEnabled = configProvider.getBoolean(KAFKA_CLIENT_BASE64_DECODING_ENABLED, false); - experimentalKafkaEnabled = configProvider.getBoolean(EXPERIMENTAL_KAFKA_ENABLED, false); jmsPropagationEnabled = isPropagationEnabled(true, "jms"); jmsPropagationDisabledTopics = tryMakeImmutableSet(configProvider.getList(JMS_PROPAGATION_DISABLED_TOPICS)); @@ -3055,10 +3052,6 @@ public boolean isKafkaClientBase64DecodingEnabled() { return kafkaClientBase64DecodingEnabled; } - public boolean isExperimentalKafkaEnabled() { - return experimentalKafkaEnabled; - } - public boolean isRabbitPropagationEnabled() { return rabbitPropagationEnabled; } From 224dc1b6d97c85262018c9044b8894e135d5b390 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 25 Nov 2024 20:23:20 +0100 Subject: [PATCH 055/106] feat: Only show notes when notes is enabled (#7994) --- .../src/main/java/datadog/apt/LogUtils.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java index 8f51e1e750b..34c0925ff4c 100644 --- a/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java +++ b/dd-java-agent/instrumentation-annotation-processor/src/main/java/datadog/apt/LogUtils.java @@ -10,24 +10,25 @@ private LogUtils() {} private static final boolean NOTE = false; - public static final void log( - ProcessingEnvironment processingEnv, String formatStr, Object... args) { + public static void log(ProcessingEnvironment processingEnv, String formatStr, Object... args) { String msg = String.format(formatStr, args); - processingEnv.getMessager().printMessage(Kind.NOTE, msg); + if (NOTE) { + processingEnv.getMessager().printMessage(Kind.NOTE, msg); + } } - public static final void warning( + public static void warning( ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) { message(processingEnv, element, Kind.WARNING, formatStr, args); } - public static final void error( + public static void error( ProcessingEnvironment processingEnv, Element element, String formatStr, Object... args) { message(processingEnv, element, Kind.ERROR, formatStr, args); } - public static final void message( + public static void message( ProcessingEnvironment processingEnv, Element element, Kind kind, From 5e6f5ab6d8d09b612a96a746044f76b5f0d2d939 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 26 Nov 2024 08:59:53 +0100 Subject: [PATCH 056/106] fix: Fix test name uniqueness (#8015) --- .../trace/logging/simplelogger/SLCompatSettingsTest.groovy | 2 +- .../trace/core/tagprocessor/PayloadTagsProcessorTest.groovy | 2 +- .../test/groovy/datadog/trace/core/util/MatchersTest.groovy | 2 +- .../groovy/datadog/trace/lambda/LambdaHandlerTest.groovy | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/simplelogger/SLCompatSettingsTest.groovy b/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/simplelogger/SLCompatSettingsTest.groovy index cfb57387adf..cea1b88a6dd 100644 --- a/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/simplelogger/SLCompatSettingsTest.groovy +++ b/dd-java-agent/agent-logging/src/test/groovy/datadog/trace/logging/simplelogger/SLCompatSettingsTest.groovy @@ -190,7 +190,7 @@ class SLCompatSettingsTest extends Specification { ["bar": "trace", "foo.bar.baz": "warn"] | [LogLevel.INFO, LogLevel.INFO, LogLevel.WARN] } - def "test DTFormatter"() { + def "test DTFormatter #iterationIndex"() { when: def formatted = new StringBuilder() dtFormatter.appendFormattedDate(formatted, timeMillis, startTimeMillis) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.groovy index db3b15c90af..3e144b38f5d 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/tagprocessor/PayloadTagsProcessorTest.groovy @@ -20,7 +20,7 @@ class PayloadTagsProcessorTest extends DDSpecification { !PayloadTagsProcessor.create(Config.get()) } - def "enabled with defaults when configured"() { + def "enabled with defaults when configured req #requestPayloadTagging resp #responsePayloadTagging"() { setup: requestPayloadTagging && injectSysConfig("trace.cloud.request.payload.tagging", requestPayloadTagging) responsePayloadTagging && injectSysConfig("trace.cloud.response.payload.tagging", responsePayloadTagging) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy index 720c0e64cff..1b4cd0c95a9 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/util/MatchersTest.groovy @@ -36,7 +36,7 @@ class MatchersTest extends DDSpecification { pattern << ["", "a", "abc", "cde"] } - def "a pattern matcher test"() { + def "a pattern matcher test #iterationIndex #pattern"() { when: def matcher = Matchers.compileGlob(pattern) diff --git a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy index 716dec06ddf..f439544c55e 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy @@ -25,6 +25,11 @@ class LambdaHandlerTest extends DDCoreSpecification { this.field1 = "toto" this.field2 = true } + + @Override + String toString() { + "$field1 / $field2}" + } } def "test start invocation success"() { From 92e8023155cf10692b7138f2c5f9a83e76a8b3e4 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 26 Nov 2024 09:10:16 +0100 Subject: [PATCH 057/106] Replace StringBuilder#append(String) with StringBuilder#append(char) (#8008) --- .../parsers/HotspotCrashLogParser.java | 2 +- .../debugger/agent/StringTemplateBuilder.java | 2 +- .../debugger/probe/ProbeDefinition.java | 2 +- .../debugger/sink/IntakeBatchHelper.java | 6 ++--- .../debugger/util/StringTokenWriter.java | 24 +++++++++---------- .../debugger/sink/DebuggerSinkTest.java | 6 ++--- .../util/CapturedValueAdapterTest.java | 4 ++-- .../logging/simplelogger/SLCompatHelper.java | 4 ++-- .../trace/logging/intake/LogsDispatcher.java | 6 ++--- .../profiling/ddprof/DatadogProfiler.java | 2 +- .../agent/tooling/InstrumenterMetrics.java | 2 +- .../muzzle/MuzzleVersionScanPlugin.java | 10 ++++---- .../eventbridge/EventBridgeInterceptor.java | 4 ++-- .../aws/v1/sns/SnsInterceptor.java | 4 ++-- .../aws/v1/sns/TextMapInjectAdapter.java | 2 +- .../aws/v2/sns/SnsInterceptor.java | 4 ++-- .../aws/v2/sns/TextMapInjectAdapter.java | 2 +- .../JakartaRsAnnotationsDecorator.java | 4 ++-- .../jaxrs1/JaxRsAnnotationsDecorator.java | 4 ++-- .../jaxrs2/JaxRsAnnotationsDecorator.java | 4 ++-- .../instrumentation/jdbc/JDBCDecorator.java | 2 +- .../maven3/MavenProjectConfigurator.java | 8 +++---- .../rabbitmq/amqp/RabbitDecorator.java | 2 +- .../instrumentation/testng/TestNGUtils.java | 6 ++--- .../ClassInjectingTestInstrumentation.java | 2 +- .../smoketest/CrashtrackingSmokeTest.java | 16 ++++++------- .../datadog/trace/core/DDSpanContext.java | 4 ++-- .../trace/core/propagation/W3CHttpCodec.java | 2 +- .../datadog/trace/core/util/GlobPattern.java | 2 +- .../instrumentation/api/URIUtils.java | 2 +- .../ProcessImplInstrumentationHelpers.java | 2 +- .../main/java/datadog/trace/util/Strings.java | 12 +++++----- .../java/datadog/trace/util/TagsHelper.java | 2 +- .../datadog/trace/util/TagsHelperTest.java | 2 +- 34 files changed, 81 insertions(+), 81 deletions(-) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java index 1ee3b7efec1..e869981ff61 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/parsers/HotspotCrashLogParser.java @@ -157,7 +157,7 @@ public CrashLog parse(String crashLog) { pid = line.substring(pidIdx + 4, endIdx); } } else { - message.append(line.substring(2)).append("\n"); + message.append(line.substring(2)).append('\n'); } } break; diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java index 9095a1fcfbc..754d5cc06b7 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/StringTemplateBuilder.java @@ -56,7 +56,7 @@ public String evaluate(CapturedContext context, LogProbe.LogStatus status) { status.addError(new EvaluationError(ex.getExpr(), ex.getMessage())); String msg = ex instanceof RedactedException ? Redaction.REDACTED_VALUE : ex.getMessage(); - sb.append("{").append(msg).append("}"); + sb.append('{').append(msg).append('}'); } if (!status.getErrors().isEmpty()) { status.setLogTemplateErrors(true); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java index 6754404f903..042ac86ff54 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/ProbeDefinition.java @@ -85,7 +85,7 @@ public String concatTags() { StringBuilder sb = new StringBuilder(); for (Tag tag : tags) { if (sb.length() > 0) { - sb.append(","); + sb.append(','); } sb.append(tag); } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java index 6ea5fe83e3e..dd58de2fe3a 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/IntakeBatchHelper.java @@ -61,7 +61,7 @@ private static int buildPayloadBatch( List payloads, int start, int count, StringBuilder sb) { int totalSize = 0; int elementCount = 0; - sb.append("["); + sb.append('['); for (int i = start; i < start + count; i++) { String jsonStr = payloads.get(i); totalSize += jsonStr.length(); @@ -71,13 +71,13 @@ private static int buildPayloadBatch( break; } sb.append(jsonStr); - sb.append(","); + sb.append(','); elementCount++; } if (elementCount > 0) { sb.delete(sb.lastIndexOf(","), sb.length()); } - sb.append("]"); + sb.append(']'); return elementCount; } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java index 389ad14c7e5..d62c5e6d6d0 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/StringTokenWriter.java @@ -31,7 +31,7 @@ public StringTokenWriter(StringBuilder sb, List evalErrors) { @Override public void prologue(Object value, String type) { if (inMapEntry && !initial) { - sb.append("="); + sb.append('='); } else if (inCollection && !initial) { sb.append(", "); } @@ -85,7 +85,7 @@ public void primitiveArrayElement(String value, String type) { @Override public void collectionPrologue(Object value) { - sb.append("["); + sb.append('['); initial = true; inCollection = true; } @@ -98,7 +98,7 @@ public void collectionEpilogue(Object value, boolean isComplete, int size) { @Override public void mapPrologue(Object value) { - sb.append("{"); + sb.append('{'); initial = true; inCollection = true; } @@ -108,14 +108,14 @@ public void mapEntryPrologue(Map.Entry entry) { if (!initial) { sb.append(", "); } - sb.append("["); + sb.append('['); initial = true; inMapEntry = true; } @Override public void mapEntryEpilogue(Map.Entry entry) { - sb.append("]"); + sb.append(']'); inMapEntry = false; } @@ -127,7 +127,7 @@ public void mapEpilogue(boolean isComplete, int size) { @Override public void objectPrologue(Object value) { - sb.append("{"); + sb.append('{'); initial = true; } @@ -137,12 +137,12 @@ public void objectFieldPrologue(String fieldName, Object value, int maxDepth) { sb.append(", "); } initial = false; - sb.append(fieldName).append("="); + sb.append(fieldName).append('='); } @Override public void objectEpilogue(Object value) { - sb.append("}"); + sb.append('}'); } @Override @@ -167,16 +167,16 @@ public void notCaptured(SerializerWithLimits.NotCapturedReason reason) { sb.append("..."); break; case TIMEOUT: - sb.append("{").append(TIMEOUT_REASON).append("}"); + sb.append('{').append(TIMEOUT_REASON).append('}'); break; case FIELD_COUNT: sb.append(", ..."); break; case REDACTED_IDENT: - sb.append("{").append(REDACTED_IDENT_REASON).append("}"); + sb.append('{').append(REDACTED_IDENT_REASON).append('}'); break; case REDACTED_TYPE: - sb.append("{").append(REDACTED_TYPE_REASON).append("}"); + sb.append('{').append(REDACTED_TYPE_REASON).append('}'); break; default: throw new RuntimeException("Unsupported NotCapturedReason: " + reason); @@ -185,6 +185,6 @@ public void notCaptured(SerializerWithLimits.NotCapturedReason reason) { @Override public void notCaptured(String reason) throws Exception { - sb.append("(Error: ").append(reason).append(")"); + sb.append("(Error: ").append(reason).append(')'); } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java index add348f3d83..7b8c5996677 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java @@ -322,7 +322,7 @@ public void splitDiagnosticsBatch() { DebuggerSink sink = createDebuggerSink(diagnosticUploader, false); StringBuilder largeMessageBuilder = new StringBuilder(100_001); for (int i = 0; i < 100_000; i++) { - largeMessageBuilder.append("f"); + largeMessageBuilder.append('f'); } String largeMessage = largeMessageBuilder.toString(); for (int i = 0; i < 100; i++) { @@ -342,7 +342,7 @@ public void splitDiagnosticsBatchDebuggerTrack() { DebuggerSink sink = createDebuggerSink(diagnosticUploader, true); StringBuilder largeMessageBuilder = new StringBuilder(100_001); for (int i = 0; i < 100_000; i++) { - largeMessageBuilder.append("f"); + largeMessageBuilder.append('f'); } String largeMessage = largeMessageBuilder.toString(); for (int i = 0; i < 100; i++) { @@ -362,7 +362,7 @@ public void tooLargeDiagnostic() { DebuggerSink sink = createDefaultDebuggerSink(); StringBuilder tooLargeMessageBuilder = new StringBuilder(MAX_PAYLOAD + 1); for (int i = 0; i < MAX_PAYLOAD; i++) { - tooLargeMessageBuilder.append("f"); + tooLargeMessageBuilder.append('f'); } String tooLargeMessage = tooLargeMessageBuilder.toString(); sink.getProbeDiagnosticsSink().addError(new ProbeId("1", 1), tooLargeMessage); diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java index cbf91c6ead5..ea16400ce84 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/CapturedValueAdapterTest.java @@ -55,7 +55,7 @@ void collection() throws IOException { StringBuilder sb = new StringBuilder(); for (int i = 0; i < 10; i++) { if (i > 0) { - sb.append(","); + sb.append(','); } sb.append(String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, int.class.getTypeName(), i)); } @@ -66,7 +66,7 @@ void collection() throws IOException { sb = new StringBuilder(); for (int i = 0; i < 10; i++) { if (i > 0) { - sb.append(","); + sb.append(','); } sb.append( String.format(CAPTURED_VALUE_SIMPLE_TEMPLATE, String.class.getTypeName(), "foo" + i)); diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java index a8037c2fbdd..463c5f42f76 100644 --- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java +++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java @@ -108,12 +108,12 @@ private void embedException(StringBuilder buf, Throwable t) { if (t != null) { buf.append(" [exception:"); buf.append(t.toString()); - buf.append("."); + buf.append('.'); for (StackTraceElement element : t.getStackTrace()) { buf.append(" at "); buf.append(element.toString()); } - buf.append("]"); + buf.append(']'); } } } diff --git a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java index 503be5ca14b..79e9ae580d1 100644 --- a/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java +++ b/dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsDispatcher.java @@ -66,21 +66,21 @@ public void dispatch(List> messages) { } if (batchCount + 1 > maxBatchRecords || batchLength + bytes.length >= maxBatchBytes) { - flush(batch.append("]")); + flush(batch.append(']')); batch = new StringBuilder("["); batchCount = 0; batchLength = 0; } if (batchCount != 0) { - batch.append(","); + batch.append(','); } batch.append(json); batchCount += 1; batchLength += bytes.length; } - flush(batch.append("]")); + flush(batch.append(']')); } private void flush(StringBuilder batch) { diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index 5bec75d9436..21c7eafc206 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -299,7 +299,7 @@ String cmdStartProfiling(Path file) throws IllegalStateException { // wall profiling is enabled. cmd.append(",wall="); if (getWallCollapsing(configProvider)) { - cmd.append("~"); + cmd.append('~'); } cmd.append(getWallInterval(configProvider)).append('m'); if (getWallContextFilter(configProvider)) { diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java index e855e9528e7..bc54ebf5777 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterMetrics.java @@ -206,7 +206,7 @@ private static void summarize(StringBuilder buf, String prefix, AtomicLong stat) long value = stat.get(); buf.append(prefix) .append(String.format("%-12d", value >>> COUNT_SHIFT)) - .append(" ") + .append(' ') .append(String.format("%.1f", (value & NANOS_MASK) / 1_000_000.0)) .append(" ms\n"); } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java index 026f218de7c..c4dc304ffcc 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java @@ -159,26 +159,26 @@ private static String prettyPrint(final String prefix, final Reference ref) { builder.append(Reference.prettyPrint(ref.flags)); builder.append(ref.className); if (ref.superName != null) { - builder.append(" extends<").append(ref.superName).append(">"); + builder.append(" extends<").append(ref.superName).append('>'); } if (ref.interfaces.length > 0) { builder.append(" implements "); for (final String iface : ref.interfaces) { - builder.append(" <").append(iface).append(">"); + builder.append(" <").append(iface).append('>'); } } for (final String source : ref.sources) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Source: ").append(source); } for (final Reference.Field field : ref.fields) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Field: "); builder.append(Reference.prettyPrint(field.flags)); builder.append(field); } for (final Reference.Method method : ref.methods) { - builder.append("\n").append(prefix).append(prefix); + builder.append('\n').append(prefix).append(prefix); builder.append("Method: "); builder.append(Reference.prettyPrint(method.flags)); builder.append(method); diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java index b1be20cccc6..a1a975d8491 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java @@ -65,7 +65,7 @@ public SdkRequest modifyRequest( } detailBuilder - .append("\"") + .append('\"') .append(PathwayContext.DATADOG_KEY) .append("\": ") .append(traceContext) @@ -104,7 +104,7 @@ private String getTraceContextToInject( .append(RESOURCE_NAME_KEY) .append("\": \"") .append(eventBusName) - .append("\""); + .append('\"'); jsonBuilder.append('}'); return jsonBuilder.toString(); diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java index 3f1d6162d17..c0521bbea5e 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java @@ -36,13 +36,13 @@ private ByteBuffer getMessageAttributeValueToInject( AmazonWebServiceRequest request, String snsTopicName) { final AgentSpan span = newSpan(request); StringBuilder jsonBuilder = new StringBuilder(); - jsonBuilder.append("{"); + jsonBuilder.append('{'); propagate().inject(span, jsonBuilder, SETTER, TracePropagationStyle.DATADOG); if (traceConfig().isDataStreamsEnabled()) { propagate().injectPathwayContext(span, jsonBuilder, SETTER, getTags(snsTopicName)); } jsonBuilder.setLength(jsonBuilder.length() - 1); // Remove the last comma - jsonBuilder.append("}"); + jsonBuilder.append('}'); return ByteBuffer.wrap(jsonBuilder.toString().getBytes(StandardCharsets.UTF_8)); } diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java index 6f2bb8f888b..6ec5a9dd5ab 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java @@ -8,6 +8,6 @@ public class TextMapInjectAdapter implements AgentPropagation.Setter 0 ? "-01" : "-00"); return sb.toString(); diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java index 2f16c40ed21..13758cefd1e 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java +++ b/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java @@ -60,9 +60,9 @@ public void configureTracer( addedArgLine .append("-D") .append(e.getKey()) - .append("=") + .append('=') .append(escapeForCommandLine(e.getValue())) - .append(" "); + .append(' '); } Integer ciVisibilityDebugPort = config.getCiVisibilityDebugPort(); @@ -70,12 +70,12 @@ public void configureTracer( addedArgLine .append("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=") .append(ciVisibilityDebugPort) - .append(" "); + .append(' '); } String additionalArgs = config.getCiVisibilityAdditionalChildProcessJvmArgs(); if (additionalArgs != null) { - addedArgLine.append(additionalArgs).append(" "); + addedArgLine.append(additionalArgs).append(' '); } File agentJar = config.getCiVisibilityAgentJarFile(); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 4ee4ced8f21..6ba59b6734a 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -181,7 +181,7 @@ private String buildResourceName( final StringBuilder prefix = new StringBuilder(opName.length() + exchangeName.length() + routingKey.length() + 5) .append(opName) - .append(" ") + .append(' ') .append(exchangeName); if (Config.get().isRabbitIncludeRoutingKeyInResource()) { prefix.append(" -> ").append(routingKey); diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index e8f2a0d3625..4ec7cb4d464 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -77,13 +77,13 @@ public static String getParameters(Object[] parameters) { // Example: {"arguments":{"0":"param1","1":"param2"}} final StringBuilder sb = new StringBuilder("{\"arguments\":{"); for (int i = 0; i < parameters.length; i++) { - sb.append("\"") + sb.append('\"') .append(i) .append("\":\"") .append(Strings.escapeToJson(String.valueOf(parameters[i]))) - .append("\""); + .append('\"'); if (i != parameters.length - 1) { - sb.append(","); + sb.append(','); } } sb.append("}}"); diff --git a/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java b/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java index 7f24d053219..9de4a6138b6 100644 --- a/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java +++ b/dd-java-agent/testing/src/test/java/locator/ClassInjectingTestInstrumentation.java @@ -56,7 +56,7 @@ public ToBeInstrumented(String message) { public String getMessage() { StringBuilder msg = new StringBuilder(message); for (Class iface : getClass().getInterfaces()) { - msg.append(":"); + msg.append(':'); msg.append(iface.getName()); } return msg.toString(); diff --git a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java index 119b433db39..469f86f0620 100644 --- a/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java +++ b/dd-smoke-tests/crashtracking/src/test/java/datadog/smoketest/CrashtrackingSmokeTest.java @@ -121,7 +121,7 @@ void testCrashTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -136,7 +136,7 @@ void testCrashTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -196,7 +196,7 @@ void testCrashTrackingLegacy() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -211,7 +211,7 @@ void testCrashTrackingLegacy() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -268,7 +268,7 @@ void testOomeTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -283,7 +283,7 @@ void testOomeTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -339,7 +339,7 @@ void testCombineTracking() throws Exception { .forEach( l -> { System.out.println(l); - stdoutStr.append(l).append("\n"); + stdoutStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); @@ -354,7 +354,7 @@ void testCombineTracking() throws Exception { .forEach( l -> { System.err.println(l); - stderrStr.append(l).append("\n"); + stderrStr.append(l).append('\n'); }); } catch (Exception e) { throw new RuntimeException(e); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java index b05d008aafa..3634dab847e 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java @@ -890,9 +890,9 @@ public String toString() { .append(parentId) .append(" ] trace=") .append(getServiceName()) - .append("/") + .append('/') .append(getOperationName()) - .append("/") + .append('/') .append(getResourceName()); if (errorFlag) { s.append(" *errored*"); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java index 25f414db3a1..4ae2fc4efee 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/W3CHttpCodec.java @@ -74,7 +74,7 @@ private void injectTraceParent( StringBuilder sb = new StringBuilder(TRACE_PARENT_LENGTH); sb.append("00-"); sb.append(context.getTraceId().toHexString()); - sb.append("-"); + sb.append('-'); sb.append(DDSpanId.toHexStringPadded(context.getSpanId())); sb.append(context.getSamplingPriority() > 0 ? "-01" : "-00"); setter.set(carrier, TRACE_PARENT_KEY, sb.toString()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java index df736770380..2b46a2181d4 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/util/GlobPattern.java @@ -32,7 +32,7 @@ private static String globToRegex(String globPattern) { case ']': case '{': case '}': - sb.append("\\").append(ch); + sb.append('\\').append(ch); break; default: sb.append(ch); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java index ea41bec4b23..37756757630 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/URIUtils.java @@ -294,7 +294,7 @@ public static URI safeConcat(final String schemeHostPort, final String theRest) PropagationUtils.onStringBuilderAppend(part1, sb.append(part1)); if (addSlash) { // it happens for http async client 4 with relative URI - sb.append("/"); + sb.append('/'); } PropagationUtils.onStringBuilderAppend(part2, sb.append(part2)); return safeParse(PropagationUtils.onStringBuilderToString(sb, sb.toString())); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java index fc4a252170a..1d19fccc298 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java @@ -79,7 +79,7 @@ public static void setTags(final AgentSpan span, final String[] origCommand) { sb.append(cur.replace("\\", "\\\\").replace("\"", "\\\"")); sb.append('"'); } - sb.append("]"); + sb.append(']'); span.setTag("cmd.exec", sb.toString()); } diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java index 666eee21d77..6715604260f 100644 --- a/internal-api/src/main/java/datadog/trace/util/Strings.java +++ b/internal-api/src/main/java/datadog/trace/util/Strings.java @@ -251,19 +251,19 @@ public static String toJson(final Map map, boolean valuesAreJson) { while (entriesIter.hasNext()) { final Entry entry = entriesIter.next(); - sb.append("\"").append(escapeToJson(entry.getKey())).append("\":"); + sb.append('\"').append(escapeToJson(entry.getKey())).append("\":"); if (valuesAreJson) { sb.append(entry.getValue()); } else { - sb.append("\"").append(escapeToJson(String.valueOf(entry.getValue()))).append("\""); + sb.append('\"').append(escapeToJson(String.valueOf(entry.getValue()))).append('\"'); } if (entriesIter.hasNext()) { - sb.append(","); + sb.append(','); } } - sb.append("}"); + sb.append('}'); return sb.toString(); } @@ -277,10 +277,10 @@ public static String toJson(final Iterable items) { String item = it.next(); json.append('"').append(escapeToJson(item)).append('"'); if (it.hasNext()) { - json.append(","); + json.append(','); } } - json.append("]"); + json.append(']'); return json.toString(); } diff --git a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java index a142873b4cf..3627cb47648 100644 --- a/internal-api/src/main/java/datadog/trace/util/TagsHelper.java +++ b/internal-api/src/main/java/datadog/trace/util/TagsHelper.java @@ -79,7 +79,7 @@ public static String concatTags(String... tags) { continue; } sb.append(tag); - sb.append(","); + sb.append(','); } return sb.substring(0, sb.length() - 1); // Remove last comma } diff --git a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java index 45ee5b1057a..180af3a8dca 100644 --- a/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java +++ b/internal-api/src/test/java/datadog/trace/util/TagsHelperTest.java @@ -41,7 +41,7 @@ public void invalidCharsConvertedToUnderscore() { public void tagTrimmedToMaxLength() { StringBuilder tag = new StringBuilder(401); for (int i = 0; i < 400; i++) { - tag.append("a"); + tag.append('a'); } assertEquals(200, TagsHelper.sanitize(tag.toString()).length()); assertEquals(200, TagsHelper.sanitize(tag.toString()).getBytes(StandardCharsets.UTF_8).length); From b0bc9ed50557b5974b37fefcdbad6b6e1589df1b Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Tue, 26 Nov 2024 12:51:24 +0000 Subject: [PATCH 058/106] Fix missing OtelSpanEvent helper when using Event API from inside @WithSpan annotated method (#8019) --- .../OpenTelemetryInstrumentation.java | 2 +- .../OpenTelemetryContextInstrumentation.java | 2 ++ .../OpenTelemetryContextStorageInstrumentation.java | 2 ++ dd-smoke-tests/opentelemetry/build.gradle | 1 + .../smoketest/opentelemetry/Application.java | 13 ++++++++++++- .../datadog/smoketest/OpenTelemetrySmokeTest.groovy | 10 ++++++++-- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java index 63883a317f5..5c28057fe09 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/OpenTelemetryInstrumentation.java @@ -73,12 +73,12 @@ public String[] helperClassNames() { "datadog.opentelemetry.shim.trace.OtelSpanBuilder", "datadog.opentelemetry.shim.trace.OtelSpanBuilder$1", "datadog.opentelemetry.shim.trace.OtelSpanContext", + "datadog.opentelemetry.shim.trace.OtelSpanEvent", "datadog.opentelemetry.shim.trace.OtelSpanEvent$AttributesJsonParser", "datadog.opentelemetry.shim.trace.OtelSpanLink", "datadog.opentelemetry.shim.trace.OtelTracer", "datadog.opentelemetry.shim.trace.OtelTracerBuilder", "datadog.opentelemetry.shim.trace.OtelTracerProvider", - "datadog.opentelemetry.shim.trace.OtelSpanEvent", }; } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java index 440cb4afc7f..1aa555993e7 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextInstrumentation.java @@ -67,6 +67,8 @@ public String[] helperClassNames() { "datadog.opentelemetry.shim.trace.OtelSpanBuilder", "datadog.opentelemetry.shim.trace.OtelSpanBuilder$1", "datadog.opentelemetry.shim.trace.OtelSpanContext", + "datadog.opentelemetry.shim.trace.OtelSpanEvent", + "datadog.opentelemetry.shim.trace.OtelSpanEvent$AttributesJsonParser", "datadog.opentelemetry.shim.trace.OtelSpanLink", "datadog.opentelemetry.shim.trace.OtelTracer", "datadog.opentelemetry.shim.trace.OtelTracerBuilder", diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java index cdf63545a8a..345563d73bb 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/main/java/datadog/trace/instrumentation/opentelemetry14/context/OpenTelemetryContextStorageInstrumentation.java @@ -68,6 +68,8 @@ public String[] helperClassNames() { "datadog.opentelemetry.shim.trace.OtelSpanBuilder", "datadog.opentelemetry.shim.trace.OtelSpanBuilder$1", "datadog.opentelemetry.shim.trace.OtelSpanContext", + "datadog.opentelemetry.shim.trace.OtelSpanEvent", + "datadog.opentelemetry.shim.trace.OtelSpanEvent$AttributesJsonParser", "datadog.opentelemetry.shim.trace.OtelSpanLink", "datadog.opentelemetry.shim.trace.OtelTracer", "datadog.opentelemetry.shim.trace.OtelTracerBuilder", diff --git a/dd-smoke-tests/opentelemetry/build.gradle b/dd-smoke-tests/opentelemetry/build.gradle index 5deaa453fbc..6be9c1ece03 100644 --- a/dd-smoke-tests/opentelemetry/build.gradle +++ b/dd-smoke-tests/opentelemetry/build.gradle @@ -11,6 +11,7 @@ application { dependencies { implementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: '1.4.0' + implementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.20.0' testImplementation project(':dd-smoke-tests') } diff --git a/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java b/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java index 6f6d55fb546..ba5b26ecf0e 100644 --- a/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java +++ b/dd-smoke-tests/opentelemetry/src/main/java/datadog/smoketest/opentelemetry/Application.java @@ -3,15 +3,26 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.instrumentation.annotations.WithSpan; /** * This application is a minimalistic application to create a trace with Open Telemetry Tracer API. */ public class Application { + + @WithSpan + static void annotatedSpan() { + Span.current().addEvent("annotated-span-event"); + } + public static void main(String[] args) throws InterruptedException { + // Start trace without touching GlobalOpenTelemetry + annotatedSpan(); + // Get an Open Telemetry tracer Tracer tracer = GlobalOpenTelemetry.getTracerProvider().tracerBuilder("smoketests").build(); - // Create a trace with few spans + + // Start some manual traces for (int i = 0; i < 10; i++) { Span span = tracer.spanBuilder("span-" + i).startSpan(); Thread.sleep(20); diff --git a/dd-smoke-tests/opentelemetry/src/test/groovy/datadog/smoketest/OpenTelemetrySmokeTest.groovy b/dd-smoke-tests/opentelemetry/src/test/groovy/datadog/smoketest/OpenTelemetrySmokeTest.groovy index 5cb5aaa2267..f9c85720b0b 100644 --- a/dd-smoke-tests/opentelemetry/src/test/groovy/datadog/smoketest/OpenTelemetrySmokeTest.groovy +++ b/dd-smoke-tests/opentelemetry/src/test/groovy/datadog/smoketest/OpenTelemetrySmokeTest.groovy @@ -1,13 +1,17 @@ package datadog.smoketest +import static java.util.concurrent.TimeUnit.SECONDS + class OpenTelemetrySmokeTest extends AbstractSmokeTest { + public static final int TIMEOUT_SECS = 30 + @Override ProcessBuilder createProcessBuilder() { def jarPath = System.getProperty("datadog.smoketest.shadowJar.path") def command = new ArrayList() command.add(javaPath()) command.addAll(defaultJavaProperties) - command.add("-Ddd.integration.opentelemetry.experimental.enabled=true") + command.add("-Ddd.trace.otel.enabled=true") command.addAll(["-jar", jarPath]) ProcessBuilder processBuilder = new ProcessBuilder(command) @@ -16,6 +20,8 @@ class OpenTelemetrySmokeTest extends AbstractSmokeTest { def 'receive trace'() { expect: - waitForTraceCount(1) + waitForTraceCount(11) // 1 annotated, 10 manual + assert testedProcess.waitFor(TIMEOUT_SECS, SECONDS) + assert testedProcess.exitValue() == 0 } } From 9113da7e19a97fa7cf18ea57c0604ce4377a7f57 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 26 Nov 2024 14:53:12 +0100 Subject: [PATCH 059/106] fix: Fix test name uniqueness (#8018) --- ...lakeDetectionSettingsSerializerTest.groovy | 2 +- .../groovy/PayloadTaggingTest.groovy | 6 +-- .../commonscodec/Base64CallSiteTest.groovy | 4 +- .../Json1ParserInstrumentationTest.groovy | 4 +- ...tpServletRequestInstrumentationTest.groovy | 38 +++++++++---------- .../test/groovy/AgentTestRunnerTest.groovy | 2 +- .../ExcludeFilterForkedTest.groovy | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy index 99b0f339869..85dd38257f5 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy @@ -6,7 +6,7 @@ import spock.lang.Specification class EarlyFlakeDetectionSettingsSerializerTest extends Specification { - def "test serialization: #settings"() { + def "test serialization: #iterationIndex"() { when: Serializer s = new Serializer() EarlyFlakeDetectionSettingsSerializer.serialize(s, settings) diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy index e8b810239ba..146d0085709 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy @@ -184,7 +184,7 @@ class PayloadTaggingExpansionForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, "\$.MessageId,\$.SubscriptionArn,\$[*].phoneNumbers") } - def "support various types, embedded JSON in string and binary format"() { + def "support various types, embedded JSON in string and binary format #expectedReqTag"() { setup: TEST_WRITER.clear() @@ -261,7 +261,7 @@ class PayloadTaggingMaxDepthForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH, "4") } - def "generate tags up to the specified max depth"() { + def "generate tags up to the specified max depth #expectedReqTag"() { setup: TEST_WRITER.clear() @@ -315,7 +315,7 @@ class PayloadTaggingMaxTagsForkedTest extends AbstractPayloadTaggingTest { injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS, "5") } - def "generate tags up to the specified max number"() { + def "generate tags up to the specified max number #iterationIndex"() { setup: TEST_WRITER.clear() diff --git a/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy b/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy index c736a1e0b5a..a710e1bd439 100644 --- a/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy +++ b/dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy @@ -15,7 +15,7 @@ class Base64CallSiteTest extends AgentTestRunner { injectSysConfig('dd.iast.enabled', 'true') } - void 'test encode base 64'() { + void 'test encode base 64 #iterationIndex'() { given: final module = Mock(CodecModule) InstrumentationBridge.registerIastModule(module) @@ -33,7 +33,7 @@ class Base64CallSiteTest extends AgentTestRunner { 'encode' | ['Hello'.bytes, new Base64()] } - void 'test decode base 64'() { + void 'test decode base 64 #iterationIndex'() { given: final module = Mock(CodecModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy index 21d39274890..847a5dbc044 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy @@ -17,7 +17,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner { injectSysConfig("dd.iast.enabled", "true") } - void 'test json parsing (tainted)'() { + void 'test json parsing #iterationIndex (tainted)'() { given: final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) @@ -45,7 +45,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner { target << testSuite() } - void 'test json parsing (not tainted)'() { + void 'test json parsing #iterationIndex (not tainted)'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy index a70e7a9a110..a314b59ddf3 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy @@ -38,7 +38,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { InstrumentationBridge.clearIastModules() } - void 'test getHeader'() { + void 'test getHeader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -58,7 +58,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaders'() { + void 'test getHeaders #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -79,7 +79,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaderNames'() { + void 'test getHeaderNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -100,7 +100,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameter'() { + void 'test getParameter #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -120,7 +120,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterValues'() { + void 'test getParameterValues #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -141,7 +141,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterMap'() { + void 'test getParameterMap #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -168,7 +168,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { } - void 'test getParameterNames'() { + void 'test getParameterNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -189,7 +189,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getCookies'() { + void 'test getCookies #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -210,7 +210,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test that get headers does not fail when servlet related code fails'() { + void 'test that get headers does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -238,7 +238,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test that get header names does not fail when servlet related code fails'() { + void 'test that get header names does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -266,7 +266,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test get query string'() { + void 'test get query string #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -287,7 +287,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getInputStream'() { + void 'test getInputStream #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -308,7 +308,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getReader'() { + void 'test getReader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -329,7 +329,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestDispatcher'() { + void 'test getRequestDispatcher #iterationIndex'() { setup: final iastModule = Mock(UnvalidatedRedirectModule) InstrumentationBridge.registerIastModule(iastModule) @@ -351,7 +351,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestURI'() { + void 'test getRequestURI #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -372,7 +372,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathInfo'() { + void 'test getPathInfo #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -393,7 +393,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathTranslated'() { + void 'test getPathTranslated #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -414,7 +414,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getRequestURL'() { + void 'test getRequestURL #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -435,7 +435,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getSession'() { + void 'test getSession #iterationIndex'() { setup: final iastModule = Mock(ApplicationModule) InstrumentationBridge.registerIastModule(iastModule) diff --git a/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy b/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy index 611d0127176..72bda341905 100644 --- a/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy +++ b/dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy @@ -132,7 +132,7 @@ class AgentTestRunnerTest extends AgentTestRunner { noExceptionThrown() } - def "excluded classes are not instrumented"() { + def "excluded classes are not instrumented #iterationIndex"() { when: runUnderTrace("parent") { subject.run() diff --git a/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy b/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy index b8ec37f065e..13b78fea5d6 100644 --- a/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy +++ b/dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy @@ -18,7 +18,7 @@ import static excludefilter.ExcludeFilterTestInstrumentation.RunnableExcludedExe class ExcludeFilterForkedTest extends AgentTestRunner { - def "test ExcludeFilter"() { + def "test ExcludeFilter #runnable.class.name"() { expect: ExcludeFilter.exclude(RUNNABLE, runnable) == excluded From ac4977af1796513512f475e456a6d088db899a36 Mon Sep 17 00:00:00 2001 From: Justin Lee Date: Tue, 26 Nov 2024 12:18:22 -0500 Subject: [PATCH 060/106] Update the CodeOriginProbe fingerprint to not rely on a stack walk (#8016) --- .../bootstrap/debugger/DebuggerContext.java | 21 ++++- .../debugger/spanorigin/CodeOriginInfo.java | 12 +-- .../codeorigin/DefaultCodeOriginRecorder.java | 82 +++++++++++-------- .../debugger/probe/CodeOriginProbe.java | 24 +++--- .../com/datadog/debugger/probe/Where.java | 17 +++- .../debugger/origin/CodeOriginTest.java | 41 ++++++++-- 6 files changed, 132 insertions(+), 65 deletions(-) diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java index d8a8a2212e7..42012b25001 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java @@ -3,6 +3,7 @@ import datadog.trace.api.Config; import datadog.trace.bootstrap.debugger.util.TimeoutChecker; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import java.lang.reflect.Method; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -72,7 +73,9 @@ public interface ExceptionDebugger { } public interface CodeOriginRecorder { - String captureCodeOrigin(String signature); + String captureCodeOrigin(boolean entry); + + String captureCodeOrigin(Method method, boolean entry); } private static volatile ProbeResolver probeResolver; @@ -351,11 +354,23 @@ public static void commit( } } - public static String captureCodeOrigin(String signature) { + public static String captureCodeOrigin(boolean entry) { + try { + CodeOriginRecorder recorder = codeOriginRecorder; + if (recorder != null) { + return recorder.captureCodeOrigin(entry); + } + } catch (Exception ex) { + LOGGER.debug("Error in captureCodeOrigin: ", ex); + } + return null; + } + + public static String captureCodeOrigin(Method method, boolean entry) { try { CodeOriginRecorder recorder = codeOriginRecorder; if (recorder != null) { - return recorder.captureCodeOrigin(signature); + return recorder.captureCodeOrigin(method, entry); } } catch (Exception ex) { LOGGER.debug("Error in captureCodeOrigin: ", ex); diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/CodeOriginInfo.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/CodeOriginInfo.java index 5c37361492a..204e37bed9d 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/CodeOriginInfo.java +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/CodeOriginInfo.java @@ -1,29 +1,23 @@ package datadog.trace.bootstrap.debugger.spanorigin; import static datadog.trace.bootstrap.debugger.DebuggerContext.captureCodeOrigin; -import static java.util.Arrays.stream; import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; -import java.util.stream.Collectors; public class CodeOriginInfo { public static void entry(Method method) { if (InstrumenterConfig.get().isCodeOriginEnabled()) { - String signature = - stream(method.getParameterTypes()) - .map(Class::getTypeName) - .collect(Collectors.joining(", ", "(", ")")); - captureCodeOrigin(signature); + captureCodeOrigin(method, true); } } public static void exit(AgentSpan span) { if (InstrumenterConfig.get().isCodeOriginEnabled()) { - String probeId = captureCodeOrigin(null); + String probeId = captureCodeOrigin(false); if (span != null) { - span.getLocalRootSpan().setTag(probeId, span); + span.getLocalRootSpan().setTag(probeId, span.getSpanId()); } } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java index 2fe3be6f8d3..73f6b0b5cc5 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java @@ -15,6 +15,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.util.AgentTaskScheduler; import datadog.trace.util.stacktrace.StackWalkerFactory; +import java.lang.reflect.Method; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -27,63 +28,75 @@ public class DefaultCodeOriginRecorder implements CodeOriginRecorder { private static final Logger LOG = LoggerFactory.getLogger(DefaultCodeOriginRecorder.class); - private final Config config; - private final ConfigurationUpdater configurationUpdater; private final Map fingerprints = new HashMap<>(); private final Map probes = new ConcurrentHashMap<>(); - private final AgentTaskScheduler taskScheduler = AgentTaskScheduler.INSTANCE; + private final int maxUserFrames; public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurationUpdater) { - this.config = config; this.configurationUpdater = configurationUpdater; + maxUserFrames = config.getDebuggerCodeOriginMaxUserFrames(); } @Override - public String captureCodeOrigin(String signature) { + public String captureCodeOrigin(boolean entry) { StackTraceElement element = findPlaceInStack(); String fingerprint = Fingerprinter.fingerprint(element); - if (fingerprint == null) { - LOG.debug("Unable to fingerprint stack trace"); - return null; - } CodeOriginProbe probe; - AgentSpan span = AgentTracer.activeSpan(); - if (!isAlreadyInstrumented(fingerprint)) { - Where where = - Where.of( - element.getClassName(), - element.getMethodName(), - signature, - String.valueOf(element.getLineNumber())); - + if (isAlreadyInstrumented(fingerprint)) { + probe = fingerprints.get(fingerprint); + } else { probe = - new CodeOriginProbe( - new ProbeId(UUID.randomUUID().toString(), 0), - where.getSignature(), - where, - config.getDebuggerCodeOriginMaxUserFrames()); - addFingerprint(fingerprint, probe); - - installProbe(probe); - if (span != null) { - // committing here manually so that first run probe encounters decorate the span until the - // instrumentation gets installed - probe.commit( - CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList()); - } + createProbe( + fingerprint, + entry, + Where.of( + element.getClassName(), + element.getMethodName(), + null, + String.valueOf(element.getLineNumber()))); + } + + return probe.getId(); + } + @Override + public String captureCodeOrigin(Method method, boolean entry) { + CodeOriginProbe probe; + + String fingerPrint = method.toString(); + if (isAlreadyInstrumented(fingerPrint)) { + probe = fingerprints.get(fingerPrint); } else { - probe = fingerprints.get(fingerprint); + probe = createProbe(fingerPrint, entry, Where.of(method)); } return probe.getId(); } + private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where where) { + CodeOriginProbe probe; + AgentSpan span = AgentTracer.activeSpan(); + + probe = + new CodeOriginProbe( + new ProbeId(UUID.randomUUID().toString(), 0), entry, where, maxUserFrames); + addFingerprint(fingerPrint, probe); + + installProbe(probe); + // committing here manually so that first run probe encounters decorate the span until the + // instrumentation gets installed + if (span != null) { + probe.commit( + CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList()); + } + return probe; + } + private StackTraceElement findPlaceInStack() { return StackWalkerFactory.INSTANCE.walk( stream -> @@ -104,7 +117,8 @@ void addFingerprint(String fingerprint, CodeOriginProbe probe) { public String installProbe(CodeOriginProbe probe) { CodeOriginProbe installed = probes.putIfAbsent(probe.getId(), probe); if (installed == null) { - taskScheduler.execute(() -> configurationUpdater.accept(CODE_ORIGIN, getProbes())); + AgentTaskScheduler.INSTANCE.execute( + () -> configurationUpdater.accept(CODE_ORIGIN, getProbes())); return probe.getId(); } return installed.getId(); diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java index 4a95adefe96..a520720aa55 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java @@ -9,6 +9,7 @@ import com.datadog.debugger.agent.DebuggerAgent; import com.datadog.debugger.instrumentation.InstrumentationResult; +import com.datadog.debugger.sink.DebuggerSink; import com.datadog.debugger.sink.Snapshot; import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.DebuggerContext; @@ -28,14 +29,11 @@ public class CodeOriginProbe extends LogProbe implements ForceMethodInstrumentat public final int maxFrames; - private final String signature; - private final boolean entrySpanProbe; - public CodeOriginProbe(ProbeId probeId, String signature, Where where, int maxFrames) { + public CodeOriginProbe(ProbeId probeId, boolean entry, Where where, int maxFrames) { super(LANGUAGE, probeId, null, where, MethodLocation.EXIT, null, null, true, null, null, null); - this.signature = signature; - this.entrySpanProbe = signature != null; + this.entrySpanProbe = entry; this.maxFrames = maxFrames; } @@ -68,16 +66,19 @@ public void commit( return; } String snapshotId = null; - if (isDebuggerEnabled(span)) { + DebuggerSink sink = DebuggerAgent.getSink(); + if (isDebuggerEnabled(span) && sink != null) { Snapshot snapshot = createSnapshot(); if (fillSnapshot(entryContext, exitContext, caughtExceptions, snapshot)) { snapshotId = snapshot.getId(); LOGGER.debug("committing code origin probe id={}, snapshot id={}", id, snapshotId); - commitSnapshot(snapshot, DebuggerAgent.getSink()); + commitSnapshot(snapshot, sink); } } applySpanOriginTags(span, snapshotId); - DebuggerAgent.getSink().getProbeStatusSink().addEmitting(probeId); + if (sink != null) { + sink.getProbeStatusSink().addEmitting(probeId); + } span.getLocalRootSpan().setTag(getId(), (String) null); // clear possible span reference } @@ -95,8 +96,8 @@ private void applySpanOriginTags(AgentSpan span, String snapshotId) { s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "method"), info.getMethodName()); s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "line"), info.getLineNumber()); s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "type"), info.getClassName()); - if (i == 0 && signature != null) { - s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "signature"), signature); + if (i == 0 && entrySpanProbe) { + s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "signature"), where.getSignature()); } if (i == 0 && snapshotId != null) { s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "snapshot_id"), snapshotId); @@ -111,6 +112,9 @@ public boolean entrySpanProbe() { /** look "back" to find exit spans that may have already come and gone */ private AgentSpan findSpan(AgentSpan candidate) { + if (candidate == null) { + return null; + } AgentSpan span = candidate; AgentSpan localRootSpan = candidate.getLocalRootSpan(); if (localRootSpan.getTag(getId()) != null) { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java index fc7f728d6f1..e295faa83e3 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java @@ -1,5 +1,7 @@ package com.datadog.debugger.probe; +import static java.util.Arrays.stream; + import com.datadog.debugger.agent.Generated; import com.datadog.debugger.instrumentation.Types; import com.datadog.debugger.util.ClassFileLines; @@ -7,12 +9,14 @@ import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonWriter; import java.io.IOException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.MethodNode; @@ -46,8 +50,17 @@ public static Where of(String typeName, String methodName, String signature, Str return new Where(typeName, methodName, signature, lines, null); } + public static Where of(Method method) { + return of( + method.getDeclaringClass().getName(), + method.getName(), + stream(method.getParameterTypes()) + .map(Class::getTypeName) + .collect(Collectors.joining(", ", "(", ")"))); + } + protected static SourceLine[] sourceLines(String[] defs) { - if (defs == null) { + if (defs == null || defs.length == 0) { return null; } SourceLine[] lines = new SourceLine[defs.length]; @@ -72,7 +85,7 @@ public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFil null); } } - throw new IllegalArgumentException("Invalid where to convert from line to method " + lineWhere); + return lineWhere; } public String getTypeName() { diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java index 3f38c4f80a3..bcd555cb480 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java @@ -119,7 +119,7 @@ public void stackDepth() throws IOException, URISyntaxException { final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04"; installProbes( new CodeOriginProbe( - CODE_ORIGIN_ID1, null, Where.of(CLASS_NAME, "exit", "()", "39"), MAX_FRAMES)); + CODE_ORIGIN_ID1, true, Where.of(CLASS_NAME, "exit", "()", "39"), MAX_FRAMES)); Class testClass = compileAndLoadClass("com.datadog.debugger.CodeOrigin04"); countFrames(testClass, 10); @@ -139,27 +139,54 @@ private void countFrames(Class testClass, int loops) { } @Test - public void testCaptureCodeOriginWithSignature() { + public void testCaptureCodeOriginEntry() { installProbes(); - CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin("()")); + CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(true)); assertNotNull(probe); assertTrue(probe.entrySpanProbe()); } @Test - public void testCaptureCodeOriginWithNullSignature() { + public void testCaptureCodeOriginExit() { installProbes(); - CodeOriginProbe probe = codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(null)); + CodeOriginProbe probe = + codeOriginRecorder.getProbe(codeOriginRecorder.captureCodeOrigin(false)); assertNotNull(probe); assertFalse(probe.entrySpanProbe()); } + @Test + public void testCaptureCodeOriginWithExplicitInfo() + throws IOException, URISyntaxException, NoSuchMethodException { + final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04"; + final Class testClass = compileAndLoadClass(CLASS_NAME); + installProbes(); + CodeOriginProbe probe = + codeOriginRecorder.getProbe( + codeOriginRecorder.captureCodeOrigin(testClass.getMethod("main", int.class), true)); + assertNotNull(probe, "The probe should have been created."); + assertTrue(probe.entrySpanProbe(), "Should be an entry probe."); + } + + @Test + public void testDuplicateInstrumentations() + throws IOException, URISyntaxException, NoSuchMethodException { + final String CLASS_NAME = "com.datadog.debugger.CodeOrigin04"; + final Class testClass = compileAndLoadClass(CLASS_NAME); + installProbes(); + String probe1 = + codeOriginRecorder.captureCodeOrigin(testClass.getMethod("main", int.class), true); + String probe2 = + codeOriginRecorder.captureCodeOrigin(testClass.getMethod("main", int.class), true); + assertEquals(probe1, probe2); + } + @NotNull private List codeOriginProbes(String type) { CodeOriginProbe entry = - new CodeOriginProbe(CODE_ORIGIN_ID1, "()", Where.of(type, "entry", "()", "53"), MAX_FRAMES); + new CodeOriginProbe(CODE_ORIGIN_ID1, true, Where.of(type, "entry", "()", "53"), MAX_FRAMES); CodeOriginProbe exit = - new CodeOriginProbe(CODE_ORIGIN_ID2, null, Where.of(type, "exit", "()", "60"), MAX_FRAMES); + new CodeOriginProbe(CODE_ORIGIN_ID2, false, Where.of(type, "exit", "()", "60"), MAX_FRAMES); return new ArrayList<>(asList(entry, exit)); } From c21d4a5a992b756590a91e99ac914b5e9c5f993f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Tue, 26 Nov 2024 20:51:50 +0100 Subject: [PATCH 061/106] Refactor probe matching for methods (#8021) To be able to match probe with more flexibility (probes targeting a method with or without signature) we are iterating over all methods of a class and using Where::isMethodMatching to select probe definitions that will be apply on the current method. With this new approach we are dropping the support of overloaded methods: only one method is instrumented or a definition is applied only once. --- .../debugger/agent/DebuggerTransformer.java | 143 ++++++++++-------- .../debugger/agent/CapturedSnapshotTest.java | 22 ++- 2 files changed, 94 insertions(+), 71 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java index 8df548c6bb5..50d0f6c1b12 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java @@ -240,22 +240,6 @@ public byte[] transform( return null; } - private Map> mergeLocations( - List definitions, ClassFileLines classFileLines) { - Map> mergedProbes = new HashMap<>(); - for (ProbeDefinition definition : definitions) { - Where where = definition.getWhere(); - if (definition instanceof ForceMethodInstrumentation) { - // normalize where for line => to precise method location - where = Where.convertLineToMethod(definition.getWhere(), classFileLines); - } - List instrumentationDefinitions = - mergedProbes.computeIfAbsent(where, key -> new ArrayList<>()); - instrumentationDefinitions.add(definition); - } - return mergedProbes; - } - private boolean skipInstrumentation(ClassLoader loader, String classFilePath) { if (definitionMatcher.isEmpty()) { log.warn("No debugger definitions present."); @@ -496,41 +480,35 @@ private boolean performInstrumentation( ClassNode classNode) { boolean transformed = false; ClassFileLines classFileLines = new ClassFileLines(classNode); - Map> definitionByLocation = - mergeLocations(definitions, classFileLines); - // FIXME build a map also for methods to optimize the matching, currently O(probes*methods) - for (Map.Entry> entry : definitionByLocation.entrySet()) { - Where where = entry.getKey(); - String methodName = where.getMethodName(); - String[] lines = where.getLines(); - List methodNodes; - if (methodName == null && lines != null) { - MethodNode methodNode = matchSourceFile(classNode, where, classFileLines); - methodNodes = methodNode != null ? singletonList(methodNode) : Collections.emptyList(); - } else { - methodNodes = matchMethodDescription(classNode, where, classFileLines); + Set remainingDefinitions = new HashSet<>(definitions); + for (MethodNode methodNode : classNode.methods) { + List matchingDefs = new ArrayList<>(); + for (ProbeDefinition definition : definitions) { + if (definition.getWhere().isMethodMatching(methodNode, classFileLines) + && remainingDefinitions.contains(definition)) { + matchingDefs.add(definition); + remainingDefinitions.remove(definition); + } } - List definitionsByWhere = entry.getValue(); - if (methodNodes.isEmpty()) { - reportLocationNotFound(definitionsByWhere, classNode.name, methodName); + if (matchingDefs.isEmpty()) { continue; } - for (MethodNode methodNode : methodNodes) { - if (log.isDebugEnabled()) { - List probeIds = - definitionsByWhere.stream().map(ProbeDefinition::getId).collect(toList()); - log.debug( - "Instrumenting method: {}.{}{} for probe ids: {}", - fullyQualifiedClassName, - methodNode.name, - methodNode.desc, - probeIds); - } - MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines); - InstrumentationResult result = applyInstrumentation(methodInfo, definitionsByWhere); - transformed |= result.isInstalled(); - handleInstrumentationResult(definitionsByWhere, result); + if (log.isDebugEnabled()) { + List probeIds = matchingDefs.stream().map(ProbeDefinition::getId).collect(toList()); + log.debug( + "Instrumenting method: {}.{}{} for probe ids: {}", + fullyQualifiedClassName, + methodNode.name, + methodNode.desc, + probeIds); } + MethodInfo methodInfo = new MethodInfo(loader, classNode, methodNode, classFileLines); + InstrumentationResult result = applyInstrumentation(methodInfo, matchingDefs); + transformed |= result.isInstalled(); + handleInstrumentationResult(matchingDefs, result); + } + for (ProbeDefinition definition : remainingDefinitions) { + reportLocationNotFound(definition, classNode.name, definition.getWhere().getMethodName()); } return transformed; } @@ -556,9 +534,9 @@ private void handleInstrumentationResult( } private void reportLocationNotFound( - List definitions, String className, String methodName) { + ProbeDefinition definition, String className, String methodName) { if (methodName != null) { - reportErrorForAllProbes(definitions, CANNOT_FIND_METHOD, className, methodName); + reportErrorForAllProbes(singletonList(definition), CANNOT_FIND_METHOD, className, methodName); return; } // This is a line probe, so we don't report line not found because the line may be found later @@ -628,39 +606,44 @@ static class ToInstrumentInfo { } } + private static boolean isCapturedContextProbe(ProbeDefinition definition) { + return definition instanceof LogProbe + || definition instanceof SpanDecorationProbe + || definition instanceof TriggerProbe; + } + private List filterAndSortDefinitions( List definitions, ClassFileLines classFileLines) { List toInstrument = new ArrayList<>(); List capturedContextProbes = new ArrayList<>(); + Map> capturedContextLineProbes = new HashMap<>(); boolean addedExceptionProbe = false; for (ProbeDefinition definition : definitions) { // Log and span decoration probe shared the same instrumentor: CaptureContextInstrumentor // and therefore need to be instrumented once // note: exception probes are log probes and are handled the same way - if (definition instanceof LogProbe - || definition instanceof SpanDecorationProbe - || definition instanceof TriggerProbe) { - if (definition instanceof ExceptionProbe) { - if (addedExceptionProbe) { - continue; + if (isCapturedContextProbe(definition)) { + if (definition.isLineProbe()) { + capturedContextLineProbes + .computeIfAbsent(definition.getWhere(), key -> new ArrayList<>()) + .add(definition); + } else { + if (definition instanceof ExceptionProbe) { + if (addedExceptionProbe) { + continue; + } + // only add one exception probe to the list of probes to instrument + // to have only one instance (1 probeId) of exception probe to handle all exceptions + addedExceptionProbe = true; } - // only add one exception probe to the list of probes to instrument - // to have only one instance (1 probeId) of exception probe to handle all exceptions - addedExceptionProbe = true; + capturedContextProbes.add(definition); } - capturedContextProbes.add(definition); } else { toInstrument.add(new ToInstrumentInfo(definition, singletonList(definition.getProbeId()))); } } - if (!capturedContextProbes.isEmpty()) { - List probesIds = - capturedContextProbes.stream().map(ProbeDefinition::getProbeId).collect(toList()); - ProbeDefinition referenceDefinition = - selectReferenceDefinition(capturedContextProbes, classFileLines); - toInstrument.add(new ToInstrumentInfo(referenceDefinition, probesIds)); - } - // LOGGER.debug("exception probe is already instrumented for {}", preciseWhere); + processCapturedContextLineProbes(capturedContextLineProbes, toInstrument); + processCapturedContextMethodProbes(classFileLines, capturedContextProbes, toInstrument); // ordering: metric < log < span decoration < span toInstrument.sort( (info1, info2) -> { @@ -671,6 +654,32 @@ private List filterAndSortDefinitions( return toInstrument; } + private void processCapturedContextMethodProbes( + ClassFileLines classFileLines, + List capturedContextProbes, + List toInstrument) { + if (capturedContextProbes.isEmpty()) { + return; + } + List probesIds = + capturedContextProbes.stream().map(ProbeDefinition::getProbeId).collect(toList()); + ProbeDefinition referenceDefinition = + selectReferenceDefinition(capturedContextProbes, classFileLines); + toInstrument.add(new ToInstrumentInfo(referenceDefinition, probesIds)); + } + + private static void processCapturedContextLineProbes( + Map> lineProbes, List toInstrument) { + for (Map.Entry> entry : lineProbes.entrySet()) { + if (entry.getValue().isEmpty()) { + continue; + } + List probeIds = + entry.getValue().stream().map(ProbeDefinition::getProbeId).collect(toList()); + toInstrument.add(new ToInstrumentInfo(entry.getValue().get(0), probeIds)); + } + } + // Log & Span Decoration probes share the same instrumentor so only one definition should be // used to generate the instrumentation. This method generate a synthetic definition that // match the type of the probe to instrument: if at least one probe is LogProbe then we are diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java index e79c77ffc4e..e8dc10ab2b7 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java @@ -1360,6 +1360,22 @@ public void mergedProbesConditionMixedLocation() throws IOException, URISyntaxEx assertNull(listener.snapshots.get(1).getEvaluationErrors()); } + @Test + public void mergedProbesDifferentSignature() throws IOException, URISyntaxException { + final String CLASS_NAME = "CapturedSnapshot08"; + LogProbe probe1 = createProbeAtExit(PROBE_ID1, CLASS_NAME, "doit", null); + LogProbe probe2 = createProbeAtExit(PROBE_ID2, CLASS_NAME, "doit", "int (java.lang.String)"); + LogProbe probe3 = createProbeAtExit(PROBE_ID3, CLASS_NAME, "doit", "(String)"); + TestSnapshotListener listener = installProbes(probe1, probe2, probe3); + Class testClass = compileAndLoadClass(CLASS_NAME); + int result = Reflect.onClass(testClass).call("main", "1").get(); + Assertions.assertEquals(3, result); + Assertions.assertEquals(3, listener.snapshots.size()); + assertNull(listener.snapshots.get(0).getEvaluationErrors()); + assertNull(listener.snapshots.get(1).getEvaluationErrors()); + assertNull(listener.snapshots.get(2).getEvaluationErrors()); + } + @Test public void fields() throws IOException, URISyntaxException { final String CLASS_NAME = "CapturedSnapshot06"; @@ -1579,11 +1595,9 @@ public void overloadedMethods() throws Exception { Class testClass = compileAndLoadClass(CLASS_NAME); int result = Reflect.onClass(testClass).call("main", "").get(); assertEquals(63, result); - List snapshots = assertSnapshots(listener, 4, PROBE_ID, PROBE_ID, PROBE_ID, PROBE_ID); + List snapshots = assertSnapshots(listener, 1, PROBE_ID); assertCaptureReturnValue(snapshots.get(0).getCaptures().getReturn(), "int", "42"); - assertCaptureArgs(snapshots.get(1).getCaptures().getEntry(), "s", "java.lang.String", "1"); - assertCaptureArgs(snapshots.get(2).getCaptures().getEntry(), "s", "java.lang.String", "2"); - assertCaptureArgs(snapshots.get(3).getCaptures().getEntry(), "s", "java.lang.String", "3"); + assertEquals(1, snapshots.get(0).getCaptures().getEntry().getArguments().size()); } @Test From 983bf0f97c8c637a276731ea37b9fb245ab074ea Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:26:06 +0100 Subject: [PATCH 062/106] Add a smoke test for Gradle Launcher instrumentation (#8014) --- .../utils/ShellCommandExecutor.java | 13 ++ dd-smoke-tests/gradle/build.gradle | 7 + .../smoketest/AbstractGradleTest.groovy | 144 +++++++++++++++ .../smoketest/GradleDaemonSmokeTest.groovy | 114 +----------- .../smoketest/GradleLauncherSmokeTest.groovy | 76 ++++++++ .../test-gradle-wrapper/build.gradleTest | 1 + .../test-gradle-wrapper/gradle.properties | 1 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../resources/test-gradle-wrapper/gradlew | 172 ++++++++++++++++++ 10 files changed, 421 insertions(+), 112 deletions(-) create mode 100644 dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy create mode 100644 dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy create mode 100644 dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/build.gradleTest create mode 100644 dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle.properties create mode 100644 dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar create mode 100644 dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties create mode 100755 dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradlew diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java index 345bbb3939b..0cb2855da8e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/ShellCommandExecutor.java @@ -11,6 +11,8 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import java.util.Collections; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.slf4j.Logger; @@ -24,10 +26,17 @@ public class ShellCommandExecutor { private final File executionFolder; private final long timeoutMillis; + private final Map environment; public ShellCommandExecutor(File executionFolder, long timeoutMillis) { + this(executionFolder, timeoutMillis, Collections.emptyMap()); + } + + public ShellCommandExecutor( + File executionFolder, long timeoutMillis, Map environment) { this.executionFolder = executionFolder; this.timeoutMillis = timeoutMillis; + this.environment = environment; } /** @@ -92,6 +101,10 @@ private T executeCommand( ProcessBuilder processBuilder = new ProcessBuilder(command); processBuilder.directory(executionFolder); + if (!environment.isEmpty()) { + processBuilder.environment().putAll(environment); + } + p = processBuilder.start(); StreamConsumer inputStreamConsumer = new StreamConsumer(p.getInputStream()); diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 8063eccd959..99d07403378 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -1,3 +1,6 @@ +import java.time.Duration +import java.time.temporal.ChronoUnit + plugins { id "com.github.johnrengelman.shadow" } @@ -14,5 +17,9 @@ test { testLogging { events "passed", "skipped", "failed", "standardOut", "standardError" } + + // overriding the default timeout of 9 minutes set in configure_tests.gradle, + // as Gradle smoke tests might run for a longer duration + timeout = Duration.of(15, ChronoUnit.MINUTES) } diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy new file mode 100644 index 00000000000..c9de4587931 --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy @@ -0,0 +1,144 @@ +package datadog.smoketest + +import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.ObjectMapper +import datadog.trace.api.Platform +import datadog.trace.civisibility.CiVisibilitySmokeTest +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import org.gradle.internal.impldep.org.apache.commons.io.FileUtils +import org.gradle.util.GradleVersion +import org.junit.jupiter.api.Assumptions +import spock.lang.AutoCleanup +import spock.lang.Shared +import spock.lang.TempDir +import spock.util.environment.Jvm + +import java.nio.charset.StandardCharsets +import java.nio.file.FileVisitResult +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import java.nio.file.SimpleFileVisitor +import java.nio.file.attribute.BasicFileAttributes +import java.util.regex.Matcher +import java.util.regex.Pattern + +class AbstractGradleTest extends CiVisibilitySmokeTest { + + static final String LATEST_GRADLE_VERSION = getLatestGradleVersion() + + // test resources use this instead of ".gradle" to avoid unwanted evaluation + private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest" + private static final String GRADLE_REGULAR_EXTENSION = ".gradle" + + @TempDir + protected Path projectFolder + + @Shared + @AutoCleanup + protected MockBackend mockBackend = new MockBackend() + + def setup() { + mockBackend.reset() + } + + private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile('\\$\\{(.+?)\\}') + + protected void givenGradleProjectFiles(String projectFilesSources, Map> replacementsByFileName = [:]) { + def projectResourcesUri = this.getClass().getClassLoader().getResource(projectFilesSources).toURI() + def projectResourcesPath = Paths.get(projectResourcesUri) + FileUtils.copyDirectory(projectResourcesPath.toFile(), projectFolder.toFile()) + + Files.walkFileTree(projectFolder, new SimpleFileVisitor() { + @Override + FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + def replacements = replacementsByFileName.get(file.getFileName().toString()) + if (replacements != null) { + def fileContents = new String(Files.readAllBytes(file), StandardCharsets.UTF_8) + Matcher matcher = PLACEHOLDER_PATTERN.matcher(fileContents) + + StringBuffer result = new StringBuffer() + while (matcher.find()) { + String propertyName = matcher.group(1) + String replacement = replacements.getOrDefault(propertyName, matcher.group(0)) + matcher.appendReplacement(result, Matcher.quoteReplacement(replacement)) + } + matcher.appendTail(result) + + Files.write(file, result.toString().getBytes(StandardCharsets.UTF_8)) + } + + if (file.toString().endsWith(GRADLE_TEST_RESOURCE_EXTENSION)) { + def fileWithFixedExtension = Paths.get(file.toString().replace(GRADLE_TEST_RESOURCE_EXTENSION, GRADLE_REGULAR_EXTENSION)) + Files.move(file, fileWithFixedExtension) + } + + return FileVisitResult.CONTINUE + } + }) + + // creating empty .git directory so that the tracer could detect projectFolder as repo root + Files.createDirectory(projectFolder.resolve(".git")) + } + + protected void givenGradleVersionIsCompatibleWithCurrentJvm(String gradleVersion) { + Assumptions.assumeTrue(isSupported(gradleVersion), + "Current JVM " + Jvm.current.javaVersion + " does not support Gradle version " + gradleVersion) + } + + private static boolean isSupported(String gradleVersion) { + // https://docs.gradle.org/current/userguide/compatibility.html + if (Jvm.current.java21Compatible) { + return gradleVersion >= "8.4" + } else if (Jvm.current.java20) { + return gradleVersion >= "8.1" + } else if (Jvm.current.java19) { + return gradleVersion >= "7.6" + } else if (Jvm.current.java18) { + return gradleVersion >= "7.5" + } else if (Jvm.current.java17) { + return gradleVersion >= "7.3" + } else if (Jvm.current.java16) { + return gradleVersion >= "7.0" + } else if (Jvm.current.java15) { + return gradleVersion >= "6.7" + } else if (Jvm.current.java14) { + return gradleVersion >= "6.3" + } else if (Jvm.current.java13) { + return gradleVersion >= "6.0" + } else if (Jvm.current.java12) { + return gradleVersion >= "5.4" + } else if (Jvm.current.java11) { + return gradleVersion >= "5.0" + } else if (Jvm.current.java10) { + return gradleVersion >= "4.7" + } else if (Jvm.current.java9) { + return gradleVersion >= "4.3" + } else if (Jvm.current.java8) { + return gradleVersion >= "2.0" + } + return false + } + + protected void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) { + if (configurationCacheEnabled) { + Assumptions.assumeFalse(Platform.isIbm8(), "Configuration cache is not compatible with IBM 8") + } + } + + private static String getLatestGradleVersion() { + OkHttpClient client = new OkHttpClient() + Request request = new Request.Builder().url("https://services.gradle.org/versions/current").build() + try (Response response = client.newCall(request).execute()) { + if (!response.successful) { + return GradleVersion.current().version + } + def responseBody = response.body().string() + ObjectMapper mapper = new ObjectMapper() + JsonNode root = mapper.readTree(responseBody) + return root.get("version").asText() + } + } +} diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy index 1b01770120c..ebe0f6a285c 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy @@ -1,52 +1,32 @@ package datadog.smoketest -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.ObjectMapper + import datadog.trace.api.Config import datadog.trace.api.Platform import datadog.trace.api.config.CiVisibilityConfig import datadog.trace.api.config.GeneralConfig -import datadog.trace.civisibility.CiVisibilitySmokeTest import datadog.trace.util.Strings -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.Response -import org.gradle.internal.impldep.org.apache.commons.io.FileUtils import org.gradle.testkit.runner.BuildResult import org.gradle.testkit.runner.GradleRunner import org.gradle.testkit.runner.TaskOutcome import org.gradle.util.DistributionLocator import org.gradle.util.GradleVersion import org.gradle.wrapper.Download -import org.gradle.wrapper.GradleUserHomeLookup import org.gradle.wrapper.Install import org.gradle.wrapper.PathAssembler import org.gradle.wrapper.WrapperConfiguration -import org.junit.jupiter.api.Assumptions -import spock.lang.AutoCleanup import spock.lang.IgnoreIf import spock.lang.Shared import spock.lang.TempDir -import spock.util.environment.Jvm -import java.nio.file.FileVisitResult import java.nio.file.Files import java.nio.file.Path -import java.nio.file.Paths -import java.nio.file.SimpleFileVisitor -import java.nio.file.attribute.BasicFileAttributes - -class GradleDaemonSmokeTest extends CiVisibilitySmokeTest { - private static final String LATEST_GRADLE_VERSION = getLatestGradleVersion() +class GradleDaemonSmokeTest extends AbstractGradleTest { private static final String TEST_SERVICE_NAME = "test-gradle-service" private static final String TEST_ENVIRONMENT_NAME = "integration-test" - // test resources use this instead of ".gradle" to avoid unwanted evaluation - private static final String GRADLE_TEST_RESOURCE_EXTENSION = ".gradleTest" - private static final String GRADLE_REGULAR_EXTENSION = ".gradle" - private static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000 // Gradle's default timeout is 10s private static final String JACOCO_PLUGIN_VERSION = Config.get().ciVisibilityJacocoPluginVersion @@ -58,21 +38,10 @@ class GradleDaemonSmokeTest extends CiVisibilitySmokeTest { @TempDir Path testKitFolder - @TempDir - Path projectFolder - - @Shared - @AutoCleanup - MockBackend mockBackend = new MockBackend() - def setupSpec() { givenGradleProperties() } - def setup() { - mockBackend.reset() - } - @IgnoreIf(reason = "Jacoco plugin does not work with OpenJ9 in older Gradle versions", value = { Platform.isJ9() }) @@ -168,26 +137,6 @@ class GradleDaemonSmokeTest extends CiVisibilitySmokeTest { Files.write(testKitFolder.resolve("gradle.properties"), gradleProperties.getBytes()) } - private void givenGradleProjectFiles(String projectFilesSources) { - def projectResourcesUri = this.getClass().getClassLoader().getResource(projectFilesSources).toURI() - def projectResourcesPath = Paths.get(projectResourcesUri) - FileUtils.copyDirectory(projectResourcesPath.toFile(), projectFolder.toFile()) - - Files.walkFileTree(projectFolder, new SimpleFileVisitor() { - @Override - FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - if (file.toString().endsWith(GRADLE_TEST_RESOURCE_EXTENSION)) { - def fileWithFixedExtension = Paths.get(file.toString().replace(GRADLE_TEST_RESOURCE_EXTENSION, GRADLE_REGULAR_EXTENSION)) - Files.move(file, fileWithFixedExtension) - } - return FileVisitResult.CONTINUE - } - }) - - // creating empty .git directory so that the tracer could detect projectFolder as repo root - Files.createDirectory(projectFolder.resolve(".git")) - } - private BuildResult runGradleTests(String gradleVersion, boolean successExpected = true, boolean configurationCache = false) { def arguments = ["test", "--stacktrace"] if (gradleVersion > "4.5") { @@ -255,63 +204,4 @@ class GradleDaemonSmokeTest extends CiVisibilitySmokeTest { assert task.outcome != TaskOutcome.FAILED } } - - void givenGradleVersionIsCompatibleWithCurrentJvm(String gradleVersion) { - Assumptions.assumeTrue(isSupported(gradleVersion), - "Current JVM " + Jvm.current.javaVersion + " does not support Gradle version " + gradleVersion) - } - - private static boolean isSupported(String gradleVersion) { - // https://docs.gradle.org/current/userguide/compatibility.html - if (Jvm.current.java21Compatible) { - return gradleVersion >= "8.4" - } else if (Jvm.current.java20) { - return gradleVersion >= "8.1" - } else if (Jvm.current.java19) { - return gradleVersion >= "7.6" - } else if (Jvm.current.java18) { - return gradleVersion >= "7.5" - } else if (Jvm.current.java17) { - return gradleVersion >= "7.3" - } else if (Jvm.current.java16) { - return gradleVersion >= "7.0" - } else if (Jvm.current.java15) { - return gradleVersion >= "6.7" - } else if (Jvm.current.java14) { - return gradleVersion >= "6.3" - } else if (Jvm.current.java13) { - return gradleVersion >= "6.0" - } else if (Jvm.current.java12) { - return gradleVersion >= "5.4" - } else if (Jvm.current.java11) { - return gradleVersion >= "5.0" - } else if (Jvm.current.java10) { - return gradleVersion >= "4.7" - } else if (Jvm.current.java9) { - return gradleVersion >= "4.3" - } else if (Jvm.current.java8) { - return gradleVersion >= "2.0" - } - return false - } - - void givenConfigurationCacheIsCompatibleWithCurrentPlatform(boolean configurationCacheEnabled) { - if (configurationCacheEnabled) { - Assumptions.assumeFalse(Platform.isIbm8(), "Configuration cache is not compatible with IBM 8") - } - } - - private static String getLatestGradleVersion() { - OkHttpClient client = new OkHttpClient() - Request request = new Request.Builder().url("https://services.gradle.org/versions/current").build() - try (Response response = client.newCall(request).execute()) { - if (!response.successful) { - return GradleVersion.current().version - } - def responseBody = response.body().string() - ObjectMapper mapper = new ObjectMapper() - JsonNode root = mapper.readTree(responseBody) - return root.get("version").asText() - } - } } diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy new file mode 100644 index 00000000000..436a6f4b3cb --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy @@ -0,0 +1,76 @@ +package datadog.smoketest + +import datadog.communication.util.IOUtils +import datadog.trace.civisibility.utils.ShellCommandExecutor + +/** + * This test runs Gradle Launcher with the Java Tracer injected + * and verifies that the tracer is injected into the Gradle Daemon. + */ +class GradleLauncherSmokeTest extends AbstractGradleTest { + + private static final int GRADLE_BUILD_TIMEOUT_MILLIS = 30_000 + + private static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path") + + def "test Gradle Launcher injects tracer into Gradle Daemon: v#gradleVersion, cmd line - #gradleDaemonCmdLineParams"() { + given: + givenGradleVersionIsCompatibleWithCurrentJvm(gradleVersion) + givenGradleProjectFiles("test-gradle-wrapper", ["gradle-wrapper.properties": ["gradle-version": gradleVersion]]) + givenGradleWrapper(gradleVersion) // we want to check that instrumentation works with different wrapper versions too + + when: + def output = whenRunningGradleLauncherWithJavaTracerInjected(gradleDaemonCmdLineParams) + + then: + gradleDaemonStartCommandContains(output, + // verify that the javaagent is injected into the Gradle Daemon start command + "-javaagent:${AGENT_JAR}", + // verify that existing Gradle Daemon JVM args are preserved: + // org.gradle.jvmargs provided on the command line, if present, + // otherwise org.gradle.jvmargs from gradle.properties file + // ("user.country" is used, as Gradle will filter out properties it is not aware of) + gradleDaemonCmdLineParams ? gradleDaemonCmdLineParams : "-Duser.country=VALUE_FROM_GRADLE_PROPERTIES_FILE") + + where: + gradleVersion | gradleDaemonCmdLineParams + "6.6.1" | null + "6.6.1" | "-Duser.country=VALUE_FROM_CMD_LINE" + "7.6.4" | null + "7.6.4" | "-Duser.country=VALUE_FROM_CMD_LINE" + "8.11.1" | null + "8.11.1" | "-Duser.country=VALUE_FROM_CMD_LINE" + LATEST_GRADLE_VERSION | null + LATEST_GRADLE_VERSION | "-Duser.country=VALUE_FROM_CMD_LINE" + } + + private void givenGradleWrapper(String gradleVersion) { + def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS) + shellCommandExecutor.executeCommand(IOUtils::readFully, "./gradlew", "wrapper", "--gradle-version", gradleVersion) + } + + private String whenRunningGradleLauncherWithJavaTracerInjected(String gradleDaemonCmdLineParams) { + def shellCommandExecutor = new ShellCommandExecutor(projectFolder.toFile(), GRADLE_BUILD_TIMEOUT_MILLIS, [ + "GRADLE_OPTS" : "-javaagent:${AGENT_JAR}".toString(), + "DD_CIVISIBILITY_ENABLED" : "true", + "DD_CIVISIBILITY_AGENTLESS_ENABLED": "true", + "DD_CIVISIBILITY_AGENTLESS_URL" : "${mockBackend.intakeUrl}".toString(), + "DD_API_KEY" : "dummy" + ]) + String[] command = ["./gradlew", "--no-daemon", "--info"] + if (gradleDaemonCmdLineParams) { + command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams" + } + return shellCommandExecutor.executeCommand(IOUtils::readFully, command) + } + + private static boolean gradleDaemonStartCommandContains(String buildOutput, String... tokens) { + def daemonStartCommandLog = buildOutput.split("\n").find { it.contains("Starting process 'Gradle build daemon'") } + for (String token : tokens) { + if (!daemonStartCommandLog.contains(token)) { + throw new org.opentest4j.AssertionFailedError("Gradle Daemon start command does not contain " + token, token, daemonStartCommandLog) + } + } + return true + } +} diff --git a/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/build.gradleTest new file mode 100644 index 00000000000..bbfeb03c223 --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/build.gradleTest @@ -0,0 +1 @@ +apply plugin: 'java' diff --git a/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle.properties b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle.properties new file mode 100644 index 00000000000..c861b2bd1ce --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Duser.country=VALUE_FROM_GRADLE_PROPERTIES_FILE diff --git a/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f6b961fd5a86aa5fbfe90f707c3138408be7c718 GIT binary patch literal 54329 zcmagFV|ZrKvM!pAZQHhO+qP}9lTNj?q^^Y^VFp)SH8qbSJ)2BQ2giqr}t zFG7D6)c?v~^Z#E_K}1nTQbJ9gQ9<%vVRAxVj)8FwL5_iTdUB>&m3fhE=kRWl;g`&m z!W5kh{WsV%fO*%je&j+Lv4xxK~zsEYQls$Q-p&dwID|A)!7uWtJF-=Tm1{V@#x*+kUI$=%KUuf2ka zjiZ{oiL1MXE2EjciJM!jrjFNwCh`~hL>iemrqwqnX?T*MX;U>>8yRcZb{Oy+VKZos zLiFKYPw=LcaaQt8tj=eoo3-@bG_342HQ%?jpgAE?KCLEHC+DmjxAfJ%Og^$dpC8Xw zAcp-)tfJm}BPNq_+6m4gBgBm3+CvmL>4|$2N$^Bz7W(}fz1?U-u;nE`+9`KCLuqg} zwNstNM!J4Uw|78&Y9~9>MLf56to!@qGkJw5Thx%zkzj%Ek9Nn1QA@8NBXbwyWC>9H z#EPwjMNYPigE>*Ofz)HfTF&%PFj$U6mCe-AFw$U%-L?~-+nSXHHKkdgC5KJRTF}`G zE_HNdrE}S0zf4j{r_f-V2imSqW?}3w-4=f@o@-q+cZgaAbZ((hn))@|eWWhcT2pLpTpL!;_5*vM=sRL8 zqU##{U#lJKuyqW^X$ETU5ETeEVzhU|1m1750#f}38_5N9)B_2|v@1hUu=Kt7-@dhA zq_`OMgW01n`%1dB*}C)qxC8q;?zPeF_r;>}%JYmlER_1CUbKa07+=TV45~symC*g8 zW-8(gag#cAOuM0B1xG8eTp5HGVLE}+gYTmK=`XVVV*U!>H`~j4+ROIQ+NkN$LY>h4 zqpwdeE_@AX@PL};e5vTn`Ro(EjHVf$;^oiA%@IBQq>R7_D>m2D4OwwEepkg}R_k*M zM-o;+P27087eb+%*+6vWFCo9UEGw>t&WI17Pe7QVuoAoGHdJ(TEQNlJOqnjZ8adCb zI`}op16D@v7UOEo%8E-~m?c8FL1utPYlg@m$q@q7%mQ4?OK1h%ODjTjFvqd!C z-PI?8qX8{a@6d&Lb_X+hKxCImb*3GFemm?W_du5_&EqRq!+H?5#xiX#w$eLti-?E$;Dhu`{R(o>LzM4CjO>ICf z&DMfES#FW7npnbcuqREgjPQM#gs6h>`av_oEWwOJZ2i2|D|0~pYd#WazE2Bbsa}X@ zu;(9fi~%!VcjK6)?_wMAW-YXJAR{QHxrD5g(ou9mR6LPSA4BRG1QSZT6A?kelP_g- zH(JQjLc!`H4N=oLw=f3{+WmPA*s8QEeEUf6Vg}@!xwnsnR0bl~^2GSa5vb!Yl&4!> zWb|KQUsC$lT=3A|7vM9+d;mq=@L%uWKwXiO9}a~gP4s_4Yohc!fKEgV7WbVo>2ITbE*i`a|V!^p@~^<={#?Gz57 zyPWeM2@p>D*FW#W5Q`1`#5NW62XduP1XNO(bhg&cX`-LYZa|m-**bu|>}S;3)eP8_ zpNTnTfm8 ze+7wDH3KJ95p)5tlwk`S7mbD`SqHnYD*6`;gpp8VdHDz%RR_~I_Ar>5)vE-Pgu7^Y z|9Px+>pi3!DV%E%4N;ii0U3VBd2ZJNUY1YC^-e+{DYq+l@cGtmu(H#Oh%ibUBOd?C z{y5jW3v=0eV0r@qMLgv1JjZC|cZ9l9Q)k1lLgm))UR@#FrJd>w^`+iy$c9F@ic-|q zVHe@S2UAnc5VY_U4253QJxm&Ip!XKP8WNcnx9^cQ;KH6PlW8%pSihSH2(@{2m_o+m zr((MvBja2ctg0d0&U5XTD;5?d?h%JcRJp{_1BQW1xu&BrA3(a4Fh9hon-ly$pyeHq zG&;6q?m%NJ36K1Sq_=fdP(4f{Hop;_G_(i?sPzvB zDM}>*(uOsY0I1j^{$yn3#U(;B*g4cy$-1DTOkh3P!LQ;lJlP%jY8}Nya=h8$XD~%Y zbV&HJ%eCD9nui-0cw!+n`V~p6VCRqh5fRX z8`GbdZ@73r7~myQLBW%db;+BI?c-a>Y)m-FW~M=1^|<21_Sh9RT3iGbO{o-hpN%d6 z7%++#WekoBOP^d0$$|5npPe>u3PLvX_gjH2x(?{&z{jJ2tAOWTznPxv-pAv<*V7r$ z6&glt>7CAClWz6FEi3bToz-soY^{ScrjwVPV51=>n->c(NJngMj6TyHty`bfkF1hc zkJS%A@cL~QV0-aK4>Id!9dh7>0IV;1J9(myDO+gv76L3NLMUm9XyPauvNu$S<)-|F zZS}(kK_WnB)Cl`U?jsdYfAV4nrgzIF@+%1U8$poW&h^c6>kCx3;||fS1_7JvQT~CV zQ8Js+!p)3oW>Df(-}uqC`Tcd%E7GdJ0p}kYj5j8NKMp(KUs9u7?jQ94C)}0rba($~ zqyBx$(1ae^HEDG`Zc@-rXk1cqc7v0wibOR4qpgRDt#>-*8N3P;uKV0CgJE2SP>#8h z=+;i_CGlv+B^+$5a}SicVaSeaNn29K`C&=}`=#Nj&WJP9Xhz4mVa<+yP6hkrq1vo= z1rX4qg8dc4pmEvq%NAkpMK>mf2g?tg_1k2%v}<3`$6~Wlq@ItJ*PhHPoEh1Yi>v57 z4k0JMO)*=S`tKvR5gb-(VTEo>5Y>DZJZzgR+j6{Y`kd|jCVrg!>2hVjz({kZR z`dLlKhoqT!aI8=S+fVp(5*Dn6RrbpyO~0+?fy;bm$0jmTN|t5i6rxqr4=O}dY+ROd zo9Et|x}!u*xi~>-y>!M^+f&jc;IAsGiM_^}+4|pHRn{LThFFpD{bZ|TA*wcGm}XV^ zr*C6~@^5X-*R%FrHIgo-hJTBcyQ|3QEj+cSqp#>&t`ZzB?cXM6S(lRQw$I2?m5=wd z78ki`R?%;o%VUhXH?Z#(uwAn9$m`npJ=cA+lHGk@T7qq_M6Zoy1Lm9E0UUysN)I_x zW__OAqvku^>`J&CB=ie@yNWsaFmem}#L3T(x?a`oZ+$;3O-icj2(5z72Hnj=9Z0w% z<2#q-R=>hig*(t0^v)eGq2DHC%GymE-_j1WwBVGoU=GORGjtaqr0BNigOCqyt;O(S zKG+DoBsZU~okF<7ahjS}bzwXxbAxFfQAk&O@>LsZMsZ`?N?|CDWM(vOm%B3CBPC3o z%2t@%H$fwur}SSnckUm0-k)mOtht`?nwsDz=2#v=RBPGg39i#%odKq{K^;bTD!6A9 zskz$}t)sU^=a#jLZP@I=bPo?f-L}wpMs{Tc!m7-bi!Ldqj3EA~V;4(dltJmTXqH0r z%HAWKGutEc9vOo3P6Q;JdC^YTnby->VZ6&X8f{obffZ??1(cm&L2h7q)*w**+sE6dG*;(H|_Q!WxU{g)CeoT z(KY&bv!Usc|m+Fqfmk;h&RNF|LWuNZ!+DdX*L=s-=_iH=@i` z?Z+Okq^cFO4}_n|G*!)Wl_i%qiMBaH8(WuXtgI7EO=M>=i_+;MDjf3aY~6S9w0K zUuDO7O5Ta6+k40~xh~)D{=L&?Y0?c$s9cw*Ufe18)zzk%#ZY>Tr^|e%8KPb0ht`b( zuP@8#Ox@nQIqz9}AbW0RzE`Cf>39bOWz5N3qzS}ocxI=o$W|(nD~@EhW13Rj5nAp; zu2obEJa=kGC*#3=MkdkWy_%RKcN=?g$7!AZ8vBYKr$ePY(8aIQ&yRPlQ=mudv#q$q z4%WzAx=B{i)UdLFx4os?rZp6poShD7Vc&mSD@RdBJ=_m^&OlkEE1DFU@csgKcBifJ zz4N7+XEJhYzzO=86 z#%eBQZ$Nsf2+X0XPHUNmg#(sNt^NW1Y0|M(${e<0kW6f2q5M!2YE|hSEQ*X-%qo(V zHaFwyGZ0on=I{=fhe<=zo{=Og-_(to3?cvL4m6PymtNsdDINsBh8m>a%!5o3s(en) z=1I z6O+YNertC|OFNqd6P=$gMyvmfa`w~p9*gKDESFqNBy(~Zw3TFDYh}$iudn)9HxPBi zdokK@o~nu?%imcURr5Y~?6oo_JBe}t|pU5qjai|#JDyG=i^V~7+a{dEnO<(y>ahND#_X_fcEBNiZ)uc&%1HVtx8Ts z*H_Btvx^IhkfOB#{szN*n6;y05A>3eARDXslaE>tnLa>+`V&cgho?ED+&vv5KJszf zG4@G;7i;4_bVvZ>!mli3j7~tPgybF5|J6=Lt`u$D%X0l}#iY9nOXH@(%FFJLtzb%p zzHfABnSs;v-9(&nzbZytLiqqDIWzn>JQDk#JULcE5CyPq_m#4QV!}3421haQ+LcfO*>r;rg6K|r#5Sh|y@h1ao%Cl)t*u`4 zMTP!deC?aL7uTxm5^nUv#q2vS-5QbBKP|drbDXS%erB>fYM84Kpk^au99-BQBZR z7CDynflrIAi&ahza+kUryju5LR_}-Z27g)jqOc(!Lx9y)e z{cYc&_r947s9pteaa4}dc|!$$N9+M38sUr7h(%@Ehq`4HJtTpA>B8CLNO__@%(F5d z`SmX5jbux6i#qc}xOhumzbAELh*Mfr2SW99=WNOZRZgoCU4A2|4i|ZVFQt6qEhH#B zK_9G;&h*LO6tB`5dXRSBF0hq0tk{2q__aCKXYkP#9n^)@cq}`&Lo)1KM{W+>5mSed zKp~=}$p7>~nK@va`vN{mYzWN1(tE=u2BZhga5(VtPKk(*TvE&zmn5vSbjo zZLVobTl%;t@6;4SsZ>5+U-XEGUZGG;+~|V(pE&qqrp_f~{_1h@5ZrNETqe{bt9ioZ z#Qn~gWCH!t#Ha^n&fT2?{`}D@s4?9kXj;E;lWV9Zw8_4yM0Qg-6YSsKgvQ*fF{#Pq z{=(nyV>#*`RloBVCs;Lp*R1PBIQOY=EK4CQa*BD0MsYcg=opP?8;xYQDSAJBeJpw5 zPBc_Ft9?;<0?pBhCmOtWU*pN*;CkjJ_}qVic`}V@$TwFi15!mF1*m2wVX+>5p%(+R zQ~JUW*zWkalde{90@2v+oVlkxOZFihE&ZJ){c?hX3L2@R7jk*xjYtHi=}qb+4B(XJ z$gYcNudR~4Kz_WRq8eS((>ALWCO)&R-MXE+YxDn9V#X{_H@j616<|P(8h(7z?q*r+ zmpqR#7+g$cT@e&(%_|ipI&A%9+47%30TLY(yuf&*knx1wNx|%*H^;YB%ftt%5>QM= z^i;*6_KTSRzQm%qz*>cK&EISvF^ovbS4|R%)zKhTH_2K>jP3mBGn5{95&G9^a#4|K zv+!>fIsR8z{^x4)FIr*cYT@Q4Z{y}};rLHL+atCgHbfX*;+k&37DIgENn&=k(*lKD zG;uL-KAdLn*JQ?@r6Q!0V$xXP=J2i~;_+i3|F;_En;oAMG|I-RX#FwnmU&G}w`7R{ z788CrR-g1DW4h_`&$Z`ctN~{A)Hv_-Bl!%+pfif8wN32rMD zJDs$eVWBYQx1&2sCdB0!vU5~uf)=vy*{}t{2VBpcz<+~h0wb7F3?V^44*&83Z2#F` z32!rd4>uc63rQP$3lTH3zb-47IGR}f)8kZ4JvX#toIpXH`L%NnPDE~$QI1)0)|HS4 zVcITo$$oWWwCN@E-5h>N?Hua!N9CYb6f8vTFd>h3q5Jg-lCI6y%vu{Z_Uf z$MU{{^o~;nD_@m2|E{J)q;|BK7rx%`m``+OqZAqAVj-Dy+pD4-S3xK?($>wn5bi90CFAQ+ACd;&m6DQB8_o zjAq^=eUYc1o{#+p+ zn;K<)Pn*4u742P!;H^E3^Qu%2dM{2slouc$AN_3V^M7H_KY3H)#n7qd5_p~Za7zAj|s9{l)RdbV9e||_67`#Tu*c<8!I=zb@ z(MSvQ9;Wrkq6d)!9afh+G`!f$Ip!F<4ADdc*OY-y7BZMsau%y?EN6*hW4mOF%Q~bw z2==Z3^~?q<1GTeS>xGN-?CHZ7a#M4kDL zQxQr~1ZMzCSKFK5+32C%+C1kE#(2L=15AR!er7GKbp?Xd1qkkGipx5Q~FI-6zt< z*PTpeVI)Ngnnyaz5noIIgNZtb4bQdKG{Bs~&tf)?nM$a;7>r36djllw%hQxeCXeW^ z(i6@TEIuxD<2ulwLTt|&gZP%Ei+l!(%p5Yij6U(H#HMkqM8U$@OKB|5@vUiuY^d6X zW}fP3;Kps6051OEO(|JzmVU6SX(8q>*yf*x5QoxDK={PH^F?!VCzES_Qs>()_y|jg6LJlJWp;L zKM*g5DK7>W_*uv}{0WUB0>MHZ#oJZmO!b3MjEc}VhsLD~;E-qNNd?x7Q6~v zR=0$u>Zc2Xr}>x_5$-s#l!oz6I>W?lw;m9Ae{Tf9eMX;TI-Wf_mZ6sVrMnY#F}cDd z%CV*}fDsXUF7Vbw>PuDaGhu631+3|{xp<@Kl|%WxU+vuLlcrklMC!Aq+7n~I3cmQ! z`e3cA!XUEGdEPSu``&lZEKD1IKO(-VGvcnSc153m(i!8ohi`)N2n>U_BemYJ`uY>8B*Epj!oXRLV}XK}>D*^DHQ7?NY*&LJ9VSo`Ogi9J zGa;clWI8vIQqkngv2>xKd91K>?0`Sw;E&TMg&6dcd20|FcTsnUT7Yn{oI5V4@Ow~m zz#k~8TM!A9L7T!|colrC0P2WKZW7PNj_X4MfESbt<-soq*0LzShZ}fyUx!(xIIDwx zRHt^_GAWe0-Vm~bDZ(}XG%E+`XhKpPlMBo*5q_z$BGxYef8O!ToS8aT8pmjbPq)nV z%x*PF5ZuSHRJqJ!`5<4xC*xb2vC?7u1iljB_*iUGl6+yPyjn?F?GOF2_KW&gOkJ?w z3e^qc-te;zez`H$rsUCE0<@7PKGW?7sT1SPYWId|FJ8H`uEdNu4YJjre`8F*D}6Wh z|FQ`xf7yiphHIAkU&OYCn}w^ilY@o4larl?^M7&8YI;hzBIsX|i3UrLsx{QDKwCX< zy;a>yjfJ6!sz`NcVi+a!Fqk^VE^{6G53L?@Tif|j!3QZ0fk9QeUq8CWI;OmO-Hs+F zuZ4sHLA3{}LR2Qlyo+{d@?;`tpp6YB^BMoJt?&MHFY!JQwoa0nTSD+#Ku^4b{5SZVFwU9<~APYbaLO zu~Z)nS#dxI-5lmS-Bnw!(u15by(80LlC@|ynj{TzW)XcspC*}z0~8VRZq>#Z49G`I zgl|C#H&=}n-ajxfo{=pxPV(L*7g}gHET9b*s=cGV7VFa<;Htgjk>KyW@S!|z`lR1( zGSYkEl&@-bZ*d2WQ~hw3NpP=YNHF^XC{TMG$Gn+{b6pZn+5=<()>C!N^jncl0w6BJ zdHdnmSEGK5BlMeZD!v4t5m7ct7{k~$1Ie3GLFoHjAH*b?++s<|=yTF+^I&jT#zuMx z)MLhU+;LFk8bse|_{j+d*a=&cm2}M?*arjBPnfPgLwv)86D$6L zLJ0wPul7IenMvVAK$z^q5<^!)7aI|<&GGEbOr=E;UmGOIa}yO~EIr5xWU_(ol$&fa zR5E(2vB?S3EvJglTXdU#@qfDbCYs#82Yo^aZN6`{Ex#M)easBTe_J8utXu(fY1j|R z9o(sQbj$bKU{IjyhosYahY{63>}$9_+hWxB3j}VQkJ@2$D@vpeRSldU?&7I;qd2MF zSYmJ>zA(@N_iK}m*AMPIJG#Y&1KR)6`LJ83qg~`Do3v^B0>fU&wUx(qefuTgzFED{sJ65!iw{F2}1fQ3= ziFIP{kezQxmlx-!yo+sC4PEtG#K=5VM9YIN0z9~c4XTX?*4e@m;hFM!zVo>A`#566 z>f&3g94lJ{r)QJ5m7Xe3SLau_lOpL;A($wsjHR`;xTXgIiZ#o&vt~ zGR6KdU$FFbLfZCC3AEu$b`tj!9XgOGLSV=QPIYW zjI!hSP#?8pn0@ezuenOzoka8!8~jXTbiJ6+ZuItsWW03uzASFyn*zV2kIgPFR$Yzm zE<$cZlF>R8?Nr2_i?KiripBc+TGgJvG@vRTY2o?(_Di}D30!k&CT`>+7ry2!!iC*X z<@=U0_C#16=PN7bB39w+zPwDOHX}h20Ap);dx}kjXX0-QkRk=cr};GYsjSvyLZa-t zzHONWddi*)RDUH@RTAsGB_#&O+QJaaL+H<<9LLSE+nB@eGF1fALwjVOl8X_sdOYme z0lk!X=S(@25=TZHR7LlPp}fY~yNeThMIjD}pd9+q=j<_inh0$>mIzWVY+Z9p<{D^#0Xk+b_@eNSiR8;KzSZ#7lUsk~NGMcB8C2c=m2l5paHPq`q{S(kdA7Z1a zyfk2Y;w?^t`?@yC5Pz9&pzo}Hc#}mLgDmhKV|PJ3lKOY(Km@Fi2AV~CuET*YfUi}u zfInZnqDX(<#vaS<^fszuR=l)AbqG{}9{rnyx?PbZz3Pyu!eSJK`uwkJU!ORQXy4x83r!PNgOyD33}}L=>xX_93l6njNTuqL8J{l%*3FVn3MG4&Fv*`lBXZ z?=;kn6HTT^#SrPX-N)4EZiIZI!0ByXTWy;;J-Tht{jq1mjh`DSy7yGjHxIaY%*sTx zuy9#9CqE#qi>1misx=KRWm=qx4rk|}vd+LMY3M`ow8)}m$3Ggv&)Ri*ON+}<^P%T5 z_7JPVPfdM=Pv-oH<tecoE}(0O7|YZc*d8`Uv_M*3Rzv7$yZnJE6N_W=AQ3_BgU_TjA_T?a)U1csCmJ&YqMp-lJe`y6>N zt++Bi;ZMOD%%1c&-Q;bKsYg!SmS^#J@8UFY|G3!rtyaTFb!5@e(@l?1t(87ln8rG? z--$1)YC~vWnXiW3GXm`FNSyzu!m$qT=Eldf$sMl#PEfGmzQs^oUd=GIQfj(X=}dw+ zT*oa0*oS%@cLgvB&PKIQ=Ok?>x#c#dC#sQifgMwtAG^l3D9nIg(Zqi;D%807TtUUCL3_;kjyte#cAg?S%e4S2W>9^A(uy8Ss0Tc++ZTjJw1 z&Em2g!3lo@LlDyri(P^I8BPpn$RE7n*q9Q-c^>rfOMM6Pd5671I=ZBjAvpj8oIi$! zl0exNl(>NIiQpX~FRS9UgK|0l#s@#)p4?^?XAz}Gjb1?4Qe4?j&cL$C8u}n)?A@YC zfmbSM`Hl5pQFwv$CQBF=_$Sq zxsV?BHI5bGZTk?B6B&KLdIN-40S426X3j_|ceLla*M3}3gx3(_7MVY1++4mzhH#7# zD>2gTHy*%i$~}mqc#gK83288SKp@y3wz1L_e8fF$Rb}ex+`(h)j}%~Ld^3DUZkgez zOUNy^%>>HHE|-y$V@B}-M|_{h!vXpk01xaD%{l{oQ|~+^>rR*rv9iQen5t?{BHg|% zR`;S|KtUb!X<22RTBA4AAUM6#M?=w5VY-hEV)b`!y1^mPNEoy2K)a>OyA?Q~Q*&(O zRzQI~y_W=IPi?-OJX*&&8dvY0zWM2%yXdFI!D-n@6FsG)pEYdJbuA`g4yy;qrgR?G z8Mj7gv1oiWq)+_$GqqQ$(ZM@#|0j7})=#$S&hZwdoijFI4aCFLVI3tMH5fLreZ;KD zqA`)0l~D2tuIBYOy+LGw&hJ5OyE+@cnZ0L5+;yo2pIMdt@4$r^5Y!x7nHs{@>|W(MzJjATyWGNwZ^4j+EPU0RpAl-oTM@u{lx*i0^yyWPfHt6QwPvYpk9xFMWfBFt!+Gu6TlAmr zeQ#PX71vzN*_-xh&__N`IXv6`>CgV#eA_%e@7wjgkj8jlKzO~Ic6g$cT`^W{R{606 zCDP~+NVZ6DMO$jhL~#+!g*$T!XW63#(ngDn#Qwy71yj^gazS{e;3jGRM0HedGD@pt z?(ln3pCUA(ekqAvvnKy0G@?-|-dh=eS%4Civ&c}s%wF@0K5Bltaq^2Os1n6Z3%?-Q zAlC4goQ&vK6TpgtzkHVt*1!tBYt-`|5HLV1V7*#45Vb+GACuU+QB&hZ=N_flPy0TY zR^HIrdskB#<$aU;HY(K{a3(OQa$0<9qH(oa)lg@Uf>M5g2W0U5 zk!JSlhrw8quBx9A>RJ6}=;W&wt@2E$7J=9SVHsdC?K(L(KACb#z)@C$xXD8^!7|uv zZh$6fkq)aoD}^79VqdJ!Nz-8$IrU(_-&^cHBI;4 z^$B+1aPe|LG)C55LjP;jab{dTf$0~xbXS9!!QdcmDYLbL^jvxu2y*qnx2%jbL%rB z{aP85qBJe#(&O~Prk%IJARcdEypZ)vah%ZZ%;Zk{eW(U)Bx7VlzgOi8)x z`rh4l`@l_Ada7z&yUK>ZF;i6YLGwI*Sg#Fk#Qr0Jg&VLax(nNN$u-XJ5=MsP3|(lEdIOJ7|(x3iY;ea)5#BW*mDV%^=8qOeYO&gIdJVuLLN3cFaN=xZtFB=b zH{l)PZl_j^u+qx@89}gAQW7ofb+k)QwX=aegihossZq*+@PlCpb$rpp>Cbk9UJO<~ zDjlXQ_Ig#W0zdD3&*ei(FwlN#3b%FSR%&M^ywF@Fr>d~do@-kIS$e%wkIVfJ|Ohh=zc zF&Rnic^|>@R%v?@jO}a9;nY3Qrg_!xC=ZWUcYiA5R+|2nsM*$+c$TOs6pm!}Z}dfM zGeBhMGWw3$6KZXav^>YNA=r6Es>p<6HRYcZY)z{>yasbC81A*G-le8~QoV;rtKnkx z;+os8BvEe?0A6W*a#dOudsv3aWs?d% z0oNngyVMjavLjtjiG`!007#?62ClTqqU$@kIY`=x^$2e>iqIy1>o|@Tw@)P)B8_1$r#6>DB_5 zmaOaoE~^9TolgDgooKFuEFB#klSF%9-~d2~_|kQ0Y{Ek=HH5yq9s zDq#1S551c`kSiWPZbweN^A4kWiP#Qg6er1}HcKv{fxb1*BULboD0fwfaNM_<55>qM zETZ8TJDO4V)=aPp_eQjX%||Ud<>wkIzvDlpNjqW>I}W!-j7M^TNe5JIFh#-}zAV!$ICOju8Kx)N z0vLtzDdy*rQN!7r>Xz7rLw8J-(GzQlYYVH$WK#F`i_i^qVlzTNAh>gBWKV@XC$T-` z3|kj#iCquDhiO7NKum07i|<-NuVsX}Q}mIP$jBJDMfUiaWR3c|F_kWBMw0_Sr|6h4 zk`_r5=0&rCR^*tOy$A8K;@|NqwncjZ>Y-75vlpxq%Cl3EgH`}^^~=u zoll6xxY@a>0f%Ddpi;=cY}fyG!K2N-dEyXXmUP5u){4VnyS^T4?pjN@Ot4zjL(Puw z_U#wMH2Z#8Pts{olG5Dy0tZj;N@;fHheu>YKYQU=4Bk|wcD9MbA`3O4bj$hNRHwzb zSLcG0SLV%zywdbuwl(^E_!@&)TdXge4O{MRWk2RKOt@!8E{$BU-AH(@4{gxs=YAz9LIob|Hzto0}9cWoz6Tp2x0&xi#$ zHh$dwO&UCR1Ob2w00-2eG7d4=cN(Y>0R#$q8?||q@iTi+7-w-xR%uMr&StFIthC<# zvK(aPduwuNB}oJUV8+Zl)%cnfsHI%4`;x6XW^UF^e4s3Z@S<&EV8?56Wya;HNs0E> z`$0dgRdiUz9RO9Au3RmYq>K#G=X%*_dUbSJHP`lSfBaN8t-~@F>)BL1RT*9I851A3 z<-+Gb#_QRX>~av#Ni<#zLswtu-c6{jGHR>wflhKLzC4P@b%8&~u)fosoNjk4r#GvC zlU#UU9&0Hv;d%g72Wq?Ym<&&vtA3AB##L}=ZjiTR4hh7J)e>ei} zt*u+>h%MwN`%3}b4wYpV=QwbY!jwfIj#{me)TDOG`?tI!%l=AwL2G@9I~}?_dA5g6 zCKgK(;6Q0&P&K21Tx~k=o6jwV{dI_G+Ba*Zts|Tl6q1zeC?iYJTb{hel*x>^wb|2RkHkU$!+S4OU4ZOKPZjV>9OVsqNnv5jK8TRAE$A&^yRwK zj-MJ3Pl?)KA~fq#*K~W0l4$0=8GRx^9+?w z!QT8*-)w|S^B0)ZeY5gZPI2G(QtQf?DjuK(s^$rMA!C%P22vynZY4SuOE=wX2f8$R z)A}mzJi4WJnZ`!bHG1=$lwaxm!GOnRbR15F$nRC-M*H<*VfF|pQw(;tbSfp({>9^5 zw_M1-SJ9eGF~m(0dvp*P8uaA0Yw+EkP-SWqu zqal$hK8SmM7#Mrs0@OD+%_J%H*bMyZiWAZdsIBj#lkZ!l2c&IpLu(5^T0Ge5PHzR} zn;TXs$+IQ_&;O~u=Jz+XE0wbOy`=6>m9JVG} zJ~Kp1e5m?K3x@@>!D)piw^eMIHjD4RebtR`|IlckplP1;r21wTi8v((KqNqn%2CB< zifaQc&T}*M&0i|LW^LgdjIaX|o~I$`owHolRqeH_CFrqCUCleN130&vH}dK|^kC>) z-r2P~mApHotL4dRX$25lIcRh_*kJaxi^%ZN5-GAAMOxfB!6flLPY-p&QzL9TE%ho( zRwftE3sy5<*^)qYzKkL|rE>n@hyr;xPqncY6QJ8125!MWr`UCWuC~A#G1AqF1@V$kv>@NBvN&2ygy*{QvxolkRRb%Ui zsmKROR%{*g*WjUUod@@cS^4eF^}yQ1>;WlGwOli z+Y$(8I`0(^d|w>{eaf!_BBM;NpCoeem2>J}82*!em=}}ymoXk>QEfJ>G(3LNA2-46 z5PGvjr)Xh9>aSe>vEzM*>xp{tJyZox1ZRl}QjcvX2TEgNc^(_-hir@Es>NySoa1g^ zFow_twnHdx(j?Q_3q51t3XI7YlJ4_q&(0#)&a+RUy{IcBq?)eaWo*=H2UUVIqtp&lW9JTJiP&u zw8+4vo~_IJXZIJb_U^&=GI1nSD%e;P!c{kZALNCm5c%%oF+I3DrA63_@4)(v4(t~JiddILp7jmoy+>cD~ivwoctFfEL zP*#2Rx?_&bCpX26MBgp^4G>@h`Hxc(lnqyj!*t>9sOBcXN(hTwEDpn^X{x!!gPX?1 z*uM$}cYRwHXuf+gYTB}gDTcw{TXSOUU$S?8BeP&sc!Lc{{pEv}x#ELX>6*ipI1#>8 zKes$bHjiJ1OygZge_ak^Hz#k;=od1wZ=o71ba7oClBMq>Uk6hVq|ePPt)@FM5bW$I z;d2Or@wBjbTyZj|;+iHp%Bo!Vy(X3YM-}lasMItEV_QrP-Kk_J4C>)L&I3Xxj=E?| zsAF(IfVQ4w+dRRnJ>)}o^3_012YYgFWE)5TT=l2657*L8_u1KC>Y-R{7w^S&A^X^U}h20jpS zQsdeaA#WIE*<8KG*oXc~$izYilTc#z{5xhpXmdT-YUnGh9v4c#lrHG6X82F2-t35} zB`jo$HjKe~E*W$=g|j&P>70_cI`GnOQ;Jp*JK#CT zuEGCn{8A@bC)~0%wsEv?O^hSZF*iqjO~_h|>xv>PO+?525Nw2472(yqS>(#R)D7O( zg)Zrj9n9$}=~b00=Wjf?E418qP-@8%MQ%PBiCTX=$B)e5cHFDu$LnOeJ~NC;xmOk# z>z&TbsK>Qzk)!88lNI8fOE2$Uxso^j*1fz>6Ot49y@=po)j4hbTIcVR`ePHpuJSfp zxaD^Dn3X}Na3@<_Pc>a;-|^Pon(>|ytG_+U^8j_JxP=_d>L$Hj?|0lz>_qQ#a|$+( z(x=Lipuc8p4^}1EQhI|TubffZvB~lu$zz9ao%T?%ZLyV5S9}cLeT?c} z>yCN9<04NRi~1oR)CiBakoNhY9BPnv)kw%*iv8vdr&&VgLGIs(-FbJ?d_gfbL2={- zBk4lkdPk~7+jIxd4{M(-W1AC_WcN&Oza@jZoj zaE*9Y;g83#m(OhA!w~LNfUJNUuRz*H-=$s*z+q+;snKPRm9EptejugC-@7-a-}Tz0 z@KHra#Y@OXK+KsaSN9WiGf?&jlZ!V7L||%KHP;SLksMFfjkeIMf<1e~t?!G3{n)H8 zQAlFY#QwfKuj;l@<$YDATAk;%PtD%B(0<|8>rXU< zJ66rkAVW_~Dj!7JGdGGi4NFuE?7ZafdMxIh65Sz7yQoA7fBZCE@WwysB=+`kT^LFX zz8#FlSA5)6FG9(qL3~A24mpzL@@2D#>0J7mMS1T*9UJ zvOq!!a(%IYY69+h45CE?(&v9H4FCr>gK0>mK~F}5RdOuH2{4|}k@5XpsX7+LZo^Qa4sH5`eUj>iffoBVm+ zz4Mtf`h?NW$*q1yr|}E&eNl)J``SZvTf6Qr*&S%tVv_OBpbjnA0&Vz#(;QmGiq-k! zgS0br4I&+^2mgA15*~Cd00cXLYOLA#Ep}_)eED>m+K@JTPr_|lSN}(OzFXQSBc6fM z@f-%2;1@BzhZa*LFV z-LrLmkmB%<<&jEURBEW>soaZ*rSIJNwaV%-RSaCZi4X)qYy^PxZ=oL?6N-5OGOMD2 z;q_JK?zkwQ@b3~ln&sDtT5SpW9a0q+5Gm|fpVY2|zqlNYBR}E5+ahgdj!CvK$Tlk0 z9g$5N;aar=CqMsudQV>yb4l@hN(9Jcc=1(|OHsqH6|g=K-WBd8GxZ`AkT?OO z-z_Ued-??Z*R4~L7jwJ%-`s~FK|qNAJ;EmIVDVpk{Lr7T4l{}vL)|GuUuswe9c5F| zv*5%u01hlv08?00Vpwyk*Q&&fY8k6MjOfpZfKa@F-^6d=Zv|0@&4_544RP5(s|4VPVP-f>%u(J@23BHqo2=zJ#v9g=F!cP((h zpt0|(s++ej?|$;2PE%+kc6JMmJjDW)3BXvBK!h!E`8Y&*7hS{c_Z?4SFP&Y<3evqf z9-ke+bSj$%Pk{CJlJbWwlBg^mEC^@%Ou?o>*|O)rl&`KIbHrjcpqsc$Zqt0^^F-gU2O=BusO+(Op}!jNzLMc zT;0YT%$@ClS%V+6lMTfhuzzxomoat=1H?1$5Ei7&M|gxo`~{UiV5w64Np6xV zVK^nL$)#^tjhCpTQMspXI({TW^U5h&Wi1Jl8g?P1YCV4=%ZYyjSo#5$SX&`r&1PyC zzc;uzCd)VTIih|8eNqFNeBMe#j_FS6rq81b>5?aXg+E#&$m++Gz9<+2)h=K(xtn}F ziV{rmu+Y>A)qvF}ms}4X^Isy!M&1%$E!rTO~5(p+8{U6#hWu>(Ll1}eD64Xa>~73A*538wry?v$vW z>^O#FRdbj(k0Nr&)U`Tl(4PI*%IV~;ZcI2z&rmq=(k^}zGOYZF3b2~Klpzd2eZJl> zB=MOLwI1{$RxQ7Y4e30&yOx?BvAvDkTBvWPpl4V8B7o>4SJn*+h1Ms&fHso%XLN5j z-zEwT%dTefp~)J_C8;Q6i$t!dnlh-!%haR1X_NuYUuP-)`IGWjwzAvp!9@h`kPZhf zwLwFk{m3arCdx8rD~K2`42mIN4}m%OQ|f)4kf%pL?Af5Ul<3M2fv>;nlhEPR8b)u} zIV*2-wyyD%%) zl$G@KrC#cUwoL?YdQyf9WH)@gWB{jd5w4evI& zOFF)p_D8>;3-N1z6mES!OPe>B^<;9xsh)){Cw$Vs-ez5nXS95NOr3s$IU;>VZSzKn zBvub8_J~I%(DozZW@{)Vp37-zevxMRZ8$8iRfwHmYvyjOxIOAF2FUngKj289!(uxY zaClWm!%x&teKmr^ABrvZ(ikx{{I-lEzw5&4t3P0eX%M~>$wG0ZjA4Mb&op+0$#SO_ z--R`>X!aqFu^F|a!{Up-iF(K+alKB{MNMs>e(i@Tpy+7Z-dK%IEjQFO(G+2mOb@BO zP>WHlS#fSQm0et)bG8^ZDScGnh-qRKIFz zfUdnk=m){ej0i(VBd@RLtRq3Ep=>&2zZ2%&vvf?Iex01hx1X!8U+?>ER;yJlR-2q4 z;Y@hzhEC=d+Le%=esE>OQ!Q|E%6yG3V_2*uh&_nguPcZ{q?DNq8h_2ahaP6=pP-+x zK!(ve(yfoYC+n(_+chiJ6N(ZaN+XSZ{|H{TR1J_s8x4jpis-Z-rlRvRK#U%SMJ(`C z?T2 zF(NNfO_&W%2roEC2j#v*(nRgl1X)V-USp-H|CwFNs?n@&vpRcj@W@xCJwR6@T!jt377?XjZ06=`d*MFyTdyvW!`mQm~t3luzYzvh^F zM|V}rO>IlBjZc}9Z zd$&!tthvr>5)m;5;96LWiAV0?t)7suqdh0cZis`^Pyg@?t>Ms~7{nCU;z`Xl+raSr zXpp=W1oHB*98s!Tpw=R5C)O{{Inl>9l7M*kq%#w9a$6N~v?BY2GKOVRkXYCgg*d

<5G2M1WZP5 zzqSuO91lJod(SBDDw<*sX(+F6Uq~YAeYV#2A;XQu_p=N5X+#cmu19Qk>QAnV=k!?wbk5I;tDWgFc}0NkvC*G=V+Yh1cyeJVq~9czZiDXe+S=VfL2g`LWo8om z$Y~FQc6MFjV-t1Y`^D9XMwY*U_re2R?&(O~68T&D4S{X`6JYU-pz=}ew-)V0AOUT1 zVOkHAB-8uBcRjLvz<9HS#a@X*Kc@|W)nyiSgi|u5$Md|P()%2(?olGg@ypoJwp6>m z*dnfjjWC>?_1p;%1brqZyDRR;8EntVA92EJ3ByOxj6a+bhPl z;a?m4rQAV1@QU^#M1HX)0+}A<7TCO`ZR_RzF}X9-M>cRLyN4C+lCk2)kT^3gN^`IT zNP~fAm(wyIoR+l^lQDA(e1Yv}&$I!n?&*p6?lZcQ+vGLLd~fM)qt}wsbf3r=tmVYe zl)ntf#E!P7wlakP9MXS7m0nsAmqxZ*)#j;M&0De`oNmFgi$ov#!`6^4)iQyxg5Iuj zjLAhzQ)r`^hf7`*1`Rh`X;LVBtDSz@0T?kkT1o!ijeyTGt5vc^Cd*tmNgiNo^EaWvaC8$e+nb_{W01j3%=1Y&92YacjCi>eNbwk%-gPQ@H-+4xskQ}f_c=jg^S-# zYFBDf)2?@5cy@^@FHK5$YdAK9cI;!?Jgd}25lOW%xbCJ>By3=HiK@1EM+I46A)Lsd zeT|ZH;KlCml=@;5+hfYf>QNOr^XNH%J-lvev)$Omy8MZ`!{`j>(J5cG&ZXXgv)TaF zg;cz99i$4CX_@3MIb?GL0s*8J=3`#P(jXF(_(6DXZjc@(@h&=M&JG)9&Te1?(^XMW zjjC_70|b=9hB6pKQi`S^Ls7JyJw^@P>Ko^&q8F&?>6i;#CbxUiLz1ZH4lNyd@QACd zu>{!sqjB!2Dg}pbAXD>d!3jW}=5aN0b;rw*W>*PAxm7D)aw(c*RX2@bTGEI|RRp}vw7;NR2wa;rXN{L{Q#=Fa z$x@ms6pqb>!8AuV(prv>|aU8oWV={C&$c zMa=p=CDNOC2tISZcd8~18GN5oTbKY+Vrq;3_obJlfSKRMk;Hdp1`y`&LNSOqeauR_ z^j*Ojl3Ohzb5-a49A8s|UnM*NM8tg}BJXdci5%h&;$afbmRpN0&~9rCnBA`#lG!p zc{(9Y?A0Y9yo?wSYn>iigf~KP$0*@bGZ>*YM4&D;@{<%Gg5^uUJGRrV4 z(aZOGB&{_0f*O=Oi0k{@8vN^BU>s3jJRS&CJOl3o|BE{FAA&a#2YYiX3pZz@|Go-F z|Fly;7eX2OTs>R}<`4RwpHFs9nwh)B28*o5qK1Ge=_^w0m`uJOv!=&!tzt#Save(C zgKU=Bsgql|`ui(e1KVxR`?>Dx>(rD1$iWp&m`v)3A!j5(6vBm*z|aKm*T*)mo(W;R zNGo2`KM!^SS7+*9YxTm6YMm_oSrLceqN*nDOAtagULuZl5Q<7mOnB@Hq&P|#9y{5B z!2x+2s<%Cv2Aa0+u{bjZXS);#IFPk(Ph-K7K?3i|4ro> zRbqJoiOEYo(Im^((r}U4b8nvo_>4<`)ut`24?ILnglT;Pd&U}$lV3U$F9#PD(O=yV zgNNA=GW|(E=&m_1;uaNmipQe?pon4{T=zK!N!2_CJL0E*R^XXIKf*wi!>@l}3_P9Z zF~JyMbW!+n-+>!u=A1ESxzkJy$DRuG+$oioG7(@Et|xVbJ#BCt;J43Nvj@MKvTxzy zMmjNuc#LXBxFAwIGZJk~^!q$*`FME}yKE8d1f5Mp}KHNq(@=Z8YxV}0@;YS~|SpGg$_jG7>_8WWYcVx#4SxpzlV9N4aO>K{c z$P?a_fyDzGX$Of3@ykvedGd<@-R;M^Shlj*SswJLD+j@hi_&_>6WZ}#AYLR0iWMK|A zH_NBeu(tMyG=6VO-=Pb>-Q#$F*or}KmEGg*-n?vWQREURdB#+6AvOj*I%!R-4E_2$ zU5n9m>RWs|Wr;h2DaO&mFBdDb-Z{APGQx$(L`if?C|njd*fC=rTS%{o69U|meRvu?N;Z|Y zbT|ojL>j;q*?xXmnHH#3R4O-59NV1j=uapkK7}6@Wo*^Nd#(;$iuGsb;H315xh3pl zHaJ>h-_$hdNl{+|Zb%DZH%ES;*P*v0#}g|vrKm9;j-9e1M4qX@zkl&5OiwnCz=tb6 zz<6HXD+rGIVpGtkb{Q^LIgExOm zz?I|oO9)!BOLW#krLmWvX5(k!h{i>ots*EhpvAE;06K|u_c~y{#b|UxQ*O@Ks=bca z^_F0a@61j3I(Ziv{xLb8AXQj3;R{f_l6a#H5ukg5rxwF9A$?Qp-Mo54`N-SKc}fWp z0T)-L@V$$&my;l#Ha{O@!fK4-FSA)L&3<${Hcwa7ue`=f&YsXY(NgeDU#sRlT3+9J z6;(^(sjSK@3?oMo$%L-nqy*E;3pb0nZLx6 z;h5)T$y8GXK1DS-F@bGun8|J(v-9o=42&nLJy#}M5D0T^5VWBNn$RpC zZzG6Bt66VY4_?W=PX$DMpKAI!d`INr) zkMB{XPQ<52rvWVQqgI0OL_NWxoe`xxw&X8yVftdODPj5|t}S6*VMqN$-h9)1MBe0N zYq?g0+e8fJCoAksr0af1)FYtz?Me!Cxn`gUx&|T;)695GG6HF7!Kg1zzRf_{VWv^bo81v4$?F6u2g|wxHc6eJQAg&V z#%0DnWm2Rmu71rPJ8#xFUNFC*V{+N_qqFH@gYRLZ6C?GAcVRi>^n3zQxORPG)$-B~ z%_oB?-%Zf7d*Fe;cf%tQwcGv2S?rD$Z&>QC2X^vwYjnr5pa5u#38cHCt4G3|efuci z@3z=#A13`+ztmp;%zjXwPY_aq-;isu*hecWWX_=Z8paSqq7;XYnUjK*T>c4~PR4W7 z#C*%_H&tfGx`Y$w7`dXvVhmovDnT>btmy~SLf>>~84jkoQ%cv=MMb+a{JV&t0+1`I z32g_Y@yDhKe|K^PevP~MiiVl{Ou7^Mt9{lOnXEQ`xY^6L8D$705GON{!1?1&YJEl#fTf5Z)da=yiEQ zGgtC-soFGOEBEB~ZF_{7b(76En>d}mI~XIwNw{e>=Fv)sgcw@qOsykWr?+qAOZSVrQfg}TNI ztKNG)1SRrAt6#Q?(me%)>&A_^DM`pL>J{2xu>xa$3d@90xR61TQDl@fu%_85DuUUA za9tn64?At;{`BAW6oykwntxHeDpXsV#{tmt5RqdN7LtcF4vR~_kZNT|wqyR#z^Xcd zFdymVRZvyLfTpBT>w9<)Ozv@;Yk@dOSVWbbtm^y@@C>?flP^EgQPAwsy75bveo=}T zFxl(f)s)j(0#N_>Or(xEuV(n$M+`#;Pc$1@OjXEJZumkaekVqgP_i}p`oTx;terTx zZpT+0dpUya2hqlf`SpXN{}>PfhajNk_J0`H|2<5E;U5Vh4F8er z;RxLSFgpGhkU>W?IwdW~NZTyOBrQ84H7_?gviIf71l`EETodG9a1!8e{jW?DpwjL? zGEM&eCzwoZt^P*8KHZ$B<%{I}>46IT%jJ3AnnB5P%D2E2Z_ z1M!vr#8r}1|KTqWA4%67ZdbMW2YJ81b(KF&SQ2L1Qn(y-=J${p?xLMx3W7*MK;LFQ z6Z`aU;;mTL4XrrE;HY*Rkh6N%?qviUGNAKiCB~!P}Z->IpO6E(gGd7I#eDuT7j|?nZ zK}I(EJ>$Kb&@338M~O+em9(L!+=0zBR;JAQesx|3?Ok90)D1aS9P?yTh6Poh8Cr4X zk3zc=f2rE7jj+aP7nUsr@~?^EGP>Q>h#NHS?F{Cn`g-gD<8F&dqOh-0sa%pfL`b+1 zUsF*4a~)KGb4te&K0}bE>z3yb8% zibb5Q%Sfiv7feb1r0tfmiMv z@^4XYwg@KZI=;`wC)`1jUA9Kv{HKe2t$WmRcR4y8)VAFjRi zaz&O7Y2tDmc5+SX(bj6yGHYk$dBkWc96u3u&F)2yEE~*i0F%t9Kg^L6MJSb&?wrXi zGSc;_rln$!^ybwYBeacEFRsVGq-&4uC{F)*Y;<0y7~USXswMo>j4?~5%Zm!m@i@-> zXzi82sa-vpU{6MFRktJy+E0j#w`f`>Lbog{zP|9~hg(r{RCa!uGe>Yl536cn$;ouH za#@8XMvS-kddc1`!1LVq;h57~zV`7IYR}pp3u!JtE6Q67 zq3H9ZUcWPm2V4IukS}MCHSdF0qg2@~ufNx9+VMjQP&exiG_u9TZAeAEj*jw($G)zL zq9%#v{wVyOAC4A~AF=dPX|M}MZV)s(qI9@aIK?Pe+~ch|>QYb+78lDF*Nxz2-vpRbtQ*F4$0fDbvNM#CCatgQ@z1+EZWrt z2dZfywXkiW=no5jus-92>gXn5rFQ-COvKyegmL=4+NPzw6o@a?wGE-1Bt;pCHe;34K%Z z-FnOb%!nH;)gX+!a3nCk?5(f1HaWZBMmmC@lc({dUah+E;NOros{?ui1zPC-Q0);w zEbJmdE$oU$AVGQPdm{?xxI_0CKNG$LbY*i?YRQ$(&;NiA#h@DCxC(U@AJ$Yt}}^xt-EC_ z4!;QlLkjvSOhdx!bR~W|Ezmuf6A#@T`2tsjkr>TvW*lFCMY>Na_v8+{Y|=MCu1P8y z89vPiH5+CKcG-5lzk0oY>~aJC_0+4rS@c@ZVKLAp`G-sJB$$)^4*A!B zmcf}lIw|VxV9NSoJ8Ag3CwN&d7`|@>&B|l9G8tXT^BDHOUPrtC70NgwN4${$k~d_4 zJ@eo6%YQnOgq$th?0{h`KnqYa$Nz@vlHw<%!C5du6<*j1nwquk=uY}B8r7f|lY+v7 zm|JU$US08ugor8E$h3wH$c&i~;guC|3-tqJy#T;v(g( zBZtPMSyv%jzf->435yM(-UfyHq_D=6;ouL4!ZoD+xI5uCM5ay2m)RPmm$I}h>()hS zO!0gzMxc`BPkUZ)WXaXam%1;)gedA7SM8~8yIy@6TPg!hR0=T>4$Zxd)j&P-pXeSF z9W`lg6@~YDhd19B9ETv(%er^Xp8Yj@AuFVR_8t*KS;6VHkEDKI#!@l!l3v6`W1`1~ zP{C@keuV4Q`Rjc08lx?zmT$e$!3esc9&$XZf4nRL(Z*@keUbk!GZi(2Bmyq*saOD? z3Q$V<*P-X1p2}aQmuMw9nSMbOzuASsxten7DKd6A@ftZ=NhJ(0IM|Jr<91uAul4JR zADqY^AOVT3a(NIxg|U;fyc#ZnSzw2cr}#a5lZ38>nP{05D)7~ad7JPhw!LqOwATXtRhK!w0X4HgS1i<%AxbFmGJx9?sEURV+S{k~g zGYF$IWSlQonq6}e;B(X(sIH|;52+(LYW}v_gBcp|x%rEAVB`5LXg_d5{Q5tMDu0_2 z|LOm$@K2?lrLNF=mr%YP|U-t)~9bqd+wHb4KuPmNK<}PK6e@aosGZK57=Zt+kcszVOSbe;`E^dN! ze7`ha3WUUU7(nS0{?@!}{0+-VO4A{7+nL~UOPW9_P(6^GL0h${SLtqG!} zKl~Ng5#@Sy?65wk9z*3SA`Dpd4b4T^@C8Fhd8O)k_4%0RZL5?#b~jmgU+0|DB%0Z) zql-cPC>A9HPjdOTpPC` zQwvF}uB5kG$Xr4XnaH#ruSjM*xG?_hT7y3G+8Ox`flzU^QIgb_>2&-f+XB6MDr-na zSi#S+c!ToK84<&m6sCiGTd^8pNdXo+$3^l3FL_E`0 z>8it5YIDxtTp2Tm(?}FX^w{fbfgh7>^8mtvN>9fWgFN_*a1P`Gz*dyOZF{OV7BC#j zQV=FQM5m>47xXgapI$WbPM5V`V<7J9tD)oz@d~MDoM`R^Y6-Na(lO~uvZlpu?;zw6 zVO1faor3dg#JEb5Q*gz4<W8tgC3nE2BG2jeIQs1)<{In&7hJ39x=;ih;CJDy)>0S1at*7n?Wr0ahYCpFjZ|@u91Zl7( zv;CSBRC65-6f+*JPf4p1UZ)k=XivKTX6_bWT~7V#rq0Xjas6hMO!HJN8GdpBKg_$B zwDHJF6;z?h<;GXFZan8W{XFNPpOj!(&I1`&kWO86p?Xz`a$`7qV7Xqev|7nn_lQuX ziGpU1MMYt&5dE2A62iX3;*0WzNB9*nSTzI%62A+N?f?;S>N@8M=|ef3gtQTIA*=yq zQAAjOqa!CkHOQo4?TsqrrsJLclXcP?dlAVv?v`}YUjo1Htt;6djP@NPFH+&p1I+f_ z)Y279{7OWomY8baT(4TAOlz1OyD{4P?(DGv3XyJTA2IXe=kqD)^h(@*E3{I~w;ws8 z)ZWv7E)pbEM zd3MOXRH3mQhks9 zv6{s;k0y5vrcjXaVfw8^>YyPo=oIqd5IGI{)+TZq5Z5O&hXAw%ZlL}^6FugH;-%vP zAaKFtt3i^ag226=f0YjzdPn6|4(C2sC5wHFX{7QF!tG1E-JFA`>eZ`}$ymcRJK?0c zN363o{&ir)QySOFY0vcu6)kX#;l??|7o{HBDVJN+17rt|w3;(C_1b>d;g9Gp=8YVl zYTtA52@!7AUEkTm@P&h#eg+F*lR zQ7iotZTcMR1frJ0*V@Hw__~CL>_~2H2cCtuzYIUD24=Cv!1j6s{QS!v=PzwQ(a0HS zBKx04KA}-Ue+%9d`?PG*hIij@54RDSQpA7|>qYVIrK_G6%6;#ZkR}NjUgmGju)2F`>|WJoljo)DJgZr4eo1k1i1+o z1D{>^RlpIY8OUaOEf5EBu%a&~c5aWnqM zxBpJq98f=%M^{4mm~5`CWl%)nFR64U{(chmST&2jp+-r z3675V<;Qi-kJud%oWnCLdaU-)xTnMM%rx%Jw6v@=J|Ir=4n-1Z23r-EVf91CGMGNz zb~wyv4V{H-hkr3j3WbGnComiqmS0vn?n?5v2`Vi>{Ip3OZUEPN7N8XeUtF)Ry6>y> zvn0BTLCiqGroFu|m2zG-;Xb6;W`UyLw)@v}H&(M}XCEVXZQoWF=Ykr5lX3XWwyNyF z#jHv)A*L~2BZ4lX?AlN3X#axMwOC)PoVy^6lCGse9bkGjb=qz%kDa6}MOmSwK`cVO zt(e*MW-x}XtU?GY5}9{MKhRhYOlLhJE5=ca+-RmO04^ z66z{40J=s=ey9OCdc(RCzy zd7Zr1%!y3}MG(D=wM_ebhXnJ@MLi7cImDkhm0y{d-Vm81j`0mbi4lF=eirlr)oW~a zCd?26&j^m4AeXEsIUXiTal)+SPM4)HX%%YWF1?(FV47BaA`h9m67S9x>hWMVHx~Hg z1meUYoLL(p@b3?x|9DgWeI|AJ`Ia84*P{Mb%H$ZRROouR4wZhOPX15=KiBMHl!^JnCt$Az`KiH^_d>cev&f zaG2>cWf$=A@&GP~DubsgYb|L~o)cn5h%2`i^!2)bzOTw2UR!>q5^r&2Vy}JaWFUQE04v>2;Z@ZPwXr?y&G(B^@&y zsd6kC=hHdKV>!NDLIj+3rgZJ|dF`%N$DNd;B)9BbiT9Ju^Wt%%u}SvfM^=|q-nxDG zuWCQG9e#~Q5cyf8@y76#kkR^}{c<_KnZ0QsZcAT|YLRo~&tU|N@BjxOuy`#>`X~Q< z?R?-Gsk$$!oo(BveQLlUrcL#eirhgBLh`qHEMg`+sR1`A=1QX7)ZLMRT+GBy?&mM8 zQG^z-!Oa&J-k7I(3_2#Q6Bg=NX<|@X&+YMIOzfEO2$6Mnh}YV!m!e^__{W@-CTprr zbdh3f=BeCD$gHwCrmwgM3LAv3!Mh$wM)~KWzp^w)Cu6roO7uUG5z*}i0_0j47}pK; ztN530`ScGatLOL06~zO)Qmuv`h!gq5l#wx(EliKe&rz-5qH(hb1*fB#B+q`9=jLp@ zOa2)>JTl7ovxMbrif`Xe9;+fqB1K#l=Dv!iT;xF zdkCvS>C5q|O;}ns3AgoE({Ua-zNT-9_5|P0iANmC6O76Sq_(AN?UeEQJ>#b54fi3k zFmh+P%b1x3^)0M;QxXLP!BZ^h|AhOde*{9A=f3|Xq*JAs^Y{eViF|=EBfS6L%k4ip zk+7M$gEKI3?bQg?H3zaE@;cyv9kv;cqK$VxQbFEsy^iM{XXW0@2|DOu$!-k zSFl}Y=jt-VaT>Cx*KQnHTyXt}f9XswFB9ibYh+k2J!ofO+nD?1iw@mwtrqI4_i?nE zhLkPp41ED62me}J<`3RN80#vjW;wt`pP?%oQ!oqy7`miL>d-35a=qotK$p{IzeSk# ze_$CFYp_zIkrPFVaW^s#U4xT1lI^A0IBe~Y<4uS%zSV=wcuLr%gQT=&5$&K*bwqx| zWzCMiz>7t^Et@9CRUm9E+@hy~sBpm9fri$sE1zgLU((1?Yg{N1Sars=DiW&~Zw=3I zi7y)&oTC?UWD2w97xQ&5vx zRXEBGeJ(I?Y}eR0_O{$~)bMJRTsNUPIfR!xU9PE7A>AMNr_wbrFK>&vVw=Y;RH zO$mlpmMsQ}-FQ2cSj7s7GpC+~^Q~dC?y>M}%!-3kq(F3hGWo9B-Gn02AwUgJ>Z-pKOaj zysJBQx{1>Va=*e@sLb2z&RmQ7ira;aBijM-xQ&cpR>X3wP^foXM~u1>sv9xOjzZpX z0K;EGouSYD~oQ&lAafj3~EaXfFShC+>VsRlEMa9cg9i zFxhCKO}K0ax6g4@DEA?dg{mo>s+~RPI^ybb^u--^nTF>**0l5R9pocwB?_K)BG_)S zyLb&k%XZhBVr7U$wlhMqwL)_r&&n%*N$}~qijbkfM|dIWP{MyLx}X&}ES?}7i;9bW zmTVK@zR)7kE2+L42Q`n4m0VVg5l5(W`SC9HsfrLZ=v%lpef=Gj)W59VTLe+Z$8T8i z4V%5+T0t8LnM&H>Rsm5C%qpWBFqgTwL{=_4mE{S3EnBXknM&u8n}A^IIM4$s3m(Rd z>zq=CP-!9p9es2C*)_hoL@tDYABn+o#*l;6@7;knWIyDrt5EuakO99S$}n((Fj4y} zD!VvuRzghcE{!s;jC*<_H$y6!6QpePo2A3ZbX*ZzRnQq*b%KK^NF^z96CHaWmzU@f z#j;y?X=UP&+YS3kZx7;{ zDA{9(wfz7GF`1A6iB6fnXu0?&d|^p|6)%3$aG0Uor~8o? z*e}u#qz7Ri?8Uxp4m_u{a@%bztvz-BzewR6bh*1Xp+G=tQGpcy|4V_&*aOqu|32CM zz3r*E8o8SNea2hYJpLQ-_}R&M9^%@AMx&`1H8aDx4j%-gE+baf2+9zI*+Pmt+v{39 zDZ3Ix_vPYSc;Y;yn68kW4CG>PE5RoaV0n@#eVmk?p$u&Fy&KDTy!f^Hy6&^-H*)#u zdrSCTJPJw?(hLf56%2;_3n|ujUSJOU8VPOTlDULwt0jS@j^t1WS z!n7dZIoT+|O9hFUUMbID4Ec$!cc($DuQWkocVRcYSikFeM&RZ=?BW)mG4?fh#)KVG zcJ!<=-8{&MdE)+}?C8s{k@l49I|Zwswy^ZN3;E!FKyglY~Aq?4m74P-0)sMTGXqd5(S<-(DjjM z&7dL-Mr8jhUCAG$5^mI<|%`;JI5FVUnNj!VO2?Jiqa|c2;4^n!R z`5KK0hyB*F4w%cJ@Un6GC{mY&r%g`OX|1w2$B7wxu97%<@~9>NlXYd9RMF2UM>(z0 zouu4*+u+1*k;+nFPk%ly!nuMBgH4sL5Z`@Rok&?Ef=JrTmvBAS1h?C0)ty5+yEFRz zY$G=coQtNmT@1O5uk#_MQM1&bPPnspy5#>=_7%WcEL*n$;sSAZcXxMpcXxLe;_mLA z5F_paad+bGZV*oh@8h0(|D2P!q# zTHjmiphJ=AazSeKQPkGOR-D8``LjzToyx{lfK-1CDD6M7?pMZOdLKFtjZaZMPk4}k zW)97Fh(Z+_Fqv(Q_CMH-YYi?fR5fBnz7KOt0*t^cxmDoIokc=+`o# zrud|^h_?KW=Gv%byo~(Ln@({?3gnd?DUf-j2J}|$Mk>mOB+1{ZQ8HgY#SA8END(Zw z3T+W)a&;OO54~m}ffemh^oZ!Vv;!O&yhL0~hs(p^(Yv=(3c+PzPXlS5W79Er8B1o* z`c`NyS{Zj_mKChj+q=w)B}K za*zzPhs?c^`EQ;keH{-OXdXJet1EsQ)7;{3eF!-t^4_Srg4(Ot7M*E~91gwnfhqaM zNR7dFaWm7MlDYWS*m}CH${o?+YgHiPC|4?X?`vV+ws&Hf1ZO-w@OGG^o4|`b{bLZj z&9l=aA-Y(L11!EvRjc3Zpxk7lc@yH1e$a}8$_-r$)5++`_eUr1+dTb@ zU~2P1HM#W8qiNN3b*=f+FfG1!rFxnNlGx{15}BTIHgxO>Cq4 z;#9H9YjH%>Z2frJDJ8=xq>Z@H%GxXosS@Z>cY9ppF+)e~t_hWXYlrO6)0p7NBMa`+ z^L>-#GTh;k_XnE)Cgy|0Dw;(c0* zSzW14ZXozu)|I@5mRFF1eO%JM=f~R1dkNpZM+Jh(?&Zje3NgM{2ezg1N`AQg5%+3Y z64PZ0rPq6;_)Pj-hyIOgH_Gh`1$j1!jhml7ksHA1`CH3FDKiHLz+~=^u@kUM{ilI5 z^FPiJ7mSrzBs9{HXi2{sFhl5AyqwUnU{sPcUD{3+l-ZHAQ)C;c$=g1bdoxeG(5N01 zZy=t8i{*w9m?Y>V;uE&Uy~iY{pY4AV3_N;RL_jT_QtLFx^KjcUy~q9KcLE3$QJ{!)@$@En{UGG7&}lc*5Kuc^780;7Bj;)X?1CSy*^^ zPP^M)Pr5R>mvp3_hmCtS?5;W^e@5BjE>Cs<`lHDxj<|gtOK4De?Sf0YuK5GX9G93i zMYB{8X|hw|T6HqCf7Cv&r8A$S@AcgG1cF&iJ5=%+x;3yB`!lQ}2Hr(DE8=LuNb~Vs z=FO&2pdc16nD$1QL7j+!U^XWTI?2qQKt3H8=beVTdHHa9=MiJ&tM1RRQ-=+vy!~iz zj3O{pyRhCQ+b(>jC*H)J)%Wq}p>;?@W*Eut@P&?VU+Sdw^4kE8lvX|6czf{l*~L;J zFm*V~UC;3oQY(ytD|D*%*uVrBB}BbAfjK&%S;z;7$w68(8PV_whC~yvkZmX)xD^s6 z{$1Q}q;99W?*YkD2*;)tRCS{q2s@JzlO~<8x9}X<0?hCD5vpydvOw#Z$2;$@cZkYrp83J0PsS~!CFtY%BP=yxG?<@#{7%2sy zOc&^FJxsUYN36kSY)d7W=*1-{7ghPAQAXwT7z+NlESlkUH&8ODlpc8iC*iQ^MAe(B z?*xO4i{zFz^G=^G#9MsLKIN64rRJykiuIVX5~0#vAyDWc9-=6BDNT_aggS2G{B>dD ze-B%d3b6iCfc5{@yz$>=@1kdK^tX9qh0=ocv@9$ai``a_ofxT=>X7_Y0`X}a^M?d# z%EG)4@`^Ej_=%0_J-{ga!gFtji_byY&Vk@T1c|ucNAr(JNr@)nCWj?QnCyvXg&?FW;S-VOmNL6^km_dqiVjJuIASVGSFEos@EVF7St$WE&Z%)`Q##+0 zjaZ=JI1G@0!?l|^+-ZrNd$WrHBi)DA0-Eke>dp=_XpV<%CO_Wf5kQx}5e<90dt>8k zAi00d0rQ821nA>B4JHN7U8Zz=0;9&U6LOTKOaC1FC8GgO&kc=_wHIOGycL@c*$`ce703t%>S}mvxEnD-V!;6c`2(p74V7D0No1Xxt`urE66$0(ThaAZ1YVG#QP$ zy~NN%kB*zhZ2Y!kjn826pw4bh)75*e!dse+2Db(;bN34Uq7bLpr47XTX{8UEeC?2i z*{$`3dP}32${8pF$!$2Vq^gY|#w+VA_|o(oWmQX8^iw#n_crb(K3{69*iU?<%C-%H zuKi)3M1BhJ@3VW>JA`M>L~5*_bxH@Euy@niFrI$82C1}fwR$p2E&ZYnu?jlS}u7W9AyfdXh2pM>78bIt3 z)JBh&XE@zA!kyCDfvZ1qN^np20c1u#%P6;6tU&dx0phT1l=(mw7`u!-0e=PxEjDds z9E}{E!7f9>jaCQhw)&2TtG-qiD)lD(4jQ!q{`x|8l&nmtHkdul# zy+CIF8lKbp9_w{;oR+jSLtTfE+B@tOd6h=QePP>rh4@~!8c;Hlg9m%%&?e`*Z?qz5-zLEWfi>`ord5uHF-s{^bexKAoMEV@9nU z^5nA{f{dW&g$)BAGfkq@r5D)jr%!Ven~Q58c!Kr;*Li#`4Bu_?BU0`Y`nVQGhNZk@ z!>Yr$+nB=`z#o2nR0)V3M7-eVLuY`z@6CT#OTUXKnxZn$fNLPv7w1y7eGE=Qv@Hey`n;`U=xEl|q@CCV^#l)s0ZfT+mUf z^(j5r4)L5i2jnHW4+!6Si3q_LdOLQi<^fu?6WdohIkn79=jf%Fs3JkeXwF(?_tcF? z?z#j6iXEd(wJy4|p6v?xNk-)iIf2oX5^^Y3q3ziw16p9C6B;{COXul%)`>nuUoM*q zzmr|NJ5n)+sF$!yH5zwp=iM1#ZR`O%L83tyog-qh1I z0%dcj{NUs?{myT~33H^(%0QOM>-$hGFeP;U$puxoJ>>o-%Lk*8X^rx1>j|LtH$*)>1C!Pv&gd16%`qw5LdOIUbkNhaBBTo}5iuE%K&ZV^ zAr_)kkeNKNYJRgjsR%vexa~&8qMrQYY}+RbZ)egRg9_$vkoyV|Nc&MH@8L)`&rpqd zXnVaI@~A;Z^c3+{x=xgdhnocA&OP6^rr@rTvCnhG6^tMox$ulw2U7NgUtW%|-5VeH z_qyd47}1?IbuKtqNbNx$HR`*+9o=8`%vM8&SIKbkX9&%TS++x z5|&6P<%=F$C?owUI`%uvUq^yW0>`>yz!|WjzsoB9dT;2Dx8iSuK%%_XPgy0dTD4kd zDXF@&O_vBVVKQq(9YTClUPM30Sk7B!v7nOyV`XC!BA;BIVwphh+c)?5VJ^(C;GoQ$ zvBxr7_p*k$T%I1ke}`U&)$uf}I_T~#3XTi53OX)PoXVgxEcLJgZG^i47U&>LY(l%_ z;9vVDEtuMCyu2fqZeez|RbbIE7@)UtJvgAcVwVZNLccswxm+*L&w`&t=ttT=sv6Aq z!HouSc-24Y9;0q$>jX<1DnnGmAsP))- z^F~o99gHZw`S&Aw7e4id6Lg7kMk-e)B~=tZ!kE7sGTOJ)8@q}np@j7&7Sy{2`D^FH zI7aX%06vKsfJ168QnCM2=l|i>{I{%@gcr>ExM0Dw{PX6ozEuqFYEt z087%MKC;wVsMV}kIiuu9Zz9~H!21d!;Cu#b;hMDIP7nw3xSX~#?5#SSjyyg+Y@xh| z%(~fv3`0j#5CA2D8!M2TrG=8{%>YFr(j)I0DYlcz(2~92?G*?DeuoadkcjmZszH5& zKI@Lis%;RPJ8mNsbrxH@?J8Y2LaVjUIhRUiO-oqjy<&{2X~*f|)YxnUc6OU&5iac= z*^0qwD~L%FKiPmlzi&~a*9sk2$u<7Al=_`Ox^o2*kEv?p`#G(p(&i|ot8}T;8KLk- zPVf_4A9R`5^e`Om2LV*cK59EshYXse&IoByj}4WZaBomoHAPKqxRKbPcD`lMBI)g- zeMRY{gFaUuecSD6q!+b5(?vAnf>c`Z(8@RJy%Ulf?W~xB1dFAjw?CjSn$ph>st5bc zUac1aD_m6{l|$#g_v6;=32(mwpveQDWhmjR7{|B=$oBhz`7_g7qNp)n20|^^op3 zSfTdWV#Q>cb{CMKlWk91^;mHap{mk)o?udk$^Q^^u@&jd zfZ;)saW6{e*yoL6#0}oVPb2!}r{pAUYtn4{P~ES9tTfC5hXZnM{HrC8^=Pof{G4%Bh#8 ze~?C9m*|fd8MK;{L^!+wMy>=f^8b&y?yr6KnTq28$pFMBW9Oy7!oV5z|VM$s-cZ{I|Xf@}-)1=$V&x7e;9v81eiTi4O5-vs?^5pCKy2l>q);!MA zS!}M48l$scB~+Umz}7NbwyTn=rqt@`YtuwiQSMvCMFk2$83k50Q>OK5&fe*xCddIm)3D0I6vBU<+!3=6?(OhkO|b4fE_-j zimOzyfBB_*7*p8AmZi~X2bgVhyPy>KyGLAnOpou~sx9)S9%r)5dE%ADs4v%fFybDa_w*0?+>PsEHTbhKK^G=pFz z@IxLTCROWiKy*)cV3y%0FwrDvf53Ob_XuA1#tHbyn%Ko!1D#sdhBo`;VC*e1YlhrC z?*y3rp86m#qI|qeo8)_xH*G4q@70aXN|SP+6MQ!fJQqo1kwO_v7zqvUfU=Gwx`CR@ zRFb*O8+54%_8tS(ADh}-hUJzE`s*8wLI>1c4b@$al)l}^%GuIXjzBK!EWFO8W`>F^ ze7y#qPS0NI7*aU)g$_ziF(1ft;2<}6Hfz10cR8P}67FD=+}MfhrpOkF3hFhQu;Q1y zu%=jJHTr;0;oC94Hi@LAF5quAQ(rJG(uo%BiRQ@8U;nhX)j0i?0SL2g-A*YeAqF>RVCBOTrn{0R27vu}_S zS>tX4!#&U4W;ikTE!eFH+PKw%p+B(MR2I%n#+m0{#?qRP_tR@zpgCb=4rcrL!F=;A zh%EIF8m6%JG+qb&mEfuFTLHSxUAZEvC-+kvZKyX~SA3Umt`k}}c!5dy?-sLIM{h@> z!2=C)@nx>`;c9DdwZ&zeUc(7t<21D7qBj!|1^Mp1eZ6)PuvHx+poKSDCSBMFF{bKy z;9*&EyKitD99N}%mK8431rvbT+^%|O|HV23{;RhmS{$5tf!bIPoH9RKps`-EtoW5h zo6H_!s)Dl}2gCeGF6>aZtah9iLuGd19^z0*OryPNt{70RvJSM<#Ox9?HxGg04}b^f zrVEPceD%)#0)v5$YDE?f`73bQ6TA6wV;b^x*u2Ofe|S}+q{s5gr&m~4qGd!wOu|cZ||#h_u=k*fB;R6&k?FoM+c&J;ISg70h!J7*xGus)ta4veTdW)S^@sU@ z4$OBS=a~@F*V0ECic;ht4@?Jw<9kpjBgHfr2FDPykCCz|v2)`JxTH55?b3IM={@DU z!^|9nVO-R#s{`VHypWyH0%cs;0GO3E;It6W@0gX6wZ%W|Dzz&O%m17pa19db(er}C zUId1a4#I+Ou8E1MU$g=zo%g7K(=0Pn$)Rk z<4T2u<0rD)*j+tcy2XvY+0 z0d2pqm4)4lDewsAGThQi{2Kc3&C=|OQF!vOd#WB_`4gG3@inh-4>BoL!&#ij8bw7? zqjFRDaQz!J-YGitV4}$*$hg`vv%N)@#UdzHFI2E<&_@0Uw@h_ZHf}7)G;_NUD3@18 zH5;EtugNT0*RXVK*by>WS>jaDDfe!A61Da=VpIK?mcp^W?!1S2oah^wowRnrYjl~`lgP-mv$?yb6{{S55CCu{R z$9;`dyf0Y>uM1=XSl_$01Lc1Iy68IosWN8Q9Op=~I(F<0+_kKfgC*JggjxNgK6 z-3gQm6;sm?J&;bYe&(dx4BEjvq}b`OT^RqF$J4enP1YkeBK#>l1@-K`ajbn05`0J?0daOtnzh@l3^=BkedW1EahZlRp;`j*CaT;-21&f2wU z+Nh-gc4I36Cw+;3UAc<%ySb`#+c@5y ze~en&bYV|kn?Cn|@fqmGxgfz}U!98$=drjAkMi`43I4R%&H0GKEgx-=7PF}y`+j>r zg&JF`jomnu2G{%QV~Gf_-1gx<3Ky=Md9Q3VnK=;;u0lyTBCuf^aUi?+1+`4lLE6ZK zT#(Bf`5rmr(tgTbIt?yA@y`(Ar=f>-aZ}T~>G32EM%XyFvhn&@PWCm#-<&ApLDCXT zD#(9m|V(OOo7PmE@`vD4$S5;+9IQm19dd zvMEU`)E1_F+0o0-z>YCWqg0u8ciIknU#{q02{~YX)gc_u;8;i233D66pf(IkTDxeN zL=4z2)?S$TV9=ORVr&AkZMl<4tTh(v;Ix1{`pPVqI3n2ci&4Dg+W|N8TBUfZ*WeLF zqCH_1Q0W&f9T$lx3CFJ$o@Lz$99 zW!G&@zFHxTaP!o#z^~xgF|(vrHz8R_r9eo;TX9}2ZyjslrtH=%6O)?1?cL&BT(Amp zTGFU1%%#xl&6sH-UIJk_PGk_McFn7=%yd6tAjm|lnmr8bE2le3I~L{0(ffo}TQjyo zHZZI{-}{E4ohYTlZaS$blB!h$Jq^Rf#(ch}@S+Ww&$b);8+>g84IJcLU%B-W?+IY& zslcZIR>+U4v3O9RFEW;8NpCM0w1ROG84=WpKxQ^R`{=0MZCubg3st z48AyJNEvyxn-jCPTlTwp4EKvyEwD3e%kpdY?^BH0!3n6Eb57_L%J1=a*3>|k68A}v zaW`*4YitylfD}ua8V)vb79)N_Ixw_mpp}yJGbNu+5YYOP9K-7nf*jA1#<^rb4#AcS zKg%zCI)7cotx}L&J8Bqo8O1b0q;B1J#B5N5Z$Zq=wX~nQFgUfAE{@u0+EnmK{1hg> zC{vMfFLD;L8b4L+B51&LCm|scVLPe6h02rws@kGv@R+#IqE8>Xn8i|vRq_Z`V;x6F zNeot$1Zsu`lLS92QlLWF54za6vOEKGYQMdX($0JN*cjG7HP&qZ#3+bEN$8O_PfeAb z0R5;=zXac2IZ?fxu59?Nka;1lKm|;0)6|#RxkD05P5qz;*AL@ig!+f=lW5^Jbag%2 z%9@iM0ph$WFlxS!`p31t92z~TB}P-*CS+1Oo_g;7`6k(Jyj8m8U|Q3Sh7o-Icp4kV zK}%qri5>?%IPfamXIZ8pXbm-#{ytiam<{a5A+3dVP^xz!Pvirsq7Btv?*d7eYgx7q zWFxrzb3-%^lDgMc=Vl7^={=VDEKabTG?VWqOngE`Kt7hs236QKidsoeeUQ_^FzsXjprCDd@pW25rNx#6x&L6ZEpoX9Ffzv@olnH3rGOSW( zG-D|cV0Q~qJ>-L}NIyT?T-+x+wU%;+_GY{>t(l9dI%Ximm+Kmwhee;FK$%{dnF;C% zFjM2&$W68Sz#d*wtfX?*WIOXwT;P6NUw}IHdk|)fw*YnGa0rHx#paG!m=Y6GkS4VX zX`T$4eW9k1W!=q8!(#8A9h67fw))k_G)Q9~Q1e3f`aV@kbcSv7!priDUN}gX(iXTy zr$|kU0Vn%*ylmyDCO&G0Z3g>%JeEPFAW!5*H2Ydl>39w3W+gEUjL&vrRs(xGP{(ze zy7EMWF14@Qh>X>st8_029||TP0>7SG9on_xxeR2Iam3G~Em$}aGsNt$iES9zFa<3W zxtOF*!G@=PhfHO!=9pVPXMUVi30WmkPoy$02w}&6A7mF)G6-`~EVq5CwD2`9Zu`kd)52``#V zNSb`9dG~8(dooi1*-aSMf!fun7Sc`-C$-E(3BoSC$2kKrVcI!&yC*+ff2+C-@!AT_ zsvlAIV+%bRDfd{R*TMF><1&_a%@yZ0G0lg2K;F>7b+7A6pv3-S7qWIgx+Z?dt8}|S z>Qbb6x(+^aoV7FQ!Ph8|RUA6vXWQH*1$GJC+wXLXizNIc9p2yLzw9 z0=MdQ!{NnOwIICJc8!+Jp!zG}**r#E!<}&Te&}|B4q;U57$+pQI^}{qj669zMMe_I z&z0uUCqG%YwtUc8HVN7?0GHpu=bL7&{C>hcd5d(iFV{I5c~jpX&!(a{yS*4MEoYXh z*X4|Y@RVfn;piRm-C%b@{0R;aXrjBtvx^HO;6(>i*RnoG0Rtcd25BT6edxTNOgUAOjn zJ2)l{ipj8IP$KID2}*#F=M%^n&=bA0tY98@+2I+7~A&T-tw%W#3GV>GTmkHaqftl)#+E zMU*P(Rjo>8%P@_@#UNq(_L{}j(&-@1iY0TRizhiATJrnvwSH0v>lYfCI2ex^><3$q znzZgpW0JlQx?JB#0^^s-Js1}}wKh6f>(e%NrMwS`Q(FhazkZb|uyB@d%_9)_xb$6T zS*#-Bn)9gmobhAtvBmL+9H-+0_0US?g6^TOvE8f3v=z3o%NcPjOaf{5EMRnn(_z8- z$|m0D$FTU zDy;21v-#0i)9%_bZ7eo6B9@Q@&XprR&oKl4m>zIj-fiRy4Dqy@VVVs?rscG| zmzaDQ%>AQTi<^vYCmv#KOTd@l7#2VIpsj?nm_WfRZzJako`^uU%Nt3e;cU*y*|$7W zLm%fX#i_*HoUXu!NI$ey>BA<5HQB=|nRAwK!$L#n-Qz;~`zACig0PhAq#^5QS<8L2 zS3A+8%vbVMa7LOtTEM?55apt(DcWh#L}R^P2AY*c8B}Cx=6OFAdMPj1f>k3#^#+Hk z6uW1WJW&RlBRh*1DLb7mJ+KO>!t^t8hX1#_Wk`gjDio9)9IGbyCAGI4DJ~orK+YRv znjxRMtshZQHc$#Y-<-JOV6g^Cr@odj&Xw5B(FmI)*qJ9NHmIz_r{t)TxyB`L-%q5l ztzHgD;S6cw?7Atg*6E1!c6*gPRCb%t7D%z<(xm+K{%EJNiI2N0l8ud0Ch@_av_RW? zIr!nO4dL5466WslE6MsfMss7<)-S!e)2@r2o=7_W)OO`~CwklRWzHTfpB)_HYwgz=BzLhgZ9S<{nLBOwOIgJU=94uj6r!m>Xyn9>&xP+=5!zG_*yEoRgM0`aYts z^)&8(>z5C-QQ*o_s(8E4*?AX#S^0)aqB)OTyX>4BMy8h(cHjA8ji1PRlox@jB*1n? zDIfyDjzeg91Ao(;Q;KE@zei$}>EnrF6I}q&Xd=~&$WdDsyH0H7fJX|E+O~%LS*7^Q zYzZ4`pBdY{b7u72gZm6^5~O-57HwzwAz{)NvVaowo`X02tL3PpgLjwA`^i9F^vSpN zAqH3mRjG8VeJNHZ(1{%!XqC+)Z%D}58Qel{_weSEHoygT9pN@i zi=G;!Vj6XQk2tuJC>lza%ywz|`f7TIz*EN2Gdt!s199Dr4Tfd_%~fu8gXo~|ogt5Q zlEy_CXEe^BgsYM^o@L?s33WM14}7^T(kqohOX_iN@U?u;$l|rAvn{rwy>!yfZw13U zB@X9)qt&4;(C6dP?yRsoTMI!j-f1KC!<%~i1}u7yLXYn)(#a;Z6~r>hp~kfP));mi zcG%kdaB9H)z9M=H!f>kM->fTjRVOELNwh1amgKQT=I8J66kI)u_?0@$$~5f`u%;zl zC?pkr^p2Fe=J~WK%4ItSzKA+QHqJ@~m|Cduv=Q&-P8I5rQ-#G@bYH}YJr zUS(~(w|vKyU(T(*py}jTUp%I%{2!W!K(i$uvotcPjVddW z8_5HKY!oBCwGZcs-q`4Yt`Zk~>K?mcxg51wkZlX5e#B08I75F7#dgn5yf&Hrp`*%$ zQ;_Qg>TYRzBe$x=T(@WI9SC!ReSas9vDm(yslQjBJZde5z8GDU``r|N(MHcxNopGr z_}u39W_zwWDL*XYYt>#Xo!9kL#97|EAGyGBcRXtLTd59x%m=3i zL^9joWYA)HfL15l9%H?q`$mY27!<9$7GH(kxb%MV>`}hR4a?+*LH6aR{dzrX@?6X4 z3e`9L;cjqYb`cJmophbm(OX0b)!AFG?5`c#zLagzMW~o)?-!@e80lvk!p#&CD8u5_r&wp4O0zQ>y!k5U$h_K;rWGk=U)zX!#@Q%|9g*A zWx)qS1?fq6X<$mQTB$#3g;;5tHOYuAh;YKSBz%il3Ui6fPRv#v62SsrCdMRTav)Sg zTq1WOu&@v$Ey;@^+_!)cf|w_X<@RC>!=~+A1-65O0bOFYiH-)abINwZvFB;hJjL_$ z(9iScmUdMp2O$WW!520Hd0Q^Yj?DK%YgJD^ez$Z^?@9@Ab-=KgW@n8nC&88)TDC+E zlJM)L3r+ZJfZW_T$;Imq*#2<(j+FIk8ls7)WJ6CjUu#r5PoXxQs4b)mZza<8=v{o)VlLRM<9yw^0En#tXAj`Sylxvki{<1DPe^ zhjHwx^;c8tb?Vr$6ZB;$Ff$+3(*oinbwpN-#F)bTsXq@Sm?43MC#jQ~`F|twI=7oC zH4TJtu#;ngRA|Y~w5N=UfMZi?s0%ZmKUFTAye&6Y*y-%c1oD3yQ%IF2q2385Zl+=> zfz=o`Bedy|U;oxbyb^rB9ixG{Gb-{h$U0hVe`J;{ql!s_OJ_>>eoQn(G6h7+b^P48 zG<=Wg2;xGD-+d@UMZ!c;0>#3nws$9kIDkK13IfloGT@s14AY>&>>^#>`PT7GV$2Hp zN<{bN*ztlZu_%W=&3+=#3bE(mka6VoHEs~0BjZ$+=0`a@R$iaW)6>wp2w)=v2@|2d z%?34!+iOc5S@;AAC4hELWLH56RGxo4jw8MDMU0Wk2k_G}=Vo(>eRFo(g3@HjG|`H3 zm8b*dK=moM*oB<)*A$M9!!5o~4U``e)wxavm@O_R(`P|u%9^LGi(_%IF<6o;NLp*0 zKsfZ0#24GT8(G`i4UvoMh$^;kOhl?`0yNiyrC#HJH=tqOH^T_d<2Z+ zeN>Y9Zn!X4*DMCK^o75Zk2621bdmV7Rx@AX^alBG4%~;G_vUoxhfhFRlR&+3WwF^T zaL)8xPq|wCZoNT^>3J0K?e{J-kl+hu2rZI>CUv#-z&u@`hjeb+bBZ>bcciQVZ{SbW zez04s9oFEgc8Z+Kp{XFX`MVf-s&w9*dx7wLen(_@y34}Qz@&`$2+osqfxz4&d}{Ql z*g1ag00Gu+$C`0avds{Q65BfGsu9`_`dML*rX~hyWIe$T>CsPRoLIr%MTk3pJ^2zH1qub1MBzPG}PO;Wmav9w%F7?%l=xIf#LlP`! z_Nw;xBQY9anH5-c8A4mME}?{iewjz(Sq-29r{fV;Fc>fv%0!W@(+{={Xl-sJ6aMoc z)9Q+$bchoTGTyWU_oI19!)bD=IG&OImfy;VxNXoIO2hYEfO~MkE#IXTK(~?Z&!ae! zl8z{D&2PC$Q*OBC(rS~-*-GHNJ6AC$@eve>LB@Iq;jbBZj`wk4|LGogE||Ie=M5g= z9d`uYQ1^Sr_q2wmZE>w2WG)!F%^KiqyaDtIAct?}D~JP4shTJy5Bg+-(EA8aXaxbd~BKMtTf2iQ69jD1o* zZF9*S3!v-TdqwK$%&?91Sh2=e63;X0Lci@n7y3XOu2ofyL9^-I767eHESAq{m+@*r zbVDx!FQ|AjT;!bYsXv8ilQjy~Chiu&HNhFXt3R_6kMC8~ChEFqG@MWu#1Q1#=~#ix zrkHpJre_?#r=N0wv`-7cHHqU`phJX2M_^{H0~{VP79Dv{6YP)oA1&TSfKPEPZn2)G z9o{U1huZBLL;Tp_0OYw@+9z(jkrwIGdUrOhKJUbwy?WBt zlIK)*K0lQCY0qZ!$%1?3A#-S70F#YyUnmJF*`xx?aH5;gE5pe-15w)EB#nuf6B*c~ z8Z25NtY%6Wlb)bUA$w%HKs5$!Z*W?YKV-lE0@w^{4vw;J>=rn?u!rv$&eM+rpU6rc=j9>N2Op+C{D^mospMCjF2ZGhe4eADA#skp2EA26%p3Ex9wHW8l&Y@HX z$Qv)mHM}4*@M*#*ll5^hE9M^=q~eyWEai*P;4z<9ZYy!SlNE5nlc7gm;M&Q zKhKE4d*%A>^m0R?{N}y|i6i^k>^n4(wzKvlQeHq{l&JuFD~sTsdhs`(?lFK@Q{pU~ zb!M3c@*3IwN1RUOVjY5>uT+s-2QLWY z4T2>fiSn>>Fob+%B868-v9D@AfWr#M8eM6w#eAlhc#zk6jkLxGBGk`E3$!A@*am!R zy>29&ptYK6>cvP`b!syNp)Q$0UOW|-O@)8!?94GOYF_}+zlW%fCEl|Tep_zx05g6q z>tp47e-&R*hSNe{6{H!mL?+j$c^TXT{C&@T-xIaesNCl05 z9SLb@q&mSb)I{VXMaiWa3PWj=Ed!>*GwUe;^|uk=Pz$njNnfFY^MM>E?zqhf6^{}0 zx&~~dA5#}1ig~7HvOQ#;d9JZBeEQ+}-~v$at`m!(ai z$w(H&mWCC~;PQ1$%iuz3`>dWeb3_p}X>L2LK%2l59Tyc}4m0>9A!8rhoU3m>i2+hl zx?*qs*c^j}+WPs>&v1%1Ko8_ivAGIn@QK7A`hDz-Emkcgv2@wTbYhkiwX2l=xz*XG zaiNg+j4F-I>9v+LjosI-QECrtKjp&0T@xIMKVr+&)gyb4@b3y?2CA?=ooN zT#;rU86WLh(e@#mF*rk(NV-qSIZyr z$6!ZUmzD)%yO-ot`rw3rp6?*_l*@Z*IB0xn4|BGPWHNc-1ZUnNSMWmDh=EzWJRP`) zl%d%J613oXzh5;VY^XWJi{lB`f#u+ThvtP7 zq(HK<4>tw(=yzSBWtYO}XI`S1pMBe3!jFxBHIuwJ(@%zdQFi1Q_hU2eDuHqXte7Ki zOV55H2D6u#4oTfr7|u*3p75KF&jaLEDpxk!4*bhPc%mpfj)Us3XIG3 zIKMX^s^1wt8YK7Ky^UOG=w!o5e7W-<&c|fw2{;Q11vm@J{)@N3-p1U>!0~sKWHaL= zWV(0}1IIyt1p%=_-Fe5Kfzc71wg}`RDDntVZv;4!=&XXF-$48jS0Sc;eDy@Sg;+{A zFStc{dXT}kcIjMXb4F7MbX~2%i;UrBxm%qmLKb|2=?uPr00-$MEUIGR5+JG2l2Nq` zkM{{1RO_R)+8oQ6x&-^kCj)W8Z}TJjS*Wm4>hf+4#VJP)OBaDF%3pms7DclusBUw} z{ND#!*I6h85g6DzNvdAmnwWY{&+!KZM4DGzeHI?MR@+~|su0{y-5-nICz_MIT_#FE zm<5f3zlaKq!XyvY3H`9s&T};z!cK}G%;~!rpzk9-6L}4Rg7vXtKFsl}@sT#U#7)x- z7UWue5sa$R>N&b{J61&gvKcKlozH*;OjoDR+elkh|4bJ!_3AZNMOu?n9&|L>OTD78 z^i->ah_Mqc|Ev)KNDzfu1P3grBIM#%`QZqj5W{qu(HocQhjyS;UINoP`{J+DvV?|1 z_sw6Yr3z6%e7JKVDY<$P=M)dbk@~Yw9|2!Cw!io3%j92wTD!c^e9Vj+7VqXo3>u#= zv#M{HHJ=e$X5vQ>>ML?E8#UlmvJgTnb73{PSPTf*0)mcj6C z{KsfUbDK|F$E(k;ER%8HMdDi`=BfpZzP3cl5yJHu;v^o2FkHNk;cXc17tL8T!CsYI zfeZ6sw@;8ia|mY_AXjCS?kUfxdjDB28)~Tz1dGE|{VfBS9`0m2!m1yG?hR})er^pl4c@9Aq+|}ZlDaHL)K$O| z%9Jp-imI-Id0|(d5{v~w6mx)tUKfbuVD`xNt04Mry%M+jXzE>4(TBsx#&=@wT2Vh) z1yeEY&~17>0%P(eHP0HB^|7C+WJxQBTG$uyOWY@iDloRIb-Cf!p<{WQHR!422#F34 zG`v|#CJ^G}y9U*7jgTlD{D&y$Iv{6&PYG>{Ixg$pGk?lWrE#PJ8KunQC@}^6OP!|< zS;}p3to{S|uZz%kKe|;A0bL0XxPB&Q{J(9PyX`+Kr`k~r2}yP^ND{8!v7Q1&vtk& z2Y}l@J@{|2`oA%sxvM9i0V+8IXrZ4;tey)d;LZI70Kbim<4=WoTPZy=Yd|34v#$Kh zx|#YJ8s`J>W&jt#GcMpx84w2Z3ur-rK7gf-p5cE)=w1R2*|0mj12hvapuUWM0b~dG zMg9p8FmAZI@i{q~0@QuY44&mMUNXd7z>U58shA3o`p5eVLpq>+{(<3->DWuSFVZwC zxd50Uz(w~LxC4}bgag#q#NNokK@yNc+Q|Ap!u>Ddy+df>v;j@I12CDNN9do+0^n8p zMQs7X#+FVF0C5muGfN{r0|Nkql%BQT|K(DDNdR2pzM=_ea5+GO|J67`05AV92t@4l z0Qno0078PIHdaQGHZ~Scw!dzgqjK~3B7kf>BcP__&lLyU(cu3B^uLo%{j|Mb0NR)tkeT7Hcwp4O# z)yzu>cvG(d9~0a^)eZ;;%3ksk@F&1eEBje~ zW+-_s)&RgiweQc!otF>4%vbXKaOU41{!hw?|2`Ld3I8$&#WOsq>EG)1ANb!{N4z9@ zsU!bPG-~-bqCeIDzo^Q;gnucB{tRzm{ZH^Orphm2U+REA!*<*J6YQV83@&xoDl%#wnl5qcBqCcAF-vX5{30}(oJrnSH z{RY85hylK2dMOh2%oO1J8%)0?8TOL%rS8)+CsDv}aQ>4D)Jv+DLK)9gI^n-T^$)Tc zFPUD75qJm!Y-KBqj;JP4dV4 z`X{lGmn<)1IGz330}s}Jrjtf{(lnuuNHe5(ezA(pYa=1|Ff-LhPFK8 zyJh_b{yzu0yll6ZkpRzRjezyYivjyjW7QwO;@6X`m;2Apn2EK2!~7S}-*=;5*7K$B z`x(=!^?zgj(-`&ApZJXI09aDLXaT@<;CH=?fBOY5d|b~wBA@@p^K#nxr`)?i?SqTupI_PJ(A3cx`z~9mX_*)>L F{|7XC?P&l2 literal 0 HcmV?d00001 diff --git a/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..7b0b125d7b8 --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-${gradle-version}-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradlew b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradlew new file mode 100755 index 00000000000..cccdd3d517f --- /dev/null +++ b/dd-smoke-tests/gradle/src/test/resources/test-gradle-wrapper/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" From 9eaf5a01bbcfa87894e05269868b1e278ddbe905 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:21:31 +0100 Subject: [PATCH 063/106] Update Gradle dependencies (#8005) * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * chore: Update Gradle dependencies * ignore additional webflux classes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Andrea Marziali --- communication/gradle.lockfile | 2 +- dd-java-agent/agent-bootstrap/gradle.lockfile | 4 +- dd-java-agent/agent-builder/gradle.lockfile | 4 +- .../agent-ci-visibility/gradle.lockfile | 4 +- .../agent-crashtracking/gradle.lockfile | 2 +- .../debugger-bootstrap/gradle.lockfile | 2 +- .../debugger-el/gradle.lockfile | 2 +- dd-java-agent/agent-debugger/gradle.lockfile | 2 +- dd-java-agent/agent-iast/gradle.lockfile | 4 +- dd-java-agent/agent-jmxfetch/gradle.lockfile | 2 +- dd-java-agent/agent-logging/gradle.lockfile | 2 +- .../agent-logs-intake/gradle.lockfile | 2 +- .../agent-otel/otel-bootstrap/gradle.lockfile | 2 +- .../agent-otel/otel-shim/gradle.lockfile | 2 +- .../agent-otel/otel-tooling/gradle.lockfile | 2 +- dd-java-agent/agent-profiling/gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../profiling-controller-jfr/gradle.lockfile | 2 +- .../implementation/gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../gradle.lockfile | 2 +- .../profiling-controller/gradle.lockfile | 2 +- .../profiling-ddprof/gradle.lockfile | 2 +- .../profiling-uploader/gradle.lockfile | 2 +- .../profiling-utils/gradle.lockfile | 2 +- dd-java-agent/agent-tooling/gradle.lockfile | 4 +- .../bytebuddy/matcher/ignored_class_name.trie | 1 + dd-java-agent/appsec/gradle.lockfile | 4 +- dd-java-agent/cws-tls/gradle.lockfile | 4 +- dd-java-agent/gradle.lockfile | 2 +- .../gradle.lockfile | 100 +++++++++ .../aerospike-4/gradle.lockfile | 4 +- .../akka-concurrent/gradle.lockfile | 4 +- .../akka-http/akka-http-10.0/gradle.lockfile | 4 +- .../akka-http-10.2-iast/gradle.lockfile | 4 +- .../akka-http/akka-http-10.6/gradle.lockfile | 4 +- .../instrumentation/akka-http/gradle.lockfile | 4 +- .../instrumentation/akka-init/gradle.lockfile | 4 +- .../apache-httpasyncclient-4/gradle.lockfile | 4 +- .../apache-httpclient-4/gradle.lockfile | 4 +- .../apache-httpclient-5/gradle.lockfile | 4 +- .../apache-httpcore-4/gradle.lockfile | 4 +- .../armeria-grpc/gradle.lockfile | 125 +++++------ .../armeria-jetty/gradle.lockfile | 76 +++---- .../instrumentation/avro/gradle.lockfile | 4 +- .../aws-common/gradle.lockfile | 4 +- .../aws-java-eventbridge-2.0/gradle.lockfile | 76 +++---- .../aws-java-sdk-1.11.0/gradle.lockfile | 25 +-- .../aws-java-sdk-2.2/gradle.lockfile | 85 ++++---- .../aws-java-sns-1.0/gradle.lockfile | 12 +- .../aws-java-sns-2.0/gradle.lockfile | 76 +++---- .../aws-java-sqs-1.0/gradle.lockfile | 10 +- .../aws-java-sqs-2.0/gradle.lockfile | 4 +- .../aws-lambda-handler/gradle.lockfile | 4 +- .../instrumentation/axis-2/gradle.lockfile | 4 +- .../instrumentation/axway-api/gradle.lockfile | 4 +- .../instrumentation/caffeine/gradle.lockfile | 4 +- .../instrumentation/cdi-1.2/gradle.lockfile | 4 +- .../classloading/gradle.lockfile | 4 +- .../jboss-testing/gradle.lockfile | 4 +- .../jsr14-testing/gradle.lockfile | 4 +- .../classloading/osgi-testing/gradle.lockfile | 4 +- .../tomcat-testing/gradle.lockfile | 4 +- .../commons-codec-1/gradle.lockfile | 4 +- .../commons-fileupload/gradle.lockfile | 4 +- .../commons-httpclient-2/gradle.lockfile | 4 +- .../commons-lang-2/gradle.lockfile | 4 +- .../commons-lang-3/gradle.lockfile | 4 +- .../commons-text/gradle.lockfile | 4 +- .../couchbase/couchbase-2.0/gradle.lockfile | 4 +- .../couchbase/couchbase-2.6/gradle.lockfile | 4 +- .../couchbase/couchbase-3.1/gradle.lockfile | 4 +- .../couchbase/couchbase-3.2/gradle.lockfile | 4 +- .../instrumentation/couchbase/gradle.lockfile | 4 +- .../instrumentation/cucumber/gradle.lockfile | 4 +- .../instrumentation/cxf-2.1/gradle.lockfile | 4 +- .../datanucleus-4/gradle.lockfile | 4 +- .../datastax-cassandra-3.8/gradle.lockfile | 4 +- .../datastax-cassandra-3/gradle.lockfile | 4 +- .../datastax-cassandra-4/gradle.lockfile | 4 +- .../dropwizard-views/gradle.lockfile | 4 +- .../dropwizard/gradle.lockfile | 4 +- .../elasticsearch/gradle.lockfile | 4 +- .../elasticsearch/rest-5/gradle.lockfile | 4 +- .../elasticsearch/rest-6.4/gradle.lockfile | 4 +- .../elasticsearch/rest-7/gradle.lockfile | 4 +- .../elasticsearch/transport-2/gradle.lockfile | 4 +- .../transport-5.3/gradle.lockfile | 4 +- .../elasticsearch/transport-5/gradle.lockfile | 4 +- .../elasticsearch/transport-6/gradle.lockfile | 4 +- .../transport-7.3/gradle.lockfile | 4 +- .../elasticsearch/transport/gradle.lockfile | 4 +- .../gradle.lockfile | 12 +- .../exception-profiling/gradle.lockfile | 4 +- .../finatra-2.9/gradle.lockfile | 4 +- .../freemarker-2.3.24/gradle.lockfile | 4 +- .../freemarker-2.3.9/gradle.lockfile | 4 +- .../freemarker/gradle.lockfile | 4 +- .../instrumentation/glassfish/gradle.lockfile | 4 +- .../google-http-client/gradle.lockfile | 6 +- .../google-pubsub/gradle.lockfile | 55 ++--- .../instrumentation/graal/gradle.lockfile | 4 +- .../graal/native-image/gradle.lockfile | 4 +- .../gradle-3.0/gradle.lockfile | 4 +- .../gradle-8.3/gradle.lockfile | 4 +- dd-java-agent/instrumentation/gradle.lockfile | 2 +- .../graphql-java/gradle.lockfile | 4 +- .../graphql-java-14.0/gradle.lockfile | 4 +- .../graphql-java-20.0/gradle.lockfile | 4 +- .../graphql-java-common/gradle.lockfile | 5 +- .../instrumentation/grizzly-2/gradle.lockfile | 4 +- .../grizzly-client-1.9/gradle.lockfile | 6 +- .../grizzly-http-2.3.20/gradle.lockfile | 4 +- .../instrumentation/grpc-1.5/gradle.lockfile | 4 +- .../instrumentation/gson-1.6/gradle.lockfile | 4 +- .../instrumentation/guava-10/gradle.lockfile | 4 +- .../hazelcast-3.6/gradle.lockfile | 4 +- .../hazelcast-3.9/gradle.lockfile | 4 +- .../hazelcast-4.0/gradle.lockfile | 4 +- .../hibernate/core-3.3/gradle.lockfile | 4 +- .../hibernate/core-4.0/gradle.lockfile | 4 +- .../hibernate/core-4.3/gradle.lockfile | 4 +- .../instrumentation/hibernate/gradle.lockfile | 4 +- .../http-url-connection/gradle.lockfile | 4 +- .../hystrix-1.4/gradle.lockfile | 4 +- .../iast-instrumenter/gradle.lockfile | 4 +- .../ignite-2.0/gradle.lockfile | 4 +- .../jackson-core/gradle.lockfile | 4 +- .../jackson-core-1/gradle.lockfile | 4 +- .../jackson-core-2.12/gradle.lockfile | 4 +- .../jackson-core-2.16/gradle.lockfile | 4 +- .../jackson-core-2.6/gradle.lockfile | 4 +- .../jackson-core-2.8/gradle.lockfile | 4 +- .../jackson-core-2/gradle.lockfile | 4 +- .../instrumentation/jacoco/gradle.lockfile | 4 +- .../jakarta-jms/gradle.lockfile | 4 +- .../jakarta-rs-annotations-3/gradle.lockfile | 4 +- .../jakarta-ws-annotations/gradle.lockfile | 4 +- .../java-concurrent/gradle.lockfile | 4 +- .../java-completablefuture/gradle.lockfile | 4 +- .../java-concurrent-21/gradle.lockfile | 4 +- .../lambda-testing/gradle.lockfile | 4 +- .../java-directbytebuffer/gradle.lockfile | 4 +- .../java-http-client/gradle.lockfile | 4 +- .../instrumentation/java-io/gradle.lockfile | 4 +- .../instrumentation/java-lang/gradle.lockfile | 4 +- .../java-lang/java-lang-11/gradle.lockfile | 4 +- .../java-lang/java-lang-17/gradle.lockfile | 4 +- .../java-lang/java-lang-9/gradle.lockfile | 4 +- .../instrumentation/java-net/gradle.lockfile | 4 +- .../java-security/gradle.lockfile | 4 +- .../instrumentation/java-util/gradle.lockfile | 4 +- .../javax-naming/gradle.lockfile | 4 +- .../instrumentation/javax-xml/gradle.lockfile | 4 +- .../jax-rs-annotations-1/gradle.lockfile | 4 +- .../filter-jersey/gradle.lockfile | 4 +- .../filter-resteasy-3.0/gradle.lockfile | 4 +- .../filter-resteasy-3.1/gradle.lockfile | 4 +- .../jax-rs-annotations-2/gradle.lockfile | 4 +- .../jax-rs-client-1.1/gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- .../jax-rs-client-2.0/gradle.lockfile | 4 +- .../jax-ws-annotations-1/gradle.lockfile | 4 +- .../jax-ws-annotations-2/gradle.lockfile | 4 +- .../jboss-logmanager/gradle.lockfile | 4 +- .../jboss-modules/gradle.lockfile | 4 +- .../instrumentation/jdbc/gradle.lockfile | 6 +- .../jdbc/scalikejdbc/gradle.lockfile | 4 +- .../instrumentation/jedis-1.4/gradle.lockfile | 4 +- .../instrumentation/jedis-3.0/gradle.lockfile | 4 +- .../instrumentation/jedis-4.0/gradle.lockfile | 4 +- .../jersey-2-appsec/gradle.lockfile | 4 +- .../jersey-3-appsec/gradle.lockfile | 4 +- .../instrumentation/jersey/gradle.lockfile | 4 +- .../instrumentation/jetty-11/gradle.lockfile | 4 +- .../instrumentation/jetty-12/gradle.lockfile | 8 +- .../instrumentation/jetty-7.0/gradle.lockfile | 4 +- .../instrumentation/jetty-7.6/gradle.lockfile | 4 +- .../instrumentation/jetty-9/gradle.lockfile | 4 +- .../jetty-appsec-7/gradle.lockfile | 4 +- .../jetty-appsec-8.1.3/gradle.lockfile | 4 +- .../jetty-appsec-9.2/gradle.lockfile | 4 +- .../jetty-appsec-9.3/gradle.lockfile | 4 +- .../jetty-client/gradle.lockfile | 4 +- .../jetty-client-10.0/gradle.lockfile | 4 +- .../jetty-client-12.0/gradle.lockfile | 4 +- .../jetty-client-9.1/gradle.lockfile | 4 +- .../jetty-client-common/gradle.lockfile | 5 +- .../jetty-common/gradle.lockfile | 4 +- .../jetty-util/gradle.lockfile | 4 +- .../instrumentation/jms/gradle.lockfile | 4 +- .../instrumentation/jose-jwt/gradle.lockfile | 4 +- .../instrumentation/jsp-2.3/gradle.lockfile | 4 +- .../cucumber-junit-4/gradle.lockfile | 4 +- .../junit-4.10/gradle.lockfile | 4 +- .../junit-4.10/munit-junit-4/gradle.lockfile | 4 +- .../cucumber-junit-5/gradle.lockfile | 4 +- .../instrumentation/junit-5.3/gradle.lockfile | 4 +- .../junit-5.3/junit-5.8/gradle.lockfile | 4 +- .../junit-5.3/spock-junit-5/gradle.lockfile | 4 +- .../kafka-clients-0.11/gradle.lockfile | 28 +-- .../kafka-clients-3.8/gradle.lockfile | 81 ++++---- .../kafka-common/gradle.lockfile | 4 +- .../kafka-streams-0.11/gradle.lockfile | 4 +- .../kafka-streams-1.0/gradle.lockfile | 4 +- .../instrumentation/karate/gradle.lockfile | 4 +- .../coroutines-1.3/gradle.lockfile | 4 +- .../coroutines-1.5/gradle.lockfile | 4 +- .../kotlin-coroutines/gradle.lockfile | 4 +- .../instrumentation/lettuce-4/gradle.lockfile | 4 +- .../instrumentation/lettuce-5/gradle.lockfile | 4 +- .../liberty-20/gradle.lockfile | 4 +- .../liberty-23/gradle.lockfile | 4 +- .../instrumentation/log4j-2.7/gradle.lockfile | 4 +- .../instrumentation/log4j1/gradle.lockfile | 4 +- .../instrumentation/log4j2/gradle.lockfile | 4 +- .../log4j2/logs-intake/gradle.lockfile | 8 +- .../instrumentation/logback-1/gradle.lockfile | 4 +- .../maven-3.2.1/gradle.lockfile | 4 +- .../instrumentation/micronaut/gradle.lockfile | 4 +- .../http-server-netty-2.0/gradle.lockfile | 4 +- .../http-server-netty-3.0/gradle.lockfile | 4 +- .../http-server-netty-4.0/gradle.lockfile | 52 ++--- .../mongo/bson-document/gradle.lockfile | 4 +- .../mongo/common/gradle.lockfile | 4 +- .../driver-3.1-core-test/gradle.lockfile | 4 +- .../mongo/driver-3.1/gradle.lockfile | 4 +- .../driver-3.10-sync-test/gradle.lockfile | 4 +- .../driver-3.3-async-test/gradle.lockfile | 4 +- .../mongo/driver-3.4/gradle.lockfile | 4 +- .../driver-3.7-core-test/gradle.lockfile | 4 +- .../mongo/driver-4.0/gradle.lockfile | 4 +- .../instrumentation/mongo/gradle.lockfile | 4 +- .../instrumentation/mule-4/gradle.lockfile | 4 +- .../instrumentation/netty-3.8/gradle.lockfile | 4 +- .../instrumentation/netty-4.0/gradle.lockfile | 4 +- .../netty-4.1-shared/gradle.lockfile | 4 +- .../instrumentation/netty-4.1/gradle.lockfile | 4 +- .../netty-buffer-4/gradle.lockfile | 4 +- .../netty-concurrent-4/gradle.lockfile | 6 +- .../netty-promise-4/gradle.lockfile | 4 +- .../ognl-appsec/gradle.lockfile | 4 +- .../instrumentation/okhttp-2/gradle.lockfile | 4 +- .../instrumentation/okhttp-3/gradle.lockfile | 4 +- .../opensearch/gradle.lockfile | 4 +- .../opensearch/rest/gradle.lockfile | 4 +- .../opensearch/transport/gradle.lockfile | 4 +- .../opentelemetry/gradle.lockfile | 4 +- .../opentelemetry-0.3/gradle.lockfile | 4 +- .../opentelemetry-1.4/gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- .../opentracing/api-0.31/gradle.lockfile | 4 +- .../opentracing/api-0.32/gradle.lockfile | 4 +- .../opentracing/gradle.lockfile | 4 +- .../instrumentation/org-json/gradle.lockfile | 4 +- .../instrumentation/osgi-4.3/gradle.lockfile | 4 +- .../owasp-esapi-2/gradle.lockfile | 4 +- .../pekko-concurrent/gradle.lockfile | 4 +- .../pekko-http-1.0/gradle.lockfile | 4 +- .../instrumentation/play-2.3/gradle.lockfile | 4 +- .../instrumentation/play-2.4/gradle.lockfile | 4 +- .../instrumentation/play-2.6/gradle.lockfile | 4 +- .../instrumentation/play-ws-1/gradle.lockfile | 4 +- .../play-ws-2.1/gradle.lockfile | 4 +- .../instrumentation/play-ws-2/gradle.lockfile | 4 +- .../instrumentation/play-ws/gradle.lockfile | 4 +- .../instrumentation/protobuf/gradle.lockfile | 4 +- .../instrumentation/quartz-2/gradle.lockfile | 20 +- .../rabbitmq-amqp-2.7/gradle.lockfile | 6 +- .../ratpack-1.5/gradle.lockfile | 18 +- .../reactive-streams/gradle.lockfile | 4 +- .../reactor-core-3.1/gradle.lockfile | 12 +- .../reactor-netty-1/gradle.lockfile | 10 +- .../rediscala-1.8.0/gradle.lockfile | 4 +- .../instrumentation/redisson/gradle.lockfile | 4 +- .../redisson/redisson-2.0.0/gradle.lockfile | 4 +- .../redisson/redisson-2.3.0/gradle.lockfile | 4 +- .../redisson/redisson-3.10.3/gradle.lockfile | 36 ++-- .../renaissance/gradle.lockfile | 4 +- .../restlet-2.2/gradle.lockfile | 4 +- .../instrumentation/rmi/gradle.lockfile | 4 +- .../instrumentation/rxjava-1/gradle.lockfile | 4 +- .../instrumentation/rxjava-2/gradle.lockfile | 4 +- .../scala-concurrent/gradle.lockfile | 4 +- .../scala-promise/gradle.lockfile | 4 +- .../scala-promise-2.10/gradle.lockfile | 4 +- .../scala-promise-2.13/gradle.lockfile | 4 +- .../instrumentation/scala/gradle.lockfile | 5 +- .../instrumentation/scalatest/gradle.lockfile | 4 +- .../instrumentation/selenium/gradle.lockfile | 4 +- .../servicetalk/gradle.lockfile | 18 +- .../servlet-common/gradle.lockfile | 4 +- .../instrumentation/servlet/gradle.lockfile | 4 +- .../servlet/request-2/gradle.lockfile | 4 +- .../servlet/request-3/gradle.lockfile | 4 +- .../servlet/request-5/gradle.lockfile | 4 +- .../instrumentation/shutdown/gradle.lockfile | 4 +- .../instrumentation/slick/gradle.lockfile | 4 +- .../instrumentation/snakeyaml/gradle.lockfile | 4 +- .../span-origin/gradle.lockfile | 4 +- .../spark-executor/gradle.lockfile | 4 +- .../spark/spark_2.12/gradle.lockfile | 4 +- .../sparkjava-2.3/gradle.lockfile | 4 +- .../instrumentation/spray-1.3/gradle.lockfile | 4 +- .../spring-beans/gradle.lockfile | 4 +- .../spring-boot/gradle.lockfile | 32 +-- .../spring-cloud-zuul-2/gradle.lockfile | 4 +- .../spring-core/gradle.lockfile | 4 +- .../spring-data-1.8/gradle.lockfile | 4 +- .../spring-jms-3.1/gradle.lockfile | 4 +- .../spring-messaging-4/gradle.lockfile | 12 +- .../spring-rabbit/gradle.lockfile | 4 +- .../spring-scheduling-3.1/gradle.lockfile | 61 +++--- .../SpringSchedulingInstrumentation.java | 16 +- .../spring-security-5/gradle.lockfile | 4 +- .../spring-security-6/gradle.lockfile | 122 +++++------ .../spring-webflux-5/gradle.lockfile | 4 +- .../spring-webflux-6/gradle.lockfile | 116 ++++++----- .../spring-webmvc-3.1/gradle.lockfile | 4 +- .../spring-webmvc-5.3/gradle.lockfile | 4 +- .../spring-webmvc-6.0/build.gradle | 2 +- .../spring-webmvc-6.0/gradle.lockfile | 124 +++++------ .../boot/SpringBootBasedTest.groovy | 13 ++ .../UrlHandlerMappingTest.groovy | 28 ++- .../spring-ws-2/gradle.lockfile | 4 +- .../spymemcached-2.10/gradle.lockfile | 4 +- .../instrumentation/sslsocket/gradle.lockfile | 4 +- .../instrumentation/synapse-3/gradle.lockfile | 4 +- .../instrumentation/testng/gradle.lockfile | 4 +- .../testng/testng-6/gradle.lockfile | 4 +- .../testng/testng-7/gradle.lockfile | 4 +- .../instrumentation/thymeleaf/gradle.lockfile | 4 +- .../tibco-businessworks/gradle.lockfile | 4 +- .../tibcobw-5/gradle.lockfile | 4 +- .../tibcobw-6/gradle.lockfile | 4 +- .../tibcobw-stubs/gradle.lockfile | 4 +- .../instrumentation/tinylog-2/gradle.lockfile | 4 +- .../tomcat-5.5-common/gradle.lockfile | 4 +- .../tomcat-5.5/gradle.lockfile | 12 +- .../tomcat-appsec-5.5/gradle.lockfile | 4 +- .../tomcat-appsec-6/gradle.lockfile | 4 +- .../tomcat-appsec-7/gradle.lockfile | 4 +- .../trace-annotation/gradle.lockfile | 4 +- .../instrumentation/twilio/gradle.lockfile | 6 +- .../instrumentation/unbescape/gradle.lockfile | 4 +- .../instrumentation/undertow/gradle.lockfile | 4 +- .../undertow/undertow-2.0/gradle.lockfile | 4 +- .../undertow/undertow-2.2/gradle.lockfile | 4 +- .../instrumentation/velocity/gradle.lockfile | 4 +- .../vertx-mysql-client-3.9/gradle.lockfile | 4 +- .../vertx-mysql-client-4.0/gradle.lockfile | 4 +- .../vertx-mysql-client-4.4.2/gradle.lockfile | 4 +- .../vertx-redis-client-3.9/gradle.lockfile | 42 ++-- .../stubs/gradle.lockfile | 4 +- .../vertx-rx-3.5/gradle.lockfile | 4 +- .../vertx-web-3.4/gradle.lockfile | 4 +- .../vertx-web-3.5/gradle.lockfile | 4 +- .../vertx-web-3.9/gradle.lockfile | 4 +- .../vertx-web-4.0/gradle.lockfile | 4 +- .../websphere-jmx/gradle.lockfile | 4 +- .../instrumentation/zio/gradle.lockfile | 4 +- .../zio/zio-2.0/gradle.lockfile | 4 +- dd-java-agent/load-generator/gradle.lockfile | 2 +- dd-java-agent/testing/gradle.lockfile | 4 +- dd-smoke-tests/appsec/gradle.lockfile | 2 +- .../appsec/spring-tomcat7/gradle.lockfile | 2 +- .../appsec/springboot-graphql/gradle.lockfile | 2 +- .../appsec/springboot-grpc/gradle.lockfile | 2 +- .../springboot-security/gradle.lockfile | 2 +- .../appsec/springboot/gradle.lockfile | 11 +- dd-smoke-tests/armeria-grpc/gradle.lockfile | 4 +- .../asm-standalone-billing/gradle.lockfile | 4 +- dd-smoke-tests/backend-mock/gradle.lockfile | 4 +- dd-smoke-tests/cli/gradle.lockfile | 4 +- dd-smoke-tests/crashtracking/gradle.lockfile | 4 +- .../custom-systemloader/gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- dd-smoke-tests/dynamic-config/gradle.lockfile | 4 +- .../field-injection/gradle.lockfile | 4 +- dd-smoke-tests/gradle.lockfile | 4 +- dd-smoke-tests/gradle/gradle.lockfile | 4 +- dd-smoke-tests/grpc-1.5/gradle.lockfile | 4 +- .../iast-propagation/gradle.lockfile | 4 +- dd-smoke-tests/iast-util/gradle.lockfile | 4 +- .../iast-util/iast-util-11/gradle.lockfile | 4 +- dd-smoke-tests/java9-modules/gradle.lockfile | 4 +- dd-smoke-tests/jboss-modules/gradle.lockfile | 4 +- dd-smoke-tests/jersey-2/gradle.lockfile | 4 +- dd-smoke-tests/jersey-3/gradle.lockfile | 4 +- dd-smoke-tests/kafka-2/gradle.lockfile | 4 +- dd-smoke-tests/kafka-3/gradle.lockfile | 4 +- dd-smoke-tests/lib-injection/gradle.lockfile | 4 +- dd-smoke-tests/log-injection/gradle.lockfile | 18 +- dd-smoke-tests/maven/gradle.lockfile | 4 +- dd-smoke-tests/opentelemetry/gradle.lockfile | 4 +- dd-smoke-tests/opentracing/gradle.lockfile | 4 +- dd-smoke-tests/osgi/gradle.lockfile | 4 +- dd-smoke-tests/play-2.4/gradle.lockfile | 4 +- dd-smoke-tests/play-2.5/gradle.lockfile | 4 +- dd-smoke-tests/play-2.6/gradle.lockfile | 4 +- dd-smoke-tests/play-2.7/gradle.lockfile | 4 +- dd-smoke-tests/play-2.8-otel/gradle.lockfile | 4 +- .../play-2.8-split-routes/gradle.lockfile | 4 +- dd-smoke-tests/play-2.8/gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- dd-smoke-tests/quarkus-native/gradle.lockfile | 4 +- dd-smoke-tests/quarkus/gradle.lockfile | 4 +- dd-smoke-tests/resteasy/gradle.lockfile | 4 +- dd-smoke-tests/sample-trace/gradle.lockfile | 4 +- .../gradle.lockfile | 4 +- .../spring-boot-2.4-webflux/gradle.lockfile | 4 +- .../spring-boot-2.5-webflux/gradle.lockfile | 4 +- .../spring-boot-2.6-webflux/gradle.lockfile | 4 +- .../spring-boot-2.6-webmvc/gradle.lockfile | 4 +- .../spring-boot-2.7-webflux/gradle.lockfile | 4 +- .../spring-boot-3.0-native/gradle.lockfile | 4 +- .../spring-boot-3.0-webflux/gradle.lockfile | 4 +- .../spring-boot-3.0-webmvc/gradle.lockfile | 4 +- .../spring-boot-3.3-webmvc/gradle.lockfile | 146 +++++++++++++ .../spring-boot-rabbit/gradle.lockfile | 4 +- .../spring-security/gradle.lockfile | 4 +- .../springboot-freemarker/gradle.lockfile | 4 +- .../springboot-grpc/gradle.lockfile | 4 +- .../springboot-java-11/gradle.lockfile | 4 +- .../springboot-jetty-jsp/gradle.lockfile | 4 +- dd-smoke-tests/springboot-jpa/gradle.lockfile | 196 ++++++++++++++++++ .../springboot-mongo/gradle.lockfile | 4 +- .../springboot-openliberty-20/gradle.lockfile | 4 +- .../springboot-openliberty-23/gradle.lockfile | 4 +- .../springboot-thymeleaf/gradle.lockfile | 4 +- .../springboot-tomcat-jsp/gradle.lockfile | 4 +- .../springboot-tomcat/gradle.lockfile | 4 +- .../springboot-velocity/gradle.lockfile | 4 +- dd-smoke-tests/springboot/gradle.lockfile | 4 +- dd-smoke-tests/vertx-3.4/gradle.lockfile | 4 +- .../vertx-3.9-resteasy/gradle.lockfile | 4 +- dd-smoke-tests/vertx-3.9/gradle.lockfile | 4 +- dd-smoke-tests/vertx-4.2/gradle.lockfile | 4 +- dd-smoke-tests/wildfly/gradle.lockfile | 4 +- dd-trace-core/gradle.lockfile | 4 +- .../correlation-id-injection/gradle.lockfile | 4 +- dd-trace-ot/gradle.lockfile | 4 +- internal-api/gradle.lockfile | 2 +- internal-api/internal-api-9/gradle.lockfile | 4 +- .../remote-config-core/gradle.lockfile | 2 +- telemetry/gradle.lockfile | 2 +- utils/socket-utils/gradle.lockfile | 2 +- 449 files changed, 1993 insertions(+), 1491 deletions(-) create mode 100644 dd-java-agent/instrumentation-annotation-processor/gradle.lockfile create mode 100644 dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile create mode 100644 dd-smoke-tests/springboot-jpa/gradle.lockfile diff --git a/communication/gradle.lockfile b/communication/gradle.lockfile index 1ad51ea0f26..1abf85f9f4c 100644 --- a/communication/gradle.lockfile +++ b/communication/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.9=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-bootstrap/gradle.lockfile b/dd-java-agent/agent-bootstrap/gradle.lockfile index 8f9dcb90dc4..f819f8a2187 100644 --- a/dd-java-agent/agent-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-bootstrap/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-builder/gradle.lockfile b/dd-java-agent/agent-builder/gradle.lockfile index 8631bcf7b07..72abf575d88 100644 --- a/dd-java-agent/agent-builder/gradle.lockfile +++ b/dd-java-agent/agent-builder/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/gradle.lockfile b/dd-java-agent/agent-ci-visibility/gradle.lockfile index a71e691545c..dfacee52f3c 100644 --- a/dd-java-agent/agent-ci-visibility/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testFixturesRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testFixturesRuntimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesApiDependenciesMet de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-crashtracking/gradle.lockfile b/dd-java-agent/agent-crashtracking/gradle.lockfile index 8bad9756418..4e4d81fe0dc 100644 --- a/dd-java-agent/agent-crashtracking/gradle.lockfile +++ b/dd-java-agent/agent-crashtracking/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.10=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.10=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile index 0893e0b8bb7..e5e8e7c5b91 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile index 37048211124..e20088acab2 100644 --- a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-debugger/gradle.lockfile b/dd-java-agent/agent-debugger/gradle.lockfile index b1473e4741c..1d96054c952 100644 --- a/dd-java-agent/agent-debugger/gradle.lockfile +++ b/dd-java-agent/agent-debugger/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/gradle.lockfile b/dd-java-agent/agent-iast/gradle.lockfile index 21772e945f8..82cfab6b86d 100644 --- a/dd-java-agent/agent-iast/gradle.lockfile +++ b/dd-java-agent/agent-iast/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=jmh,jmhCompileProtoPath,jmhRuntimeClasspath,testCompil com.blogspot.mydailyjava:weak-lock-free:0.17=compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,compileProtoPath,jmh,jmhCompileClasspath,jmhCompileProtoPath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileProtoPath,jmh,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileProtoPath,jmh,jmhCompileProtoPath,jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.2=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -81,7 +81,7 @@ io.grpc:grpc-protobuf-lite:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testC io.grpc:grpc-protobuf:1.42.2=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc io.perfmark:perfmark-api:0.23.0=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,jmhAnnotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileClasspath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/agent-jmxfetch/gradle.lockfile b/dd-java-agent/agent-jmxfetch/gradle.lockfile index 19de00fd95d..0ce766cd2c1 100644 --- a/dd-java-agent/agent-jmxfetch/gradle.lockfile +++ b/dd-java-agent/agent-jmxfetch/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:2.10.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:jmxfetch:0.49.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logging/gradle.lockfile b/dd-java-agent/agent-logging/gradle.lockfile index 0893e0b8bb7..e5e8e7c5b91 100644 --- a/dd-java-agent/agent-logging/gradle.lockfile +++ b/dd-java-agent/agent-logging/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-logs-intake/gradle.lockfile b/dd-java-agent/agent-logs-intake/gradle.lockfile index d622d73f745..08fb6a9a23f 100644 --- a/dd-java-agent/agent-logs-intake/gradle.lockfile +++ b/dd-java-agent/agent-logs-intake/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile index eadeb5aacdd..a4543fe488b 100644 --- a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile index 6fde0518ca1..9f59f437c08 100644 --- a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile index d6e68faf5e6..c8e62ea0adb 100644 --- a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile @@ -7,7 +7,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-profiling/gradle.lockfile b/dd-java-agent/agent-profiling/gradle.lockfile index d9105373056..f9529a7f101 100644 --- a/dd-java-agent/agent-profiling/gradle.lockfile +++ b/dd-java-agent/agent-profiling/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=runtimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile index d6be38fa098..211233be3c0 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile index ba78c8f5dd3..e2fe36c87d7 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile index dccd9ccc4bf..01afcdc477a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile index 03e08f8ebc2..17275b9c524 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile index 059a6fe5d40..8e11da05092 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile index d15dbaeba7b..fcc2c6f3028 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile index 55c7377ac1f..c3fe1af1b7f 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:ddprof:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile index 1baa564f3ba..fa33e4ceb90 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.10=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.10=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile index 71d723d6c32..6dc17f98304 100644 --- a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/dd-java-agent/agent-tooling/gradle.lockfile b/dd-java-agent/agent-tooling/gradle.lockfile index b8abb47ebb7..a182fead288 100644 --- a/dd-java-agent/agent-tooling/gradle.lockfile +++ b/dd-java-agent/agent-tooling/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath,test_java11Ru com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=jmhCompileClasspath,jmhRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=jmhCompileClasspath,jmhRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie index b979461accf..9372507c6b9 100644 --- a/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie +++ b/dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie @@ -314,6 +314,7 @@ 0 org.springframework.core.io.buffer.DataBuffer 0 org.springframework.core.io.buffer.DefaultDataBuffer 0 org.springframework.core.io.buffer.NettyDataBuffer +0 org.springframework.core.io.buffer.SubscriberInputStream # There are some Mono implementation that get instrumented 0 org.springframework.http.server.reactive.* 2 org.springframework.instrument.* diff --git a/dd-java-agent/appsec/gradle.lockfile b/dd-java-agent/appsec/gradle.lockfile index 8af05632e19..954b114f7a6 100644 --- a/dd-java-agent/appsec/gradle.lockfile +++ b/dd-java-agent/appsec/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testR com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -43,7 +43,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/cws-tls/gradle.lockfile b/dd-java-agent/cws-tls/gradle.lockfile index 1c60158f5b4..e54780f5c16 100644 --- a/dd-java-agent/cws-tls/gradle.lockfile +++ b/dd-java-agent/cws-tls/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/gradle.lockfile b/dd-java-agent/gradle.lockfile index 884447b74bd..ddddfa31743 100644 --- a/dd-java-agent/gradle.lockfile +++ b/dd-java-agent/gradle.lockfile @@ -8,7 +8,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.datadoghq.okio:okio:1.17.6=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude -com.datadoghq:dd-javac-plugin-client:0.1.7=shadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude +com.datadoghq:dd-javac-plugin-client:0.2.2=shadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.datadoghq:java-dogstatsd-client:4.4.0=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath,traceShadowInclude com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile new file mode 100644 index 00000000000..796246583be --- /dev/null +++ b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile @@ -0,0 +1,100 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs:4.7.3=spotbugs +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.9.1=spotbugs +com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath +commons-codec:commons-codec:1.15=spotbugs +de.thetaphi:forbiddenapis:3.1=compileClasspath +info.picocli:picocli:4.6.3=testRuntimeClasspath +jaxen:jaxen:1.2.0=spotbugs +jline:jline:2.14.6=testRuntimeClasspath +junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:11.4=spotbugs +org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath +org.apache.ant:ant-antlr:1.9.15=codenarc +org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath +org.apache.ant:ant-junit:1.9.15=codenarc +org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath +org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath +org.apache.bcel:bcel:6.5.0=spotbugs +org.apache.commons:commons-lang3:3.12.0=spotbugs +org.apache.commons:commons-text:1.10.0=spotbugs +org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.logging.log4j:log4j-api:2.19.0=spotbugs +org.apache.logging.log4j:log4j-core:2.19.0=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:2.5.14=codenarc +org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:2.5.14=codenarc +org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:2.5.14=codenarc +org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:2.5.14=codenarc +org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:2.5.14=codenarc +org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:2.2.0=codenarc +org.dom4j:dom4j:2.1.3=spotbugs +org.gmetrics:GMetrics:1.1=codenarc +org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.1=spotbugs +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.4=spotbugs +org.ow2.asm:asm-commons:9.4=spotbugs +org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-util:9.4=spotbugs +org.ow2.asm:asm:9.4=spotbugs +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=testCompileClasspath +org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j +org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.testng:testng:7.5=testRuntimeClasspath +org.webjars:jquery:3.5.1=testRuntimeClasspath +org.xmlresolver:xmlresolver:4.4.3=spotbugs +xml-apis:xml-apis:1.4.01=spotbugs +empty=annotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/dd-java-agent/instrumentation/aerospike-4/gradle.lockfile b/dd-java-agent/instrumentation/aerospike-4/gradle.lockfile index a2a0acd22f9..c9677e99548 100644 --- a/dd-java-agent/instrumentation/aerospike-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/aerospike-4/gradle.lockfile @@ -12,7 +12,7 @@ com.beust:jcommander:1.78=latest7DepForkedTestRuntimeClasspath,latest7DepTestRun com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=latest7DepForkedTestCompileClasspath,l commons-io:commons-io:2.11.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/akka-concurrent/gradle.lockfile index 43b6eef3483..14bce3c0e29 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-concurrent/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspa com.blogspot.mydailyjava:weak-lock-free:0.17=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=akka23TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=akka23TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -63,7 +63,7 @@ commons-io:commons-io:2.11.0=akka23TestCompileClasspath,akka23TestRuntimeClasspa de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=akka23TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/gradle.lockfile b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/gradle.lockfile index 3d3d155bb76..bac99eca295 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspat com.blogspot.mydailyjava:weak-lock-free:0.17=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -216,7 +216,7 @@ io.netty:netty:3.10.6.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.spray:spray-json_2.11:1.3.3=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath io.spray:spray-json_2.12:1.3.6=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath io.spray:spray-json_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath javax.cache:cache-api:1.0.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath javax.inject:javax.inject:1=lagomTestCompileClasspath,lagomTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/gradle.lockfile b/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/gradle.lockfile index 362b39453d4..3bc4e3fe3e7 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.2-iast/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -57,7 +57,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/gradle.lockfile b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/gradle.lockfile index a181d3995a7..8ed13e10a6e 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -82,7 +82,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc io.spray:spray-json_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-http/gradle.lockfile b/dd-java-agent/instrumentation/akka-http/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/akka-http/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-http/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/akka-init/gradle.lockfile b/dd-java-agent/instrumentation/akka-init/gradle.lockfile index 6bc2f6d0402..29ad1a050ea 100644 --- a/dd-java-agent/instrumentation/akka-init/gradle.lockfile +++ b/dd-java-agent/instrumentation/akka-init/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -58,7 +58,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile index 3087afd85fc..d7851f83631 100644 --- a/dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-logging:commons-logging:1.1.3=compileClasspath,testCompileClasspath,test commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile index ae15aaf8cfc..62f441d1896 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=iastIntegrationTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastIntegrationTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath @@ -55,7 +55,7 @@ commons-logging:commons-logging:1.1.3=v43IastIntegrationTestCompileClasspath,v43 commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile index 11b96396ab9..5fdc1e97e75 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile index aed0c2c6c94..cb259f1573a 100644 --- a/dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile b/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile index 83dbc8c2308..ba24c103e77 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile @@ -5,27 +5,27 @@ cafe.cryptography:curve25519-elisabeth:0.1.0=compileProtoPath,instrumentPluginCl cafe.cryptography:ed25519-elisabeth:0.1.0=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.aayushatharva.brotli4j:brotli4j:1.16.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.aayushatharva.brotli4j:service:1.16.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.aayushatharva.brotli4j:brotli4j:1.17.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.aayushatharva.brotli4j:service:1.17.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.8=compileClasspath,compileProtoPath com.fasterxml.jackson.core:jackson-core:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.8=compileClasspath,compileProtoPath com.fasterxml.jackson.core:jackson-databind:2.11.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.8=compileClasspath,compileProtoPath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -42,50 +42,52 @@ com.github.stefanbirkner:system-rules:1.19.0=latestDepForkedTestCompileClasspath com.google.android:annotations:4.1.1.4=compileClasspath,compileProtoPath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:1.12.0=compileClasspath,compileProtoPath com.google.api.grpc:proto-google-common-protos:1.17.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.29.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.41.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,compileProtoPath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.auto:auto-common:0.10=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileProtoPath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.code.gson:gson:2.10.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.code.gson:gson:2.11.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.code.gson:gson:2.7=compileClasspath,compileProtoPath com.google.code.gson:gson:2.8.6=testCompileProtoPath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.23.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.28.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.3.2=compileClasspath,compileProtoPath com.google.errorprone:error_prone_annotations:2.5.1=testCompileClasspath com.google.errorprone:error_prone_annotations:2.9.0=testCompileProtoPath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.guava:guava:26.0-android=compileClasspath,compileProtoPath com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:guava:30.1.1-android=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.guava:guava:32.1.3-android=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath -com.google.guava:guava:32.1.3-jre=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.guava:guava:33.2.1-android=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath +com.google.guava:guava:33.2.1-jre=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:1.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.0.0=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath com.google.protobuf:protobuf-java-util:3.12.0=testCompileProtoPath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.25.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.25.5=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java-util:3.7.1=compileClasspath,compileProtoPath com.google.protobuf:protobuf-java:3.17.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.5=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.google.protobuf:protobuf-java:3.7.1=compileClasspath,compileProtoPath com.google.protobuf:protoc:3.17.3=protobufToolsLocator_protoc com.google.re2j:re2j:1.2=compileClasspath com.google.re2j:re2j:1.7=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc-protocol:1.30.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc-protocol:1.31.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-grpc:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc:1.30.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc:1.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-junit4:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-protobuf:1.30.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-protobuf:1.31.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria:1.30.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -97,89 +99,89 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked de.thetaphi:forbiddenapis:3.1=compileClasspath,compileProtoPath info.picocli:picocli:4.6.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath io.grpc:grpc-api:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-api:1.65.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-context:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-context:1.65.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.68.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-core:1.31.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-core:1.65.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-protobuf-lite:1.31.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.65.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.68.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-protobuf:1.31.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.65.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-services:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-services:1.31.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-services:1.65.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-services:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.20.0=compileClasspath,compileProtoPath io.grpc:grpc-stub:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-stub:1.65.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.65.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.68.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc -io.micrometer:micrometer-commons:1.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.13.6=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.1.4=compileClasspath,compileProtoPath -io.micrometer:micrometer-core:1.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.13.6=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.5.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-buffer:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.13.6=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-buffer:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-dns:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-haproxy:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-haproxy:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-haproxy:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-haproxy:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-http2:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec-http:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-codec:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-common:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-common:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-handler:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-resolver-dns:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-resolver-dns:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-resolver:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.23.Final=compileClasspath,compileProtoPath io.netty:netty-tcnative-boringssl-static:2.0.31.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.65.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.65.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-epoll:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.69.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.69.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-epoll:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport-native-epoll:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport-native-kqueue:4.1.112.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.1.115.Final=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport-native-unix-common:4.1.51.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport:4.1.112.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=compileClasspath,compileProtoPath io.netty:netty-transport:4.1.51.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.opencensus:opencensus-api:0.19.2=compileClasspath,compileProtoPath io.opencensus:opencensus-contrib-grpc-metrics:0.19.2=compileClasspath,compileProtoPath io.perfmark:perfmark-api:0.19.0=testCompileProtoPath,testRuntimeClasspath -io.perfmark:perfmark-api:0.26.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -188,7 +190,8 @@ jline:jline:2.14.6=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntim junit:junit-dep:4.11=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.3=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -211,7 +214,7 @@ org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,latest org.checkerframework:checker-compat-qual:2.5.2=compileClasspath,compileProtoPath org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.37.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +org.checkerframework:checker-qual:3.42.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath org.codehaus.groovy:groovy-all:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:2.5.14=codenarc org.codehaus.groovy:groovy-ant:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -243,11 +246,11 @@ org.codehaus.groovy:groovy:2.5.14=codenarc org.codehaus.groovy:groovy:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.mojo:animal-sniffer-annotations:1.18=testCompileProtoPath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.23=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath org.codenarc:CodeNarc:2.2.0=codenarc org.curioswitch.curiostack:protobuf-jackson:0.3.1=compileClasspath,compileProtoPath org.curioswitch.curiostack:protobuf-jackson:1.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.curioswitch.curiostack:protobuf-jackson:2.5.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +org.curioswitch.curiostack:protobuf-jackson:2.6.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath org.dom4j:dom4j:2.1.3=spotbugs org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile b/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile index 25458da5e65..d2a0ca141b1 100644 --- a/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile @@ -6,28 +6,28 @@ cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,jetty11Lates ch.qos.logback:logback-classic:1.2.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.aayushatharva.brotli4j:brotli4j:1.12.0=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -com.aayushatharva.brotli4j:brotli4j:1.16.0=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +com.aayushatharva.brotli4j:brotli4j:1.17.0=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath com.aayushatharva.brotli4j:service:1.12.0=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -com.aayushatharva.brotli4j:service:1.16.0=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +com.aayushatharva.brotli4j:service:1.17.0=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath com.beust:jcommander:1.78=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -54,11 +54,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.7=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty11:1.30.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty11:1.31.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty9:1.30.1=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty9:1.31.1=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria:1.30.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.31.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -70,56 +70,56 @@ commons-io:commons-io:2.11.0=jetty11LatestDepTestCompileClasspath,jetty11LatestD de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-commons:1.13.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.13.6=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-core:1.13.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.13.6=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.11.1=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.micrometer:micrometer-observation:1.13.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath -io.netty:netty-buffer:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.13.6=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-dns:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-haproxy:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-haproxy:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-haproxy:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-http2:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-http:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec-socks:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-codec:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-codec:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-common:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-common:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-handler-proxy:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-handler:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-handler:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-classes-macos:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns-classes-macos:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns-native-macos:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns-native-macos:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns-native-macos:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver-dns:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-resolver:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.61.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.65.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.69.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-tcnative-classes:2.0.61.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.65.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.69.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-classes-kqueue:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-epoll:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-epoll:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-kqueue:4.1.112.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.1.115.Final=jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-kqueue:4.1.93.Final=jetty11TestRuntimeClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.netty:netty-transport:4.1.112.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath io.netty:netty-transport:4.1.93.Final=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/avro/gradle.lockfile b/dd-java-agent/instrumentation/avro/gradle.lockfile index 6140a5bb76b..1a5095e8478 100644 --- a/dd-java-agent/instrumentation/avro/gradle.lockfile +++ b/dd-java-agent/instrumentation/avro/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTest8RuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.2=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -110,7 +110,7 @@ io.netty:netty-transport-native-unix-common:4.1.100.Final=latestDepTest8CompileC io.netty:netty-transport-native-unix-common:4.1.42.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.100.Final=latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.42.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=latestDepTest8RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,latestDepTest8CompileClasspath,latestDepTest8RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-common/gradle.lockfile b/dd-java-agent/instrumentation/aws-common/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/aws-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile index 0396240b03f..778d47268c1 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,26 +54,26 @@ commons-logging:commons-logging:1.2=latestDepForkedTestRuntimeClasspath,latestDe de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.112.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.112.Final=testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.112.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.112.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -186,83 +186,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.27.19=compileClasspath software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.27.19=compileClasspath software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.27.19=compileClasspath software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.27.19=compileClasspath software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:eventbridge:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.27.19=compileClasspath software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.27.19=compileClasspath software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.27.19=compileClasspath software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.27.19=compileClasspath software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.27.19=compileClasspath software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.27.19=compileClasspath software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.27.19=compileClasspath software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.27.19=compileClasspath software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.27.19=compileClasspath software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile index 9b1a035a08b..c0f5741c878 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile @@ -9,44 +9,45 @@ com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath,test_before_1_11_106Comp com.amazonaws:aws-java-sdk-core:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-dynamodb:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-dynamodb:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-dynamodb:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-dynamodb:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-ec2:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-ec2:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-ec2:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-ec2:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-kinesis:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-kinesis:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-kms:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-kms:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-kms:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-kms:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-rds:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-rds:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-rds:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-rds:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-s3:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-s3:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-s3:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-s3:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.11.106=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.106=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:jmespath-java:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:jmespath-java:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.beust:jcommander:1.78=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.datadoghq:java-dogstatsd-client:4.2.0=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.datadoghq:sketches-java:0.8.2=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath @@ -111,7 +112,7 @@ commons-io:commons-io:2.11.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeC commons-logging:commons-logging:1.2=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -io.sqreen:libsqreen:11.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +io.sqreen:libsqreen:11.2.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath io.sqreen:libsqreen:8.0.0=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile index 117f4253f9c..ae74e1bf839 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile @@ -9,7 +9,8 @@ com.beust:jcommander:1.78=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath, com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.2.0=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.2=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath @@ -70,65 +71,65 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-buffer:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-buffer:4.1.32.Final=testRuntimeClasspath io.netty:netty-buffer:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-buffer:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec-http2:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec-http2:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec-http2:4.1.32.Final=testRuntimeClasspath io.netty:netty-codec-http2:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-codec-http2:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec-http:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-codec-http:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec-http:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec-http:4.1.32.Final=testRuntimeClasspath io.netty:netty-codec-http:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-codec-http:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-codec:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec:4.1.32.Final=testRuntimeClasspath io.netty:netty-codec:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-codec:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-common:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-common:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-common:4.1.32.Final=testRuntimeClasspath io.netty:netty-common:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-handler:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-handler:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-handler:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-handler:4.1.32.Final=testRuntimeClasspath io.netty:netty-handler:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-handler:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-resolver:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-resolver:4.1.32.Final=testRuntimeClasspath io.netty:netty-resolver:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-resolver:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.32.Final=testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.32.Final=testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport:4.1.100.Final=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath io.netty:netty-transport:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath io.netty:netty-transport:4.1.32.Final=testRuntimeClasspath io.netty:netty-transport:4.1.77.Final=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath io.netty:netty-transport:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath io.sqreen:libsqreen:8.0.0=kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs @@ -267,14 +268,14 @@ software.amazon.awssdk:annotations:2.2.0=compileClasspath,testCompileClasspath,t software.amazon.awssdk:annotations:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:annotations:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:annotations:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:annotations:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:apache-client:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath @@ -286,40 +287,40 @@ software.amazon.awssdk:auth:2.2.0=compileClasspath,testCompileClasspath,testRunt software.amazon.awssdk:auth:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:auth:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:aws-cbor-protocol:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:crt-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -330,68 +331,68 @@ software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClass software.amazon.awssdk:endpoints-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:http-client-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:json-utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:kinesis:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:kinesis:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:kinesis:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:kinesis:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:kinesis:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.18.40=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.2.0=testRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.20.33=latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.23.8=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.9=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.20=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:profiles:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:profiles:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:profiles:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:protocol-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:rds:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath @@ -400,9 +401,9 @@ software.amazon.awssdk:regions:2.2.0=compileClasspath,testCompileClasspath,testR software.amazon.awssdk:regions:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:regions:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:s3:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -412,12 +413,12 @@ software.amazon.awssdk:sdk-core:2.2.0=compileClasspath,testCompileClasspath,test software.amazon.awssdk:sdk-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sns:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sns:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sqs:2.18.40=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sqs:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -427,18 +428,18 @@ software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestC software.amazon.awssdk:third-party-jackson-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:utils:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:utils:2.29.9=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile index c6ee5fa14e0..c6afe7c8e00 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile @@ -6,18 +6,18 @@ cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepFor ch.qos.logback:logback-classic:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:jmespath-java:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.7=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -79,7 +79,7 @@ io.netty:netty-resolver:4.1.108.Final=latestDepForkedTestRuntimeClasspath,latest io.netty:netty-transport-classes-epoll:4.1.108.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.108.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.108.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile index 07a30390cbf..a5d85d4e57a 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,26 +54,26 @@ commons-logging:commons-logging:1.2=latestDepForkedTestRuntimeClasspath,latestDe de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.108.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.108.Final=testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.108.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -186,56 +186,56 @@ org.testng:testng:7.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeCl org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.9=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile index b36d30c3f36..f2f8c926df8 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile @@ -10,17 +10,17 @@ com.amazonaws:amazon-sqs-java-messaging-lib:1.0.8=testCompileClasspath,testRunti com.amazonaws:amazon-sqs-java-messaging-lib:1.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath com.amazonaws:aws-java-sdk-core:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.0=compileClasspath com.amazonaws:aws-java-sdk-sqs:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:jmespath-java:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.777=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -79,7 +79,7 @@ commons-logging:commons-logging:1.2=compileClasspath,latestDepForkedTestCompileC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.spray:spray-json_2.13:1.3.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.jms:jms-api:1.1-rev-1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile index 8c415d40e3b..a87d7c49d47 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -83,7 +83,7 @@ io.netty:netty-transport-native-unix-common:4.1.86.Final=latestDepForkedTestRunt io.netty:netty-transport:4.1.77.Final=testRuntimeClasspath io.netty:netty-transport:4.1.86.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.spray:spray-json_2.13:1.3.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile b/dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile index 1804b382064..f03257602cb 100644 --- a/dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-lambda-handler/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axis-2/gradle.lockfile b/dd-java-agent/instrumentation/axis-2/gradle.lockfile index 30b60f267c1..a2d77a25e50 100644 --- a/dd-java-agent/instrumentation/axis-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/axis-2/gradle.lockfile @@ -12,7 +12,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:6.2.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath @@ -58,7 +58,7 @@ commons-logging:commons-logging:1.1=compileClasspath,testCompileClasspath,testRu commons-logging:commons-logging:1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.activation:activation:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.mail:mail:1.4=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axway-api/gradle.lockfile b/dd-java-agent/instrumentation/axway-api/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/axway-api/gradle.lockfile +++ b/dd-java-agent/instrumentation/axway-api/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/caffeine/gradle.lockfile b/dd-java-agent/instrumentation/caffeine/gradle.lockfile index 74b2c48cc45..42f09ad4c91 100644 --- a/dd-java-agent/instrumentation/caffeine/gradle.lockfile +++ b/dd-java-agent/instrumentation/caffeine/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:1.0.0=compileClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile index 98b1dceb934..ff6c155e04b 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.enterprise:cdi-api:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/classloading/gradle.lockfile b/dd-java-agent/instrumentation/classloading/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/classloading/gradle.lockfile +++ b/dd-java-agent/instrumentation/classloading/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/classloading/jboss-testing/gradle.lockfile b/dd-java-agent/instrumentation/classloading/jboss-testing/gradle.lockfile index 0d44b6b322d..07ec705f601 100644 --- a/dd-java-agent/instrumentation/classloading/jboss-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation/classloading/jboss-testing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/classloading/jsr14-testing/gradle.lockfile b/dd-java-agent/instrumentation/classloading/jsr14-testing/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/classloading/jsr14-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation/classloading/jsr14-testing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/classloading/osgi-testing/gradle.lockfile b/dd-java-agent/instrumentation/classloading/osgi-testing/gradle.lockfile index 42624422bc0..81e27f70a38 100644 --- a/dd-java-agent/instrumentation/classloading/osgi-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation/classloading/osgi-testing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/classloading/tomcat-testing/gradle.lockfile b/dd-java-agent/instrumentation/classloading/tomcat-testing/gradle.lockfile index 5b1f4eeceef..6058353eaff 100644 --- a/dd-java-agent/instrumentation/classloading/tomcat-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation/classloading/tomcat-testing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-codec-1/gradle.lockfile b/dd-java-agent/instrumentation/commons-codec-1/gradle.lockfile index dcf9a4a9a5a..98c13b82431 100644 --- a/dd-java-agent/instrumentation/commons-codec-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-codec-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-fileupload/gradle.lockfile b/dd-java-agent/instrumentation/commons-fileupload/gradle.lockfile index d53795fb9ae..c8d5560d210 100644 --- a/dd-java-agent/instrumentation/commons-fileupload/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-fileupload/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,latestDepTestCompileC commons-io:commons-io:2.11.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-httpclient-2/gradle.lockfile b/dd-java-agent/instrumentation/commons-httpclient-2/gradle.lockfile index c944c7ba620..ace4d1292a8 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-httpclient-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-logging:commons-logging:1.0.3=compileClasspath,testCompileClasspath,test commons-logging:commons-logging:1.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang-2/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang-2/gradle.lockfile index 346ab5a6e1b..089298f3e3f 100644 --- a/dd-java-agent/instrumentation/commons-lang-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-lang:commons-lang:2.1=compileClasspath,csiCompileClasspath,testCompileCl commons-lang:commons-lang:2.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-lang-3/gradle.lockfile b/dd-java-agent/instrumentation/commons-lang-3/gradle.lockfile index 8f395dbd832..29b6f6eed3c 100644 --- a/dd-java-agent/instrumentation/commons-lang-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-lang-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/commons-text/gradle.lockfile b/dd-java-agent/instrumentation/commons-text/gradle.lockfile index c42705ff3e1..7cbbec48fbc 100644 --- a/dd-java-agent/instrumentation/commons-text/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-text/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile index 1d5255378e5..c37c9875127 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile @@ -18,7 +18,7 @@ com.couchbase.client:java-client:2.7.23=latestDepTestCompileClasspath,latestDepT com.couchbase.mock:CouchbaseMock:1.5.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -67,7 +67,7 @@ io.opentracing:opentracing-api:0.31.0=latestDepTestCompileClasspath,latestDepTes io.reactivex:rxjava:1.0.0-rc.3=compileClasspath io.reactivex:rxjava:1.3.0=testCompileClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile index 928c2d63245..885f5624e3c 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile @@ -18,7 +18,7 @@ com.couchbase.client:java-client:2.7.23=latestDepTestCompileClasspath,latestDepT com.couchbase.mock:CouchbaseMock:1.5.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=testCompileClasspath,testRuntimeClasspath @@ -65,7 +65,7 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentracing:opentracing-api:0.31.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.7=compileClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile index ec830eb9436..7d316f87e96 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile @@ -13,7 +13,7 @@ com.couchbase.client:java-client:3.1.0=compileClasspath,testCompileClasspath,tes com.couchbase.client:java-client:3.1.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -57,7 +57,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile index 52c93dc4702..2c31ef6fa5b 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -13,7 +13,7 @@ com.couchbase.client:java-client:3.2.0=compileClasspath,testCompileClasspath,tes com.couchbase.client:java-client:3.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -57,7 +57,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.6=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.6.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/couchbase/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/couchbase/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cucumber/gradle.lockfile b/dd-java-agent/instrumentation/cucumber/gradle.lockfile index 873b7b38bc0..d1fc59223f6 100644 --- a/dd-java-agent/instrumentation/cucumber/gradle.lockfile +++ b/dd-java-agent/instrumentation/cucumber/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -74,7 +74,7 @@ io.cucumber:query:12.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClass io.cucumber:tag-expressions:2.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:tag-expressions:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:testng-xml-formatter:0.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile index 586261bf28c..248d6e0c93a 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntime com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=cxf3LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:6.6.2=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -54,7 +54,7 @@ commons-lang:commons-lang:2.4=compileClasspath commons-logging:commons-logging:1.1.1=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datanucleus-4/gradle.lockfile b/dd-java-agent/instrumentation/datanucleus-4/gradle.lockfile index 595073d3044..71dc10aaef1 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/datanucleus-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.transaction:transaction-api:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile index f3a7d6754d7..62802ce2469 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra-3.8/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datastax.cassandra:cassandra-driver-core:3.8.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -66,7 +66,7 @@ io.netty:netty-codec:4.0.56.Final=compileClasspath,latestDepTestCompileClasspath io.netty:netty-common:4.0.56.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.0.56.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.0.56.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile index 7906f762643..fe9dac819ea 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datastax.cassandra:cassandra-driver-core:3.0.0=compileClasspath @@ -81,7 +81,7 @@ io.netty:netty-handler:4.0.56.Final=latestDepTestCompileClasspath,latestDepTestR io.netty:netty-transport:4.0.33.Final=compileClasspath io.netty:netty-transport:4.0.44.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.0.56.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile b/dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile index 1652158057c..2287afcce10 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/datastax-cassandra-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datastax.cassandra:cassandra-driver-core:3.10.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,7 +92,7 @@ io.netty:netty-resolver:4.1.94.Final=latestDepTestCompileClasspath,latestDepTest io.netty:netty-transport-native-unix-common:4.1.94.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.34.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.94.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/dropwizard-views/gradle.lockfile index 420a64c7cc5..d37d9830448 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views/gradle.lockfile @@ -20,7 +20,7 @@ com.codahale.metrics:metrics-logback:3.0.1=compileClasspath,testCompileClasspath com.codahale.metrics:metrics-servlets:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -88,7 +88,7 @@ io.dropwizard:dropwizard-validation:0.7.0=compileClasspath,testCompileClasspath, io.dropwizard:dropwizard-views-freemarker:0.7.0=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-views-mustache:0.7.0=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-views:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.el:javax.el-api:2.2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/dropwizard/gradle.lockfile b/dd-java-agent/instrumentation/dropwizard/gradle.lockfile index 32bac951812..cc679da7158 100644 --- a/dd-java-agent/instrumentation/dropwizard/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.10=testCompileClasspath,testRuntimeClasspath @@ -80,7 +80,7 @@ io.dropwizard:dropwizard-servlets:0.8.0=testCompileClasspath,testRuntimeClasspat io.dropwizard:dropwizard-testing:0.8.0=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-util:0.8.0=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-validation:0.8.0=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:activation:1.1=testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/gradle.lockfile index 70c3c02bf09..0e0f350a3ad 100644 --- a/dd-java-agent/instrumentation/elasticsearch/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=compileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.5.3=compileClasspath @@ -61,7 +61,7 @@ commons-logging:commons-logging:1.1.3=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.netty:netty:3.10.5.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile index 7912e8aa00f..4d8d3f527da 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/rest-5/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.1=testCompileClasspath,testRuntimeClasspath @@ -68,7 +68,7 @@ io.netty:netty-handler:4.1.16.Final=latestDepTestCompileClasspath,latestDepTestR io.netty:netty-resolver:4.1.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty:3.10.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/gradle.lockfile index d049bb2f66d..7b7bcc24b06 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.10=testCompileClasspath,testRuntimeClasspath @@ -74,7 +74,7 @@ io.netty:netty-resolver:4.1.16.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.32.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.16.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.32.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-7/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/rest-7/gradle.lockfile index 32be049f900..68dd1245031 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-7/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/rest-7/gradle.lockfile @@ -11,7 +11,7 @@ com.carrotsearch:hppc:0.7.1=testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.10.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -75,7 +75,7 @@ io.netty:netty-resolver:4.1.32.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.49.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.32.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.49.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-2/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport-2/gradle.lockfile index b00db34f078..82ae0057716 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport-2/gradle.lockfile @@ -11,7 +11,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.6.0=testCompileClasspath,testRuntimeClasspath @@ -73,7 +73,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty:3.10.5.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty:3.10.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/gradle.lockfile index 0b1b3dee639..a3dd5a3c821 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -85,7 +85,7 @@ io.netty:netty-transport:4.1.11.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.13.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.7.Final=compileClasspath io.netty:netty:3.10.6.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport-5/gradle.lockfile index dc677580ab2..72bc809915b 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.1=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ io.netty:netty-handler:4.1.5.Final=compileClasspath,testCompileClasspath,testRun io.netty:netty-resolver:4.1.5.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.5.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty:3.10.6.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport-6/gradle.lockfile index a86396ddb96..8dc9e318bdf 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -75,7 +75,7 @@ io.netty:netty-resolver:4.1.13.Final=compileClasspath,testCompileClasspath,testR io.netty:netty-resolver:4.1.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.13.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/gradle.lockfile index 558a5dbe163..16b6d224020 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.8.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.10.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -75,7 +75,7 @@ io.netty:netty-resolver:4.1.36.Final=compileClasspath,testCompileClasspath,testR io.netty:netty-resolver:4.1.49.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.36.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.49.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/transport/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/transport/gradle.lockfile index 4b48d5a75e1..f893403a47c 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/transport/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.8.1=compileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.11=compileClasspath @@ -63,7 +63,7 @@ io.netty:netty-common:4.1.36.Final=compileClasspath io.netty:netty-handler:4.1.36.Final=compileClasspath io.netty:netty-resolver:4.1.36.Final=compileClasspath io.netty:netty-transport:4.1.36.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile b/dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile index 45e419c1c26..6f63b848462 100644 --- a/dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/enable-wallclock-profiling/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDep4TestRuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-all:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-haproxy:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ io.netty:netty-codec-stomp:4.1.108.Final=latestDep4TestCompileClasspath,latestDe io.netty:netty-codec-xml:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler-ssl-ocsp:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -71,7 +71,7 @@ io.netty:netty-resolver-dns-classes-macos:4.1.108.Final=latestDep4TestCompileCla io.netty:netty-resolver-dns-native-macos:4.1.108.Final=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-resolver-dns:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-classes-kqueue:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.108.Final=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -81,8 +81,8 @@ io.netty:netty-transport-rxtx:4.1.108.Final=latestDep4TestCompileClasspath,lates io.netty:netty-transport-sctp:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-udt:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/exception-profiling/gradle.lockfile b/dd-java-agent/instrumentation/exception-profiling/gradle.lockfile index fcc1b5e3a4e..1ba3e8b5ab9 100644 --- a/dd-java-agent/instrumentation/exception-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/exception-profiling/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile index c11fe3a5ac3..936d7f0625e 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,latestPre207TestRuntimeC com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -269,7 +269,7 @@ io.netty:netty-transport:4.1.43.Final=latestPre207TestCompileClasspath,latestPre io.netty:netty-transport:4.1.51.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.8.Final=compileClasspath io.netty:netty:3.10.1.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,latestPre207TestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207TestCompileClasspath,latestPre207TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile index 61537728b07..63626fa3c79 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile index 8513dc6180b..d6d6d556b7f 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath,version2_3_23TestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath,version2_3_23TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/freemarker/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/freemarker/gradle.lockfile +++ b/dd-java-agent/instrumentation/freemarker/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/glassfish/gradle.lockfile b/dd-java-agent/instrumentation/glassfish/gradle.lockfile index 1c0021e53ff..67a6705d8b8 100644 --- a/dd-java-agent/instrumentation/glassfish/gradle.lockfile +++ b/dd-java-agent/instrumentation/glassfish/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-http-client/gradle.lockfile b/dd-java-agent/instrumentation/google-http-client/gradle.lockfile index 0492cb58453..50cfa977288 100644 --- a/dd-java-agent/instrumentation/google-http-client/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-http-client/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -38,7 +38,7 @@ com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepTestAnnotationPro com.google.guava:guava:30.1.1-android=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.http-client:google-http-client:1.45.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -59,7 +59,7 @@ io.grpc:grpc-api:1.66.0=latestDepTestRuntimeClasspath io.grpc:grpc-context:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-api:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-pubsub/gradle.lockfile b/dd-java-agent/instrumentation/google-pubsub/gradle.lockfile index 7a205b908e8..becc1287a26 100644 --- a/dd-java-agent/instrumentation/google-pubsub/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-pubsub/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,22 +30,22 @@ com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs com.github.spotbugs:spotbugs:4.7.3=spotbugs com.github.stefanbirkner:system-rules:1.19.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.android:annotations:4.1.1.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-pubsub-v1:1.116.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.116.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.48.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.49.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.7.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-iam-v1:1.2.6=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.43.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.44.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:api-common:2.1.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:api-common:2.41.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:gax-grpc:2.12.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.57.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.api:gax-httpjson:2.57.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax-grpc:2.58.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax-httpjson:2.58.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:gax:2.12.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.57.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.29.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax:2.58.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.30.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auth:google-auth-library-credentials:1.5.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.29.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.30.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auth:google-auth-library-oauth2-http:1.5.3=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -53,7 +53,7 @@ com.google.auto.value:auto-value-annotations:1.11.0=latestDepForkedTestCompileCl com.google.auto.value:auto-value-annotations:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:0.10=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.cloud:google-cloud-pubsub:1.116.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-pubsub:1.134.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.cloud:google-cloud-pubsub:1.134.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.code.gson:gson:2.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,32 +92,33 @@ commons-logging:commons-logging:1.2=compileClasspath,testCompileClasspath,testRu de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.grpc:grpc-alts:1.44.1=testRuntimeClasspath -io.grpc:grpc-alts:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-alts:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-api:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-auth:1.44.1=testRuntimeClasspath -io.grpc:grpc-auth:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-auth:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.grpc:grpc-googleapis:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-googleapis:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-grpclb:1.44.1=testRuntimeClasspath -io.grpc:grpc-grpclb:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.grpc:grpc-inprocess:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-grpclb:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-inprocess:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-netty-shaded:1.44.1=testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-netty-shaded:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.67.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-s2a:1.68.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-services:1.44.1=testRuntimeClasspath -io.grpc:grpc-services:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-services:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-xds:1.44.1=testRuntimeClasspath -io.grpc:grpc-xds:1.67.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-xds:1.68.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-api:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -128,7 +129,7 @@ io.opentelemetry:opentelemetry-context:1.42.1=latestDepForkedTestCompileClasspat io.opentelemetry:opentelemetry-semconv:1.26.0-alpha=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.perfmark:perfmark-api:0.23.0=testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/graal/gradle.lockfile b/dd-java-agent/instrumentation/graal/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/graal/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graal/native-image/gradle.lockfile b/dd-java-agent/instrumentation/graal/native-image/gradle.lockfile index 9d94c2f9933..fbc720d6df8 100644 --- a/dd-java-agent/instrumentation/graal/native-image/gradle.lockfile +++ b/dd-java-agent/instrumentation/graal/native-image/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile b/dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile b/dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle.lockfile b/dd-java-agent/instrumentation/gradle.lockfile index 25abc9a085a..fd277943d6f 100644 --- a/dd-java-agent/instrumentation/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/graphql-java/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile index d31ae94c6cf..c54584627e0 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile index 1cf16cfbb6d..7a1c2ecd80f 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=graphql20LatestDepForkedTestRuntimeClasspath,graphql20 com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=graphql20LatestDepForkedTestCompileCla commons-io:commons-io:2.11.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile index 8cc2291b8b9..c32cfe7aa72 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/gradle.lockfile @@ -9,7 +9,8 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.2.0=latestDepTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.2=latestDepTestRuntimeClasspath @@ -58,7 +59,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath io.sqreen:libsqreen:8.0.0=latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/grizzly-2/gradle.lockfile b/dd-java-agent/instrumentation/grizzly-2/gradle.lockfile index 87bf464ed44..9c010230492 100644 --- a/dd-java-agent/instrumentation/grizzly-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile b/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile index c8d007d0403..603ac621a97 100644 --- a/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,muleLatestDepTestRuntime com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath @@ -138,7 +138,7 @@ org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-026=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-008=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath -org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-026=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath +org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-027=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-008=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-026=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/gradle.lockfile b/dd-java-agent/instrumentation/grizzly-http-2.3.20/gradle.lockfile index d1c6f510e3f..71208825b99 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index eca7df56e8f..4af0327ca4e 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestCompileProtoPath,latestDepTestRuntimeClas com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -102,7 +102,7 @@ io.netty:netty-transport:4.1.110.Final=latestDepTestCompileClasspath,latestDepTe io.netty:netty-transport:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.perfmark:perfmark-api:0.23.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile index 6cc6ed7f17d..5188bc0f5f8 100644 --- a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/guava-10/gradle.lockfile b/dd-java-agent/instrumentation/guava-10/gradle.lockfile index d259b2c79d7..456032435c4 100644 --- a/dd-java-agent/instrumentation/guava-10/gradle.lockfile +++ b/dd-java-agent/instrumentation/guava-10/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast-3.6/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast-3.6/gradle.lockfile index abab964f80b..a47dc6eb351 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast-3.6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast-3.9/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast-3.9/gradle.lockfile index 8a35a8efbf7..a5b5ddc81a4 100644 --- a/dd-java-agent/instrumentation/hazelcast-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast-3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hazelcast-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hazelcast-4.0/gradle.lockfile index d5a63de232a..03215864158 100644 --- a/dd-java-agent/instrumentation/hazelcast-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/core-3.3/gradle.lockfile index 9c34caa3baf..08ba353e393 100644 --- a/dd-java-agent/instrumentation/hibernate/core-3.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/core-3.3/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath dom4j:dom4j:1.6.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javassist:javassist:3.12.1.GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/core-4.0/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/core-4.0/gradle.lockfile index 9185b2a5956..fb751e84db0 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/core-4.0/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml:classmate:0.5.4=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath dom4j:dom4j:1.6.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javassist:javassist:3.12.1.GA=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/core-4.3/gradle.lockfile index f22d1e55173..f90abbbbc0c 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/core-4.3/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-logging:commons-logging:1.1.3=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath dom4j:dom4j:1.6.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hibernate/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/hibernate/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile b/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile index 1e36c7a36dc..ea7add0312b 100644 --- a/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile +++ b/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile index ec3aff59d65..d1cea2e6252 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.reactivex:rxjava:1.0.7=compileClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile b/dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile index fc590abd869..d84a6e9e7d6 100644 --- a/dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile +++ b/dd-java-agent/instrumentation/iast-instrumenter/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile index 0f6b7654cb4..135a3d4af1f 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.cache:cache-api:1.0.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jackson-core/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/gradle.lockfile index 5561208379f..5ad94d955d6 100644 --- a/dd-java-agent/instrumentation/jackson-core/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/gradle.lockfile index 134593096a4..a4a522e6757 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile index a8ef413451a..dc09c90a43d 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile index 2235d3fff6a..90447ab5e7f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile index 8fd9f09bf05..72d505c36f1 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.6.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile index d0b1864d201..3992f2c7563 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/gradle.lockfile index 6b4aa131f46..3830a0934fb 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jacoco/gradle.lockfile b/dd-java-agent/instrumentation/jacoco/gradle.lockfile index 139540911bc..f1c3dd75f41 100644 --- a/dd-java-agent/instrumentation/jacoco/gradle.lockfile +++ b/dd-java-agent/instrumentation/jacoco/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jakarta-jms/gradle.lockfile b/dd-java-agent/instrumentation/jakarta-jms/gradle.lockfile index 4f63ecdfc9f..bf24bb4ee29 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/gradle.lockfile +++ b/dd-java-agent/instrumentation/jakarta-jms/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.netty:netty-all:4.0.30.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=testCompileClasspath,testRuntimeClasspath jakarta.ejb:jakarta.ejb-api:4.0.0=testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/gradle.lockfile b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/gradle.lockfile index f3b7ab62ca2..dae5fef8aa7 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepJava11TestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepJava11TestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.0.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:3.0.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jakarta-ws-annotations/gradle.lockfile b/dd-java-agent/instrumentation/jakarta-ws-annotations/gradle.lockfile index e55a5d457ee..232782e59b8 100644 --- a/dd-java-agent/instrumentation/jakarta-ws-annotations/gradle.lockfile +++ b/dd-java-agent/instrumentation/jakarta-ws-annotations/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.jws:jakarta.jws-api:3.0.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/java-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/gradle.lockfile index 550211b2483..1a70fd95f19 100644 --- a/dd-java-agent/instrumentation/java-concurrent/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-concurrent/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.netty:netty-all:4.1.9.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile index d9b34b620ab..09b3f8be76c 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=previewTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleBootstrap,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleBootstrap,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java21RuntimeClasspath,muzzleTooling,previewTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java21RuntimeClasspath,muzzleTooling,previewTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=previewTestCompileClasspath,previewTes commons-io:commons-io:2.11.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=previewTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=previewTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=previewTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=previewTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile index 92fa5785eb2..fec3f6bc1cd 100644 --- a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile b/dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile index 199e61a9ad0..1d898406753 100644 --- a/dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-http-client/gradle.lockfile b/dd-java-agent/instrumentation/java-http-client/gradle.lockfile index 199e61a9ad0..1d898406753 100644 --- a/dd-java-agent/instrumentation/java-http-client/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-http-client/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-io/gradle.lockfile b/dd-java-agent/instrumentation/java-io/gradle.lockfile index 56072d415df..a38fb6a7f57 100644 --- a/dd-java-agent/instrumentation/java-io/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-io/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-lang/gradle.lockfile b/dd-java-agent/instrumentation/java-lang/gradle.lockfile index 0e60af6260d..c5c18af12b0 100644 --- a/dd-java-agent/instrumentation/java-lang/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-lang/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile b/dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile index 973d22e83d2..dadfce812ae 100644 --- a/dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile b/dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile index 87f0ded9a46..be5f31ec284 100644 --- a/dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile b/dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile index 4adb8f3208d..09d4b09e035 100644 --- a/dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java9CompileClasspath,main_java9RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java9CompileClasspath,main_java9RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java9CompileClasspath,main_java9RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java9CompileClasspath,main_java9RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java9CompileClasspath,main_java9RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java9RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java9RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-net/gradle.lockfile b/dd-java-agent/instrumentation/java-net/gradle.lockfile index 0e60af6260d..c5c18af12b0 100644 --- a/dd-java-agent/instrumentation/java-net/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-net/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-security/gradle.lockfile b/dd-java-agent/instrumentation/java-security/gradle.lockfile index d47ec775840..0a357b82a5b 100644 --- a/dd-java-agent/instrumentation/java-security/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-security/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java-util/gradle.lockfile b/dd-java-agent/instrumentation/java-util/gradle.lockfile index 0e60af6260d..c5c18af12b0 100644 --- a/dd-java-agent/instrumentation/java-util/gradle.lockfile +++ b/dd-java-agent/instrumentation/java-util/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-naming/gradle.lockfile b/dd-java-agent/instrumentation/javax-naming/gradle.lockfile index 0e60af6260d..c5c18af12b0 100644 --- a/dd-java-agent/instrumentation/javax-naming/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-naming/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/javax-xml/gradle.lockfile b/dd-java-agent/instrumentation/javax-xml/gradle.lockfile index e9cbc535c68..3819c276887 100644 --- a/dd-java-agent/instrumentation/javax-xml/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-xml/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-annotations-1/gradle.lockfile index f83d853e272..6b0abd037a9 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/gradle.lockfile @@ -18,7 +18,7 @@ com.codahale.metrics:metrics-logback:3.0.2=testCompileClasspath,testRuntimeClass com.codahale.metrics:metrics-servlets:3.0.2=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.3.0=testCompileClasspath,testRuntimeClasspath @@ -86,7 +86,7 @@ io.dropwizard:dropwizard-servlets:0.7.1=testCompileClasspath,testRuntimeClasspat io.dropwizard:dropwizard-testing:0.7.1=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-util:0.7.1=testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-validation:0.7.1=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:activation:1.1=testCompileClasspath,testRuntimeClasspath javax.el:javax.el-api:2.2.5=testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-jersey/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-jersey/gradle.lockfile index 12bd27680a6..f46dadef975 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-jersey/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-jersey/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=compileClasspath javax.inject:javax.inject:1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/gradle.lockfile index cb32fe35b94..d5422a8d5aa 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.1.1=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javassist:javassist:3.12.1.GA=compileClasspath javax.activation:activation:1.1=compileClasspath javax.annotation:jsr250-api:1.0=compileClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/gradle.lockfile index 65ed5c6fc40..fea73c39b2e 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/filter-resteasy-3.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-io:commons-io:2.5=compileClasspath commons-logging:commons-logging:1.2=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:activation:1.1.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-annotations-2/gradle.lockfile index bb78639a219..b3137974d08 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspa com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,7 +126,7 @@ io.dropwizard:dropwizard-util:0.8.0=nestedTestCompileClasspath,nestedTestRuntime io.dropwizard:dropwizard-util:1.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.dropwizard:dropwizard-validation:0.8.0=nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard:dropwizard-validation:1.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=nestedTestCompileClasspath,nestedTestRuntimeClasspath javassist:javassist:3.12.1.GA=nestedTestCompileClasspath,nestedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=nestedTestCompileClasspath,nestedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-client-1.1/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-client-1.1/gradle.lockfile index e4f5774718d..fa7cc7c55d5 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-client-1.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.ws.rs:jsr311-api:1.1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/gradle.lockfile index 829611a7763..fb7e2052b58 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-jersey/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/gradle.lockfile index 341662467df..f88f2d8b90d 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/connection-error-handling-resteasy/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javassist:javassist:3.12.1.GA=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-rs-client-2.0/gradle.lockfile b/dd-java-agent/instrumentation/jax-rs-client-2.0/gradle.lockfile index 90cd29e35eb..4298df381c8 100644 --- a/dd-java-agent/instrumentation/jax-rs-client-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-rs-client-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:5.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -52,7 +52,7 @@ commons-logging:commons-logging:1.1.1=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javassist:javassist:3.12.1.GA=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-1/gradle.lockfile b/dd-java-agent/instrumentation/jax-ws-annotations-1/gradle.lockfile index 97241a2ae49..4390fc01f66 100644 --- a/dd-java-agent/instrumentation/jax-ws-annotations-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-ws-annotations-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.jws:javax.jws-api:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-2/gradle.lockfile b/dd-java-agent/instrumentation/jax-ws-annotations-2/gradle.lockfile index ce94aaa8ae7..ec07402112f 100644 --- a/dd-java-agent/instrumentation/jax-ws-annotations-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jax-ws-annotations-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile b/dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile index 55115a9df7c..8f086d64443 100644 --- a/dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jboss-modules/gradle.lockfile b/dd-java-agent/instrumentation/jboss-modules/gradle.lockfile index fdb69bf48fb..98befb35f6a 100644 --- a/dd-java-agent/instrumentation/jboss-modules/gradle.lockfile +++ b/dd-java-agent/instrumentation/jboss-modules/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/gradle.lockfile index 2f6d3d16347..c1d04bb168b 100644 --- a/dd-java-agent/instrumentation/jdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspat com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,13 +58,13 @@ com.squareup.okio:okio:1.17.5=compileClasspath,csiCompileClasspath,instrumentPlu com.thoughtworks.qdox:qdox:1.12.1=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.zaxxer:HikariCP:2.4.0=compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.zaxxer:HikariCP:6.1.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath +com.zaxxer:HikariCP:6.2.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath commons-codec:commons-codec:1.15=spotbugs commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/scalikejdbc/gradle.lockfile index 38f7332f421..bb031d24c3d 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -63,7 +63,7 @@ commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestR de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis-1.4/gradle.lockfile b/dd-java-agent/instrumentation/jedis-1.4/gradle.lockfile index c909e333f8e..cc4a081d604 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis-1.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis-3.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis-3.0/gradle.lockfile index 0f4f681e377..411b3aebf3d 100644 --- a/dd-java-agent/instrumentation/jedis-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis-3.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jedis-4.0/gradle.lockfile b/dd-java-agent/instrumentation/jedis-4.0/gradle.lockfile index 095a2047feb..5135c3ce846 100644 --- a/dd-java-agent/instrumentation/jedis-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey-2-appsec/gradle.lockfile b/dd-java-agent/instrumentation/jersey-2-appsec/gradle.lockfile index 28a7a12ff5b..bfb4391d4ed 100644 --- a/dd-java-agent/instrumentation/jersey-2-appsec/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey-2-appsec/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=compileClasspath javax.inject:javax.inject:1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey-3-appsec/gradle.lockfile b/dd-java-agent/instrumentation/jersey-3-appsec/gradle.lockfile index 279b7799786..63160bb68f0 100644 --- a/dd-java-agent/instrumentation/jersey-3-appsec/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey-3-appsec/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.0.0=compileClasspath jakarta.inject:jakarta.inject-api:2.0.0=compileClasspath jakarta.validation:jakarta.validation-api:3.0.0=compileClasspath diff --git a/dd-java-agent/instrumentation/jersey/gradle.lockfile b/dd-java-agent/instrumentation/jersey/gradle.lockfile index a65ecd7e638..aa9ba6bdeaa 100644 --- a/dd-java-agent/instrumentation/jersey/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath @@ -59,7 +59,7 @@ commons-fileupload:commons-fileupload:1.5=jersey2JettyTestCompileClasspath,jerse commons-io:commons-io:2.11.0=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.0=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jersey2JettyTestCompileClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-11/gradle.lockfile b/dd-java-agent/instrumentation/jetty-11/gradle.lockfile index 46b17005bae..415f90dd0df 100644 --- a/dd-java-agent/instrumentation/jetty-11/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-11/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-12/gradle.lockfile b/dd-java-agent/instrumentation/jetty-12/gradle.lockfile index bbddcb46cf7..d7fe5def198 100644 --- a/dd-java-agent/instrumentation/jetty-12/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-12/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=ee10LatestDepTestCompileClasspath,ee10 commons-io:commons-io:2.11.0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.0.0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -131,8 +131,8 @@ org.eclipse.jetty:jetty-security:12.0.0=ee10TestCompileClasspath,ee10TestRuntime org.eclipse.jetty:jetty-security:12.1.0.alpha0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.0=ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-server:12.1.0.alpha0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-session:12.0.0=ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-session:12.1.0.alpha0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-session:12.0.0=ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath +org.eclipse.jetty:jetty-session:12.1.0.alpha0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.0=ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:12.1.0.alpha0=ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.gmetrics:GMetrics:1.1=codenarc diff --git a/dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile index 3130cd91bef..269755cc8e2 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,testRuntimeClasspa com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile index 83ccf79c96c..04d14e98b0f 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,testRuntimeClasspa com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-9/gradle.lockfile b/dd-java-agent/instrumentation/jetty-9/gradle.lockfile index e8d72e496b1..5b033bc2c4a 100644 --- a/dd-java-agent/instrumentation/jetty-9/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jetty92ForkedTestRuntimeClasspath,jetty92TestImplement com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10CompileClasspath,main_jetty10RuntimeClasspath,main_jetty904CompileClasspath,main_jetty93CompileClasspath,main_jetty9421CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10CompileClasspath,main_jetty10RuntimeClasspath,main_jetty904CompileClasspath,main_jetty93CompileClasspath,main_jetty9421CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10CompileClasspath,main_jetty10RuntimeClasspath,main_jetty904CompileClasspath,main_jetty93CompileClasspath,main_jetty9421CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10CompileClasspath,main_jetty10RuntimeClasspath,main_jetty904CompileClasspath,main_jetty93CompileClasspath,main_jetty9421CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10CompileClasspath,main_jetty10RuntimeClasspath,main_jetty904CompileClasspath,main_jetty93CompileClasspath,main_jetty9421CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,main_jetty10RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=jetty92ForkedTestCompileClasspath,jett commons-io:commons-io:2.11.0=jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jetty92ForkedTestCompileClasspath,jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestCompileClasspath,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepJetty9ForkedTestCompileClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,main_jetty93CompileClasspath,main_jetty9421CompileClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jetty92ForkedTestRuntimeClasspath,jetty92TestImplementation,jetty94ForkedTestRuntimeClasspath,jetty94TestImplementation,latestDepForkedTestRuntimeClasspath,latestDepJetty9ForkedTestRuntimeClasspath,latestDepJetty9TestImplementation,latestDepTestImplementation,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile b/dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile index c0e5603b5f2..9b1ecbf61ba 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.5=compileClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile index 55cc01b12c7..7406b303d50 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile b/dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile index fc57bcbd712..3783e90d385 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile index fc57bcbd712..3783e90d385 100644 --- a/dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-client/gradle.lockfile b/dd-java-agent/instrumentation/jetty-client/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/jetty-client/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-client/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile index 0703bf39d54..6a9b3b03aa1 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntim com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=jetty10LatestDepTestCompileClasspath,j commons-io:commons-io:2.11.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile index d891e809679..60c2cbfbe97 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile index f8e2bc39171..d13c0f3bcf1 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile index dcb118f34a4..1dcf09a250d 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile @@ -9,7 +9,8 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.2.0=latestDepTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.2=latestDepTestRuntimeClasspath @@ -54,7 +55,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath io.sqreen:libsqreen:8.0.0=latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty-common/gradle.lockfile index db36326d952..7cee18afded 100644 --- a/dd-java-agent/instrumentation/jetty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/jetty-util/gradle.lockfile b/dd-java-agent/instrumentation/jetty-util/gradle.lockfile index 6c73512c8fb..8d14174a83a 100644 --- a/dd-java-agent/instrumentation/jetty-util/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty-util/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jms/gradle.lockfile b/dd-java-agent/instrumentation/jms/gradle.lockfile index 94bb466d5d4..5fc907c25d5 100644 --- a/dd-java-agent/instrumentation/jms/gradle.lockfile +++ b/dd-java-agent/instrumentation/jms/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-logging:commons-logging:1.2=latestDepForkedTestCompileClasspath,latestDe de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-all:4.0.13.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.ejb:javax.ejb-api:3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jose-jwt/gradle.lockfile b/dd-java-agent/instrumentation/jose-jwt/gradle.lockfile index b60a554b772..1ff19305bd0 100644 --- a/dd-java-agent/instrumentation/jose-jwt/gradle.lockfile +++ b/dd-java-agent/instrumentation/jose-jwt/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile index 843a183bf03..80067971060 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet.jsp:javax.servlet.jsp-api:2.3.0=compileClasspath javax.servlet.jsp:javax.servlet.jsp-api:2.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile index 5b0d4db3df0..e8d323393cc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -80,7 +80,7 @@ io.cucumber:query:12.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClass io.cucumber:tag-expressions:2.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:tag-expressions:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:testng-xml-formatter:0.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-4.10/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/gradle.lockfile index 558c7942574..a4430e6e8d1 100644 --- a/dd-java-agent/instrumentation/junit-4.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-4.10/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile index 092cf2a268d..f04012d82e0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -60,7 +60,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile index 993539de8e7..8bbfa45df20 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -80,7 +80,7 @@ io.cucumber:query:12.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClass io.cucumber:tag-expressions:2.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:tag-expressions:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:testng-xml-formatter:0.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile index 03995a6b9ae..86ace0836c1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile index 80cd5ab6aad..8a94125daa2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile index 9c2a7c47081..67e9b195701 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile index 7b3278902d1..62a196f0bb8 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntim com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.3=latestDepTestRuntimeClasspath @@ -70,8 +70,8 @@ commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.1.12.1=latestDepTestRuntimeClasspath -io.micrometer:micrometer-commons:1.13.4=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath -io.micrometer:micrometer-observation:1.13.4=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +io.micrometer:micrometer-commons:1.14.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +io.micrometer:micrometer-observation:1.14.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath io.netty:netty-buffer:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -82,7 +82,7 @@ io.netty:netty-transport-native-unix-common:4.1.63.Final=latestDepTestCompileCla io.netty:netty-transport:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.2.3=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -223,35 +223,35 @@ org.springframework.kafka:spring-kafka-test:1.3.3.RELEASE=iastLatestDepTest3Comp org.springframework.kafka:spring-kafka-test:2.9.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.kafka:spring-kafka:1.3.3.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework.kafka:spring-kafka:2.9.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework.kafka:spring-kafka:3.2.4=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework.kafka:spring-kafka:3.3.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework.retry:spring-retry:1.2.2.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework.retry:spring-retry:1.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework.retry:spring-retry:2.0.9=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework.retry:spring-retry:2.0.10=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-aop:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-aop:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-aop:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-aop:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-beans:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-beans:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-beans:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-context:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-context:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-context:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-context:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-core:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-core:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-core:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-expression:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-expression:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-expression:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-jcl:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-jcl:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-jcl:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-messaging:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-messaging:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-messaging:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-messaging:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.springframework:spring-test:4.3.14.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-test:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-tx:4.3.14.RELEASE=testCompileClasspath,testRuntimeClasspath org.springframework:spring-tx:5.3.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-tx:6.1.13=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath +org.springframework:spring-tx:6.2.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath org.testng:testng:7.5=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xerial.snappy:snappy-java:1.1.10.5=iastLatestDepTest3RuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/gradle.lockfile b/dd-java-agent/instrumentation/kafka-clients-3.8/gradle.lockfile index 6c0c486e469..c199303b2a7 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,testCompileClasspath @@ -75,16 +75,17 @@ commons-codec:commons-codec:1.15=spotbugs commons-collections:commons-collections:3.2.2=latestDepTestRuntimeClasspath,testRuntimeClasspath commons-digester:commons-digester:2.1=latestDepTestRuntimeClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.14.0=latestDepTestRuntimeClasspath commons-logging:commons-logging:1.2=latestDepTestRuntimeClasspath commons-validator:commons-validator:1.7=latestDepTestRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.1.12.1=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.12.0=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.12.0=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.105.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.94.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.105.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -103,7 +104,7 @@ io.netty:netty-transport-native-unix-common:4.1.105.Final=latestDepTestCompileCl io.netty:netty-transport-native-unix-common:4.1.94.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.105.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.94.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -135,27 +136,29 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.kafka:kafka-clients:3.8.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.kafka:kafka-clients:3.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-group-coordinator-api:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-group-coordinator:3.6.0=testRuntimeClasspath -org.apache.kafka:kafka-group-coordinator:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-group-coordinator:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-metadata:3.6.0=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-metadata:3.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-metadata:3.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.kafka:kafka-raft:3.6.0=testRuntimeClasspath -org.apache.kafka:kafka-raft:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-raft:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-server-common:3.6.0=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-server-common:3.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.kafka:kafka-server:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-server-common:3.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-server:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-storage-api:3.6.0=testRuntimeClasspath -org.apache.kafka:kafka-storage-api:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-storage-api:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-storage:3.6.0=testRuntimeClasspath -org.apache.kafka:kafka-storage:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-storage:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka-streams-test-utils:3.6.0=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-streams-test-utils:3.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-streams-test-utils:3.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.kafka:kafka-streams:3.6.0=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka-streams:3.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-streams:3.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.kafka:kafka-tools-api:3.6.0=testRuntimeClasspath -org.apache.kafka:kafka-tools-api:3.7.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-tools-api:3.8.1=latestDepTestRuntimeClasspath +org.apache.kafka:kafka-transaction-coordinator:3.8.1=latestDepTestRuntimeClasspath org.apache.kafka:kafka_2.13:3.6.0=testCompileClasspath,testRuntimeClasspath -org.apache.kafka:kafka_2.13:3.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka_2.13:3.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs org.apache.logging.log4j:log4j-core:2.19.0=spotbugs org.apache.yetus:audience-annotations:0.12.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -212,23 +215,23 @@ org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.10.3=latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-engine:1.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.10.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.10.0=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.10.3=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.10.0=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.10.3=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.10.0=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.10.3=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.3=latestDepTestRuntimeClasspath org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit:junit-bom:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.lz4:lz4-java:1.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:2.19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -250,9 +253,9 @@ org.rocksdb:rocksdbjni:7.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeC org.scala-lang.modules:scala-collection-compat_2.13:2.10.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=latestDepTestRuntimeClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.11=testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.13.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scala-lang:scala-library:2.13.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.scala-lang:scala-reflect:2.13.11=testRuntimeClasspath -org.scala-lang:scala-reflect:2.13.12=latestDepTestRuntimeClasspath +org.scala-lang:scala-reflect:2.13.14=latestDepTestRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -264,29 +267,29 @@ org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.spockframework:spock-core:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-junit4:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.kafka:spring-kafka-test:3.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework.kafka:spring-kafka-test:3.2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.kafka:spring-kafka-test:3.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.kafka:spring-kafka:3.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework.kafka:spring-kafka:3.2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.kafka:spring-kafka:3.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.retry:spring-retry:2.0.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.retry:spring-retry:2.0.4=testCompileClasspath,testRuntimeClasspath -org.springframework.retry:spring-retry:2.0.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-messaging:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-messaging:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-messaging:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-test:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-test:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-tx:6.1.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-tx:6.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-tx:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testcontainers:kafka:1.17.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.17.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-common/gradle.lockfile b/dd-java-agent/instrumentation/kafka-common/gradle.lockfile index 645bbd391b0..e7040259e63 100644 --- a/dd-java-agent/instrumentation/kafka-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/gradle.lockfile b/dd-java-agent/instrumentation/kafka-streams-0.11/gradle.lockfile index 65de3320ed0..d34427d2366 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -72,7 +72,7 @@ io.netty:netty-resolver:4.1.50.Final=latestDepTestCompileClasspath,latestDepTest io.netty:netty-transport-native-epoll:4.1.50.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.50.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.50.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka-streams-1.0/gradle.lockfile b/dd-java-agent/instrumentation/kafka-streams-1.0/gradle.lockfile index 31703d9f138..e8937217ac9 100644 --- a/dd-java-agent/instrumentation/kafka-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka-streams-1.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=compileClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/karate/gradle.lockfile b/dd-java-agent/instrumentation/karate/gradle.lockfile index 33ed20a6528..5d1e81d7bb8 100644 --- a/dd-java-agent/instrumentation/karate/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,7 +92,7 @@ io.netty:netty-transport-classes-epoll:4.1.79.Final=latestDepTestRuntimeClasspat io.netty:netty-transport-native-epoll:4.1.79.Final=latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.79.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/gradle.lockfile index 5772c71f8d9..65152f0d411 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/gradle.lockfile index 17371a9a938..90db5b6723b 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines/coroutines-1.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/gradle.lockfile b/dd-java-agent/instrumentation/kotlin-coroutines/gradle.lockfile index 15ef90ad7ba..258ce9316b2 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testFixturesRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,implementationDependenciesMetadata,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testFixturesApiDe commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce-4/gradle.lockfile b/dd-java-agent/instrumentation/lettuce-4/gradle.lockfile index a3b2d875870..6704c422e75 100644 --- a/dd-java-agent/instrumentation/lettuce-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce-4/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ io.netty:netty-transport:4.0.30.Final=compileClasspath,testCompileClasspath,test io.netty:netty-transport:4.1.29.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.reactivex:rxjava:1.0.14=compileClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex:rxjava:1.3.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile b/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile index 8a523c6e196..708f1710512 100644 --- a/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,testCompileClasspath @@ -74,7 +74,7 @@ io.netty:netty-transport:4.1.113.Final=latestDepTestCompileClasspath,latestDepTe io.netty:netty-transport:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.1.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.6.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/liberty-20/gradle.lockfile b/dd-java-agent/instrumentation/liberty-20/gradle.lockfile index 29a65f02be0..202f8954d43 100644 --- a/dd-java-agent/instrumentation/liberty-20/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty-20/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath,webappRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath,webappRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath,webappRuntimeClasspath io.openliberty:openliberty-runtime:21.0.0.3=zipped -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.0.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/liberty-23/gradle.lockfile b/dd-java-agent/instrumentation/liberty-23/gradle.lockfile index 275c3342294..0e508cdf800 100644 --- a/dd-java-agent/instrumentation/liberty-23/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty-23/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath,webappRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath,webappRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath,webappRuntimeClasspath io.openliberty:openliberty-runtime:22.0.0.1=zipped -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:5.0.0=compileClasspath,webappCompileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/log4j-2.7/gradle.lockfile b/dd-java-agent/instrumentation/log4j-2.7/gradle.lockfile index 4ca8b2621ee..66d29ed7603 100644 --- a/dd-java-agent/instrumentation/log4j-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j-2.7/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j1/gradle.lockfile b/dd-java-agent/instrumentation/log4j1/gradle.lockfile index 4412324d3d4..e6fef830f85 100644 --- a/dd-java-agent/instrumentation/log4j1/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testImplementation,testR com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testImplementation,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testImplementation,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testImplementation,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testImplementation,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testImplementation,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementation,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testImplementation,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j2/gradle.lockfile b/dd-java-agent/instrumentation/log4j2/gradle.lockfile index c07a1852ee0..1943e723959 100644 --- a/dd-java-agent/instrumentation/log4j2/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/log4j2/logs-intake/gradle.lockfile b/dd-java-agent/instrumentation/log4j2/logs-intake/gradle.lockfile index 4209460cff0..4870266d0e8 100644 --- a/dd-java-agent/instrumentation/log4j2/logs-intake/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j2/logs-intake/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -73,10 +73,10 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-api:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.24.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/logback-1/gradle.lockfile b/dd-java-agent/instrumentation/logback-1/gradle.lockfile index 7dc9dc43d8b..935deb1d059 100644 --- a/dd-java-agent/instrumentation/logback-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/logback-1/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile b/dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile index 0967b4c1b6a..26adf8c8378 100644 --- a/dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.annotation:jsr250-api:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/gradle.lockfile index 5a4e8ee35b4..0cc886cbff0 100644 --- a/dd-java-agent/instrumentation/micronaut/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.0=compileClasspath @@ -70,7 +70,7 @@ io.netty:netty-handler:4.1.48.Final=compileClasspath io.netty:netty-resolver:4.1.48.Final=compileClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath io.reactivex.rxjava2:rxjava:2.2.10=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath javax.inject:javax.inject:1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/gradle.lockfile index 51980693d45..76fad1a08bc 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -101,7 +101,7 @@ io.netty:netty-resolver:4.1.67.Final=latestDepTestCompileClasspath,latestDepTest io.netty:netty-transport:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.67.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/gradle.lockfile index 211ef88dc31..8ead78d757f 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -110,7 +110,7 @@ io.netty:netty-transport-native-unix-common:4.1.108.Final=latestDepTestCompileCl io.netty:netty-transport:4.1.108.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.0.0=compileClasspath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.0=compileClasspath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile index 89330897218..695c6c6fd6d 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.2=testCompileClasspath,testRuntimeClasspath @@ -62,58 +62,58 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micronaut:micronaut-aop:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-aop:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-aop:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-buffer-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-buffer-netty:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-buffer-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context-propagation:4.0.0=testRuntimeClasspath -io.micronaut:micronaut-context-propagation:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context-propagation:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-context:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core-processor:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-core-reactive:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core-reactive:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core-reactive:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-netty:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server-netty:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-inject-java:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-inject:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-inject:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-inject:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-core:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-databind:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-databind:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-databind:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-json-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-json-core:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-json-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-router:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-router:4.7.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-router:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.5.7=latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.6.10=latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile b/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile index fbacd8e7d05..1a690763be7 100644 --- a/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/common/gradle.lockfile index fbacd8e7d05..1a690763be7 100644 --- a/dd-java-agent/instrumentation/mongo/common/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile index 5b3f3ba4f91..9313cc5978d 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile index 8f6b9ee5fb1..7f9475d77c4 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile index 739cb07f976..a09f17152d0 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile index 6fd0708999b..a8dee52c061 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile index bda939fbbc4..91127548a3a 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile index bb7a485cc10..7d653559da6 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile b/dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile index f3052dd2654..f1eea6c9bff 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.2.22.RELEASE=mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath io.projectreactor:reactor-core:3.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mongo/gradle.lockfile b/dd-java-agent/instrumentation/mongo/gradle.lockfile index f16d46cc77e..20428166d48 100644 --- a/dd-java-agent/instrumentation/mongo/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mule-4/gradle.lockfile b/dd-java-agent/instrumentation/mule-4/gradle.lockfile index 09e16a54081..8c7b7436cc6 100644 --- a/dd-java-agent/instrumentation/mule-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4/gradle.lockfile @@ -11,7 +11,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.chuusai:shapeless_2.12:2.3.3=muleServices com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=testCompileClasspath,testRuntimeClasspath @@ -100,7 +100,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.projectreactor.addons:reactor-extra:3.1.6.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.2.12.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath it.unimi.dsi:fastutil:8.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-3.8/gradle.lockfile b/dd-java-agent/instrumentation/netty-3.8/gradle.lockfile index e5fdfb1099b..ab1e9344a9c 100644 --- a/dd-java-agent/instrumentation/netty-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-3.8/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -52,7 +52,7 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty:3.10.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty:3.8.0.Final=compileClasspath io.netty:netty:3.9.0.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty-4.0/gradle.lockfile index 5dff98a4d8d..7e77fc6c10f 100644 --- a/dd-java-agent/instrumentation/netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -68,7 +68,7 @@ io.netty:netty-transport-native-epoll:4.0.56.Final=latestDepTestCompileClasspath io.netty:netty-transport:4.0.0.Final=compileClasspath io.netty:netty-transport:4.0.36.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.0.56.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile b/dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile index 10b9e000ab9..8d4daf2298e 100644 --- a/dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ io.netty:netty-codec:4.1.0.Final=compileClasspath io.netty:netty-common:4.1.0.Final=compileClasspath io.netty:netty-resolver:4.1.0.Final=compileClasspath io.netty:netty-transport:4.1.0.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-4.1/gradle.lockfile b/dd-java-agent/instrumentation/netty-4.1/gradle.lockfile index 5426ccfd77a..2ddbebb6a9d 100644 --- a/dd-java-agent/instrumentation/netty-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-4.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -86,7 +86,7 @@ io.netty:netty-transport:4.1.29.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty:0.8.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.2.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile b/dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile index a77a1c45ffa..ac1cc6db91d 100644 --- a/dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDep4TestRuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ io.netty:netty-buffer:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRu io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.2.0.Beta1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath io.netty:netty-common:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile b/dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile index 6de3be20a72..90555a6fecc 100644 --- a/dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDep4TestRuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,8 +48,8 @@ commons-io:commons-io:2.11.0=latestDep4TestCompileClasspath,latestDep4TestRuntim de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile b/dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile index a4e98adf8f4..9ac7a5880c3 100644 --- a/dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDep4TestRuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ info.picocli:picocli:4.6.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeCl io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.2.0.Beta1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath io.netty:netty-common:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ognl-appsec/gradle.lockfile b/dd-java-agent/instrumentation/ognl-appsec/gradle.lockfile index 752a5cea964..9ae3e37e412 100644 --- a/dd-java-agent/instrumentation/ognl-appsec/gradle.lockfile +++ b/dd-java-agent/instrumentation/ognl-appsec/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp-2/gradle.lockfile b/dd-java-agent/instrumentation/okhttp-2/gradle.lockfile index e0837fb4562..a9ac4782f3f 100644 --- a/dd-java-agent/instrumentation/okhttp-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/okhttp-3/gradle.lockfile b/dd-java-agent/instrumentation/okhttp-3/gradle.lockfile index 1f6c953cd2a..87ce860f546 100644 --- a/dd-java-agent/instrumentation/okhttp-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/gradle.lockfile index aac04a90fc8..44f0575b1b9 100644 --- a/dd-java-agent/instrumentation/opensearch/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.8.1=compileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.4=compileClasspath @@ -55,7 +55,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.1.3=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile index 560b47aa199..63f6ac38b3c 100644 --- a/dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/rest/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ io.netty:netty-common:4.1.59.Final=latestDepTestCompileClasspath,latestDepTestRu io.netty:netty-handler:4.1.59.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.59.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.59.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/transport/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/transport/gradle.lockfile index 90bc31284d2..f74d05e0f0a 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/transport/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.carrotsearch:hppc:0.8.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.4=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ io.netty:netty-common:4.1.59.Final=compileClasspath,latestDepTestCompileClasspat io.netty:netty-handler:4.1.59.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.59.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.59.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile index 4925e2833ed..2f5ad4ecd96 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ io.opentelemetry:opentelemetry-api:0.3.0=compileClasspath,testCompileClasspath,t io.opentelemetry:opentelemetry-api:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context-prop:0.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context-prop:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile index 75612ea9bce..3cdda833eb5 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,testCompileClasspath,t io.opentelemetry:opentelemetry-api:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile index 8545d4f9dde..b9d46c45309 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ io.opentelemetry:opentelemetry-api:1.20.0=compileClasspath,testCompileClasspath, io.opentelemetry:opentelemetry-api:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.20.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile index 429e5144527..f0c00b8f4c5 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ io.opentelemetry:opentelemetry-api:1.26.0=compileClasspath,testCompileClasspath, io.opentelemetry:opentelemetry-api:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.26.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.41.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/api-0.31/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/api-0.31/gradle.lockfile index a81b5d5a2ae..e3bc45ec63d 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/api-0.31/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentracing:opentracing-api:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/api-0.32/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/api-0.32/gradle.lockfile index 0c11ccd2ecd..51eb2bb488f 100644 --- a/dd-java-agent/instrumentation/opentracing/api-0.32/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/api-0.32/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ io.opentracing:opentracing-noop:0.32.0=compileClasspath,testCompileClasspath,tes io.opentracing:opentracing-noop:0.33.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/gradle.lockfile index ec490b32fe5..3f1b53e17b3 100644 --- a/dd-java-agent/instrumentation/opentracing/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentracing:opentracing-api:0.31.0=compileClasspath io.opentracing:opentracing-noop:0.31.0=compileClasspath io.opentracing:opentracing-util:0.31.0=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/org-json/gradle.lockfile b/dd-java-agent/instrumentation/org-json/gradle.lockfile index 49c24f202e1..405dc7b1921 100644 --- a/dd-java-agent/instrumentation/org-json/gradle.lockfile +++ b/dd-java-agent/instrumentation/org-json/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile index 22746cdbbd6..5dc8000f5d3 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile b/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile index 2cb7aee0606..7cb9353fff8 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ commons-logging:commons-logging:1.1=compileClasspath,csiCompileClasspath,testCom commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/pekko-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/pekko-concurrent/gradle.lockfile index 2aa22d1b889..3ab41bd6ae2 100644 --- a/dd-java-agent/instrumentation/pekko-concurrent/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko-concurrent/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -56,7 +56,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/gradle.lockfile b/dd-java-agent/instrumentation/pekko-http-1.0/gradle.lockfile index 58d12a5a360..9d8871d6ffc 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/pekko-http-1.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=baseTestRuntimeClasspath,iastTestRuntimeClasspath,late com.blogspot.mydailyjava:weak-lock-free:0.17=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -72,7 +72,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath de.thetaphi:forbiddenapis:3.4=iastTestCompileClasspath info.picocli:picocli:4.6.3=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-2.3/gradle.lockfile b/dd-java-agent/instrumentation/play-2.3/gradle.lockfile index 214a78fcede..839cc841006 100644 --- a/dd-java-agent/instrumentation/play-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-2.3/gradle.lockfile @@ -12,7 +12,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -96,7 +96,7 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc io.netty:netty:3.9.8.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty:3.9.9.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.transaction:jta:1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-2.4/gradle.lockfile b/dd-java-agent/instrumentation/play-2.4/gradle.lockfile index b171e6522c7..d8f7a9780a5 100644 --- a/dd-java-agent/instrumentation/play-2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-2.4/gradle.lockfile @@ -13,7 +13,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -154,7 +154,7 @@ io.netty:netty-transport-native-epoll:4.0.51.Final=latestDepTestCompileClasspath io.netty:netty-transport:4.0.34.Final=testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.0.51.Final=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty:3.5.2.Final=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.el:javax.el-api:3.0.0=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play25CompileClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testGeneratedCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play-2.6/gradle.lockfile index ba8fb25884b..7fb465129ad 100644 --- a/dd-java-agent/instrumentation/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-2.6/gradle.lockfile @@ -16,7 +16,7 @@ com.beust:jcommander:1.78=baseTestRuntimeClasspath,latestDepTestRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=baseTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -185,7 +185,7 @@ io.opentelemetry:opentelemetry-sdk-metrics:1.28.0=latestDepTestCompileClasspath, io.opentelemetry:opentelemetry-sdk-trace:1.28.0=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.28.0=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-semconv:1.28.0-alpha=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=baseTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=baseTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath javax.activation:javax.activation-api:1.2.0=main_play27CompileClasspath javax.inject:javax.inject:1=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath diff --git a/dd-java-agent/instrumentation/play-ws-1/gradle.lockfile b/dd-java-agent/instrumentation/play-ws-1/gradle.lockfile index 0d54da67d61..f795d278396 100644 --- a/dd-java-agent/instrumentation/play-ws-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -66,7 +66,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/play-ws-2.1/gradle.lockfile b/dd-java-agent/instrumentation/play-ws-2.1/gradle.lockfile index 91d3306d14e..c118149a85f 100644 --- a/dd-java-agent/instrumentation/play-ws-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws-2.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -66,7 +66,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/play-ws-2/gradle.lockfile b/dd-java-agent/instrumentation/play-ws-2/gradle.lockfile index 0f6fe2dd47e..52820718aab 100644 --- a/dd-java-agent/instrumentation/play-ws-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -66,7 +66,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/play-ws/gradle.lockfile b/dd-java-agent/instrumentation/play-ws/gradle.lockfile index a670eaa248b..e4bef699212 100644 --- a/dd-java-agent/instrumentation/play-ws/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-ws/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -56,7 +56,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/protobuf/gradle.lockfile b/dd-java-agent/instrumentation/protobuf/gradle.lockfile index 6456c177298..684d1a2bd8e 100644 --- a/dd-java-agent/instrumentation/protobuf/gradle.lockfile +++ b/dd-java-agent/instrumentation/protobuf/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testCompileProtoPath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,compileProtoPath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,compileProtoPath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testCompileProtoP commons-io:commons-io:2.11.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,compileProtoPath info.picocli:picocli:4.6.3=testCompileProtoPath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testCompileProtoPath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/quartz-2/gradle.lockfile b/dd-java-agent/instrumentation/quartz-2/gradle.lockfile index e255c5ceb72..3162faf3531 100644 --- a/dd-java-agent/instrumentation/quartz-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/quartz-2/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath,ver com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=latestDepTestRuntimeClasspath,version40TestRuntimeClasspath jakarta.transaction:jakarta.transaction-api:2.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=latestDepTestRuntimeClasspath,version40TestRuntimeClasspath @@ -78,7 +78,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=spotbugs org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath,version40TestCompileClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.codehaus.groovy:groovy-ant:2.5.14=codenarc @@ -122,16 +122,14 @@ org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.0=latestDepTestCompileClasspath,testCompileClasspath,version40TestCompileClasspath -org.junit.platform:junit-platform-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.0=latestDepTestCompileClasspath,testCompileClasspath,version40TestCompileClasspath -org.junit.platform:junit-platform-engine:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -org.junit:junit-bom:5.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs +org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile index a067ffd8057..c208816120b 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,latestReactorTestRuntime com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath com.rabbitmq:amqp-client:2.7.0=compileClasspath com.rabbitmq:amqp-client:2.8.1=testCompileClasspath,testRuntimeClasspath com.rabbitmq:amqp-client:5.14.2=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath -com.rabbitmq:amqp-client:5.22.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.rabbitmq:amqp-client:5.23.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.rabbitmq:amqp-client:5.5.1=reactorTestCompileClasspath,reactorTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ io.projectreactor.rabbitmq:reactor-rabbitmq:1.0.0.RELEASE=reactorTestCompileClas io.projectreactor.rabbitmq:reactor-rabbitmq:1.5.6=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath io.projectreactor:reactor-core:3.2.3.RELEASE=reactorTestCompileClasspath,reactorTestRuntimeClasspath io.projectreactor:reactor-core:3.4.28=latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile index f1baf90a125..c7ca3e50ff5 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -99,21 +99,21 @@ io.netty:netty-transport-native-epoll:4.1.9.Final=compileClasspath,testCompileCl io.netty:netty-transport-native-unix-common:4.1.82.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.82.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.9.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-base:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-base:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-base:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-core:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-core:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-core:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-exec:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-exec:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-exec:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-groovy-test:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-groovy-test:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-groovy-test:1.5.0=testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-groovy:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-groovy:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-groovy:1.5.0=testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-guice:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-guice:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-guice:1.5.0=testCompileClasspath,testRuntimeClasspath -io.ratpack:ratpack-test:1.10.0-milestone-37=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.ratpack:ratpack-test:1.10.0-milestone-38=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.ratpack:ratpack-test:1.5.0=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/reactive-streams/gradle.lockfile b/dd-java-agent/instrumentation/reactive-streams/gradle.lockfile index c7d4444de2c..714848cdba0 100644 --- a/dd-java-agent/instrumentation/reactive-streams/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactive-streams/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile index 7ac8925a386..5dea008c6e0 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,9 +47,9 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.13.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micrometer:micrometer-core:1.13.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micrometer:micrometer-observation:1.13.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -57,8 +57,8 @@ io.opentracing:opentracing-api:0.32.0=latestDepTestCompileClasspath,latestDepTes io.opentracing:opentracing-noop:0.32.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.1.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.6.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/reactor-netty-1/gradle.lockfile b/dd-java-agent/instrumentation/reactor-netty-1/gradle.lockfile index 3004804d9f4..98c9410a471 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-netty-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -79,12 +79,12 @@ io.netty:netty-transport-native-unix-common:4.1.53.Final=compileClasspath,testCo io.netty:netty-transport:4.1.114.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.53.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor.netty:reactor-netty-core:1.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.netty:reactor-netty-core:1.1.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.netty:reactor-netty-core:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.netty:reactor-netty-http:1.1.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.netty:reactor-netty-http:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-core:3.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.5.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rediscala-1.8.0/gradle.lockfile b/dd-java-agent/instrumentation/rediscala-1.8.0/gradle.lockfile index e2987d163e3..137465d696a 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rediscala-1.8.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.etaty:rediscala_2.11:1.8.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/gradle.lockfile b/dd-java-agent/instrumentation/redisson/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/redisson/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile index bed9fc3abc9..abdd5c9521e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath @@ -77,7 +77,7 @@ io.netty:netty-transport:4.0.28.Final=compileClasspath,testCompileClasspath,test io.netty:netty-transport:4.0.39.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-core:2.0.8.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-stream:2.0.8.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile index ba17322643a..cdc95e2bc16 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath @@ -83,7 +83,7 @@ io.projectreactor:reactor-core:2.0.8.RELEASE=compileClasspath,testCompileClasspa io.projectreactor:reactor-core:3.2.3.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-stream:2.0.8.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex.rxjava2:rxjava:2.1.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.cache:cache-api:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile index b1cc9df9266..882680b7092 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.esotericsoftware:kryo:5.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -17,19 +17,19 @@ com.esotericsoftware:minlog:1.3.1=latestDepForkedTestCompileClasspath,latestDepF com.esotericsoftware:reflectasm:1.11.9=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.18.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.0=compileClasspath com.fasterxml.jackson.core:jackson-core:2.13.2=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.18.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.9.8=compileClasspath,testCompileClasspath com.fasterxml.jackson.core:jackson-databind:2.13.2.1=testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.18.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.8=compileClasspath,testCompileClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2=testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8=compileClasspath,testCompileClasspath com.fasterxml.jackson:jackson-bom:2.13.2.1=testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.18.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.docker-java:docker-java-api:3.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -71,28 +71,28 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked de.ruedigermoeller:fst:2.57=compileClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.114.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.33.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.2.6.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.6.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.7=compileClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex.rxjava3:rxjava:3.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.cache:cache-api:1.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.cache:cache-api:1.1.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -198,7 +198,7 @@ org.ow2.asm:asm:9.4=spotbugs org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.reactivestreams:reactive-streams:1.0.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.redisson:redisson:3.10.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.redisson:redisson:3.38.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.redisson:redisson:3.39.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -215,6 +215,6 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim org.xmlresolver:xmlresolver:4.4.3=spotbugs org.yaml:snakeyaml:1.23=compileClasspath,testCompileClasspath org.yaml:snakeyaml:1.30=testRuntimeClasspath -org.yaml:snakeyaml:2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.yaml:snakeyaml:2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/renaissance/gradle.lockfile b/dd-java-agent/instrumentation/renaissance/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/renaissance/gradle.lockfile +++ b/dd-java-agent/instrumentation/renaissance/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile index d1143085ca1..04bd555dfea 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=baseForkedTestRuntimeClasspath,latestDepTestRuntimeCla com.blogspot.mydailyjava:weak-lock-free:0.17=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=baseForkedTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseForkedTestRuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=baseForkedTestCompileClasspath,baseFor commons-io:commons-io:2.11.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rmi/gradle.lockfile b/dd-java-agent/instrumentation/rmi/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/rmi/gradle.lockfile +++ b/dd-java-agent/instrumentation/rmi/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava-1/gradle.lockfile b/dd-java-agent/instrumentation/rxjava-1/gradle.lockfile index 49560f2644b..bbac9f37062 100644 --- a/dd-java-agent/instrumentation/rxjava-1/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava-1/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.reactivex:rxjava:1.0.7=compileClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rxjava-2/gradle.lockfile b/dd-java-agent/instrumentation/rxjava-2/gradle.lockfile index 6fa62b723a8..33798be7c49 100644 --- a/dd-java-agent/instrumentation/rxjava-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ io.opentelemetry:opentelemetry-context:1.28.0=latestDepTestCompileClasspath,late io.reactivex.rxjava2:rxjava:2.0.0=compileClasspath io.reactivex.rxjava2:rxjava:2.0.5=testCompileClasspath,testRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/scala-concurrent/gradle.lockfile index 2dd5ea1627f..2aa1fa2d37b 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala-concurrent/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latest11TestRuntimeClasspath,latest12TestRuntimeClassp com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=latest11TestCompileClasspath,latest11TestRuntimeCla de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala-promise/gradle.lockfile b/dd-java-agent/instrumentation/scala-promise/gradle.lockfile index d7f304283e2..3936b09a037 100644 --- a/dd-java-agent/instrumentation/scala-promise/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala-promise/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/gradle.lockfile b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/gradle.lockfile index 797cc2f9efe..2ce98e748a8 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/gradle.lockfile b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/gradle.lockfile index 2b0fc02b666..0e3a7bf40f8 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -54,7 +54,7 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scala/gradle.lockfile b/dd-java-agent/instrumentation/scala/gradle.lockfile index ecfc45f09c0..fd5dc0a7c92 100644 --- a/dd-java-agent/instrumentation/scala/gradle.lockfile +++ b/dd-java-agent/instrumentation/scala/gradle.lockfile @@ -9,7 +9,8 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=2_12_12Implementation,2_12_12RuntimeClasspath,2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=2_12_12Implementation,2_12_12RuntimeClasspath,2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=2_12_12Implementation,2_12_12RuntimeClasspath,2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=2_12_12Implementation,2_12_12RuntimeClasspath,2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=2_12_12Implementation,2_12_12RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.2.0=2_12_12Implementation,2_12_12RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=2_12_18Implementation,2_12_18RuntimeClasspath,2_13_11Implementation,2_13_11RuntimeClasspath,3_3_0Implementation,3_3_0RuntimeClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.2=2_12_12Implementation,2_12_12RuntimeClasspath,2_13_4Implementation,2_13_4RuntimeClasspath @@ -61,7 +62,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/scalatest/gradle.lockfile b/dd-java-agent/instrumentation/scalatest/gradle.lockfile index 4b6455a7fcd..a79bf4fb0da 100644 --- a/dd-java-agent/instrumentation/scalatest/gradle.lockfile +++ b/dd-java-agent/instrumentation/scalatest/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -60,7 +60,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/selenium/gradle.lockfile b/dd-java-agent/instrumentation/selenium/gradle.lockfile index d533c6eb6b1..b47b7a18b2d 100644 --- a/dd-java-agent/instrumentation/selenium/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testFixturesRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -77,7 +77,7 @@ io.opentelemetry:opentelemetry-sdk-logs:1.43.0=latestDepTestCompileClasspath,lat io.opentelemetry:opentelemetry-sdk-metrics:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/gradle.lockfile index 26efe2f759e..844e5d5a829 100644 --- a/dd-java-agent/instrumentation/servicetalk/gradle.lockfile +++ b/dd-java-agent/instrumentation/servicetalk/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath @@ -52,25 +52,25 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-bom:4.1.111.Final=compileClasspath io.servicetalk:servicetalk-annotations:0.42.0=testRuntimeClasspath -io.servicetalk:servicetalk-annotations:0.42.50=latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-annotations:0.42.52=latestDepTestRuntimeClasspath io.servicetalk:servicetalk-bom:0.42.45=compileClasspath io.servicetalk:servicetalk-buffer-api:0.42.0=testRuntimeClasspath -io.servicetalk:servicetalk-buffer-api:0.42.50=latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-buffer-api:0.42.52=latestDepTestRuntimeClasspath io.servicetalk:servicetalk-concurrent-api:0.42.0=testCompileClasspath,testRuntimeClasspath io.servicetalk:servicetalk-concurrent-api:0.42.45=compileClasspath -io.servicetalk:servicetalk-concurrent-api:0.42.50=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-concurrent-api:0.42.52=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.servicetalk:servicetalk-concurrent-internal:0.42.0=testRuntimeClasspath -io.servicetalk:servicetalk-concurrent-internal:0.42.50=latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-concurrent-internal:0.42.52=latestDepTestRuntimeClasspath io.servicetalk:servicetalk-concurrent:0.42.0=testCompileClasspath,testRuntimeClasspath io.servicetalk:servicetalk-concurrent:0.42.45=compileClasspath -io.servicetalk:servicetalk-concurrent:0.42.50=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-concurrent:0.42.52=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.servicetalk:servicetalk-context-api:0.42.0=testCompileClasspath,testRuntimeClasspath io.servicetalk:servicetalk-context-api:0.42.45=compileClasspath -io.servicetalk:servicetalk-context-api:0.42.50=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.servicetalk:servicetalk-context-api:0.42.52=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.servicetalk:servicetalk-dependencies:0.42.45=compileClasspath io.servicetalk:servicetalk-utils-internal:0.42.0=testRuntimeClasspath -io.servicetalk:servicetalk-utils-internal:0.42.50=latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.servicetalk:servicetalk-utils-internal:0.42.52=latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet-common/gradle.lockfile b/dd-java-agent/instrumentation/servlet-common/gradle.lockfile index dc0f10b830b..a3b719e822a 100644 --- a/dd-java-agent/instrumentation/servlet-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet-common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/servlet/gradle.lockfile b/dd-java-agent/instrumentation/servlet/gradle.lockfile index 73dca0a40b3..1c4c0498082 100644 --- a/dd-java-agent/instrumentation/servlet/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile b/dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile index 53434c0a67a..f301089f573 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.2=compileClasspath javax.servlet:servlet-api:2.5=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile b/dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile index eeb72bd9fe2..9e1b767fb40 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.0.1=testFixturesCompileClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile b/dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile index d2eb4d96dd4..63d3b0c36e6 100644 --- a/dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testFixturesRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testFixturesCompi commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0=testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:5.0.0=compileClasspath,csiCompileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/shutdown/gradle.lockfile b/dd-java-agent/instrumentation/shutdown/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/shutdown/gradle.lockfile +++ b/dd-java-agent/instrumentation/shutdown/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/slick/gradle.lockfile b/dd-java-agent/instrumentation/slick/gradle.lockfile index ea3a77673b3..17ed6155d4e 100644 --- a/dd-java-agent/instrumentation/slick/gradle.lockfile +++ b/dd-java-agent/instrumentation/slick/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -59,7 +59,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/snakeyaml/gradle.lockfile b/dd-java-agent/instrumentation/snakeyaml/gradle.lockfile index ec7280a28fc..7e34b122b19 100644 --- a/dd-java-agent/instrumentation/snakeyaml/gradle.lockfile +++ b/dd-java-agent/instrumentation/snakeyaml/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/span-origin/gradle.lockfile b/dd-java-agent/instrumentation/span-origin/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/span-origin/gradle.lockfile +++ b/dd-java-agent/instrumentation/span-origin/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark-executor/gradle.lockfile b/dd-java-agent/instrumentation/spark-executor/gradle.lockfile index 4290d909ede..5105bfd0cc4 100644 --- a/dd-java-agent/instrumentation/spark-executor/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark-executor/gradle.lockfile @@ -13,7 +13,7 @@ com.clearspring.analytics:stream:2.7.0=baseTestCompileClasspath,baseTestRuntimeC com.clearspring.analytics:stream:2.9.6=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=baseTestRuntimeClasspath,instrumentPluginClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,instrumentPluginClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.esotericsoftware:kryo-shaded:4.0.2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath @@ -129,7 +129,7 @@ io.netty:netty-transport-native-kqueue:4.1.96.Final=latest212DepTestCompileClass io.netty:netty-transport-native-unix-common:4.1.96.Final=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath io.netty:netty-transport:4.1.96.Final=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath io.netty:netty:3.9.9.Final=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath -io.sqreen:libsqreen:11.1.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath jakarta.servlet:jakarta.servlet-api:4.0.3=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/gradle.lockfile b/dd-java-agent/instrumentation/spark/spark_2.12/gradle.lockfile index dffd751ad51..890a43797a0 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/spark_2.12/gradle.lockfile @@ -13,7 +13,7 @@ com.clearspring.analytics:stream:2.7.0=compileClasspath,testCompileClasspath,tes com.clearspring.analytics:stream:2.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24RuntimeClasspath,test_spark32RuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,test_spark24RuntimeClasspath,test_spark32RuntimeClasspath com.esotericsoftware:kryo-shaded:4.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath @@ -155,7 +155,7 @@ io.netty:netty-transport-native-unix-common:4.1.96.Final=latestDepTestCompileCla io.netty:netty-transport:4.1.50.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath io.netty:netty-transport:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty:3.9.9.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_spark24CompileClasspath,test_spark24RuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,test_spark24RuntimeClasspath,test_spark32RuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,test_spark24RuntimeClasspath,test_spark32RuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath jakarta.servlet:jakarta.servlet-api:4.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,test_spark32CompileClasspath,test_spark32RuntimeClasspath diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile b/dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile index 153c0c59220..f469d5d0174 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile index f51cf1f72cc..3aa1cfbe196 100644 --- a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginCl com.chuusai:shapeless_2.11:1.2.4=compileClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -67,7 +67,7 @@ io.spray:spray-io_2.11:1.3.3=testCompileClasspath,testRuntimeClasspath io.spray:spray-routing_2.11:1.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath io.spray:spray-util_2.11:1.3.1=compileClasspath io.spray:spray-util_2.11:1.3.3=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-beans/gradle.lockfile b/dd-java-agent/instrumentation/spring-beans/gradle.lockfile index 68c5c3b2dec..98bf79edb27 100644 --- a/dd-java-agent/instrumentation/spring-beans/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-beans/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.1.1=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-boot/gradle.lockfile b/dd-java-agent/instrumentation/spring-boot/gradle.lockfile index 1428dd38e85..a3ba2654b77 100644 --- a/dd-java-agent/instrumentation/spring-boot/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-boot/gradle.lockfile @@ -5,14 +5,14 @@ aopalliance:aopalliance:1.0=compileClasspath,testCompileClasspath,testRuntimeCla cafe.cryptography:curve25519-elisabeth:0.1.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.2.3=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-core:1.5.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,9 +51,9 @@ commons-io:commons-io:2.11.0=boot1LatestDepForkedTestCompileClasspath,boot1Lates commons-logging:commons-logging:1.2=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.12.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micrometer:micrometer-observation:1.12.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -78,9 +78,9 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-api:2.23.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepTestCompileClasspath,boot2ForkedTestCompileClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepTestCompileClasspath,boot2TestCompileClasspath,boot3ForkedTestCompileClasspath,boot3TestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -156,40 +156,40 @@ org.slf4j:slf4j-api:2.0.16=latestDepForkedTestCompileClasspath,latestDepForkedTe org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.spockframework:spock-core:2.2-groovy-3.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-junit4:2.2-groovy-3.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:1.3.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot:1.5.22.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot:2.0.0.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework.boot:spring-boot:3.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:4.2.3.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-aop:4.3.25.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework:spring-aop:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-aop:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-aop:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:4.2.3.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:4.3.25.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework:spring-beans:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-beans:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-beans:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:4.2.3.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-context:4.3.25.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework:spring-context:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-context:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-context:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:4.2.3.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:4.3.25.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework:spring-core:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-core:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-core:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:4.2.3.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:4.3.25.RELEASE=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath org.springframework:spring-expression:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-expression:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-expression:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:5.0.4.RELEASE=boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath org.springframework:spring-jcl:6.0.2=boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath -org.springframework:spring-jcl:6.1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testng:testng:7.5=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs diff --git a/dd-java-agent/instrumentation/spring-cloud-zuul-2/gradle.lockfile b/dd-java-agent/instrumentation/spring-cloud-zuul-2/gradle.lockfile index e05a6b95c27..c25501f8096 100644 --- a/dd-java-agent/instrumentation/spring-cloud-zuul-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-cloud-zuul-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=testCompileClasspath,testRuntimeClasspath @@ -95,7 +95,7 @@ io.reactivex:rxjava:1.3.8=testCompileClasspath,testRuntimeClasspath io.reactivex:rxnetty-contexts:0.4.9=testRuntimeClasspath io.reactivex:rxnetty-servo:0.4.9=testRuntimeClasspath io.reactivex:rxnetty:0.4.9=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-core/gradle.lockfile b/dd-java-agent/instrumentation/spring-core/gradle.lockfile index dcee0a470d5..4d7da71ce03 100644 --- a/dd-java-agent/instrumentation/spring-core/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-core/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC commons-logging:commons-logging:1.1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-data-1.8/gradle.lockfile b/dd-java-agent/instrumentation/spring-data-1.8/gradle.lockfile index 62b291b5eec..4f5775f2e01 100644 --- a/dd-java-agent/instrumentation/spring-data-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-data-1.8/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -55,7 +55,7 @@ commons-logging:commons-logging:1.1.3=compileClasspath,testCompileClasspath,test de.thetaphi:forbiddenapis:3.1=compileClasspath dom4j:dom4j:1.6.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-jms-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring-jms-3.1/gradle.lockfile index e584c6b6674..ff42bd20280 100644 --- a/dd-java-agent/instrumentation/spring-jms-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-jms-3.1/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-logging:commons-logging:1.1.1=compileClasspath commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.jms:jms-api:1.1-rev-1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/spring-messaging-4/gradle.lockfile b/dd-java-agent/instrumentation/spring-messaging-4/gradle.lockfile index fec98916122..43140f11a25 100644 --- a/dd-java-agent/instrumentation/spring-messaging-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-messaging-4/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -78,7 +78,7 @@ io.netty:netty-transport-classes-epoll:4.1.86.Final=latestDepTestRuntimeClasspat io.netty:netty-transport-native-unix-common:4.1.86.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.86.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath io.spray:spray-json_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs @@ -196,19 +196,19 @@ org.springframework:spring-aop:4.0.0.RELEASE=compileClasspath org.springframework:spring-aop:6.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:4.0.0.RELEASE=compileClasspath org.springframework:spring-beans:6.0.4=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:4.0.0.RELEASE=compileClasspath org.springframework:spring-context:6.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:4.0.0.RELEASE=compileClasspath org.springframework:spring-core:6.0.4=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:4.0.0.RELEASE=compileClasspath org.springframework:spring-expression:6.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:6.0.4=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-messaging:4.0.0.RELEASE=compileClasspath org.springframework:spring-messaging:6.0.4=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-messaging:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-messaging:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs diff --git a/dd-java-agent/instrumentation/spring-rabbit/gradle.lockfile b/dd-java-agent/instrumentation/spring-rabbit/gradle.lockfile index 238a1a38621..6ce7e084893 100644 --- a/dd-java-agent/instrumentation/spring-rabbit/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-rabbit/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -62,7 +62,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC commons-logging:commons-logging:1.1.3=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring-scheduling-3.1/gradle.lockfile index 810fd081fd5..e527e767a12 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/gradle.lockfile @@ -7,16 +7,16 @@ cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTes ch.qos.logback:logback-classic:1.2.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=spring6TestCompileClasspath,spring6TestRuntimeClasspath -ch.qos.logback:logback-classic:1.5.11=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.12=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.2.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.4.5=spring6TestCompileClasspath,spring6TestRuntimeClasspath -ch.qos.logback:logback-core:1.5.11=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +ch.qos.logback:logback-core:1.5.12=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath @@ -71,11 +71,11 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.12.11=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath io.micrometer:micrometer-core:1.6.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.12.11=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath -io.smallrye:jandex:3.1.2=spring6LatestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.14.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +io.smallrye:jandex:3.2.0=spring6LatestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.1=spring6LatestDepTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath @@ -123,12 +123,12 @@ org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.13.3=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs,spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.23.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs org.apache.logging.log4j:log4j-to-slf4j:2.13.3=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-to-slf4j:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-to-slf4j:2.19.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,spring6LatestDepTestCompileClasspath,spring6TestCompileClasspath,testCompileClasspath org.aspectj:aspectjweaver:1.9.22.1=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.aspectj:aspectjweaver:1.9.6=testCompileClasspath,testRuntimeClasspath @@ -186,9 +186,9 @@ org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClas org.hdrhistogram:HdrHistogram:2.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:6.0.2.Final=spring6TestRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:6.0.6.Final=spring6LatestDepTestRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:7.0.3.Final=spring6LatestDepTestRuntimeClasspath org.hibernate.orm:hibernate-core:6.1.5.Final=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.hibernate.orm:hibernate-core:6.5.3.Final=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.hibernate.orm:hibernate-core:6.6.2.Final=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.hibernate:hibernate-core:5.4.23.Final=testCompileClasspath,testRuntimeClasspath org.hibernate:hibernate-core:5.6.15.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.javassist:javassist:3.24.0-GA=testCompileClasspath,testRuntimeClasspath @@ -242,92 +242,91 @@ org.springframework.boot:spring-boot-actuator:2.4.0=latestDepTestCompileClasspat org.springframework.boot:spring-boot-autoconfigure:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-actuator:2.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-aop:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-aop:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-aop:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-aop:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-data-jpa:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-data-jpa:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-data-jpa:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-jdbc:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-jdbc:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-jdbc:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-starter:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.boot:spring-boot:2.4.0=testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.boot:spring-boot:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.data:spring-data-commons:2.4.1=testCompileClasspath,testRuntimeClasspath org.springframework.data:spring-data-commons:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.data:spring-data-commons:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.data:spring-data-commons:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.data:spring-data-commons:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework.data:spring-data-jpa:2.4.1=testCompileClasspath,testRuntimeClasspath org.springframework.data:spring-data-jpa:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.data:spring-data-jpa:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework.data:spring-data-jpa:3.3.5=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework.data:spring-data-jpa:3.4.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-aop:5.0.0.RELEASE=compileClasspath org.springframework:spring-aop:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-aop:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-aop:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-aspects:5.3.1=testCompileClasspath,testRuntimeClasspath org.springframework:spring-aspects:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aspects:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-aspects:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-aspects:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-beans:5.0.0.RELEASE=compileClasspath org.springframework:spring-beans:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-beans:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-context:5.0.0.RELEASE=compileClasspath org.springframework:spring-context:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-context:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-context:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-core:5.0.0.RELEASE=compileClasspath org.springframework:spring-core:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-core:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-expression:5.0.0.RELEASE=compileClasspath org.springframework:spring-expression:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-expression:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-jcl:5.0.0.RELEASE=compileClasspath org.springframework:spring-jcl:5.3.39=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-jcl:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-jdbc:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jdbc:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jdbc:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-jdbc:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-jdbc:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-orm:5.3.1=testCompileClasspath,testRuntimeClasspath org.springframework:spring-orm:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-orm:6.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-orm:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-orm:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.springframework:spring-tx:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-tx:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-tx:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-tx:6.1.14=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.springframework:spring-tx:6.2.0=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath org.testng:testng:7.5=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,spring6LatestDepTestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs org.yaml:snakeyaml:1.27=testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.yaml:snakeyaml:1.33=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.yaml:snakeyaml:2.2=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath +org.yaml:snakeyaml:2.3=spring6LatestDepTestCompileClasspath,spring6LatestDepTestRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java index c2b29f6b8d2..f77251982fe 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingInstrumentation.java @@ -1,16 +1,22 @@ package datadog.trace.instrumentation.springscheduling; +import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.ExcludeFilterProvider; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) public final class SpringSchedulingInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { + implements Instrumenter.ForSingleType, ExcludeFilterProvider { public SpringSchedulingInstrumentation() { super("spring-scheduling"); @@ -35,6 +41,14 @@ public void methodAdvice(MethodTransformer transformer) { getClass().getName() + "$SpringSchedulingAdvice"); } + @Override + public Map> excludedClasses() { + return Collections.singletonMap( + RUNNABLE, + Collections.singleton( + "org.springframework.scheduling.config.Task$OutcomeTrackingRunnable")); + } + public static class SpringSchedulingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static void onConstruction( diff --git a/dd-java-agent/instrumentation/spring-security-5/gradle.lockfile b/dd-java-agent/instrumentation/spring-security-5/gradle.lockfile index 4a1b111f29b..e59075ff001 100644 --- a/dd-java-agent/instrumentation/spring-security-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-security-5/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.0=testCompileClasspath,testRuntimeClasspath @@ -66,7 +66,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-security-6/gradle.lockfile b/dd-java-agent/instrumentation/spring-security-6/gradle.lockfile index 92b6fe18468..3dfcb34c566 100644 --- a/dd-java-agent/instrumentation/spring-security-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-security-6/gradle.lockfile @@ -4,30 +4,30 @@ cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.4.5=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-core:1.5.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -67,10 +67,10 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.10.1=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.12.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.10.1=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.12.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.0=testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -81,8 +81,10 @@ jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.15.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -104,19 +106,19 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=spotbugs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.23.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs org.apache.logging.log4j:log4j-to-slf4j:2.19.0=testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-core:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-el:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.assertj:assertj-core:3.23.1=testCompileClasspath,testRuntimeClasspath -org.assertj:assertj-core:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.assertj:assertj-core:3.26.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.awaitility:awaitility:4.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -159,33 +161,33 @@ org.gmetrics:GMetrics:1.1=codenarc org.hamcrest:hamcrest-core:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.10.5=latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath -org.junit:junit-bom:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit:junit-bom:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.8.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:5.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mockito:mockito-core:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.8.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:5.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -215,59 +217,59 @@ org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.spockframework:spock-core:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-junit4:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-security:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-security:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-config:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-config:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-core:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-core:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-crypto:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-crypto:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-crypto:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-web:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-web:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-web:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-test:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-test:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-web:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-web:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-web:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-webmvc:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-webmvc:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-webmvc:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs +org.xmlunit:xmlunit-core:2.10.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.xmlunit:xmlunit-core:2.9.0=testCompileClasspath,testRuntimeClasspath -org.xmlunit:xmlunit-core:2.9.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.yaml:snakeyaml:1.33=testCompileClasspath,testRuntimeClasspath -org.yaml:snakeyaml:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.yaml:snakeyaml:2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=main_java17AnnotationProcessor,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/spring-webflux-5/gradle.lockfile b/dd-java-agent/instrumentation/spring-webflux-5/gradle.lockfile index 508f592c8dd..a44e08d97e9 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webflux-5/gradle.lockfile @@ -13,7 +13,7 @@ com.beust:jcommander:1.78=iastTestRuntimeClasspath,latestBoot20TestRuntimeClassp com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastTestRuntimeClasspath,instrumentPluginClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.4=latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath @@ -144,7 +144,7 @@ io.projectreactor:reactor-core:3.1.16.RELEASE=iastTestCompileClasspath,iastTestR io.projectreactor:reactor-core:3.4.12=latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath io.projectreactor:reactor-core:3.4.34=latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath io.projectreactor:reactor-core:3.4.41=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-webflux-6/gradle.lockfile b/dd-java-agent/instrumentation/spring-webflux-6/gradle.lockfile index cc4999f4f08..5d1ff0b9cba 100644 --- a/dd-java-agent/instrumentation/spring-webflux-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webflux-6/gradle.lockfile @@ -5,31 +5,31 @@ cafe.cryptography:curve25519-elisabeth:0.1.0=bootTestRuntimeClasspath,iastTestRu cafe.cryptography:ed25519-elisabeth:0.1.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -ch.qos.logback:logback-classic:1.5.11=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.12=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath ch.qos.logback:logback-core:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.4.5=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -ch.qos.logback:logback-core:1.5.11=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +ch.qos.logback:logback-core:1.5.12=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.beust:jcommander:1.78=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -69,9 +69,9 @@ commons-io:commons-io:2.11.0=bootTestCompileClasspath,bootTestRuntimeClasspath,i de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.10.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.12.11=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.10.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.12.11=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-observation:1.14.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty.incubator:netty-incubator-codec-classes-quic:0.0.36.Final=bootTestRuntimeClasspath,iastTestRuntimeClasspath,testRuntimeClasspath io.netty.incubator:netty-incubator-codec-classes-quic:0.0.68.Final=latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty.incubator:netty-incubator-codec-native-quic:0.0.36.Final=bootTestRuntimeClasspath,iastTestRuntimeClasspath,testRuntimeClasspath @@ -110,17 +110,17 @@ io.netty:netty-transport-native-unix-common:4.1.114.Final=latestDepBootTestCompi io.netty:netty-transport-native-unix-common:4.1.89.Final=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.114.Final=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.89.Final=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.1.23=latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.1.3=bootTestRuntimeClasspath,iastTestRuntimeClasspath,testRuntimeClasspath -io.projectreactor.netty:reactor-netty-core:1.1.23=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.2.0=latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty-core:1.1.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.netty:reactor-netty-http:1.1.23=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.netty:reactor-netty-core:1.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty-http:1.1.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor.netty:reactor-netty:1.1.23=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.projectreactor.netty:reactor-netty-http:1.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty:1.1.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor.netty:reactor-netty:1.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-core:3.5.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.6.11=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.7.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath @@ -131,8 +131,10 @@ jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath junit:junit-dep:4.11=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.14.18=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.15.4=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.4=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=bootTestCompileClasspath,bootTestRuntimeClasspath,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -154,13 +156,13 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,spotbugs -org.apache.logging.log4j:log4j-api:2.23.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs org.apache.logging.log4j:log4j-to-slf4j:2.19.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=bootTestCompileClasspath,iastTestCompileClasspath,latestDepBootTestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.assertj:assertj-core:3.23.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.assertj:assertj-core:3.25.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.assertj:assertj-core:3.26.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.awaitility:awaitility:4.2.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -203,33 +205,33 @@ org.gmetrics:GMetrics:1.1=codenarc org.hamcrest:hamcrest-core:1.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:3.3.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,instrumentPluginClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.10.5=latestDepBootTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepBootTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit.jupiter:junit-jupiter:5.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.junit.platform:junit-platform-commons:1.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-engine:1.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.10.5=latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.3=latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.9.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.10.5=latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.3=latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.9.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.10.5=latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.3=latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.9.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.10.5=latestDepBootTestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.3=latestDepBootTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.9.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.10.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.junit:junit-bom:5.11.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.8.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.mockito:mockito-core:5.11.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.mockito:mockito-core:5.14.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.8.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.mockito:mockito-junit-jupiter:5.11.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.14.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.objenesis:objenesis:3.3=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath @@ -266,55 +268,55 @@ org.spockframework:spock-junit4:2.4-M1-groovy-3.0=bootTestCompileClasspath,bootT org.spockframework:spock-spring:1.1-groovy-2.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-spring:2.4-M1-groovy-3.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-reactor-netty:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-reactor-netty:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-reactor-netty:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter-webflux:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-webflux:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-webflux:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot-test:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework.boot:spring-boot:3.3.5=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.springframework.boot:spring-boot:3.4.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.springframework:spring-aop:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-aop:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-beans:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-context:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-core:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-expression:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-jcl:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-test:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-test:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-test:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-test:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-web:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-web:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-web:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-web:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-webflux:6.0.0=testCompileClasspath,testRuntimeClasspath org.springframework:spring-webflux:6.0.2=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.springframework:spring-webflux:6.1.14=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-webflux:6.2.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testng:testng:7.5=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs +org.xmlunit:xmlunit-core:2.10.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.xmlunit:xmlunit-core:2.9.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.xmlunit:xmlunit-core:2.9.1=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath org.yaml:snakeyaml:1.33=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath -org.yaml:snakeyaml:2.2=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath +org.yaml:snakeyaml:2.3=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=main_java17AnnotationProcessor,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/gradle.lockfile b/dd-java-agent/instrumentation/spring-webmvc-3.1/gradle.lockfile index cad87093bb3..b32a010aad2 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.8.0=testCompileClasspath,testRuntimeClasspath @@ -60,7 +60,7 @@ commons-logging:commons-logging:1.1.1=compileClasspath commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testCompileClasspath,testRuntimeClasspath javassist:javassist:3.12.1.GA=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-webmvc-5.3/gradle.lockfile b/dd-java-agent/instrumentation/spring-webmvc-5.3/gradle.lockfile index cc4d11d0123..acc0e59d158 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webmvc-5.3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.4=testCompileClasspath,testRuntimeClasspath @@ -56,7 +56,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle index 65762be0bb6..f37139560e6 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/build.gradle @@ -49,7 +49,7 @@ dependencies { testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.0.0' testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '3.0.0' testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '3.0.0' - testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' + testImplementation group: 'com.google.code.gson', name: 'gson', version: '+' latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.+' latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '3.+' diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile index f0af06a87d8..569459c6f0f 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile @@ -4,30 +4,30 @@ cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.4.5=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-core:1.5.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.1=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,com com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.auto:auto-common:0.10=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -69,11 +69,11 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.10.0=main_java17CompileClasspath io.micrometer:micrometer-commons:1.10.1=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.12.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micrometer:micrometer-observation:1.10.0=main_java17CompileClasspath io.micrometer:micrometer-observation:1.10.1=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.12.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.0=testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -84,8 +84,10 @@ jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.15.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -107,19 +109,19 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=spotbugs,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.23.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs org.apache.logging.log4j:log4j-to-slf4j:2.19.0=testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.23.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-core:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-el:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:10.1.1=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.assertj:assertj-core:3.23.1=testCompileClasspath,testRuntimeClasspath -org.assertj:assertj-core:3.25.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.assertj:assertj-core:3.26.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.awaitility:awaitility:4.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -158,33 +160,33 @@ org.gmetrics:GMetrics:1.1=codenarc org.hamcrest:hamcrest-core:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.10.5=latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.10.5=latestDepTestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath -org.junit:junit-bom:5.10.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.junit:junit-bom:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.8.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:5.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mockito:mockito-core:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.8.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:5.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -215,67 +217,67 @@ org.spockframework:spock-core:2.2-groovy-3.0=latestDepTestCompileClasspath,lates org.spockframework:spock-junit4:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-spring:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-json:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-security:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-security:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-security:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-tomcat:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-web:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:3.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-config:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-config:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-config:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-core:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-core:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-core:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-crypto:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-crypto:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-crypto:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-web:6.0.0=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-web:6.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-web:6.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:6.0.0=main_java17CompileClasspath org.springframework:spring-aop:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:6.0.0=main_java17CompileClasspath org.springframework:spring-beans:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:6.0.0=main_java17CompileClasspath org.springframework:spring-context:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:6.0.0=main_java17CompileClasspath org.springframework:spring-core:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:6.0.0=main_java17CompileClasspath org.springframework:spring-expression:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:6.0.0=main_java17CompileClasspath org.springframework:spring-jcl:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-test:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-test:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-web:6.0.0=main_java17CompileClasspath org.springframework:spring-web:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-web:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-web:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-webmvc:6.0.0=main_java17CompileClasspath org.springframework:spring-webmvc:6.0.2=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-webmvc:6.1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-webmvc:6.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs +org.xmlunit:xmlunit-core:2.10.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.xmlunit:xmlunit-core:2.9.0=testCompileClasspath,testRuntimeClasspath -org.xmlunit:xmlunit-core:2.9.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.yaml:snakeyaml:1.33=testCompileClasspath,testRuntimeClasspath -org.yaml:snakeyaml:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.yaml:snakeyaml:2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=main_java17AnnotationProcessor,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy index a56022c05ee..d3b2c80236b 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/boot/SpringBootBasedTest.groovy @@ -15,6 +15,7 @@ import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.api.ConfigDefaults import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.iast.IastContext import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.SourceTypes @@ -152,6 +153,18 @@ class SpringBootBasedTest extends HttpServerTest true } + @Override + Map expectedExtraErrorInformation(ServerEndpoint endpoint) { + System.err.println("CALLED") + // latest DispatcherServlet throws if no handlers have been found + if (endpoint == NOT_FOUND && isLatestDepTest) { + return [(DDTags.ERROR_STACK): { String }, + (DDTags.ERROR_MSG) : {String}, + (DDTags.ERROR_TYPE) :{String}] + } + return super.expectedExtraErrorInformation(endpoint) + } + @Override Serializable expectedServerSpanRoute(ServerEndpoint endpoint) { switch (endpoint) { diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy index 538baff4293..19fde0ed138 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/test/groovy/datadog/trace/instrumentation/springweb6/urlhandlermapping/UrlHandlerMappingTest.groovy @@ -1,10 +1,17 @@ package datadog.trace.instrumentation.springweb6.urlhandlermapping +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM +import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import static java.util.Collections.singletonMap + import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.api.ConfigDefaults import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.SourceTypes import datadog.trace.api.iast.propagation.PropagationModule @@ -19,13 +26,6 @@ import org.springframework.boot.SpringApplication import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext import org.springframework.context.ConfigurableApplicationContext -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.LOGIN -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM -import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS -import static java.util.Collections.singletonMap - /** * Test instrumentation of UriTemplateVariablesHandlerInterceptor * (used by AbstractUrlHandlerMapping). @@ -135,12 +135,20 @@ class UrlHandlerMappingTest extends HttpServerTest expectedExtraErrorInformation(ServerEndpoint endpoint) { + // latest DispatcherServlet throws if no handlers have been found + if (endpoint == NOT_FOUND && isLatestDepTest) { + return [(DDTags.ERROR_STACK): { String }, + (DDTags.ERROR_MSG): {String}, + (DDTags.ERROR_TYPE):{String}] + } + return super.expectedExtraErrorInformation(endpoint) + } + @Override Serializable expectedServerSpanRoute(ServerEndpoint endpoint) { switch (endpoint) { - case LOGIN: - case NOT_FOUND: - return null case PATH_PARAM: return testPathParam() default: diff --git a/dd-java-agent/instrumentation/spring-ws-2/gradle.lockfile b/dd-java-agent/instrumentation/spring-ws-2/gradle.lockfile index 93db1da714a..a7590c62e6a 100644 --- a/dd-java-agent/instrumentation/spring-ws-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-ws-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,7 +58,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC commons-logging:commons-logging:1.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.jws:jakarta.jws-api:2.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile index e51c73308c9..2414335a5aa 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -51,7 +51,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/sslsocket/gradle.lockfile b/dd-java-agent/instrumentation/sslsocket/gradle.lockfile index 073dd8be306..1d01d6ca9e4 100644 --- a/dd-java-agent/instrumentation/sslsocket/gradle.lockfile +++ b/dd-java-agent/instrumentation/sslsocket/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/synapse-3/gradle.lockfile b/dd-java-agent/instrumentation/synapse-3/gradle.lockfile index c8418edf0b9..383b838f920 100644 --- a/dd-java-agent/instrumentation/synapse-3/gradle.lockfile +++ b/dd-java-agent/instrumentation/synapse-3/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -63,7 +63,7 @@ commons-logging:commons-logging:1.2=compileClasspath,latestDepTestCompileClasspa commons-pool:commons-pool:1.5.7=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.activation:activation:1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/gradle.lockfile b/dd-java-agent/instrumentation/testng/gradle.lockfile index c6797c1f1af..8db89c85936 100644 --- a/dd-java-agent/instrumentation/testng/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.12=compileClasspath,testFixturesCompileClasspath,testFixt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testFixturesCompi commons-io:commons-io:2.11.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-6/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-6/gradle.lockfile index 416b90dbb28..6cfd35934da 100644 --- a/dd-java-agent/instrumentation/testng/testng-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.12=compileClasspath,testCompileClasspath,testRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testRuntimeClasspath @@ -53,7 +53,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/testng/testng-7/gradle.lockfile b/dd-java-agent/instrumentation/testng/testng-7/gradle.lockfile index a5ac3b9c98b..bc0c4328684 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-7/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestCompileClasspath,latestDepTestRuntimeClas com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/thymeleaf/gradle.lockfile b/dd-java-agent/instrumentation/thymeleaf/gradle.lockfile index ef0c952d36a..30ee1372531 100644 --- a/dd-java-agent/instrumentation/thymeleaf/gradle.lockfile +++ b/dd-java-agent/instrumentation/thymeleaf/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tinylog-2/gradle.lockfile b/dd-java-agent/instrumentation/tinylog-2/gradle.lockfile index e1892de5dd4..60ccb98e598 100644 --- a/dd-java-agent/instrumentation/tinylog-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/tinylog-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat-5.5-common/gradle.lockfile b/dd-java-agent/instrumentation/tomcat-5.5-common/gradle.lockfile index a87eade4198..d8052c24f73 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat-5.5-common/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.4=compileClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/tomcat-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat-5.5/gradle.lockfile index c7fe7a1b687..a2cf0d17719 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat-5.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latest10ForkedTestRuntimeClasspath,latest10TestRuntime com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -54,7 +54,7 @@ commons-logging:commons-logging:1.0=latest10ForkedTestCompileClasspath,latest10F commons-modeler:commons-modeler:2.0.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.4=compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -83,11 +83,11 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs org.apache.logging.log4j:log4j-api:2.19.0=spotbugs org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.tomcat.embed:tomcat-embed-core:10.1.31=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:11.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.33=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:11.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat:jakartaee-migration:1.0.8=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:10.1.31=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:11.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:10.1.33=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latest10ForkedTestCompileClasspath,latest10TestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor org.codehaus.groovy:groovy-all:3.0.17=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat-appsec-5.5/gradle.lockfile b/dd-java-agent/instrumentation/tomcat-appsec-5.5/gradle.lockfile index de11f131e7b..751ccaeb2a9 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat-appsec-5.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging-api:1.0.4=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat-appsec-6/gradle.lockfile b/dd-java-agent/instrumentation/tomcat-appsec-6/gradle.lockfile index 08cb7ad439d..330a235aaa3 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-6/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat-appsec-6/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat-appsec-7/gradle.lockfile b/dd-java-agent/instrumentation/tomcat-appsec-7/gradle.lockfile index 21126f1b82d..9e67cc8eea5 100644 --- a/dd-java-agent/instrumentation/tomcat-appsec-7/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat-appsec-7/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/trace-annotation/gradle.lockfile b/dd-java-agent/instrumentation/trace-annotation/gradle.lockfile index 174930854f5..37a9950ab95 100644 --- a/dd-java-agent/instrumentation/trace-annotation/gradle.lockfile +++ b/dd-java-agent/instrumentation/trace-annotation/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/twilio/gradle.lockfile b/dd-java-agent/instrumentation/twilio/gradle.lockfile index 2e1fa23186c..3e92170cecb 100644 --- a/dd-java-agent/instrumentation/twilio/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -55,7 +55,7 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=latestDepTestRuntimeClasspath,testRuntimeClasspath com.twilio.sdk:twilio:0.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.twilio.sdk:twilio:10.6.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.twilio.sdk:twilio:10.6.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-codec:commons-codec:1.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs commons-codec:commons-codec:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -68,7 +68,7 @@ io.jsonwebtoken:jjwt-api:0.11.2=latestDepTestCompileClasspath,latestDepTestRunti io.jsonwebtoken:jjwt-impl:0.11.2=latestDepTestRuntimeClasspath io.jsonwebtoken:jjwt-jackson:0.11.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.jsonwebtoken:jjwt:0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/unbescape/gradle.lockfile b/dd-java-agent/instrumentation/unbescape/gradle.lockfile index 3065c949943..bdfffc9b237 100644 --- a/dd-java-agent/instrumentation/unbescape/gradle.lockfile +++ b/dd-java-agent/instrumentation/unbescape/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/gradle.lockfile b/dd-java-agent/instrumentation/undertow/gradle.lockfile index e71c81cc559..09b9ad20af4 100644 --- a/dd-java-agent/instrumentation/undertow/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath io.undertow:undertow-core:2.0.0.Final=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile index 083fe02ee08..cc63401f3c2 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.undertow:undertow-core:2.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.undertow:undertow-core:2.2.37.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.undertow:undertow-servlet:2.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile index 07e15430813..b9611542e56 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latest22ForkedTestRuntimeClasspath,latest22TestRuntime com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=latest22ForkedTestCompileClasspath,lat commons-io:commons-io:2.11.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.undertow:undertow-core:2.2.14.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.undertow:undertow-core:2.2.20.Final=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath io.undertow:undertow-core:2.3.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/velocity/gradle.lockfile b/dd-java-agent/instrumentation/velocity/gradle.lockfile index 9d2ae2258b8..0fe7dab6135 100644 --- a/dd-java-agent/instrumentation/velocity/gradle.lockfile +++ b/dd-java-agent/instrumentation/velocity/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -60,7 +60,7 @@ commons-validator:commons-validator:1.3.1=compileClasspath,csiCompileClasspath,l de.thetaphi:forbiddenapis:3.1=compileClasspath,csiCompileClasspath dom4j:dom4j:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/gradle.lockfile index 46bfa6892fe..d463f2ebc45 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-mysql-client-3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.2=compileClasspath @@ -84,7 +84,7 @@ io.netty:netty-resolver:4.1.89.Final=latestDepForkedTestCompileClasspath,latestD io.netty:netty-transport-native-unix-common:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-core:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-mysql-client:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/gradle.lockfile index d0f6bd067ae..6013a537e1e 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -77,7 +77,7 @@ io.netty:netty-resolver:4.1.49.Final=compileClasspath,testCompileClasspath,testR io.netty:netty-resolver:4.1.60.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.60.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-core:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:4.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-mysql-client:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/gradle.lockfile b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/gradle.lockfile index 47269e7f1c1..015cff29892 100644 --- a/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-mysql-client-4.4.2/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -81,7 +81,7 @@ io.netty:netty-transport-native-unix-common:4.1.92.Final=compileClasspath,testCo io.netty:netty-transport-native-unix-common:4.1.94.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.92.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.94.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-core:4.4.2=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:4.4.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-mysql-client:4.4.2=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx-redis-client-3.9/gradle.lockfile index b5efd9f3df5..27a557cdc95 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.2=compileClasspath @@ -65,63 +65,63 @@ commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,la commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-dns:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-dns:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-http2:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-http:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-socks:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-socks:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-common:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-handler-proxy:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler-proxy:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-handler:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-resolver-dns:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver-dns:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-resolver:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.111.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.12=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.21=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-codegen:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-codegen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-codegen:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-codegen:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-core:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-redis-client:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-redis-client:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-redis-client:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-redis-client:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-gen:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-rx-gen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-gen:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-gen:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-java2-gen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-java2-gen:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-java2-gen:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-java2:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-rx-java2:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-java2:4.5.10=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-java2:4.5.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-redis-client-3.9/stubs/gradle.lockfile b/dd-java-agent/instrumentation/vertx-redis-client-3.9/stubs/gradle.lockfile index 7c2d2a196a4..f0324f22edc 100644 --- a/dd-java-agent/instrumentation/vertx-redis-client-3.9/stubs/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-redis-client-3.9/stubs/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.2=compileClasspath @@ -62,7 +62,7 @@ io.netty:netty-handler:4.1.48.Final=compileClasspath io.netty:netty-resolver-dns:4.1.48.Final=compileClasspath io.netty:netty-resolver:4.1.48.Final=compileClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath io.vertx:vertx-core:3.9.0=compileClasspath io.vertx:vertx-redis-client:3.9.0=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-rx-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx-rx-3.5/gradle.lockfile index 1f71714011d..9eb28206127 100644 --- a/dd-java-agent/instrumentation/vertx-rx-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-rx-3.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -81,7 +81,7 @@ io.netty:netty-transport:4.1.15.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.reactivex.rxjava2:rxjava:2.1.3=testCompileClasspath,testRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.5.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:3.5.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/gradle.lockfile b/dd-java-agent/instrumentation/vertx-web-3.4/gradle.lockfile index e828ecb1803..50c5ada0679 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-web-3.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -79,7 +79,7 @@ io.netty:netty-resolver:4.1.89.Final=latestDepForkedTestCompileClasspath,latestD io.netty:netty-transport-native-unix-common:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.8.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-web-3.5/gradle.lockfile b/dd-java-agent/instrumentation/vertx-web-3.5/gradle.lockfile index 80709f73873..e1bcda63ac9 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-web-3.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRunti com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -79,7 +79,7 @@ io.netty:netty-resolver:4.1.89.Final=latestDepForkedTestCompileClasspath,latestD io.netty:netty-transport-native-unix-common:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.89.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:3.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-web-3.9/gradle.lockfile b/dd-java-agent/instrumentation/vertx-web-3.9/gradle.lockfile index 021bcfc64ef..97f2df176e9 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-web-3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -62,7 +62,7 @@ io.netty:netty-handler:4.1.48.Final=compileClasspath,latestDepTestCompileClasspa io.netty:netty-resolver-dns:4.1.48.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.48.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:3.9.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-bridge-common:3.9.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:3.9.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/gradle.lockfile b/dd-java-agent/instrumentation/vertx-web-4.0/gradle.lockfile index ed6f6796e34..508e888eb3a 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/vertx-web-4.0/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.3=testCompileClasspath,testRuntimeClasspath @@ -91,7 +91,7 @@ io.netty:netty-transport-native-unix-common:4.1.108.Final=latestDepTestCompileCl io.netty:netty-transport:4.1.108.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.49.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.74.Final=compileClasspath -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:4.0.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:4.2.7=compileClasspath io.vertx:vertx-auth-common:4.4.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile b/dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile +++ b/dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/zio/gradle.lockfile b/dd-java-agent/instrumentation/zio/gradle.lockfile index c1e55952ba2..5771b842e99 100644 --- a/dd-java-agent/instrumentation/zio/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile index 436ccdedd67..ec423154a90 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -64,7 +64,7 @@ dev.zio:zio_2.12:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspat dev.zio:zio_2.12:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/load-generator/gradle.lockfile b/dd-java-agent/load-generator/gradle.lockfile index 6a3986aa077..7c564f81449 100644 --- a/dd-java-agent/load-generator/gradle.lockfile +++ b/dd-java-agent/load-generator/gradle.lockfile @@ -6,7 +6,7 @@ ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=runtimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=runtimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/testing/gradle.lockfile b/dd-java-agent/testing/gradle.lockfile index 509a8650550..7a64e0c3d44 100644 --- a/dd-java-agent/testing/gradle.lockfile +++ b/dd-java-agent/testing/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,runtimeClasspath,test commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=runtimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/gradle.lockfile b/dd-smoke-tests/appsec/gradle.lockfile index 7fd59b5cab8..f96dfa21e6a 100644 --- a/dd-smoke-tests/appsec/gradle.lockfile +++ b/dd-smoke-tests/appsec/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile index d5ac7ad3a5f..9340665cc69 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile +++ b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile index 600d85fe56c..6041f0711e0 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile index c96858ad099..f33a8477fa6 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile index 50a67171c69..e3fb9cd5ce2 100644 --- a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot/gradle.lockfile b/dd-smoke-tests/appsec/springboot/gradle.lockfile index f68be7cefdd..f48e8824847 100644 --- a/dd-smoke-tests/appsec/springboot/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,12 +39,19 @@ com.google.re2j:re2j:1.7=testRuntimeClasspath com.h2database:h2:2.1.212=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.0.0=compileClasspath,runtimeClasspath com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp:okhttp:2.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.6.0=compileClasspath,runtimeClasspath com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath +commons-httpclient:commons-httpclient:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath +commons-lang:commons-lang:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -71,6 +78,8 @@ org.apache.commons:commons-text:1.10.0=spotbugs org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.httpcomponents:httpclient:4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs org.apache.logging.log4j:log4j-core:2.19.0=spotbugs diff --git a/dd-smoke-tests/armeria-grpc/gradle.lockfile b/dd-smoke-tests/armeria-grpc/gradle.lockfile index 01dbe4628ce..6dff7001e52 100644 --- a/dd-smoke-tests/armeria-grpc/gradle.lockfile +++ b/dd-smoke-tests/armeria-grpc/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testCompileProtoPath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -57,7 +57,7 @@ io.grpc:grpc-protobuf:1.56.0=compileClasspath,compileProtoPath,runtimeClasspath, io.grpc:grpc-stub:1.56.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.grpc:protoc-gen-grpc-java:1.56.0=protobufToolsLocator_grpc io.perfmark:perfmark-api:0.26.0=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testCompileProtoPath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/asm-standalone-billing/gradle.lockfile b/dd-smoke-tests/asm-standalone-billing/gradle.lockfile index 22b257127c9..23497c117ab 100644 --- a/dd-smoke-tests/asm-standalone-billing/gradle.lockfile +++ b/dd-smoke-tests/asm-standalone-billing/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentracing:opentracing-api:0.32.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/backend-mock/gradle.lockfile b/dd-smoke-tests/backend-mock/gradle.lockfile index da79262bea2..0808d1e929c 100644 --- a/dd-smoke-tests/backend-mock/gradle.lockfile +++ b/dd-smoke-tests/backend-mock/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,runtimeClasspath,test commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=runtimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/cli/gradle.lockfile b/dd-smoke-tests/cli/gradle.lockfile index 63accf233b6..930f78bdeb0 100644 --- a/dd-smoke-tests/cli/gradle.lockfile +++ b/dd-smoke-tests/cli/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/crashtracking/gradle.lockfile b/dd-smoke-tests/crashtracking/gradle.lockfile index e3d6382c01d..194a411244b 100644 --- a/dd-smoke-tests/crashtracking/gradle.lockfile +++ b/dd-smoke-tests/crashtracking/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -40,7 +40,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/custom-systemloader/gradle.lockfile b/dd-smoke-tests/custom-systemloader/gradle.lockfile index a64bf921e6f..6537aee5997 100644 --- a/dd-smoke-tests/custom-systemloader/gradle.lockfile +++ b/dd-smoke-tests/custom-systemloader/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile index 577eaa9bd86..80d9fb087a1 100644 --- a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/dynamic-config/gradle.lockfile b/dd-smoke-tests/dynamic-config/gradle.lockfile index a3275f00a34..5ce7ac4885b 100644 --- a/dd-smoke-tests/dynamic-config/gradle.lockfile +++ b/dd-smoke-tests/dynamic-config/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -42,7 +42,7 @@ info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/field-injection/gradle.lockfile b/dd-smoke-tests/field-injection/gradle.lockfile index 63accf233b6..930f78bdeb0 100644 --- a/dd-smoke-tests/field-injection/gradle.lockfile +++ b/dd-smoke-tests/field-injection/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/gradle.lockfile b/dd-smoke-tests/gradle.lockfile index fd8b1603877..e20a1972cec 100644 --- a/dd-smoke-tests/gradle.lockfile +++ b/dd-smoke-tests/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,runtimeClasspath,test commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=runtimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/gradle.lockfile b/dd-smoke-tests/gradle/gradle.lockfile index 28ac1e06aa0..d4f21cfc446 100644 --- a/dd-smoke-tests/gradle/gradle.lockfile +++ b/dd-smoke-tests/gradle/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/grpc-1.5/gradle.lockfile b/dd-smoke-tests/grpc-1.5/gradle.lockfile index b0eababab5c..4a40620822e 100644 --- a/dd-smoke-tests/grpc-1.5/gradle.lockfile +++ b/dd-smoke-tests/grpc-1.5/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testCompileProtoPath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -95,7 +95,7 @@ io.opencensus:opencensus-api:0.28.0=compileClasspath,compileProtoPath,runtimeCla io.opencensus:opencensus-contrib-http-util:0.28.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-proto:0.2.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.26.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testCompileProtoPath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-propagation/gradle.lockfile b/dd-smoke-tests/iast-propagation/gradle.lockfile index 0f5f4e4f3e5..d42b229283a 100644 --- a/dd-smoke-tests/iast-propagation/gradle.lockfile +++ b/dd-smoke-tests/iast-propagation/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -53,7 +53,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testImplementationDependencies de.thetaphi:forbiddenapis:3.1=compileClasspath,compileOnlyDependenciesMetadata info.picocli:picocli:4.6.3=runtimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/iast-util/gradle.lockfile b/dd-smoke-tests/iast-util/gradle.lockfile index 94508cf8ab2..dbb80ea0473 100644 --- a/dd-smoke-tests/iast-util/gradle.lockfile +++ b/dd-smoke-tests/iast-util/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.8.0=compileClasspath @@ -49,7 +49,7 @@ commons-lang:commons-lang:1.0.1=compileClasspath commons-logging:commons-logging:1.2=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile index d22991a765c..aad0629ca6b 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.0=compileClasspath @@ -46,7 +46,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,runtimeClasspath,test commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath jakarta.validation:jakarta.validation-api:2.0.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/java9-modules/gradle.lockfile b/dd-smoke-tests/java9-modules/gradle.lockfile index 45c00c03827..b9a3aeafc8f 100644 --- a/dd-smoke-tests/java9-modules/gradle.lockfile +++ b/dd-smoke-tests/java9-modules/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/jboss-modules/gradle.lockfile b/dd-smoke-tests/jboss-modules/gradle.lockfile index 4cc9a2d054e..08b6f504b0a 100644 --- a/dd-smoke-tests/jboss-modules/gradle.lockfile +++ b/dd-smoke-tests/jboss-modules/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -41,7 +41,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-2/gradle.lockfile b/dd-smoke-tests/jersey-2/gradle.lockfile index ea91d1c5e17..cdb44545cc7 100644 --- a/dd-smoke-tests/jersey-2/gradle.lockfile +++ b/dd-smoke-tests/jersey-2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -40,7 +40,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:activation:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-3/gradle.lockfile b/dd-smoke-tests/jersey-3/gradle.lockfile index 601ab1e05d2..29595f46d41 100644 --- a/dd-smoke-tests/jersey-3/gradle.lockfile +++ b/dd-smoke-tests/jersey-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-2/gradle.lockfile b/dd-smoke-tests/kafka-2/gradle.lockfile index fd2e9f69334..a9e72962c85 100644 --- a/dd-smoke-tests/kafka-2/gradle.lockfile +++ b/dd-smoke-tests/kafka-2/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=productionRuntimeClasspath,runtimeClasspath,testFixtur com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -65,7 +65,7 @@ io.netty:netty-transport-classes-epoll:4.1.97.Final=testCompileClasspath,testRun io.netty:netty-transport-native-epoll:4.1.97.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.97.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.97.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/kafka-3/gradle.lockfile b/dd-smoke-tests/kafka-3/gradle.lockfile index 58fc3ca1116..0a1247161eb 100644 --- a/dd-smoke-tests/kafka-3/gradle.lockfile +++ b/dd-smoke-tests/kafka-3/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.3=testRuntimeClasspath @@ -60,7 +60,7 @@ io.netty:netty-resolver:4.1.63.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.63.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.63.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.63.Final=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/lib-injection/gradle.lockfile b/dd-smoke-tests/lib-injection/gradle.lockfile index 08c91f77b47..2d37a2b3f7b 100644 --- a/dd-smoke-tests/lib-injection/gradle.lockfile +++ b/dd-smoke-tests/lib-injection/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -41,7 +41,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/log-injection/gradle.lockfile b/dd-smoke-tests/log-injection/gradle.lockfile index f7eb3421462..f148222e37a 100644 --- a/dd-smoke-tests/log-injection/gradle.lockfile +++ b/dd-smoke-tests/log-injection/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.0=logbackBackendLatest @@ -60,7 +60,7 @@ commons-logging:commons-logging:1.2=compileClasspath,jcl,jclLog4j2Bridge commons-logging:commons-logging:1.3.4=jclLog4j2BridgeLatest de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath @@ -90,23 +90,23 @@ org.apache.commons:commons-text:1.10.0=spotbugs org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-1.2-api:2.24.1=log4j1Log4j2BridgeLatest +org.apache.logging.log4j:log4j-1.2-api:2.24.2=log4j1Log4j2BridgeLatest org.apache.logging.log4j:log4j-1.2-api:2.7=log4j1Log4j2Bridge org.apache.logging.log4j:log4j-api:2.14.0=compileClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-api:2.24.1=jclLog4j2BridgeLatest,julLog4j2BridgeLatest,log4j1Log4j2BridgeLatest,log4j2Latest,log4j2Slf4jBridgeLatest,slf4jLog4j2BridgeLatest +org.apache.logging.log4j:log4j-api:2.24.2=jclLog4j2BridgeLatest,julLog4j2BridgeLatest,log4j1Log4j2BridgeLatest,log4j2Latest,log4j2Slf4jBridgeLatest,slf4jLog4j2BridgeLatest org.apache.logging.log4j:log4j-api:2.7=jclLog4j2Bridge,julLog4j2Bridge,log4j1Log4j2Bridge,log4j2,log4j2Slf4jBridge,slf4jLog4j2Bridge org.apache.logging.log4j:log4j-core:2.14.0=compileClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.24.1=log4j2Latest,slf4jLog4j2BridgeLatest +org.apache.logging.log4j:log4j-core:2.24.2=log4j2Latest,slf4jLog4j2BridgeLatest org.apache.logging.log4j:log4j-core:2.7=log4j1Log4j2Bridge,log4j2 -org.apache.logging.log4j:log4j-jcl:2.24.1=jclLog4j2BridgeLatest +org.apache.logging.log4j:log4j-jcl:2.24.2=jclLog4j2BridgeLatest org.apache.logging.log4j:log4j-jcl:2.7=jclLog4j2Bridge -org.apache.logging.log4j:log4j-jul:2.24.1=julLog4j2BridgeLatest +org.apache.logging.log4j:log4j-jul:2.24.2=julLog4j2BridgeLatest org.apache.logging.log4j:log4j-jul:2.7=julLog4j2Bridge -org.apache.logging.log4j:log4j-slf4j-impl:2.24.1=slf4jLog4j2BridgeLatest +org.apache.logging.log4j:log4j-slf4j-impl:2.24.2=slf4jLog4j2BridgeLatest org.apache.logging.log4j:log4j-slf4j-impl:2.7=slf4jLog4j2Bridge -org.apache.logging.log4j:log4j-to-slf4j:2.24.1=log4j2Slf4jBridgeLatest +org.apache.logging.log4j:log4j-to-slf4j:2.24.2=log4j2Slf4jBridgeLatest org.apache.logging.log4j:log4j-to-slf4j:2.7=log4j2Slf4jBridge org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-compat-qual:2.5.3=compileClasspath,floggerInterface,floggerJULBackend,floggerSlf4jBackend diff --git a/dd-smoke-tests/maven/gradle.lockfile b/dd-smoke-tests/maven/gradle.lockfile index 2a9d2d84c77..abefa397ffd 100644 --- a/dd-smoke-tests/maven/gradle.lockfile +++ b/dd-smoke-tests/maven/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=testCompileClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index 08c91f77b47..2d37a2b3f7b 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -41,7 +41,7 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/opentracing/gradle.lockfile b/dd-smoke-tests/opentracing/gradle.lockfile index 50f7737ee40..c66cdc20116 100644 --- a/dd-smoke-tests/opentracing/gradle.lockfile +++ b/dd-smoke-tests/opentracing/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -43,7 +43,7 @@ io.opentracing.contrib:opentracing-tracerresolver:0.1.0=compileClasspath,runtime io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/osgi/gradle.lockfile b/dd-smoke-tests/osgi/gradle.lockfile index d70fe042407..8966023916c 100644 --- a/dd-smoke-tests/osgi/gradle.lockfile +++ b/dd-smoke-tests/osgi/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -41,7 +41,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.4/gradle.lockfile b/dd-smoke-tests/play-2.4/gradle.lockfile index 9ec34220aab..9cf646dfd51 100644 --- a/dd-smoke-tests/play-2.4/gradle.lockfile +++ b/dd-smoke-tests/play-2.4/gradle.lockfile @@ -13,7 +13,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -97,7 +97,7 @@ io.netty:netty:3.10.6.Final=compileClasspath,runtimeClasspath,testCompileClasspa io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.5/gradle.lockfile b/dd-smoke-tests/play-2.5/gradle.lockfile index 3af2e06a74e..b38728d7bdc 100644 --- a/dd-smoke-tests/play-2.5/gradle.lockfile +++ b/dd-smoke-tests/play-2.5/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -106,7 +106,7 @@ io.netty:netty-transport:4.0.51.Final=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.el:javax.el-api:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.6/gradle.lockfile b/dd-smoke-tests/play-2.6/gradle.lockfile index 140e6e3ccdd..9c48e70f4b1 100644 --- a/dd-smoke-tests/play-2.6/gradle.lockfile +++ b/dd-smoke-tests/play-2.6/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -121,7 +121,7 @@ io.netty:netty-transport:4.1.43.Final=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.cache:cache-api:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.7/gradle.lockfile b/dd-smoke-tests/play-2.7/gradle.lockfile index 26b0c9d98fc..4d4b4207f0e 100644 --- a/dd-smoke-tests/play-2.7/gradle.lockfile +++ b/dd-smoke-tests/play-2.7/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -119,7 +119,7 @@ io.netty:netty-transport:4.1.45.Final=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.activation:javax.activation-api:1.2.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.cache:cache-api:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8-otel/gradle.lockfile b/dd-smoke-tests/play-2.8-otel/gradle.lockfile index 17e71969478..87e67cd1ca1 100644 --- a/dd-smoke-tests/play-2.8-otel/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-otel/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -127,7 +127,7 @@ io.netty:netty-transport-native-unix-common:4.1.75.Final=compileClasspath,runtim io.netty:netty-transport:4.1.75.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-context:1.24.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,play diff --git a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile index 9f5af05453d..7a525d36c5d 100644 --- a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -127,7 +127,7 @@ io.netty:netty-transport:4.1.75.Final=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,play diff --git a/dd-smoke-tests/play-2.8/gradle.lockfile b/dd-smoke-tests/play-2.8/gradle.lockfile index c8c17984f25..895edf67750 100644 --- a/dd-smoke-tests/play-2.8/gradle.lockfile +++ b/dd-smoke-tests/play-2.8/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -128,7 +128,7 @@ io.netty:netty-transport:4.1.75.Final=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,play diff --git a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile index 3b215af6c20..db63cff36d7 100644 --- a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.10=testCompileClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ io.opentracing.contrib:opentracing-tracerresolver:0.1.6=compileClasspath,runtime io.opentracing:opentracing-api:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus-native/gradle.lockfile b/dd-smoke-tests/quarkus-native/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/quarkus-native/gradle.lockfile +++ b/dd-smoke-tests/quarkus-native/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus/gradle.lockfile b/dd-smoke-tests/quarkus/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/quarkus/gradle.lockfile +++ b/dd-smoke-tests/quarkus/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/resteasy/gradle.lockfile b/dd-smoke-tests/resteasy/gradle.lockfile index a8c0a8f3143..0b4b76b2d60 100644 --- a/dd-smoke-tests/resteasy/gradle.lockfile +++ b/dd-smoke-tests/resteasy/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -44,7 +44,7 @@ commons-io:commons-io:2.5=compileClasspath,runtimeClasspath,testFixturesRuntimeC commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath io.undertow:undertow-core:1.3.25.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.undertow:undertow-servlet:1.3.25.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/sample-trace/gradle.lockfile b/dd-smoke-tests/sample-trace/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/sample-trace/gradle.lockfile +++ b/dd-smoke-tests/sample-trace/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile index b4eb0d20325..2f3590fa8dc 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -45,7 +45,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.websocket:jakarta.websocket-api:1.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile index 409d407af45..a6eb20ab7a6 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -62,7 +62,7 @@ io.netty:netty-transport:4.1.53.Final=compileClasspath,runtimeClasspath,testComp io.projectreactor.netty:reactor-netty-core:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile index a6efedb7b1e..6448c73cad9 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -64,7 +64,7 @@ io.netty:netty-transport:4.1.63.Final=compileClasspath,runtimeClasspath,testComp io.projectreactor.netty:reactor-netty-core:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile index 1a2fec32ed1..63845d91b91 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -79,7 +79,7 @@ io.netty:netty-transport:4.1.70.Final=compileClasspath,runtimeClasspath,testComp io.projectreactor.netty:reactor-netty-core:1.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.4.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:2.2.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile index 69647411fdb..8dbe95621b0 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -65,7 +65,7 @@ commons-lang:commons-lang:1.0.1=compileClasspath,runtimeClasspath,testCompileCla commons-logging:commons-logging:1.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:2.2.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile index 95ea67d8478..24ced8f6883 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile index e6af113343d..5e07ebbcdd0 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile index e6af113343d..5e07ebbcdd0 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile new file mode 100644 index 00000000000..5e07ebbcdd0 --- /dev/null +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile @@ -0,0 +1,146 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.13=testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.17=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.16=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.19=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.22=testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs:4.7.3=spotbugs +com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.9.1=spotbugs +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.7=testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath +commons-codec:commons-codec:1.15=spotbugs +commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.1=compileClasspath +info.picocli:picocli:4.6.3=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:1.2.0=spotbugs +jline:jline:2.14.6=testRuntimeClasspath +junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:11.4=spotbugs +org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath +org.apache.ant:ant-antlr:1.9.15=codenarc +org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath +org.apache.ant:ant-junit:1.9.15=codenarc +org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath +org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath +org.apache.bcel:bcel:6.5.0=spotbugs +org.apache.commons:commons-lang3:3.12.0=spotbugs +org.apache.commons:commons-text:1.10.0=spotbugs +org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.logging.log4j:log4j-api:2.19.0=spotbugs +org.apache.logging.log4j:log4j-core:2.19.0=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:2.5.14=codenarc +org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:2.5.14=codenarc +org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:2.5.14=codenarc +org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:2.5.14=codenarc +org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:2.5.14=codenarc +org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:2.2.0=codenarc +org.dom4j:dom4j:2.1.3=spotbugs +org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath +org.gmetrics:GMetrics:1.1=codenarc +org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core:3.3.0=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit:junit-bom:5.9.1=spotbugs +org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.2=testRuntimeClasspath +org.ow2.asm:asm-analysis:9.4=spotbugs +org.ow2.asm:asm-commons:9.2=testRuntimeClasspath +org.ow2.asm:asm-commons:9.4=spotbugs +org.ow2.asm:asm-tree:9.2=testRuntimeClasspath +org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-util:9.2=testRuntimeClasspath +org.ow2.asm:asm-util:9.4=spotbugs +org.ow2.asm:asm:9.2=testRuntimeClasspath +org.ow2.asm:asm:9.4=spotbugs +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=testCompileClasspath +org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j +org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.testng:testng:7.5=testRuntimeClasspath +org.webjars:jquery:3.5.1=testRuntimeClasspath +org.xmlresolver:xmlresolver:4.4.3=spotbugs +xml-apis:xml-apis:1.4.01=spotbugs +empty=annotationProcessor,main_java17AnnotationProcessor,main_java17CompileClasspath,main_java17RuntimeClasspath,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile index aa6db3bfc7e..d03469248c8 100644 --- a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -50,7 +50,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/spring-security/gradle.lockfile b/dd-smoke-tests/spring-security/gradle.lockfile index 9bd419469bb..6cc8fa80e11 100644 --- a/dd-smoke-tests/spring-security/gradle.lockfile +++ b/dd-smoke-tests/spring-security/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -49,7 +49,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,runtimeClasspath,test commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/springboot-freemarker/gradle.lockfile b/dd-smoke-tests/springboot-freemarker/gradle.lockfile index 0a07b1bcb22..dfdfe1cb935 100644 --- a/dd-smoke-tests/springboot-freemarker/gradle.lockfile +++ b/dd-smoke-tests/springboot-freemarker/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:2.0.1.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-grpc/gradle.lockfile b/dd-smoke-tests/springboot-grpc/gradle.lockfile index 2aca0c28930..6f67c9196e0 100644 --- a/dd-smoke-tests/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/springboot-grpc/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=testCompileProtoPath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.8.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -92,7 +92,7 @@ io.opencensus:opencensus-api:0.24.0=compileClasspath,compileProtoPath,runtimeCla io.opencensus:opencensus-contrib-grpc-util:0.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.24.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.perfmark:perfmark-api:0.23.0=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testCompileProtoPath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testCompileProtoPath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-11/gradle.lockfile b/dd-smoke-tests/springboot-java-11/gradle.lockfile index 0269f19a6da..0bed668a4e6 100644 --- a/dd-smoke-tests/springboot-java-11/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-11/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=productionRuntimeClasspath,runtimeClasspath,testFixtur com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=compileClasspath,productionRuntimeClas commons-io:commons-io:2.11.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile index 459e107ca55..f369cea1ed3 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:4.0.4=productionRuntimeClasspath,providedRuntime,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jakarta.websocket:jakarta.websocket-api:1.1.2=productionRuntimeClasspath,providedRuntime,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jpa/gradle.lockfile b/dd-smoke-tests/springboot-jpa/gradle.lockfile new file mode 100644 index 00000000000..8cccb088d51 --- /dev/null +++ b/dd-smoke-tests/springboot-jpa/gradle.lockfile @@ -0,0 +1,196 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +antlr:antlr:2.7.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath +ch.qos.logback:logback-core:1.2.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.13.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.23.0=testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.13=testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.17=testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.16=testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.19=testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.22=testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs:4.7.3=spotbugs +com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.8.9=spotbugs +com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.7=testRuntimeClasspath +com.h2database:h2:2.1.214=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.14.9=testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.14.9=testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath +com.sun.activation:jakarta.activation:1.2.2=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath +com.zaxxer:HikariCP:4.0.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.15=spotbugs +commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.1=compileClasspath +info.picocli:picocli:4.6.1=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:2.2.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath +javax.servlet:jstl:1.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:1.2.0=spotbugs +jline:jline:2.14.6=testRuntimeClasspath +junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.11.22=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.11.22=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:11.4=spotbugs +org.apache.ant:ant-antlr:1.10.11=codenarc,testRuntimeClasspath +org.apache.ant:ant-junit:1.10.11=codenarc,testRuntimeClasspath +org.apache.ant:ant-launcher:1.10.11=testRuntimeClasspath +org.apache.ant:ant:1.10.11=testCompileClasspath,testRuntimeClasspath +org.apache.bcel:bcel:6.5.0=spotbugs +org.apache.commons:commons-lang3:3.12.0=spotbugs +org.apache.commons:commons-text:1.10.0=spotbugs +org.apache.httpcomponents.client5:httpclient5:5.1.2=spotbugs +org.apache.httpcomponents.core5:httpcore5-h2:5.1.2=spotbugs +org.apache.httpcomponents.core5:httpcore5:5.1.2=spotbugs +org.apache.logging.log4j:log4j-api:2.14.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.14.1=spotbugs +org.apache.logging.log4j:log4j-to-slf4j:2.14.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.55=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:9.0.55=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-jasper:9.0.55=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:9.0.55=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:9.0.55=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.aspectj:aspectjweaver:1.9.7=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.9=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.9=codenarc,testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:2.2.0=codenarc +org.dom4j:dom4j:2.1.3=spotbugs +org.eclipse.jdt:ecj:3.18.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:2.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:2.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.gmetrics:GMetrics:1.1=codenarc +org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate:hibernate-core:5.6.1.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.4.2.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss:jandex:2.2.3.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core:3.3.0=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.8.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.8.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.8.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.8.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.8.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.8.1=testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.8.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.8.1=testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.8.1=testRuntimeClasspath +org.junit:junit-bom:5.9.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.1=spotbugs +org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.2=testRuntimeClasspath +org.ow2.asm:asm-analysis:9.4=spotbugs +org.ow2.asm:asm-commons:9.2=testRuntimeClasspath +org.ow2.asm:asm-commons:9.4=spotbugs +org.ow2.asm:asm-tree:9.2=testRuntimeClasspath +org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-util:9.2=testRuntimeClasspath +org.ow2.asm:asm-util:9.4=spotbugs +org.ow2.asm:asm:9.2=testRuntimeClasspath +org.ow2.asm:asm:9.4=spotbugs +org.projectlombok:lombok:1.18.34=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.32=compileClasspath,productionRuntimeClasspath,runtimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=compileClasspath,productionRuntimeClasspath,runtimeClasspath,spotbugs,spotbugsSlf4j,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j +org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-aop:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-data-jpa:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-jdbc:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.data:spring-data-commons:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.data:spring-data-jpa:2.6.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aspects:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-beans:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-context:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-core:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-expression:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-jcl:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-jdbc:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-orm:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-tx:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-web:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-webmvc:5.3.13=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testng:testng:7.4.0=testRuntimeClasspath +org.webjars:jquery:3.5.1=testRuntimeClasspath +org.xmlresolver:xmlresolver:4.4.3=spotbugs +org.yaml:snakeyaml:1.29=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +xml-apis:xml-apis:1.4.01=spotbugs +empty=developmentOnly,providedCompile,providedRuntime,spotbugsPlugins diff --git a/dd-smoke-tests/springboot-mongo/gradle.lockfile b/dd-smoke-tests/springboot-mongo/gradle.lockfile index 3f41b9c7aca..13244a72a3e 100644 --- a/dd-smoke-tests/springboot-mongo/gradle.lockfile +++ b/dd-smoke-tests/springboot-mongo/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.11.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -48,7 +48,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile index cb95401fe66..fa18918cdb9 100644 --- a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile +++ b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile index 3fb4d19f32f..0bd8873e94e 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -47,7 +47,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,providedRuntime,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath javax.servlet:jstl:1.2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat/gradle.lockfile b/dd-smoke-tests/springboot-tomcat/gradle.lockfile index 383b44794a5..c32c1c605ea 100644 --- a/dd-smoke-tests/springboot-tomcat/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.12.6=compileClasspath,productionRuntimeClasspath,runtimeClasspath,serverFile,testCompileClasspath,testRuntimeClasspath @@ -46,7 +46,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,providedRuntime,runtimeClasspath,serverFile,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/springboot-velocity/gradle.lockfile b/dd-smoke-tests/springboot-velocity/gradle.lockfile index dd1a911b177..9ab5936f3a6 100644 --- a/dd-smoke-tests/springboot-velocity/gradle.lockfile +++ b/dd-smoke-tests/springboot-velocity/gradle.lockfile @@ -12,7 +12,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -57,7 +57,7 @@ commons-logging:commons-logging:1.1=compileClasspath,productionRuntimeClasspath, commons-validator:commons-validator:1.3.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:2.0.1.Final=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot/gradle.lockfile b/dd-smoke-tests/springboot/gradle.lockfile index 0997e4647ef..6d965eeeb7c 100644 --- a/dd-smoke-tests/springboot/gradle.lockfile +++ b/dd-smoke-tests/springboot/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testFixturesRuntimeClasspath,testRunt com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.2=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -62,7 +62,7 @@ commons-lang:commons-lang:1.0.1=compileClasspath,runtimeClasspath,testCompileCla commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-smoke-tests/vertx-3.4/gradle.lockfile b/dd-smoke-tests/vertx-3.4/gradle.lockfile index e2fdc01c46b..f867398ad17 100644 --- a/dd-smoke-tests/vertx-3.4/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.4/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9/gradle.lockfile b/dd-smoke-tests/vertx-3.9/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/vertx-3.9/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-4.2/gradle.lockfile b/dd-smoke-tests/vertx-4.2/gradle.lockfile index fffb6fe2af8..f65badcb9b8 100644 --- a/dd-smoke-tests/vertx-4.2/gradle.lockfile +++ b/dd-smoke-tests/vertx-4.2/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-smoke-tests/wildfly/gradle.lockfile b/dd-smoke-tests/wildfly/gradle.lockfile index 3ae41b937b5..f9738b13b2d 100644 --- a/dd-smoke-tests/wildfly/gradle.lockfile +++ b/dd-smoke-tests/wildfly/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-trace-core/gradle.lockfile b/dd-trace-core/gradle.lockfile index 201f356c6c3..b7932d0e73a 100644 --- a/dd-trace-core/gradle.lockfile +++ b/dd-trace-core/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTes com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath @@ -56,7 +56,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath diff --git a/dd-trace-ot/correlation-id-injection/gradle.lockfile b/dd-trace-ot/correlation-id-injection/gradle.lockfile index 5b2e47da1ba..179ec19315d 100644 --- a/dd-trace-ot/correlation-id-injection/gradle.lockfile +++ b/dd-trace-ot/correlation-id-injection/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath @@ -43,7 +43,7 @@ io.opentracing.contrib:opentracing-tracerresolver:0.1.6=testCompileClasspath,tes io.opentracing:opentracing-api:0.32.0=testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.32.0=testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.32.0=testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=testRuntimeClasspath diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 711e85fc414..15a36d64a3e 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClassp com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -56,7 +56,7 @@ io.opentracing:opentracing-noop:0.33.0=ot33CompatibilityTestCompileClasspath,ot3 io.opentracing:opentracing-util:0.31.0=ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath io.opentracing:opentracing-util:0.32.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath diff --git a/internal-api/gradle.lockfile b/internal-api/gradle.lockfile index 746af1b4d54..7fcac79e354 100644 --- a/internal-api/gradle.lockfile +++ b/internal-api/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/internal-api/internal-api-9/gradle.lockfile b/internal-api/internal-api-9/gradle.lockfile index 428c11d9f66..fc99ca9c394 100644 --- a/internal-api/internal-api-9/gradle.lockfile +++ b/internal-api/internal-api-9/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,7 +39,7 @@ commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspa commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=jmhRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=jmhRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-core/gradle.lockfile b/remote-config/remote-config-core/gradle.lockfile index 908decc27c1..33045f29f87 100644 --- a/remote-config/remote-config-core/gradle.lockfile +++ b/remote-config/remote-config-core/gradle.lockfile @@ -7,7 +7,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs diff --git a/telemetry/gradle.lockfile b/telemetry/gradle.lockfile index 857dc65c29f..b2eaa430451 100644 --- a/telemetry/gradle.lockfile +++ b/telemetry/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/socket-utils/gradle.lockfile b/utils/socket-utils/gradle.lockfile index f1646bc3a7f..6c25a8cc876 100644 --- a/utils/socket-utils/gradle.lockfile +++ b/utils/socket-utils/gradle.lockfile @@ -4,7 +4,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.78=testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From 7bd70a5416b6a6a719071fa521b0a931b43d9415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Wed, 27 Nov 2024 12:17:51 +0100 Subject: [PATCH 064/106] Add IAST propagation to String valueOf (#8013) --- .../iast/propagation/StringModuleImpl.java | 50 ++++++++++ .../iast/propagation/StringModuleTest.groovy | 99 ++++++++++++++++++- .../com/datadog/iast/taint/TaintUtils.groovy | 20 ++++ .../java/lang/StringCallSite.java | 14 +++ .../java/lang/StringCallSiteTest.groovy | 20 ++++ .../test/java/foo/bar/TestStringSuite.java | 7 ++ .../api/iast/propagation/StringModule.java | 2 + 7 files changed, 211 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java index a5f8d0f883f..4ef50cb6b1e 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java @@ -8,6 +8,7 @@ import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; import com.datadog.iast.model.Range; +import com.datadog.iast.model.Source; import com.datadog.iast.taint.Ranges; import com.datadog.iast.taint.TaintedObject; import com.datadog.iast.taint.TaintedObjects; @@ -15,6 +16,7 @@ import com.datadog.iast.util.Ranged; import com.datadog.iast.util.StringUtils; import datadog.trace.api.iast.IastContext; +import datadog.trace.api.iast.Taintable; import datadog.trace.api.iast.propagation.StringModule; import de.thetaphi.forbiddenapis.SuppressForbidden; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -742,6 +744,54 @@ public String onStringReplace( numReplacements); } + @Override + @SuppressFBWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ") + public void onStringValueOf(Object param, @Nonnull String result) { + if (param == null || !canBeTainted(result)) { + return; + } + final IastContext ctx = IastContext.Provider.get(); + if (ctx == null) { + return; + } + final TaintedObjects taintedObjects = ctx.getTaintedObjects(); + + if (param instanceof Taintable) { + final Taintable taintable = (Taintable) param; + if (!taintable.$DD$isTainted()) { + return; + } + final Source source = (Source) taintable.$$DD$getSource(); + final Range[] ranges = + Ranges.forCharSequence( + result, new Source(source.getOrigin(), source.getName(), source.getValue())); + + taintedObjects.taint(result, ranges); + } else { + final TaintedObject taintedParam = taintedObjects.get(param); + if (taintedParam == null) { + return; + } + + final Range[] rangesParam = taintedParam.getRanges(); + if (rangesParam.length == 0) { + return; + } + + // Special objects like InputStream... + if (rangesParam[0].getLength() == Integer.MAX_VALUE) { + final Source source = rangesParam[0].getSource(); + final Range[] ranges = + Ranges.forCharSequence( + result, new Source(source.getOrigin(), source.getName(), source.getValue())); + + taintedObjects.taint(result, ranges); + } else { + taintedObjects.taint(result, rangesParam); + } + } + } + /** * Adds the tainted ranges belonging to the current parameter added via placeholder taking care of * an optional tainted placeholder. diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy index f880a31bb2f..99b17559b4b 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/StringModuleTest.groovy @@ -1,8 +1,12 @@ package com.datadog.iast.propagation import com.datadog.iast.IastModuleImplTestBase +import com.datadog.iast.model.Source +import com.datadog.iast.taint.TaintedObjects import datadog.trace.api.gateway.RequestContext import datadog.trace.api.gateway.RequestContextSlot +import datadog.trace.api.iast.SourceTypes +import datadog.trace.api.iast.Taintable import datadog.trace.api.iast.propagation.StringModule import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentTracer @@ -16,6 +20,7 @@ import static com.datadog.iast.taint.TaintUtils.fromTaintFormat import static com.datadog.iast.taint.TaintUtils.getStringFromTaintFormat import static com.datadog.iast.taint.TaintUtils.taint import static com.datadog.iast.taint.TaintUtils.taintFormat +import static com.datadog.iast.taint.TaintUtils.taintObject @CompileDynamic class StringModuleTest extends IastModuleImplTestBase { @@ -1298,6 +1303,65 @@ class StringModuleTest extends IastModuleImplTestBase { "==>my_o<==u==>tput<====>my_o<==u==>tput<==" | 'out' | '==>in<==' | 0 | "==>my_o<==u==>tput<====>my_o<==u==>tput<==" } + void 'test valueOf with (#param) and make sure IastRequestContext is called'() { + given: + final taintedObjects = ctx.getTaintedObjects() + def paramTainted = addFromTaintFormat(taintedObjects, param) + def result = String.valueOf(paramTainted) + + when: + module.onStringValueOf(paramTainted, result) + def taintedObject = taintedObjects.get(result) + + then: + 1 * tracer.activeSpan() >> span + taintFormat(result, taintedObject.getRanges()) == expected + + where: + param | expected + "==>test<==" | "==>test<==" + sb("==>test<==") | "==>test<==" + sbf("==>my_input<==") | "==>my_input<==" + } + + void 'test valueOf with taintable object and make sure IastRequestContext is called'() { + given: + final taintedObjects = ctx.getTaintedObjects() + final source = taintedSource() + final param = taintable(taintedObjects, source) + final result = String.valueOf(param) + + when: + module.onStringValueOf(param, result) + final taintedObject = taintedObjects.get(result) + + then: + 1 * tracer.activeSpan() >> span + taintFormat(result, taintedObject.getRanges()) == "==>my_input<==" + } + + void 'test valueOf with special objects and make sure IastRequestContext is called'() { + given: + final taintedObjects = ctx.getTaintedObjects() + final source = taintedSource() + final param = new Object() { + @Override + String toString() { + return "my_input" + } + } + taintObject(taintedObjects, param, source) + final result = String.valueOf(param) + + when: + module.onStringValueOf(param, result) + final taintedObject = taintedObjects.get(result) + + then: + 1 * tracer.activeSpan() >> span + taintFormat(result, taintedObject.getRanges()) == "==>my_input<==" + } + private static Date date(final String pattern, final String value) { return new SimpleDateFormat(pattern).parse(value) } @@ -1310,11 +1374,44 @@ class StringModuleTest extends IastModuleImplTestBase { return new StringBuilder(string) } - private static StringBuilder sbf() { + private static StringBuffer sbf() { return sbf('') } private static StringBuffer sbf(final String string) { return new StringBuffer(string) } + + private static Source taintedSource(String value = 'value') { + return new Source(SourceTypes.REQUEST_PARAMETER_VALUE, 'name', value) + } + + private static Taintable taintable(TaintedObjects tos, Source source = null) { + final result = new MockTaintable() + if (source != null) { + taintObject(tos, result, source) + } + return result + } + + private static class MockTaintable implements Taintable { + private Source source + + @SuppressWarnings('CodeNarc') + @Override + Source $$DD$getSource() { + return source + } + + @SuppressWarnings('CodeNarc') + @Override + void $$DD$setSource(Source source) { + this.source = source + } + + @Override + String toString() { + return "my_input" + } + } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy index 863ec96ce18..e7d8c4485c6 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/TaintUtils.groovy @@ -3,6 +3,7 @@ package com.datadog.iast.taint import com.datadog.iast.model.Range import com.datadog.iast.model.Source import datadog.trace.api.iast.SourceTypes +import datadog.trace.api.iast.Taintable import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED @@ -81,6 +82,14 @@ class TaintUtils { getStringFromTaintFormat(appendable.toString()) } + static TaintedObject getTaintedObject(final TaintedObjects tos, final Object target) { + if (target instanceof Taintable) { + final source = (target as Taintable).$$DD$getSource() as Source + return source == null ? null : new TaintedObject(target, Ranges.forObject(source)) + } + return tos.get(target) + } + static E taint(final TaintedObjects tos, final E value) { if (value instanceof String) { return addFromTaintFormat(tos, value as String) @@ -89,6 +98,17 @@ class TaintUtils { return value } + static TaintedObject taintObject(final TaintedObjects tos, final Object target, Source source, int mark = NOT_MARKED) { + if (target instanceof Taintable) { + target.$$DD$setSource(source) + } else if (target instanceof CharSequence) { + tos.taint(target, Ranges.forCharSequence(target, source, mark)) + } else { + tos.taint(target, Ranges.forObject(source, mark)) + } + return getTaintedObject(tos, target) + } + static String addFromTaintFormat(final TaintedObjects tos, final String s) { return addFromTaintFormat(tos, s, NOT_MARKED) } diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java index 75669f20c9a..7715a5321dd 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java @@ -300,4 +300,18 @@ public static String afterReplaceChar( } return result; } + + @CallSite.After("java.lang.String java.lang.String.valueOf(java.lang.Object)") + public static String afterValueOf( + @CallSite.Argument(0) final Object obj, @CallSite.Return final String result) { + final StringModule module = InstrumentationBridge.STRING; + if (module != null) { + try { + module.onStringValueOf(obj, result); + } catch (final Throwable e) { + module.onUnexpectedException("afterValueOf threw", e); + } + } + return result; + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy index 0bb3fe70a13..1bd09783c3b 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy @@ -265,4 +265,24 @@ class StringCallSiteTest extends AgentTestRunner { "test" | 't' | 'T' | "TesT" "test" | 'e' | 'E' | "tEst" } + + def 'test string valueOf call site'() { + setup: + final stringModule = Mock(StringModule) + InstrumentationBridge.registerIastModule(stringModule) + + when: + final result = TestStringSuite.valueOf(input) + + then: + result == expected + 1 * stringModule.onStringValueOf(input, expected) + 0 * _ + + where: + input | expected + "test" | "test" + new StringBuilder("test") | "test" + new StringBuffer("test") | "test" + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java index b25b6de9aae..edf1559554b 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java @@ -239,4 +239,11 @@ public static String replaceFirst( LOGGER.debug("After replace first {}", result); return result; } + + public static String valueOf(final Object param) { + LOGGER.debug("Before valueOf {}", param); + String result = String.valueOf(param); + LOGGER.debug("After valueOf {}", result); + return result; + } } diff --git a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java index a42df53652c..23bcdd860a5 100644 --- a/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java +++ b/internal-api/src/main/java/datadog/trace/api/iast/propagation/StringModule.java @@ -61,4 +61,6 @@ void onStringFormat( String onStringReplace( @Nonnull String self, String regex, String replacement, int numReplacements); + + void onStringValueOf(Object param, @Nullable String result); } From 107788f4fe626df529a02870519854ff82fc9b40 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 27 Nov 2024 12:51:41 +0100 Subject: [PATCH 065/106] Twilio: allow service name flattening (#8025) --- .../twilio/TwilioClientDecorator.java | 8 +- .../test/groovy/test/TwilioClientTest.groovy | 145 ++++++++++++------ 2 files changed, 102 insertions(+), 51 deletions(-) diff --git a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java index edcdfe18549..48e89083c3b 100644 --- a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java +++ b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioClientDecorator.java @@ -5,6 +5,7 @@ import com.twilio.rest.api.v2010.account.Message; import datadog.trace.api.Functions; import datadog.trace.api.cache.QualifiedClassNameCache; +import datadog.trace.api.naming.SpanNaming; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; @@ -24,6 +25,11 @@ public class TwilioClientDecorator extends ClientDecorator { private static final CharSequence COMPONENT_NAME = UTF8BytesString.create("twilio-sdk"); + private static final String SERVICE_NAME = + SpanNaming.instance().namingSchema().allowInferredServices() + ? COMPONENT_NAME.toString() + : null; + private static final QualifiedClassNameCache NAMES = new QualifiedClassNameCache( new Function, CharSequence>() { @@ -54,7 +60,7 @@ protected CharSequence component() { @Override protected String service() { - return COMPONENT_NAME.toString(); + return SERVICE_NAME; } /** Decorate trace based on service execution metadata. */ diff --git a/dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy b/dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy index a661ac3f47b..8eddb50db30 100644 --- a/dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy +++ b/dd-java-agent/instrumentation/twilio/src/test/groovy/test/TwilioClientTest.groovy @@ -1,5 +1,7 @@ package test +import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace + import com.fasterxml.jackson.databind.ObjectMapper import com.google.common.util.concurrent.ListenableFuture import com.twilio.Twilio @@ -10,7 +12,9 @@ import com.twilio.http.TwilioRestClient import com.twilio.rest.api.v2010.account.Call import com.twilio.rest.api.v2010.account.Message import com.twilio.type.PhoneNumber -import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions +import datadog.trace.agent.test.naming.VersionedNamingTestBase +import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes import datadog.trace.bootstrap.instrumentation.api.Tags import org.apache.http.HttpEntity @@ -23,9 +27,7 @@ import org.apache.http.impl.client.HttpClientBuilder import java.util.concurrent.ExecutionException import java.util.concurrent.TimeUnit -import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace - -class TwilioClientTest extends AgentTestRunner { +abstract class TwilioClientTest extends VersionedNamingTestBase { // Made up Twilio Account IDs and Auth token final static String SHORT_SID = "abc" @@ -113,6 +115,13 @@ class TwilioClientTest extends AgentTestRunner { Twilio.setRestClient(null) } + abstract String httpClientOperation() + + @Override + String operation() { + return "twilio.sdk" + } + def "synchronous message"() { setup: twilioRestClient.getObjectMapper() >> new ObjectMapper() @@ -143,8 +152,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -156,7 +165,7 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } } @@ -195,8 +204,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.CallCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -208,7 +217,7 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.sid" "CAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "completed" - defaultTags() + defaultTagsNoPeerService() } } } @@ -269,8 +278,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -282,12 +291,12 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } span { - serviceName "twilio-sdk" - operationName "http.request" + serviceName service() + operationName httpClientOperation() resourceName "POST /?/Accounts/abc/Messages.json" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -375,8 +384,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -388,12 +397,12 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } span { - serviceName "twilio-sdk" - operationName "http.request" + serviceName service() + operationName httpClientOperation() resourceName "POST /?/Accounts/abc/Messages.json" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -409,8 +418,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "http.request" + serviceName service() + operationName httpClientOperation() resourceName "POST /?/Accounts/abc/Messages.json" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -505,8 +514,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.createAsync" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -518,12 +527,12 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -535,14 +544,14 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } // Spans are reported in reverse order of completion, // so the error span is last even though it happened first. span { - serviceName "twilio-sdk" - operationName "http.request" + serviceName service() + operationName httpClientOperation() resourceName "POST /?/Accounts/abc/Messages.json" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -558,8 +567,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "http.request" + serviceName service() + operationName httpClientOperation() resourceName "POST /?/Accounts/abc/Messages.json" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -616,8 +625,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored true @@ -626,7 +635,7 @@ class TwilioClientTest extends AgentTestRunner { "$Tags.COMPONENT" "twilio-sdk" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT errorTags(ApiException, "Testing Failure") - defaultTags() + defaultTagsNoPeerService() } } } @@ -652,8 +661,8 @@ class TwilioClientTest extends AgentTestRunner { assertTraces(1) { trace(1) { span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" parent() spanType DDSpanTypes.HTTP_CLIENT @@ -666,7 +675,7 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } } @@ -714,8 +723,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.createAsync" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -727,12 +736,12 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored false @@ -744,7 +753,7 @@ class TwilioClientTest extends AgentTestRunner { "twilio.account" "$LONG_SID" "twilio.sid" "MMXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" "twilio.status" "sent" - defaultTags() + defaultTagsNoPeerService() } } } @@ -800,8 +809,8 @@ class TwilioClientTest extends AgentTestRunner { } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.createAsync" spanType DDSpanTypes.HTTP_CLIENT errored true @@ -810,12 +819,12 @@ class TwilioClientTest extends AgentTestRunner { "$Tags.COMPONENT" "twilio-sdk" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT errorTags(ApiException, "Testing Failure") - defaultTags() + defaultTagsNoPeerService() } } span { - serviceName "twilio-sdk" - operationName "twilio.sdk" + serviceName service() + operationName operation() resourceName "api.v2010.account.MessageCreator.create" spanType DDSpanTypes.HTTP_CLIENT errored true @@ -824,10 +833,46 @@ class TwilioClientTest extends AgentTestRunner { "$Tags.COMPONENT" "twilio-sdk" "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT errorTags(ApiException, "Testing Failure") - defaultTags() + defaultTagsNoPeerService() } } } } } } + +class TwilioClientV0Test extends TwilioClientTest { + + @Override + int version() { + return 0 + } + + @Override + String service() { + return "twilio-sdk" + } + + @Override + String httpClientOperation() { + return new TestingGenericHttpNamingConventions.ClientV0(){}.operation() + } +} + +class TwilioClientV1ForkedTest extends TwilioClientTest { + + @Override + int version() { + return 1 + } + + @Override + String service() { + return Config.get().getServiceName() + } + + @Override + String httpClientOperation() { + return new TestingGenericHttpNamingConventions.ClientV1(){}.operation() + } +} From 966ef84e87a81593335c6f3f7533ef823be0c0e5 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Wed, 27 Nov 2024 13:08:11 +0100 Subject: [PATCH 066/106] fix(ci): Fix JUnit test case name uniqueness (#8024) --- .circleci/collect_results.sh | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.circleci/collect_results.sh b/.circleci/collect_results.sh index 44bc59f7f54..1d67afda889 100755 --- a/.circleci/collect_results.sh +++ b/.circleci/collect_results.sh @@ -7,20 +7,30 @@ set -e #Enable '**' support shopt -s globstar -TEST_RESULTS_DIR=./results -mkdir -p $TEST_RESULTS_DIR >/dev/null 2>&1 - +TEST_RESULTS_DIR=results +WORKSPACE_DIR=workspace mkdir -p $TEST_RESULTS_DIR +mkdir -p $WORKSPACE_DIR -mkdir -p workspace -mapfile -t test_result_dirs < <(find workspace -name test-results -type d) +mapfile -t TEST_RESULT_DIRS < <(find $WORKSPACE_DIR -name test-results -type d) -if [[ ${#test_result_dirs[@]} -eq 0 ]]; then +if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then echo "No test results found" exit 0 fi -echo "saving test results" -find "${test_result_dirs[@]}" -name \*.xml -exec sh -c ' - file=$(echo "$0" | rev | cut -d "/" -f 1,2,5 | rev | tr "/" "_") - cp "$0" "$1/$file"' {} $TEST_RESULTS_DIR \; +echo "Saving test results:" +while IFS= read -r -d '' RESULT_XML_FILE +do + echo -n "- $RESULT_XML_FILE" + AGGREGATED_FILE_NAME=$(echo "$RESULT_XML_FILE" | rev | cut -d "/" -f 1,2,5 | rev | tr "/" "_") + echo -n " as $AGGREGATED_FILE_NAME" + cp "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME" + # Replace Java Object hashCode by marker in testcase XML nodes to get stable test names + sed -i '/ Date: Wed, 27 Nov 2024 17:01:21 +0100 Subject: [PATCH 067/106] Exclude git data upload errors from telemetry logging (#8027) --- .../trace/civisibility/git/tree/GitDataUploaderImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java index 483285802a5..80fb6ccd9cb 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/tree/GitDataUploaderImpl.java @@ -5,6 +5,7 @@ import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.api.git.GitInfo; import datadog.trace.api.git.GitInfoProvider; +import datadog.trace.api.telemetry.LogCollector; import datadog.trace.civisibility.utils.FileUtils; import datadog.trace.civisibility.utils.ShellCommandExecutor; import datadog.trace.util.AgentThreadFactory; @@ -164,7 +165,11 @@ private void uploadGitData() { callback.complete(null); } catch (Exception e) { - LOGGER.error("Failed to upload git tree data for remote {}", remoteName, e); + LOGGER.error( + LogCollector.EXCLUDE_TELEMETRY, + "Failed to upload git tree data for remote {}", + remoteName, + e); callback.completeExceptionally(e); } finally { removeShutdownHook(); From f7a6771e5bcfeb420e105b2200050278b729ad0e Mon Sep 17 00:00:00 2001 From: Justin Lee Date: Wed, 27 Nov 2024 11:31:45 -0500 Subject: [PATCH 068/106] Implement code origin support for grpc server entry spans (#7942) * Add code origin support to the grpc server integration --------- Co-authored-by: Andrea Marziali --- dd-java-agent/agent-bootstrap/build.gradle | 1 + .../debugger/agent/CapturingTestBase.java | 1 + .../instrumentation/grpc-1.5/build.gradle | 2 + .../server/MethodHandlersInstrumentation.java | 70 ++++ .../src/test/groovy/GrpcCodeOriginTest.groovy | 324 ++++++++++++++++++ .../agent/test/asserts/TagsAssert.groovy | 5 + 6 files changed, 403 insertions(+) create mode 100644 dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java create mode 100644 dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle index e8c8d4147b8..3aa57b554e2 100644 --- a/dd-java-agent/agent-bootstrap/build.gradle +++ b/dd-java-agent/agent-bootstrap/build.gradle @@ -21,6 +21,7 @@ dependencies { api project(':internal-api') api project(':internal-api:internal-api-9') api project(':dd-java-agent:agent-logging') + api project(':dd-java-agent:agent-debugger:debugger-bootstrap') api libs.slf4j // ^ Generally a bad idea for libraries, but we're shadowing. diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java index 991bdee2b2e..92fb5c57b41 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java @@ -351,6 +351,7 @@ public static LogProbe.Builder createProbeBuilder( protected TestSnapshotListener installProbes( Configuration configuration, ProbeDefinition... probes) { + config = mock(Config.class); when(config.isDebuggerEnabled()).thenReturn(true); when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true); diff --git a/dd-java-agent/instrumentation/grpc-1.5/build.gradle b/dd-java-agent/instrumentation/grpc-1.5/build.gradle index c32c11f72f1..8c0db536c82 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/build.gradle +++ b/dd-java-agent/instrumentation/grpc-1.5/build.gradle @@ -39,6 +39,8 @@ dependencies { testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + testImplementation project(':dd-java-agent:agent-debugger') + testImplementation libs.bundles.mockito latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes latestDepTestCompileOnly group: 'io.grpc', name: 'grpc-core', version: '1.+' diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java new file mode 100644 index 00000000000..cf6bae17205 --- /dev/null +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java @@ -0,0 +1,70 @@ +package datadog.trace.instrumentation.grpc.server; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameEndsWith; +import static datadog.trace.bootstrap.debugger.spanorigin.CodeOriginInfo.entry; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter.ForTypeHierarchy; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.Platform; +import java.lang.reflect.Method; +import net.bytebuddy.asm.Advice; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.matcher.ElementMatcher; + +@AutoService(InstrumenterModule.class) +public class MethodHandlersInstrumentation extends InstrumenterModule.Tracing + implements ForTypeHierarchy { + private static final ElementMatcher METHOD_HANDLERS = + nameEndsWith("$MethodHandlers"); + + public MethodHandlersInstrumentation() { + super("grpc", "grpc-server", "grpc-server-code-origin"); + } + + @Override + public String hierarchyMarkerType() { + return "io.grpc.MethodDescriptor"; + } + + @Override + public ElementMatcher hierarchyMatcher() { + return METHOD_HANDLERS; + } + + @Override + public boolean isEnabled() { + return super.isEnabled() && !Platform.isGraalVM(); + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isConstructor().and(takesArguments(2)), + MethodHandlersInstrumentation.class.getName() + "$BuildAdvice"); + } + + public static class BuildAdvice { + + @Advice.OnMethodEnter(suppress = Throwable.class) + public static void onEnter(@Advice.Argument(0) Object serviceImpl) { + try { + Class serviceClass = serviceImpl.getClass(); + Class superclass = serviceClass.getSuperclass(); + if (superclass != null) { + for (Method method : superclass.getDeclaredMethods()) { + try { + entry(serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes())); + } catch (Throwable e) { + // service method not overridden on the impl. skipping instrumentation. + } + } + } + } catch (Throwable e) { + // this should be logged somehow + } + } + } +} diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy new file mode 100644 index 00000000000..fb1204ae45e --- /dev/null +++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy @@ -0,0 +1,324 @@ +import com.datadog.debugger.agent.ClassesToRetransformFinder +import com.datadog.debugger.agent.Configuration +import com.datadog.debugger.agent.ConfigurationUpdater +import com.datadog.debugger.agent.DebuggerTransformer +import com.datadog.debugger.agent.DenyListHelper +import com.datadog.debugger.agent.JsonSnapshotSerializer +import com.datadog.debugger.codeorigin.DefaultCodeOriginRecorder +import com.datadog.debugger.instrumentation.InstrumentationResult +import com.datadog.debugger.probe.ProbeDefinition +import com.datadog.debugger.sink.DebuggerSink +import com.datadog.debugger.sink.ProbeStatusSink +import com.google.common.util.concurrent.MoreExecutors +import datadog.trace.agent.test.naming.VersionedNamingTestBase +import datadog.trace.api.Config +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags +import datadog.trace.bootstrap.debugger.DebuggerContext +import datadog.trace.bootstrap.instrumentation.api.Tags +import datadog.trace.util.AgentTaskScheduler +import example.GreeterGrpc +import example.Helloworld +import io.grpc.BindableService +import io.grpc.ManagedChannel +import io.grpc.Server +import io.grpc.inprocess.InProcessChannelBuilder +import io.grpc.inprocess.InProcessServerBuilder +import io.grpc.stub.StreamObserver +import net.bytebuddy.agent.ByteBuddyAgent + +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicReference + +import static datadog.trace.api.config.TraceInstrumentationConfig.* +import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER +import static java.lang.String.format +import static org.mockito.Mockito.mock +import static org.mockito.Mockito.when + +abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { + + @Override + final String service() { + return null + } + + @Override + final String operation() { + return null + } + + protected abstract String clientOperation() + + protected abstract String serverOperation() + + protected boolean hasClientMessageSpans() { + false + } + + @Override + protected void configurePreAgent() { + super.configurePreAgent() + injectSysConfig("dd.trace.grpc.ignored.inbound.methods", "example.Greeter/IgnoreInbound") + injectSysConfig("dd.trace.grpc.ignored.outbound.methods", "example.Greeter/Ignore") + if (hasClientMessageSpans()) { + injectSysConfig("integration.grpc-message.enabled", "true") + } + // here to trigger wrapping to record scheduling time - the logic is trivial so it's enough to verify + // that ClassCastExceptions do not arise from the wrapping + injectSysConfig("dd.profiling.enabled", "true") + codeOriginSetup() + } + + def "test conversation #name"() { + setup: + + def msgCount = serverMessageCount + def serverReceived = new CopyOnWriteArrayList<>() + def clientReceived = new CopyOnWriteArrayList<>() + def error = new AtomicReference() + + BindableService greeter = new GreeterGrpc.GreeterImplBase() { + @Override + StreamObserver conversation(StreamObserver observer) { + return new StreamObserver() { + @Override + void onNext(Helloworld.Response value) { + + serverReceived << value.message + + (1..msgCount).each { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + observer.onNext(value) + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } + } + + @Override + void onError(Throwable t) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(t) + observer.onError(t) + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } + + @Override + void onCompleted() { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + observer.onCompleted() + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } + } + } + } + Server server = InProcessServerBuilder.forName(getClass().name).addService(greeter) + .executor(directExecutor ? MoreExecutors.directExecutor() : Executors.newCachedThreadPool()) + .build().start() + + Thread.sleep(1000) + ManagedChannel channel = InProcessChannelBuilder.forName(getClass().name).build() + GreeterGrpc.GreeterStub client = GreeterGrpc.newStub(channel).withWaitForReady() + + when: + def streamObserver = client.conversation(new StreamObserver() { + @Override + void onNext(Helloworld.Response value) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + clientReceived << value.message + } else { + error.set(new IllegalStateException("not async propagating!")) + } + } + + @Override + void onError(Throwable t) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(t) + } else { + error.set(new IllegalStateException("not async propagating!")) + } + } + + @Override + void onCompleted() { + if (!TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(new IllegalStateException("not async propagating!")) + } + } + }) + + clientRange.each { + def message = Helloworld.Response.newBuilder().setMessage("call $it").build() + streamObserver.onNext(message) + } + streamObserver.onCompleted() + + then: + error.get() == null + TEST_WRITER.waitForTraces(2) + error.get() == null + serverReceived == clientRange.collect { "call $it" } + clientReceived == serverRange.collect { + clientRange.collect { + "call $it" + } + }.flatten().sort() + + assertTraces(2) { + trace((hasClientMessageSpans() ? clientMessageCount * serverMessageCount : 0) + 1) { + span { + operationName clientOperation() + resourceName "example.Greeter/Conversation" + spanType DDSpanTypes.RPC + parent() + errored false + tags { + "$Tags.COMPONENT" "grpc-client" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT + "$Tags.RPC_SERVICE" "example.Greeter" + "status.code" "OK" + "request.type" "example.Helloworld\$Response" + "response.type" "example.Helloworld\$Response" + peerServiceFrom(Tags.RPC_SERVICE) + defaultTags() + } + } + if (hasClientMessageSpans()) { + (1..(clientMessageCount * serverMessageCount)).each { + span { + operationName "grpc.message" + resourceName "grpc.message" + spanType DDSpanTypes.RPC + childOf span(0) + errored false + tags { + "$Tags.COMPONENT" "grpc-client" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT + "message.type" "example.Helloworld\$Response" + defaultTagsNoPeerService() + } + } + } + } + } + trace(clientMessageCount + 1) { + span { + operationName serverOperation() + resourceName "example.Greeter/Conversation" + spanType DDSpanTypes.RPC + childOf trace(0).get(0) + errored false + tags { + "$Tags.COMPONENT" "grpc-server" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER + "status.code" "OK" + isPresent(DDTags.DD_CODE_ORIGIN_TYPE) + isPresent(format(DDTags.DD_CODE_ORIGIN_FRAME, 0, "signature")) + + for (i in 0..<8) { + for (label in ["file", "line", "method", "type"]) { + isPresent(format(DDTags.DD_CODE_ORIGIN_FRAME, i, label)) + } + } + defaultTags(true) + } + } + clientRange.each { + span { + operationName "grpc.message" + resourceName "grpc.message" + spanType DDSpanTypes.RPC + childOf span(0) + errored false + tags { + "$Tags.COMPONENT" "grpc-server" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER + "message.type" "example.Helloworld\$Response" + defaultTags() + } + } + } + } + } + + cleanup: + channel?.shutdownNow()?.awaitTermination(10, TimeUnit.SECONDS) + server?.shutdownNow()?.awaitTermination() + + where: + name | clientMessageCount | serverMessageCount | directExecutor + "A" | 1 | 1 | false + "B" | 2 | 1 | false + "C" | 1 | 2 | false + "D" | 2 | 2 | false + "E" | 3 | 3 | false + "A" | 1 | 1 | true + "B" | 2 | 1 | true + "C" | 1 | 2 | true + "D" | 2 | 2 | true + "E" | 3 | 3 | true + + clientRange = 1..clientMessageCount + serverRange = 1..serverMessageCount + } + + + void codeOriginSetup() { + injectSysConfig(CODE_ORIGIN_FOR_SPANS_ENABLED, "true", true) + + def configuration = Configuration.builder() + .setService("grpc code origin test") + .build() + + def config = mock(Config.class) + when(config.isDebuggerEnabled()).thenReturn(true) + when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true) + when(config.isDebuggerVerifyByteCode()).thenReturn(false) + when(config.getFinalDebuggerSnapshotUrl()) + .thenReturn("http://localhost:8126/debugger/v1/input") + when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input") + when(config.getDebuggerCodeOriginMaxUserFrames()).thenReturn(8) + + def probeStatusSink = mock(ProbeStatusSink.class) + + def sink = new DebuggerSink(config, probeStatusSink) + def configurationUpdater = new ConfigurationUpdater(INSTRUMENTATION, DebuggerTransformer::new, config, sink, new ClassesToRetransformFinder()) + + def currentTransformer = new DebuggerTransformer(config, configuration, { + ProbeDefinition definition, InstrumentationResult result -> + }, sink) + INSTRUMENTATION.addTransformer(currentTransformer) + + DebuggerContext.initProbeResolver(configurationUpdater) + DebuggerContext.initClassFilter(new DenyListHelper(null)) + DebuggerContext.initValueSerializer(new JsonSnapshotSerializer()) + + DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater)) + } +} + +class GrpcCodeOriginForkedTest extends GrpcCodeOriginTest { + + @Override + int version() { + return 1 + } + + @Override + protected String clientOperation() { + return "grpc.client.request" + } + + @Override + protected String serverOperation() { + return "grpc.server.request" + } +} diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index 04a5d124a3b..33b8233af24 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -49,6 +49,11 @@ class TagsAssert { defaultTags(distributedRootSpan, false) } + def isPresent(String name) { + tag(name, { it != null }) + } + + /** * @param distributedRootSpan set to true if current span has a parent span but still considered 'root' for current service */ From 207f7706238cce1afbd3e13c09dd03079098bf06 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Wed, 27 Nov 2024 19:32:42 +0000 Subject: [PATCH 069/106] Fix native-image generation of reactive applications (#8012) * Refactor registration of AsyncResult extensions so it doesn't pull in AsyncResultDecorator * Rebuild AsyncResultExtensions at native-image runtime --- .../decorator/AsyncResultDecorator.java | 97 ++----------------- .../java/concurrent/AsyncResultExtension.java | 27 ++++++ .../concurrent/AsyncResultExtensions.java | 67 +++++++++++++ ...veImageGeneratorRunnerInstrumentation.java | 1 + ...on.java => GuavaAsyncResultExtension.java} | 16 +-- .../ListenableFutureInstrumentation.java | 4 +- ...y => GuavaAsyncResultExtensionTest.groovy} | 2 +- .../PublisherInstrumentation.java | 10 +- ... ReactiveStreamsAsyncResultExtension.java} | 16 +-- ...iveStreamsAsyncResultExtensionTest.groovy} | 2 +- ...=> ReactorAsyncResultExtensionTest.groovy} | 2 +- .../BlockingPublisherInstrumentation.java | 4 +- ....java => ReactorAsyncResultExtension.java} | 16 +-- ...=> ReactorAsyncResultExtensionTest.groovy} | 2 +- ...n.java => RxJavaAsyncResultExtension.java} | 16 +-- .../rxjava2/RxJavaPluginsInstrumentation.java | 4 +- ...oovy => RxJava2ResultExtensionTest.groovy} | 2 +- 17 files changed, 152 insertions(+), 136 deletions(-) create mode 100644 dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java create mode 100644 dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java rename dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/{GuavaAsyncResultSupportExtension.java => GuavaAsyncResultExtension.java} (74%) rename dd-java-agent/instrumentation/guava-10/src/test/groovy/{GuavaAsyncResultSupportExtensionTest.groovy => GuavaAsyncResultExtensionTest.groovy} (97%) rename dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/{ReactiveStreamsAsyncResultSupportExtension.java => ReactiveStreamsAsyncResultExtension.java} (81%) rename dd-java-agent/instrumentation/reactive-streams/src/test/groovy/{ReactiveStreamsAsyncResultSupportExtensionTest.groovy => ReactiveStreamsAsyncResultExtensionTest.groovy} (97%) rename dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/{ReactorAsyncResultSupportExtensionTest.groovy => ReactorAsyncResultExtensionTest.groovy} (98%) rename dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/{ReactorAsyncResultSupportExtension.java => ReactorAsyncResultExtension.java} (64%) rename dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/{ReactorAsyncResultSupportExtensionTest.groovy => ReactorAsyncResultExtensionTest.groovy} (98%) rename dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/{RxJavaAsyncResultSupportExtension.java => RxJavaAsyncResultExtension.java} (80%) rename dd-java-agent/instrumentation/rxjava-2/src/test/groovy/{RxJava2ResultSupportExtensionTest.groovy => RxJava2ResultExtensionTest.groovy} (97%) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java index ececbdfc8ae..fdcf7c60f74 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/AsyncResultDecorator.java @@ -1,47 +1,27 @@ package datadog.trace.bootstrap.instrumentation.decorator; -import static java.util.Collections.singletonList; - import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutionException; -import java.util.function.BiConsumer; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; /** * This decorator handles asynchronous result types, finishing spans only when the async calls are - * complete. The different async types are supported using {@link AsyncResultSupportExtension} that - * should be registered using {@link #registerExtension(AsyncResultSupportExtension)} first. + * complete. The different async types are supported using {@link AsyncResultExtension} that should + * be registered using {@link AsyncResultExtensions#register(AsyncResultExtension)} first. */ public abstract class AsyncResultDecorator extends BaseDecorator { - private static final CopyOnWriteArrayList EXTENSIONS = - new CopyOnWriteArrayList<>( - singletonList(new JavaUtilConcurrentAsyncResultSupportExtension())); - private static final ClassValue EXTENSION_CLASS_VALUE = - new ClassValue() { + private static final ClassValue EXTENSION_CLASS_VALUE = + new ClassValue() { @Override - protected AsyncResultSupportExtension computeValue(Class type) { - return EXTENSIONS.stream() + protected AsyncResultExtension computeValue(Class type) { + return AsyncResultExtensions.registered().stream() .filter(extension -> extension.supports(type)) .findFirst() .orElse(null); } }; - /** - * Registers an extension to add supported async types. - * - * @param extension The extension to register. - */ - public static void registerExtension(AsyncResultSupportExtension extension) { - if (extension != null) { - EXTENSIONS.add(extension); - } - } - /** * Look for asynchronous result and decorate it with span finisher. If the result is not * asynchronous, it will be return unmodified and span will be finished. @@ -53,7 +33,7 @@ public static void registerExtension(AsyncResultSupportExtension extension) { */ public Object wrapAsyncResultOrFinishSpan( final Object result, final Class methodReturnType, final AgentSpan span) { - AsyncResultSupportExtension extension; + AsyncResultExtension extension; if (result != null && (extension = EXTENSION_CLASS_VALUE.get(methodReturnType)) != null) { Object applied = extension.apply(result, span); if (applied != null) { @@ -64,63 +44,4 @@ public Object wrapAsyncResultOrFinishSpan( span.finish(); return result; } - - /** - * This interface defines asynchronous result type support extension. It allows deferring the - * support implementations where types are available on classpath. - */ - public interface AsyncResultSupportExtension { - /** - * Checks whether this extensions support a result type. - * - * @param result The result type to check. - * @return {@code true} if the type is supported by this extension, {@code false} otherwise. - */ - boolean supports(Class result); - - /** - * Applies the extension to the async result. - * - * @param result The async result. - * @param span The related span. - * @return The result object to return (can be the original result if not modified), or {@code - * null} if the extension could not be applied. - */ - Object apply(Object result, AgentSpan span); - } - - private static class JavaUtilConcurrentAsyncResultSupportExtension - implements AsyncResultSupportExtension { - @Override - public boolean supports(Class result) { - return CompletableFuture.class.isAssignableFrom(result) - || CompletionStage.class.isAssignableFrom(result); - } - - @Override - public Object apply(Object result, AgentSpan span) { - if (result instanceof CompletableFuture) { - CompletableFuture completableFuture = (CompletableFuture) result; - if (!completableFuture.isDone() && !completableFuture.isCancelled()) { - return completableFuture.whenComplete(finishSpan(span)); - } - } else if (result instanceof CompletionStage) { - CompletionStage completionStage = (CompletionStage) result; - return completionStage.whenComplete(finishSpan(span)); - } - return null; - } - - private BiConsumer finishSpan(AgentSpan span) { - return (o, throwable) -> { - if (throwable != null) { - span.addThrowable( - throwable instanceof ExecutionException || throwable instanceof CompletionException - ? throwable.getCause() - : throwable); - } - span.finish(); - }; - } - } } diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java new file mode 100644 index 00000000000..07d8fed551e --- /dev/null +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtension.java @@ -0,0 +1,27 @@ +package datadog.trace.bootstrap.instrumentation.java.concurrent; + +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; + +/** + * This interface defines asynchronous result type support extension. It allows deferring the + * support implementations where types are available on classpath. + */ +public interface AsyncResultExtension { + /** + * Checks whether this extensions support a result type. + * + * @param result The result type to check. + * @return {@code true} if the type is supported by this extension, {@code false} otherwise. + */ + boolean supports(Class result); + + /** + * Applies the extension to the async result. + * + * @param result The async result. + * @param span The related span. + * @return The result object to return (can be the original result if not modified), or {@code + * null} if the extension could not be applied. + */ + Object apply(Object result, AgentSpan span); +} diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java new file mode 100644 index 00000000000..7e54f058753 --- /dev/null +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java @@ -0,0 +1,67 @@ +package datadog.trace.bootstrap.instrumentation.java.concurrent; + +import static java.util.Collections.singletonList; + +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; +import java.util.function.BiConsumer; + +public final class AsyncResultExtensions { + private static final List EXTENSIONS = + new CopyOnWriteArrayList<>(singletonList(new CompletableAsyncResultExtension())); + + /** + * Registers an extension to add supported async types. + * + * @param extension The extension to register. + */ + public static void register(AsyncResultExtension extension) { + if (extension != null) { + EXTENSIONS.add(extension); + } + } + + /** Returns the list of currently registered extensions. */ + public static List registered() { + return EXTENSIONS; + } + + static final class CompletableAsyncResultExtension implements AsyncResultExtension { + @Override + public boolean supports(Class result) { + return CompletableFuture.class.isAssignableFrom(result) + || CompletionStage.class.isAssignableFrom(result); + } + + @Override + public Object apply(Object result, AgentSpan span) { + if (result instanceof CompletableFuture) { + CompletableFuture completableFuture = (CompletableFuture) result; + if (!completableFuture.isDone() && !completableFuture.isCancelled()) { + return completableFuture.whenComplete(finishSpan(span)); + } + } else if (result instanceof CompletionStage) { + CompletionStage completionStage = (CompletionStage) result; + return completionStage.whenComplete(finishSpan(span)); + } + return null; + } + + private BiConsumer finishSpan(AgentSpan span) { + return (o, throwable) -> { + if (throwable != null) { + span.addThrowable( + throwable instanceof ExecutionException || throwable instanceof CompletionException + ? throwable.getCause() + : throwable); + } + span.finish(); + }; + } + } +} diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index ebfef8bb62c..9b24b9d3fca 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -96,6 +96,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.bootstrap.benchmark.StaticEventLogger:build_time," + "datadog.trace.bootstrap.blocking.BlockingExceptionHandler:build_time," + "datadog.trace.bootstrap.InstrumentationErrors:build_time," + + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions:rerun," + "datadog.trace.bootstrap.instrumentation.java.concurrent.ConcurrentState:build_time," + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter:build_time," + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimeHelper:build_time," diff --git a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultSupportExtension.java b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java similarity index 74% rename from dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultSupportExtension.java rename to dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java index 7d79fe052bc..5a0788e3642 100644 --- a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultSupportExtension.java +++ b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java @@ -2,22 +2,22 @@ import com.google.common.util.concurrent.ListenableFuture; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; -public class GuavaAsyncResultSupportExtension - implements AsyncResultDecorator.AsyncResultSupportExtension { +public class GuavaAsyncResultExtension implements AsyncResultExtension { static { - AsyncResultDecorator.registerExtension(new GuavaAsyncResultSupportExtension()); + AsyncResultExtensions.register(new GuavaAsyncResultExtension()); } /** - * Register the extension as an {@link AsyncResultDecorator.AsyncResultSupportExtension} using - * static class initialization.
+ * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
* It uses an empty static method call to ensure the class loading and the one-time-only static - * class initialization. This will ensure this extension will only be registered once to the - * {@link AsyncResultDecorator}. + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. */ public static void initialize() {} diff --git a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java index cf8f6c4b5ec..76811786110 100644 --- a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java +++ b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java @@ -36,7 +36,7 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { - this.packageName + ".GuavaAsyncResultSupportExtension", + this.packageName + ".GuavaAsyncResultExtension", }; } @@ -57,7 +57,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class AbstractFutureAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void init() { - GuavaAsyncResultSupportExtension.initialize(); + GuavaAsyncResultExtension.initialize(); } } diff --git a/dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultSupportExtensionTest.groovy b/dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultExtensionTest.groovy similarity index 97% rename from dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultSupportExtensionTest.groovy rename to dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultExtensionTest.groovy index 38c44289538..1e60dc956f9 100644 --- a/dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultSupportExtensionTest.groovy +++ b/dd-java-agent/instrumentation/guava-10/src/test/groovy/GuavaAsyncResultExtensionTest.groovy @@ -8,7 +8,7 @@ import java.util.concurrent.ExecutionException import java.util.concurrent.ExecutorService import java.util.concurrent.Executors -class GuavaAsyncResultSupportExtensionTest extends AgentTestRunner { +class GuavaAsyncResultExtensionTest extends AgentTestRunner { @Override void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java index 5acc5e79d1d..f6782955ad2 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java @@ -60,10 +60,10 @@ public Map contextStore() { @Override public String[] helperClassNames() { return new String[] { - this.packageName + ".ReactiveStreamsAsyncResultSupportExtension", - this.packageName + ".ReactiveStreamsAsyncResultSupportExtension$WrappedPublisher", - this.packageName + ".ReactiveStreamsAsyncResultSupportExtension$WrappedSubscriber", - this.packageName + ".ReactiveStreamsAsyncResultSupportExtension$WrappedSubscription", + this.packageName + ".ReactiveStreamsAsyncResultExtension", + this.packageName + ".ReactiveStreamsAsyncResultExtension$WrappedPublisher", + this.packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscriber", + this.packageName + ".ReactiveStreamsAsyncResultExtension$WrappedSubscription", }; } @@ -82,7 +82,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class PublisherAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void init() { - ReactiveStreamsAsyncResultSupportExtension.initialize(); + ReactiveStreamsAsyncResultExtension.initialize(); } } diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultSupportExtension.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java similarity index 81% rename from dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultSupportExtension.java rename to dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java index 66b3de15490..666f63dad1d 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultSupportExtension.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java @@ -1,23 +1,23 @@ package datadog.trace.instrumentation.reactivestreams; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator.AsyncResultSupportExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -public class ReactiveStreamsAsyncResultSupportExtension implements AsyncResultSupportExtension { +public class ReactiveStreamsAsyncResultExtension implements AsyncResultExtension { static { - AsyncResultDecorator.registerExtension(new ReactiveStreamsAsyncResultSupportExtension()); + AsyncResultExtensions.register(new ReactiveStreamsAsyncResultExtension()); } /** - * Register the extension as an {@link AsyncResultSupportExtension} using static class - * initialization.
+ * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
* It uses an empty static method call to ensure the class loading and the one-time-only static - * class initialization. This will ensure this extension will only be registered once to the - * {@link AsyncResultDecorator}. + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. */ public static void initialize() {} diff --git a/dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultSupportExtensionTest.groovy b/dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultExtensionTest.groovy similarity index 97% rename from dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultSupportExtensionTest.groovy rename to dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultExtensionTest.groovy index 8f605df6e18..2f179aae07a 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultSupportExtensionTest.groovy +++ b/dd-java-agent/instrumentation/reactive-streams/src/test/groovy/ReactiveStreamsAsyncResultExtensionTest.groovy @@ -4,7 +4,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags import java.util.concurrent.CountDownLatch -class ReactiveStreamsAsyncResultSupportExtensionTest extends AgentTestRunner { +class ReactiveStreamsAsyncResultExtensionTest extends AgentTestRunner { @Override void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultSupportExtensionTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultExtensionTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultSupportExtensionTest.groovy rename to dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultExtensionTest.groovy index a80e5564117..4e9c08c9245 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultSupportExtensionTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorAsyncResultExtensionTest.groovy @@ -8,7 +8,7 @@ import spock.lang.Shared import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors -class ReactorAsyncResultSupportExtensionTest extends AgentTestRunner { +class ReactorAsyncResultExtensionTest extends AgentTestRunner { @Override void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java index 2e61d85ec79..69b60923a71 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java @@ -36,7 +36,7 @@ public BlockingPublisherInstrumentation() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".ReactorAsyncResultSupportExtension", + packageName + ".ReactorAsyncResultExtension", }; } @@ -83,7 +83,7 @@ public static void after(@Advice.Enter final AgentScope scope) { public static class AsyncExtensionInstallAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void init() { - ReactorAsyncResultSupportExtension.initialize(); + ReactorAsyncResultExtension.initialize(); } } } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultSupportExtension.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java similarity index 64% rename from dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultSupportExtension.java rename to dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java index d180541a274..09f586a14ee 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultSupportExtension.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java @@ -1,22 +1,22 @@ package datadog.trace.instrumentation.reactor.core; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator.AsyncResultSupportExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -public class ReactorAsyncResultSupportExtension implements AsyncResultSupportExtension { +public class ReactorAsyncResultExtension implements AsyncResultExtension { static { - AsyncResultDecorator.registerExtension(new ReactorAsyncResultSupportExtension()); + AsyncResultExtensions.register(new ReactorAsyncResultExtension()); } /** - * Register the extension as an {@link AsyncResultSupportExtension} using static class - * initialization.
+ * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
* It uses an empty static method call to ensure the class loading and the one-time-only static - * class initialization. This will ensure this extension will only be registered once to the - * {@link AsyncResultDecorator}. + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. */ public static void initialize() {} diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultSupportExtensionTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultExtensionTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultSupportExtensionTest.groovy rename to dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultExtensionTest.groovy index 94a82f4a25b..1f4a2de5443 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultSupportExtensionTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorAsyncResultExtensionTest.groovy @@ -8,7 +8,7 @@ import spock.lang.Shared import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors -class ReactorAsyncResultSupportExtensionTest extends AgentTestRunner { +class ReactorAsyncResultExtensionTest extends AgentTestRunner { @Override void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultSupportExtension.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java similarity index 80% rename from dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultSupportExtension.java rename to dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java index e77536bc192..44ca7c5d6c9 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultSupportExtension.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java @@ -1,25 +1,25 @@ package datadog.trace.instrumentation.rxjava2; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.decorator.AsyncResultDecorator; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; +import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import io.reactivex.Completable; import io.reactivex.Flowable; import io.reactivex.Maybe; import io.reactivex.Observable; import io.reactivex.Single; -public class RxJavaAsyncResultSupportExtension - implements AsyncResultDecorator.AsyncResultSupportExtension { +public class RxJavaAsyncResultExtension implements AsyncResultExtension { static { - AsyncResultDecorator.registerExtension(new RxJavaAsyncResultSupportExtension()); + AsyncResultExtensions.register(new RxJavaAsyncResultExtension()); } /** - * Register the extension as an {@link AsyncResultDecorator.AsyncResultSupportExtension} using - * static class initialization.
+ * Register the extension as an {@link AsyncResultExtension} using static class initialization. + *
* It uses an empty static method call to ensure the class loading and the one-time-only static - * class initialization. This will ensure this extension will only be registered once to the - * {@link AsyncResultDecorator}. + * class initialization. This will ensure this extension will only be registered once under {@link + * AsyncResultExtensions}. */ public static void initialize() {} diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java index 0140c345727..5772ab71acf 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java @@ -30,7 +30,7 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".RxJavaAsyncResultSupportExtension", + packageName + ".RxJavaAsyncResultExtension", }; } @@ -42,7 +42,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RxJavaPluginsAdvice { @Advice.OnMethodExit(suppress = Throwable.class) public static void init() { - RxJavaAsyncResultSupportExtension.initialize(); + RxJavaAsyncResultExtension.initialize(); } } } diff --git a/dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultSupportExtensionTest.groovy b/dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultExtensionTest.groovy similarity index 97% rename from dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultSupportExtensionTest.groovy rename to dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultExtensionTest.groovy index c3fd5e92dce..9ff97597138 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultSupportExtensionTest.groovy +++ b/dd-java-agent/instrumentation/rxjava-2/src/test/groovy/RxJava2ResultExtensionTest.groovy @@ -4,7 +4,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags import java.util.concurrent.CountDownLatch -class RxJava2ResultSupportExtensionTest extends AgentTestRunner { +class RxJava2ResultExtensionTest extends AgentTestRunner { @Override void configurePreAgent() { super.configurePreAgent() From 600378f05031c0d6d547f94ecffdd1b44268b425 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Wed, 27 Nov 2024 23:10:37 +0100 Subject: [PATCH 070/106] Generate Muzzle classes for Groovy instrumentations (#8004) --- buildSrc/src/main/groovy/InstrumentPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/InstrumentPlugin.groovy b/buildSrc/src/main/groovy/InstrumentPlugin.groovy index d716f203532..fed739a19e4 100644 --- a/buildSrc/src/main/groovy/InstrumentPlugin.groovy +++ b/buildSrc/src/main/groovy/InstrumentPlugin.groovy @@ -35,7 +35,7 @@ class InstrumentPlugin implements Plugin { InstrumentExtension extension = project.extensions.create('instrument', InstrumentExtension) project.tasks.matching { - it.name in ['compileJava', 'compileScala', 'compileKotlin'] || + it.name in ['compileJava', 'compileScala', 'compileKotlin', 'compileGroovy'] || it.name =~ /compileMain_.+Java/ }.all { AbstractCompile compileTask = it as AbstractCompile From a86c3ca391d6eb0e65b1a1260a59c50e2459c7ea Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 28 Nov 2024 09:32:18 +0000 Subject: [PATCH 071/106] Introduce marker mechanism for eagerly initializing helpers, and use it to register AsyncResultExtensions (#8028) --- .../concurrent/AsyncResultExtensions.java | 10 +++++++++ .../trace/agent/tooling/HelperInjector.java | 13 ++++++++++++ ...veImageGeneratorRunnerInstrumentation.java | 6 +++++- .../guava10/GuavaAsyncResultExtension.java | 5 +++-- .../ListenableFutureInstrumentation.java | 10 --------- .../PublisherInstrumentation.java | 9 -------- .../ReactiveStreamsAsyncResultExtension.java | 5 +++-- .../BlockingPublisherInstrumentation.java | 21 ++++++------------- .../core/ReactorAsyncResultExtension.java | 5 +++-- .../rxjava2/RxJavaAsyncResultExtension.java | 5 +++-- .../rxjava2/RxJavaPluginsInstrumentation.java | 12 +---------- .../instrumentation/api/EagerHelper.java | 8 +++++++ 12 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/EagerHelper.java diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java index 7e54f058753..4feec759ca6 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/AsyncResultExtensions.java @@ -2,6 +2,7 @@ import static java.util.Collections.singletonList; +import datadog.trace.api.Platform; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -22,6 +23,15 @@ public final class AsyncResultExtensions { */ public static void register(AsyncResultExtension extension) { if (extension != null) { + if (Platform.isNativeImageBuilder() + && extension + .getClass() + .getClassLoader() + .getClass() + .getName() + .endsWith("ThrowawayClassLoader")) { + return; // spring-native expects this to be thrown away, not persisted + } EXTENSIONS.add(extension); } } diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java index e0662c2c94b..7751877baf7 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.AgentClassLoading.INJECTING_HELPERS; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; import java.io.IOException; import java.lang.ref.WeakReference; import java.security.CodeSource; @@ -124,6 +125,18 @@ public DynamicType.Builder transform( final JavaModule javaModule = JavaModule.ofType(classes.values().iterator().next()); helperModules.add(new WeakReference<>(javaModule.unwrap())); } + + // forcibly initialize any eager helpers + for (Class clazz : classes.values()) { + if (EagerHelper.class.isAssignableFrom(clazz)) { + try { + clazz.getMethod("init").invoke(null); + } catch (Throwable e) { + log.debug("Problem initializing {}", clazz, e); + } + } + } + } catch (final Exception e) { if (log.isErrorEnabled()) { log.error( diff --git a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java index 9b24b9d3fca..fba42b66d02 100644 --- a/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java +++ b/dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java @@ -96,7 +96,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.bootstrap.benchmark.StaticEventLogger:build_time," + "datadog.trace.bootstrap.blocking.BlockingExceptionHandler:build_time," + "datadog.trace.bootstrap.InstrumentationErrors:build_time," - + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions:rerun," + + "datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions:build_time," + "datadog.trace.bootstrap.instrumentation.java.concurrent.ConcurrentState:build_time," + "datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter:build_time," + "datadog.trace.bootstrap.instrumentation.java.concurrent.QueueTimeHelper:build_time," @@ -105,6 +105,10 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[ + "datadog.trace.bootstrap.instrumentation.jfr.exceptions.ExceptionSampleEvent:build_time," + "datadog.trace.bootstrap.instrumentation.jfr.backpressure.BackpressureSampleEvent:build_time," + "datadog.trace.bootstrap.instrumentation.jfr.directallocation.DirectAllocationTotalEvent:build_time," + + "datadog.trace.instrumentation.guava10.GuavaAsyncResultExtension:build_time," + + "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time," + + "datadog.trace.instrumentation.reactor.core.ReactorAsyncResultExtension:build_time," + + "datadog.trace.instrumentation.rxjava2.RxJavaAsyncResultExtension:build_time," + "datadog.trace.logging.LoggingSettingsDescription:build_time," + "datadog.trace.logging.simplelogger.SLCompatFactory:build_time," + "datadog.trace.logging.LogReporter:build_time," diff --git a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java index 5a0788e3642..78a2c37f207 100644 --- a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java +++ b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/GuavaAsyncResultExtension.java @@ -2,12 +2,13 @@ import com.google.common.util.concurrent.ListenableFuture; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; -public class GuavaAsyncResultExtension implements AsyncResultExtension { +public class GuavaAsyncResultExtension implements AsyncResultExtension, EagerHelper { static { AsyncResultExtensions.register(new GuavaAsyncResultExtension()); } @@ -19,7 +20,7 @@ public class GuavaAsyncResultExtension implements AsyncResultExtension { * class initialization. This will ensure this extension will only be registered once under {@link * AsyncResultExtensions}. */ - public static void initialize() {} + public static void init() {} @Override public boolean supports(Class result) { diff --git a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java index 76811786110..fbaa023c599 100644 --- a/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java +++ b/dd-java-agent/instrumentation/guava-10/src/main/java/datadog/trace/instrumentation/guava10/ListenableFutureInstrumentation.java @@ -3,7 +3,6 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope; import static java.util.Collections.singletonMap; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; @@ -47,20 +46,11 @@ public Map contextStore() { @Override public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice( - isConstructor(), ListenableFutureInstrumentation.class.getName() + "$AbstractFutureAdvice"); transformer.applyAdvice( named("addListener").and(takesArguments(Runnable.class, Executor.class)), ListenableFutureInstrumentation.class.getName() + "$AddListenerAdvice"); } - public static class AbstractFutureAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void init() { - GuavaAsyncResultExtension.initialize(); - } - } - public static class AddListenerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static State addListenerEnter( diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java index f6782955ad2..879cafe5ae1 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/PublisherInstrumentation.java @@ -5,7 +5,6 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.not; @@ -69,7 +68,6 @@ public String[] helperClassNames() { @Override public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), this.getClass().getName() + "$PublisherAdvice"); transformer.applyAdvice( isMethod() .and(not(isStatic())) @@ -79,13 +77,6 @@ public void methodAdvice(MethodTransformer transformer) { getClass().getName() + "$PublisherSubscribeAdvice"); } - public static class PublisherAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void init() { - ReactiveStreamsAsyncResultExtension.initialize(); - } - } - public static class PublisherSubscribeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onSubscribe( diff --git a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java index 666f63dad1d..ea4bd12d61d 100644 --- a/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java +++ b/dd-java-agent/instrumentation/reactive-streams/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsAsyncResultExtension.java @@ -1,13 +1,14 @@ package datadog.trace.instrumentation.reactivestreams; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -public class ReactiveStreamsAsyncResultExtension implements AsyncResultExtension { +public class ReactiveStreamsAsyncResultExtension implements AsyncResultExtension, EagerHelper { static { AsyncResultExtensions.register(new ReactiveStreamsAsyncResultExtension()); } @@ -19,7 +20,7 @@ public class ReactiveStreamsAsyncResultExtension implements AsyncResultExtension * class initialization. This will ensure this extension will only be registered once under {@link * AsyncResultExtensions}. */ - public static void initialize() {} + public static void init() {} @Override public boolean supports(Class result) { diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java index 69b60923a71..891beb517fc 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/BlockingPublisherInstrumentation.java @@ -4,7 +4,6 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import com.google.auto.service.AutoService; @@ -40,13 +39,6 @@ public String[] helperClassNames() { }; } - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), getClass().getName() + "$AsyncExtensionInstallAdvice"); - transformer.applyAdvice( - isMethod().and(nameStartsWith("block")), getClass().getName() + "$BlockingAdvice"); - } - @Override public Map contextStore() { return Collections.singletonMap("org.reactivestreams.Publisher", AgentSpan.class.getName()); @@ -62,6 +54,12 @@ public ElementMatcher hierarchyMatcher() { return hasSuperType(namedOneOf("reactor.core.publisher.Mono", "reactor.core.publisher.Flux")); } + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod().and(nameStartsWith("block")), getClass().getName() + "$BlockingAdvice"); + } + public static class BlockingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope before(@Advice.This final Publisher self) { @@ -79,11 +77,4 @@ public static void after(@Advice.Enter final AgentScope scope) { } } } - - public static class AsyncExtensionInstallAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void init() { - ReactorAsyncResultExtension.initialize(); - } - } } diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java index 09f586a14ee..cdda0734ad5 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/main/java/datadog/trace/instrumentation/reactor/core/ReactorAsyncResultExtension.java @@ -1,12 +1,13 @@ package datadog.trace.instrumentation.reactor.core; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -public class ReactorAsyncResultExtension implements AsyncResultExtension { +public class ReactorAsyncResultExtension implements AsyncResultExtension, EagerHelper { static { AsyncResultExtensions.register(new ReactorAsyncResultExtension()); } @@ -18,7 +19,7 @@ public class ReactorAsyncResultExtension implements AsyncResultExtension { * class initialization. This will ensure this extension will only be registered once under {@link * AsyncResultExtensions}. */ - public static void initialize() {} + public static void init() {} @Override public boolean supports(Class result) { diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java index 44ca7c5d6c9..0ff7026a77c 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaAsyncResultExtension.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.rxjava2; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.EagerHelper; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtension; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import io.reactivex.Completable; @@ -9,7 +10,7 @@ import io.reactivex.Observable; import io.reactivex.Single; -public class RxJavaAsyncResultExtension implements AsyncResultExtension { +public class RxJavaAsyncResultExtension implements AsyncResultExtension, EagerHelper { static { AsyncResultExtensions.register(new RxJavaAsyncResultExtension()); } @@ -21,7 +22,7 @@ public class RxJavaAsyncResultExtension implements AsyncResultExtension { * class initialization. This will ensure this extension will only be registered once under {@link * AsyncResultExtensions}. */ - public static void initialize() {} + public static void init() {} @Override public boolean supports(Class result) { diff --git a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java index 5772ab71acf..57ba844a257 100644 --- a/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java +++ b/dd-java-agent/instrumentation/rxjava-2/src/main/java/datadog/trace/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java @@ -1,12 +1,9 @@ package datadog.trace.instrumentation.rxjava2; -import static net.bytebuddy.matcher.ElementMatchers.isMethod; - import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.InstrumenterConfig; -import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) public class RxJavaPluginsInstrumentation extends InstrumenterModule.Tracing @@ -36,13 +33,6 @@ public String[] helperClassNames() { @Override public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isMethod(), getClass().getName() + "$RxJavaPluginsAdvice"); - } - - public static class RxJavaPluginsAdvice { - @Advice.OnMethodExit(suppress = Throwable.class) - public static void init() { - RxJavaAsyncResultExtension.initialize(); - } + // no-op } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/EagerHelper.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/EagerHelper.java new file mode 100644 index 00000000000..d762e5812e6 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/EagerHelper.java @@ -0,0 +1,8 @@ +package datadog.trace.bootstrap.instrumentation.api; + +/** + * Marker interface used to identify helpers that should be eagerly initialized when injected. + * + *

Eager helpers must declare a public static "init" method that takes no arguments. + */ +public interface EagerHelper {} From 7c67b638ce2ccd136be86328c3a14ed777f8e173 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 28 Nov 2024 09:47:32 +0000 Subject: [PATCH 072/106] Update Grizzly instrumentation to check active span instead of scope (#7982) --- .../grizzly/GrizzlyBlockingHelper.java | 11 ++++------- .../instrumentation/grizzly/GrizzlyDecorator.java | 10 +++++----- .../grizzly/GrizzlyHttpHandlerInstrumentation.java | 2 +- .../instrumentation/grizzlyhttp232/FilterAdvice.java | 4 ++-- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java index a6c2dd0dd71..0be7ae6ee01 100644 --- a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java +++ b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java @@ -5,7 +5,6 @@ import datadog.appsec.api.blocking.BlockingContentType; import datadog.trace.api.gateway.Flow; import datadog.trace.bootstrap.blocking.BlockingActionHelper; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.OutputStream; import java.lang.invoke.MethodHandle; @@ -36,14 +35,14 @@ public class GrizzlyBlockingHelper { private GrizzlyBlockingHelper() {} public static boolean block( - Request request, Response response, Flow.Action.RequestBlockingAction rba, AgentScope scope) { + Request request, Response response, Flow.Action.RequestBlockingAction rba, AgentSpan span) { return block( request, response, rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders(), - scope); + span); } public static boolean block( @@ -52,7 +51,7 @@ public static boolean block( int statusCode, BlockingContentType bct, Map extraHeaders, - AgentScope scope) { + AgentSpan span) { if (GET_OUTPUT_STREAM == null) { return false; } @@ -77,15 +76,13 @@ public static boolean block( os.close(); response.finish(); - scope.span().getRequestContext().getTraceSegment().effectivelyBlocked(); + span.getRequestContext().getTraceSegment().effectivelyBlocked(); SpanClosingListener.LISTENER.onAfterService(request); } catch (Throwable e) { log.info("Error committing blocking response", e); - final AgentSpan span = scope.span(); DECORATE.onError(span, e); DECORATE.beforeFinish(span); span.finish(); - scope.close(); } return true; diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java index ecc3f5bd223..3b3e5118565 100644 --- a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java +++ b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java @@ -4,7 +4,7 @@ import datadog.trace.api.gateway.BlockResponseFunction; import datadog.trace.api.internal.TraceSegment; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; @@ -90,9 +90,9 @@ public boolean tryCommitBlockingResponse( int statusCode, BlockingContentType templateType, Map extraHeaders) { - AgentScope agentScope = AgentTracer.get().activeScope(); - if (agentScope == null) { - log.warn("Can't block: no active scope"); + AgentSpan agentSpan = AgentTracer.get().activeSpan(); + if (agentSpan == null) { + log.warn("Can't block: no active span"); return false; } @@ -102,7 +102,7 @@ public boolean tryCommitBlockingResponse( statusCode, templateType, extraHeaders, - agentScope); + agentSpan); } } } diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java index 881eb772f4c..2755a658781 100644 --- a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java @@ -87,7 +87,7 @@ public static class HandleAdvice { Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction(); if (rba != null) { - boolean success = GrizzlyBlockingHelper.block(request, response, rba, scope); + boolean success = GrizzlyBlockingHelper.block(request, response, rba, span); if (success) { return true; /* skip body */ } diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java index dd0056379ad..5fefa67984e 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java @@ -1,7 +1,7 @@ package datadog.trace.instrumentation.grizzlyhttp232; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE; import datadog.trace.bootstrap.instrumentation.api.AgentScope; @@ -15,7 +15,7 @@ public class FilterAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter( @Advice.This BaseFilter it, @Advice.Argument(0) final FilterChainContext ctx) { - if (ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE) == null || activeScope() != null) { + if (ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE) == null || activeSpan() != null) { return null; } AgentScope scope = From 36fb47531709153695ec53fe1678fe3ee41963fa Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 28 Nov 2024 11:59:24 +0100 Subject: [PATCH 073/106] Fix test name uniqueness (#8023) --- .../IastQueryInstrumentationTest.groovy | 4 +-- .../IastQueryInstrumentationTest.groovy | 4 +-- .../core/JsonParserInstrumentationTest.groovy | 10 ++---- .../core/JsonParserInstrumentationTest.groovy | 10 ++---- .../core/JsonParserInstrumentationTest.groovy | 10 ++---- .../core/JsonParserInstrumentationTest.groovy | 10 ++---- .../core/JsonParserInstrumentationTest.groovy | 10 ++---- .../JsonParserInstrumentationTest.groovy | 10 ++---- .../StringConcatFactoryCallSiteTest.groovy | 2 +- .../test/groovy/HttpServletRequestTest.groovy | 36 +++++++++---------- 10 files changed, 41 insertions(+), 65 deletions(-) diff --git a/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/IastQueryInstrumentationTest.groovy b/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/IastQueryInstrumentationTest.groovy index cdedf097617..954bb56989b 100644 --- a/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/IastQueryInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/IastQueryInstrumentationTest.groovy @@ -25,7 +25,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest { session.close() } - void 'test sql query'() { + void 'test sql query [#iterationIndex] #queryString'() { given: final module = Mock(SqlInjectionModule) InstrumentationBridge.registerIastModule(module) @@ -48,7 +48,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest { 'select * from value' | { Query query -> query.scroll(ScrollMode.FORWARD_ONLY) } } - void 'test hql query'() { + void 'test hql query [#iterationIndex] #queryString'() { given: final module = Mock(SqlInjectionModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/IastQueryInstrumentationTest.groovy b/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/IastQueryInstrumentationTest.groovy index cdedf097617..954bb56989b 100644 --- a/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/IastQueryInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/IastQueryInstrumentationTest.groovy @@ -25,7 +25,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest { session.close() } - void 'test sql query'() { + void 'test sql query [#iterationIndex] #queryString'() { given: final module = Mock(SqlInjectionModule) InstrumentationBridge.registerIastModule(module) @@ -48,7 +48,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest { 'select * from value' | { Query query -> query.scroll(ScrollMode.FORWARD_ONLY) } } - void 'test hql query'() { + void 'test hql query [#iterationIndex] #queryString'() { given: final module = Mock(SqlInjectionModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy index ddc746baf3c..f8d78f98b08 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy @@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING) 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { _ * module.taintObjectIfTainted(_, _) _ * module.findSource(_) >> source 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy index 4f5d2a9a375..38f638ca8e3 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy @@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -39,13 +40,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING) 1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -61,12 +60,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { _ * module.taintObjectIfTainted(_, _) _ * module.findSource(_) >> source 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy index ca5f92306f8..c839bccf0c5 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy @@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING) 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { _ * module.taintObjectIfTainted(_, _) _ * module.findSource(_) >> source 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy index 30b10ac5e2a..08c889db41c 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy @@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING) 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { _ * module.taintObjectIfTainted(_, _) _ * module.findSource(_) >> source 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy index eb28615a3e0..505ce50fce9 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy @@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING) 1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { _ * module.taintObjectIfTainted(_, _) _ * module.findSource(_) >> source 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/JsonParserInstrumentationTest.groovy b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/JsonParserInstrumentationTest.groovy index 964af4c23b9..236d109970b 100644 --- a/dd-java-agent/instrumentation/jackson-core/src/test/groovy/JsonParserInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jackson-core/src/test/groovy/JsonParserInstrumentationTest.groovy @@ -19,6 +19,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner { void 'test json parsing (tainted)'() { given: + final target = JSON_STRING final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -37,13 +38,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'array_0', source.origin, _, JSON_STRING) 1 * module.taintString(_, 'array_1', source.origin, _, JSON_STRING) 0 * _ - - where: - target << [JSON_STRING] } void 'test json parsing (tainted but field names)'() { given: + final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset())) final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING) final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) @@ -62,12 +61,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner { 1 * module.taintString(_, 'array_0', source.origin, _, JSON_STRING) 1 * module.taintString(_, 'array_1', source.origin, _, JSON_STRING) 0 * _ - - where: - target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))] } - void 'test json parsing (not tainted)'() { + void 'test json parsing (not tainted) #iterationIndex'() { given: final module = Mock(PropagationModule) InstrumentationBridge.registerIastModule(module) diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy index 68b56404354..7c47e4e96ff 100644 --- a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy @@ -163,7 +163,7 @@ class StringConcatFactoryCallSiteTest extends AgentTestRunner { 0 * _ } - void 'test string concat factory with primitives'() { + void 'test string concat factory with primitives #iterationIndex'() { setup: final iastModule = Mock(StringModule) InstrumentationBridge.registerIastModule(iastModule) diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy index 88bf1e42b90..c025561b8b2 100644 --- a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy +++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy @@ -36,7 +36,7 @@ class HttpServletRequestTest extends AgentTestRunner { InstrumentationBridge.clearIastModules() } - void 'test getHeader'() { + void 'test getHeader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -56,7 +56,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaders'() { + void 'test getHeaders #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -77,7 +77,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getHeaderNames'() { + void 'test getHeaderNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -98,7 +98,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameter'() { + void 'test getParameter #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -118,7 +118,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterValues'() { + void 'test getParameterValues #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -139,7 +139,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterMap'() { + void 'test getParameterMap #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -165,7 +165,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getParameterNames'() { + void 'test getParameterNames #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -186,7 +186,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getCookies'() { + void 'test getCookies #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -207,7 +207,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test that get headers does not fail when servlet related code fails'() { + void 'test that get headers does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -235,7 +235,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test that get header names does not fail when servlet related code fails'() { + void 'test that get header names does not fail when servlet related code fails #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -263,7 +263,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test get query string'() { + void 'test get query string #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -284,7 +284,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getInputStream'() { + void 'test getInputStream #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -305,7 +305,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getReader'() { + void 'test getReader #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -326,7 +326,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestDispatcher'() { + void 'test getRequestDispatcher #iterationIndex'() { setup: final iastModule = Mock(UnvalidatedRedirectModule) InstrumentationBridge.registerIastModule(iastModule) @@ -348,7 +348,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuite() } - void 'test getRequestURI'() { + void 'test getRequestURI #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -369,7 +369,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathInfo'() { + void 'test getPathInfo #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -390,7 +390,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getPathTranslated'() { + void 'test getPathTranslated #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) @@ -411,7 +411,7 @@ class HttpServletRequestTest extends AgentTestRunner { suite << testSuiteCallSites() } - void 'test getRequestURL'() { + void 'test getRequestURL #iterationIndex'() { setup: final iastModule = Mock(PropagationModule) InstrumentationBridge.registerIastModule(iastModule) From 4d76fed149a2980c87f4fae8096ebd1b31ca9f6b Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Thu, 28 Nov 2024 12:09:30 +0100 Subject: [PATCH 074/106] Fix test name uniqueness (#8020) --- .../civisibility/git/LocalFSGitInfoExtractorTest.groovy | 4 ++-- .../datadog/trace/civisibility/ipc/SerializerTest.groovy | 5 +++++ .../datadog/iast/propagation/PropagationModuleTest.groovy | 2 +- .../src/test/groovy/IastHttpClientInstrumentationTest.groovy | 5 +++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy index 5ae6cf5fbca..d517fba940e 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy @@ -50,7 +50,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification { ) } - def "test git info extraction for local fs"() { + def "test git info extraction for local fs #gitFolder"() { setup: def sut = new LocalFSGitInfoExtractor() @@ -119,7 +119,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification { fullMessage == null } - def "test repository url with different remotes"() { + def "test repository url with different remotes #gitFolder"() { setup: def sut = new LocalFSGitInfoExtractor() diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy index 13ed28d29d4..de3b4aeb4d5 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy @@ -154,6 +154,11 @@ class SerializerTest extends Specification { this.b = b } + @Override + String toString() { + "$a / $b" + } + boolean equals(o) { if (this.is(o)) { return true diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy index 44eb840307b..40788ecdc3b 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy @@ -688,7 +688,7 @@ class PropagationModuleTest extends IastModuleImplTestBase { } private Date date(Source source = null, int mark = NOT_MARKED) { - final result = new Date() + final result = new Date(1234567890) // Use a fixed date if (source != null) { taintObject(result, source, mark) } diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy index e672e738000..597ca47ff20 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy @@ -1,4 +1,5 @@ import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.agent.test.server.http.TestHttpServer import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.sink.SsrfModule import org.apache.http.HttpHost @@ -31,7 +32,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner { } } - void 'test ssrf httpClient execute method with args #args expecting call module'() { + void 'test ssrf httpClient execute method expecting call module #iterationIndex'() { given: final ssrf = Mock(SsrfModule) InstrumentationBridge.registerIastModule(ssrf) @@ -68,7 +69,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner { return new BasicHttpRequest("GET", server.address.toString()) } - private static HttpHost getHttpHost(final server){ + private static HttpHost getHttpHost(final TestHttpServer server){ return new HttpHost(server.address.host, server.address.port, server.address.scheme) } } From 7f91a3ecc23a26cff5d16fb8d0c02bd95c230cf9 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:24:22 +0100 Subject: [PATCH 075/106] Ignore RC versions when running Maven smoke tests (#8034) --- .../src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy index 897b482aca5..8df06e14f25 100644 --- a/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy +++ b/dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy @@ -296,7 +296,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest { NodeList versionList = doc.getElementsByTagName("latest") if (versionList.getLength() > 0) { def version = versionList.item(0).getTextContent() - if (!version.contains('alpha') && !version.contains('beta')) { + if (!version.contains('alpha') && !version.contains('beta') && !version.contains('rc')) { LOGGER.info("Will run the 'latest' tests with version ${version}") return version } From d949e2841c2d013f55c0751aa4261c03dcf8fbae Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Thu, 28 Nov 2024 14:10:24 +0100 Subject: [PATCH 076/106] Muzzle exclude dep from extras (#8035) --- buildSrc/src/main/groovy/MuzzlePlugin.groovy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index c28e6022a0a..5bd62fb0453 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -456,8 +456,12 @@ class MuzzlePlugin implements Plugin { config.dependencies.add(dep) } for (String additionalDependency : muzzleDirective.additionalDependencies) { - config.dependencies.add(instrumentationProject.dependencies.create(additionalDependency) { - transitive = true + config.dependencies.add(instrumentationProject.dependencies.create(additionalDependency) { dep -> + for (String excluded : muzzleDirective.excludedDependencies) { + String[] parts = excluded.split(':') + dep.exclude group: parts[0], module: parts[1] + } + dep.transitive = true }) } From 1ef67e57aa597501a9ab12f9b94f36524d393fc6 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 28 Nov 2024 13:59:12 +0000 Subject: [PATCH 077/106] Fold setAsyncPropagation into preceding activateSpan (#8032) --- .../trace/civisibility/domain/TestImpl.java | 3 +-- .../trace/civisibility/domain/TestSuiteImpl.java | 3 +-- .../akka-concurrent/src/test/java/LinearTask.java | 4 +--- .../akkahttp/DatadogWrapperHelper.java | 4 +--- .../finatra/FinatraInstrumentation.java | 4 +--- .../GrizzlyHttpHandlerInstrumentation.java | 3 +-- .../grizzlyhttp232/FilterAdvice.java | 15 +++++---------- .../grizzlyhttp232/GrizzlyDecorator.java | 3 +-- .../v2/cache/IgniteCacheAsyncInstrumentation.java | 8 ++------ .../DefaultRequestContextInstrumentation.java | 3 +-- .../JakartaRsAnnotationsInstrumentation.java | 3 +-- .../jakarta3/RequestFilterHelper.java | 3 +-- .../recursive/RecursiveThreadPoolExecution.java | 3 +-- ...siveThreadPoolMixedSubmissionAndExecution.java | 3 +-- .../recursive/RecursiveThreadPoolSubmission.java | 3 +-- .../src/test/java/forkjoin/LinearTask.java | 4 +--- .../jaxrs1/JaxRsAnnotationsInstrumentation.java | 4 +--- .../DefaultRequestContextInstrumentation.java | 3 +-- .../jaxrs2/JaxRsAnnotationsInstrumentation.java | 3 +-- .../jaxrs2/RequestFilterHelper.java | 3 +-- .../jdbc/DataSourceInstrumentation.java | 4 +--- .../jetty11/JettyServerAdvice.java | 3 +-- .../jetty12/JettyServerAdvice.java | 3 +-- .../jetty70/JettyServerInstrumentation.java | 3 +-- .../jetty76/JettyServerInstrumentation.java | 3 +-- .../jetty9/JettyServerInstrumentation.java | 3 +-- .../instrumentation/jetty10/HandleAdvice.java | 3 +-- .../kafka_clients/KafkaProducerCallback.java | 3 +-- .../kafka_clients38/KafkaProducerCallback.java | 3 +-- .../liberty20/LibertyServerInstrumentation.java | 3 +-- .../liberty23/LibertyServerInstrumentation.java | 3 +-- .../client/HttpClientResponseTracingHandler.java | 6 ++---- .../server/HttpServerRequestTracingHandler.java | 7 ++----- .../client/HttpClientResponseTracingHandler.java | 9 +++------ .../server/HttpServerRequestTracingHandler.java | 7 ++----- .../client/HttpClientResponseTracingHandler.java | 9 +++------ .../server/HttpServerRequestTracingHandler.java | 7 ++----- .../opentelemetry/annotations/WithSpanAdvice.java | 4 +--- .../pekkohttp/DatadogWrapperHelper.java | 4 +--- .../trace/instrumentation/play23/PlayAdvice.java | 3 +-- .../trace/instrumentation/play24/PlayAdvice.java | 3 +-- .../trace/instrumentation/play26/PlayAdvice.java | 3 +-- .../instrumentation/ratpack/ActionWrapper.java | 3 +-- .../instrumentation/ratpack/BlockWrapper.java | 3 +-- .../instrumentation/ratpack/TracingHandler.java | 3 +-- .../instrumentation/rxjava/TracedSubscriber.java | 12 ++++-------- .../src/test/java/LinearTask.java | 4 +--- .../instrumentation/servlet2/Servlet2Advice.java | 3 +-- .../instrumentation/servlet3/Servlet3Advice.java | 3 +-- .../RequestDispatcherInstrumentation.java | 4 +--- .../servlet/filter/FilterInstrumentation.java | 4 +--- .../servlet/http/HttpServletInstrumentation.java | 4 +--- .../http/HttpServletResponseInstrumentation.java | 4 +--- .../SprayHttpServerRunSealedRouteAdvice.java | 5 ++--- .../springdata/RepositoryInterceptor.java | 3 +-- .../springscheduling/SpannedMethodInvocation.java | 3 +-- .../SpringSchedulingRunnableWrapper.java | 3 +-- .../server/HandlerAdapterAdvice.java | 3 +-- .../springweb/HandlerAdapterInstrumentation.java | 4 +--- .../springweb6/ControllerAdvice.java | 4 +--- .../tomcat/TomcatServerInstrumentation.java | 3 +-- .../twilio/TwilioAsyncInstrumentation.java | 4 +--- .../undertow/HandlerInstrumentation.java | 3 +-- .../vertx_3_4/server/RouteHandlerWrapper.java | 3 +-- .../vertx_4_0/server/RouteHandlerWrapper.java | 3 +-- 65 files changed, 82 insertions(+), 184 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 45cacd63965..9479fe3c0e9 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -98,8 +98,7 @@ public TestImpl( span = spanBuilder.start(); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + activateSpan(span, true); span.setSpanType(InternalSpanTypes.TEST); span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_TEST); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index e7596f1334b..fb546111375 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -121,8 +121,7 @@ public TestSuiteImpl( testDecorator.afterStart(span); if (!parallelized) { - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + activateSpan(span, true); } metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.SUITE); diff --git a/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java index 9850c5daefc..3f52dc3610d 100644 --- a/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java @@ -32,9 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan(Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { - // shouldn't be necessary with a decent API - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java index 7bc82034f4d..1717189e1b2 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java @@ -15,9 +15,7 @@ public static AgentScope createSpan(final HttpRequest request) { DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } public static void finishSpan(final AgentSpan span, final HttpResponse response) { diff --git a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java index 1bbb8bf416c..7e1ff85b1fd 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java +++ b/dd-java-agent/instrumentation/finatra-2.9/src/main/java/datadog/trace/instrumentation/finatra/FinatraInstrumentation.java @@ -76,9 +76,7 @@ public static AgentScope nameSpan( DECORATE.afterStart(span); span.setResourceName(DECORATE.className(clazz)); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java index 2755a658781..e3a24ba69e9 100644 --- a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java @@ -78,8 +78,7 @@ public static class HandleAdvice { DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, parentContext); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); request.setAttribute(DD_SPAN_ATTRIBUTE, span); request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId()); diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java index 5fefa67984e..147439794db 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/FilterAdvice.java @@ -7,27 +7,22 @@ import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; -import org.glassfish.grizzly.filterchain.BaseFilter; import org.glassfish.grizzly.filterchain.FilterChainContext; public class FilterAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( - @Advice.This BaseFilter it, @Advice.Argument(0) final FilterChainContext ctx) { - if (ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE) == null || activeSpan() != null) { + public static AgentScope onEnter(@Advice.Argument(0) final FilterChainContext ctx) { + Object span = ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE); + if (span == null || activeSpan() != null) { return null; } - AgentScope scope = - activateSpan((AgentSpan) ctx.getAttributes().getAttribute(DD_SPAN_ATTRIBUTE)); - scope.setAsyncPropagation(true); - return scope; + return activateSpan((AgentSpan) span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void onExit(@Advice.This BaseFilter it, @Advice.Enter final AgentScope scope) { + public static void onExit(@Advice.Enter final AgentScope scope) { if (scope != null) { - scope.setAsyncPropagation(false); scope.close(); } } diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java index 0d2978953ab..f80d2291d5a 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java @@ -115,8 +115,7 @@ public static NextAction onHttpCodecFilterExit( HttpResponsePacket httpResponse = httpRequest.getResponse(); AgentSpan.Context.Extracted context = DECORATE.extract(httpRequest); AgentSpan span = DECORATE.startSpan(httpRequest, context); - AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); ctx.getAttributes().setAttribute(DD_SPAN_ATTRIBUTE, span); ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse); diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java index 6446768028d..4f2de9b112d 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java @@ -91,11 +91,9 @@ public static AgentScope onEnter( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); DECORATE.onOperation(span, that.getName(), methodName); - final AgentScope scope = activateSpan(span); // Enable async propagation, so the newly spawned task will be associated back with this // original trace. - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) @@ -149,11 +147,9 @@ public static AgentScope onEnter( span, InstrumentationContext.get(IgniteCache.class, Ignite.class).get(that)); DECORATE.onOperation(span, that.getName(), methodName, key); - final AgentScope scope = activateSpan(span); // Enable async propagation, so the newly spawned task will be associated back with this // original trace. - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java index 7dd07d0b7f3..69fa219a1e4 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java @@ -47,8 +47,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo // can only be aborted inside the filter method } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onJakartaRsSpan(span, parent, filterClass, method); diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java index 7fda891b023..7e7d2fb3a0c 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java @@ -123,8 +123,7 @@ public static AgentScope nameSpan( DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); if (contextStore != null && asyncResponse != null) { contextStore.put(asyncResponse, span); diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java index 594b69d02a0..27486963cd7 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java @@ -28,8 +28,7 @@ public static AgentScope createOrUpdateAbortSpan( parent = activeSpan(); span = startSpan(JAKARTA_RS_REQUEST_ABORT); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onJakartaRsSpan(span, parent, resourceClass, method); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java index f02b42956ba..1fe45976ae1 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java @@ -26,8 +26,7 @@ public void run() { return; } AgentSpan span = startSpan(String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java index 0dbcb4c6871..0c7acae3da2 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java @@ -27,8 +27,7 @@ public void run() { return; } AgentSpan span = startSpan(String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { if (depth % 2 == 0) { executor.submit( new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1)); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java index e49c50eea67..33904ba2e38 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java @@ -26,8 +26,7 @@ public void run() { return; } AgentSpan span = startSpan(String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java index 5bcc09dacec..0697ee5ba48 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java @@ -34,9 +34,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan(Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { - // shouldn't be necessary with a decent API - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index dabd2218610..a0780800097 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -100,9 +100,7 @@ public static AgentScope nameSpan( DECORATE.onJaxRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java index 8c69ab0a95f..4354cef7baa 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java @@ -47,8 +47,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo // can only be aborted inside the filter method } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onJaxRsSpan(span, parent, filterClass, method); diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 8467c310a1a..9a9bfb74ce3 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -131,8 +131,7 @@ public static AgentScope nameSpan( DECORATE.onJaxRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); if (contextStore != null && asyncResponse != null) { contextStore.put(asyncResponse, span); diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java index 00a57be3c89..d452eb7e741 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java @@ -27,8 +27,7 @@ public static AgentScope createOrUpdateAbortSpan( parent = activeSpan(); span = startSpan(JAX_RS_REQUEST_ABORT); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onJaxRsSpan(span, parent, resourceClass, method); diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index 96d41750400..d5d85cb395f 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -67,9 +67,7 @@ public static AgentScope start(@Advice.This final DataSource ds) { span.setResourceName(DECORATE.spanNameForMethod(ds.getClass(), "getConnection")); - final AgentScope agentScope = activateSpan(span); - agentScope.setAsyncPropagation(true); - return agentScope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java index f5899f56e3f..72e2444e7c5 100644 --- a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java +++ b/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java @@ -27,8 +27,7 @@ public static AgentScope onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req); span = DECORATE.startSpan(req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); span.setMeasured(true); DECORATE.afterStart(span); DECORATE.onRequest(span, req, req, extractedContext); diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java index 44d4e00cb7a..a6f8f462c58 100644 --- a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java +++ b/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java @@ -29,8 +29,7 @@ public static void onExit( final AgentSpan.Context.Extracted extractedContext = JettyDecorator.DECORATE.extract(req); final AgentSpan span = JettyDecorator.DECORATE.startSpan(req, extractedContext); - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { span.setMeasured(true); JettyDecorator.DECORATE.afterStart(span); JettyDecorator.DECORATE.onRequest(span, req, req, extractedContext); diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java index d6276e5c340..f65d25d2f86 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java @@ -155,8 +155,7 @@ public static AgentScope onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req); span = DECORATE.startSpan(req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, req, req, extractedContext); diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java index 3775c48a79b..1961ff9e671 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java @@ -156,8 +156,7 @@ public static AgentScope onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req); span = DECORATE.startSpan(req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, req, req, extractedContext); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java index f18928f9cb2..f4cd564861d 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java @@ -169,8 +169,7 @@ public static AgentScope onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(req); span = DECORATE.startSpan(req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, req, req, extractedContext); diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java b/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java index b6554d3c7c1..e9e851da803 100644 --- a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java +++ b/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java @@ -29,8 +29,7 @@ public static AgentScope onEnter( DECORATE.afterStart(span); DECORATE.onRequest(span, req, req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); req.setAttribute(DD_SPAN_ATTRIBUTE, span); req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId()); req.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId()); diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java index b7479f82da1..623b4639faa 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java @@ -39,8 +39,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java index d2575af5a2d..9b8edfbebfd 100644 --- a/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java @@ -38,8 +38,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java index fe2d0bb1343..eac3a358f2a 100644 --- a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java @@ -103,8 +103,7 @@ public static class HandleRequestAdvice { final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(request); request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, extractedContext); final AgentSpan span = DECORATE.startSpan(request, extractedContext); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, extractedContext); diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java index 050cd760020..3209bbed508 100644 --- a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java +++ b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java @@ -105,8 +105,7 @@ public static class HandleRequestAdvice { final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(request); request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, extractedContext); final AgentSpan span = DECORATE.startSpan(request, extractedContext); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, extractedContext); diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java index 9a002e22023..911a2665c02 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java @@ -48,8 +48,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { ctx.sendUpstream(msg); } } @@ -77,8 +76,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { super.exceptionCaught(ctx, e); } } diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java index 57bc287eee1..6524d01a707 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java @@ -35,8 +35,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent if (span == null) { ctx.sendUpstream(msg); // superclass does not throw } else { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { ctx.sendUpstream(msg); // superclass does not throw } } @@ -51,12 +50,10 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent channelTraceContext.reset(); channelTraceContext.setRequestHeaders(headers); - try (final AgentScope scope = activateSpan(span)) { + try (final AgentScope scope = activateSpan(span, true)) { DECORATE.afterStart(span); DECORATE.onRequest(span, ctx.getChannel(), request, context); - scope.setAsyncPropagation(true); - channelTraceContext.setServerSpan(span); Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction(); diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java index f401503753a..dfe8f481f7e 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java @@ -37,8 +37,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { ctx.fireChannelRead(msg); } } @@ -59,8 +58,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { super.exceptionCaught(ctx, cause); } } @@ -78,8 +76,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java index f066c3bb75b..c2dc2613bf7 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java @@ -31,8 +31,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { if (span == null) { ctx.fireChannelRead(msg); // superclass does not throw } else { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { ctx.fireChannelRead(msg); // superclass does not throw } } @@ -44,12 +43,10 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { final Context.Extracted extractedContext = DECORATE.extract(headers); final AgentSpan span = DECORATE.startSpan(headers, extractedContext); - try (final AgentScope scope = activateSpan(span)) { + try (final AgentScope scope = activateSpan(span, true)) { DECORATE.afterStart(span); DECORATE.onRequest(span, channel, request, extractedContext); - scope.setAsyncPropagation(true); - channel.attr(ANALYZED_RESPONSE_KEY).set(null); channel.attr(BLOCKED_RESPONSE_KEY).set(null); diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java index c397c8aadd2..a7d8e240085 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java @@ -46,8 +46,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { ctx.fireChannelRead(msg); } } @@ -68,8 +67,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { super.exceptionCaught(ctx, cause); } } @@ -87,8 +85,7 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(parent, true)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java index 775a3f863aa..e8e33f7148b 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java @@ -30,8 +30,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { if (span == null) { ctx.fireChannelRead(msg); // superclass does not throw } else { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { ctx.fireChannelRead(msg); // superclass does not throw } } @@ -43,12 +42,10 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { final Context.Extracted extractedContext = DECORATE.extract(headers); final AgentSpan span = DECORATE.startSpan(headers, extractedContext); - try (final AgentScope scope = activateSpan(span)) { + try (final AgentScope scope = activateSpan(span, true)) { DECORATE.afterStart(span); DECORATE.onRequest(span, channel, request, extractedContext); - scope.setAsyncPropagation(true); - channel.attr(ANALYZED_RESPONSE_KEY).set(null); channel.attr(BLOCKED_RESPONSE_KEY).set(null); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java index 83c318fb7c3..02a444c7130 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java @@ -14,9 +14,7 @@ public class WithSpanAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope onEnter(@Advice.Origin final Method method) { AgentSpan span = DECORATE.startMethodSpan(method); - AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java index 3a8ef2d603b..9437ba83f49 100644 --- a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java +++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java @@ -15,9 +15,7 @@ public static AgentScope createSpan(final HttpRequest request) { DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } public static void finishSpan(final AgentSpan span, final HttpResponse response) { diff --git a/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java b/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java index cd5ea321086..78c3296b830 100644 --- a/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java @@ -32,8 +32,7 @@ public static AgentScope onEnter(@Advice.Argument(0) final Request req) { span.setMeasured(true); } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); return scope; } diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java index 5bb9eaa72bb..7bcba240fe2 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java @@ -38,8 +38,7 @@ public static AgentScope onEnter(@Advice.Argument(value = 0, readOnly = false) R span.setMeasured(true); } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); req = RequestHelper.withTag(req, "_dd_HasPlayRequestSpan", "true"); diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java index 51aaaef20ee..9c6d7295daf 100644 --- a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java +++ b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java @@ -38,8 +38,7 @@ public static AgentScope onEnter( // Do not extract the context. span = startSpan(PLAY_REQUEST); } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); span.setMeasured(true); DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java index cb22e793883..6710c8036f3 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java @@ -22,8 +22,7 @@ private ActionWrapper(final Action delegate, final AgentSpan span) { @Override public void execute(final T t) throws Exception { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { delegate.execute(t); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java index ba187854c16..650d1c2cb4d 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java @@ -23,8 +23,7 @@ private BlockWrapper(final Block delegate, final AgentSpan span) { @Override public void execute() throws Exception { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { delegate.execute(); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java index e2e9b8abd66..f4be50df0e3 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java @@ -42,8 +42,7 @@ public void handle(final Context ctx) { boolean setFinalizer = false; - try (final AgentScope scope = activateSpan(ratpackSpan)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(ratpackSpan, true)) { ctx.getResponse() .beforeSend( diff --git a/dd-java-agent/instrumentation/rxjava-1/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java b/dd-java-agent/instrumentation/rxjava-1/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java index d19fa4db4cd..15e16008fe1 100644 --- a/dd-java-agent/instrumentation/rxjava-1/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java +++ b/dd-java-agent/instrumentation/rxjava-1/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java @@ -28,8 +28,7 @@ public TracedSubscriber( public void onStart() { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { delegate.onStart(); } } else { @@ -41,8 +40,7 @@ public void onStart() { public void onNext(final T value) { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { delegate.onNext(value); } catch (final Throwable e) { onError(e); @@ -57,8 +55,7 @@ public void onCompleted() { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { boolean errored = false; - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { delegate.onCompleted(); } catch (final Throwable e) { // Repopulate the spanRef for onError @@ -81,8 +78,7 @@ public void onCompleted() { public void onError(final Throwable e) { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (final AgentScope scope = activateSpan(span, true)) { decorator.onError(span, e); delegate.onError(e); } catch (final Throwable e2) { diff --git a/dd-java-agent/instrumentation/scala-concurrent/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/scala-concurrent/src/test/java/LinearTask.java index 74fa503a1b4..56401a21316 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/scala-concurrent/src/test/java/LinearTask.java @@ -32,9 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan(Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { - // shouldn't be necessary with a decent API - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java index ac31baaa709..8f27ba741b0 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java +++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java @@ -50,8 +50,7 @@ public static boolean onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(httpServletRequest); final AgentSpan span = DECORATE.startSpan(httpServletRequest, extractedContext); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext); diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java index b61545ed29f..8171a5d5d4f 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java +++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java @@ -67,8 +67,7 @@ public static boolean onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(httpServletRequest); final AgentSpan span = DECORATE.startSpan(httpServletRequest, extractedContext); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext); diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index 1d88985971e..4aab49bada7 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -129,9 +129,7 @@ public static AgentScope start( requestSpan = request.getAttribute(DD_SPAN_ATTRIBUTE); request.setAttribute(DD_SPAN_ATTRIBUTE, span); - final AgentScope agentScope = activateSpan(span); - agentScope.setAsyncPropagation(true); - return agentScope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index d78aaa1806e..3d29a99e8bf 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -74,9 +74,7 @@ public static AgentScope start(@Advice.This final Filter filter) { // Here we use "this" instead of "the method target" to distinguish abstract filter instances. span.setResourceName(DECORATE.spanNameForMethod(filter.getClass(), "doFilter")); - final AgentScope agentScope = activateSpan(span); - agentScope.setAsyncPropagation(true); - return agentScope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java index 9cd2d8febe5..858cc725e44 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java @@ -84,9 +84,7 @@ public static AgentScope start(@Advice.Origin final Method method) { // Here we use the Method instead of "this.class.name" to distinguish calls to "super". span.setResourceName(DECORATE.spanNameForMethod(method)); - final AgentScope agentScope = activateSpan(span); - agentScope.setAsyncPropagation(true); - return agentScope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index 80607c00637..82289210e5f 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -72,9 +72,7 @@ public static AgentScope start( span.setResourceName(DECORATE.spanNameForMethod(HttpServletResponse.class, method)); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java index 3db525c6eea..571a683ed22 100644 --- a/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java +++ b/dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java @@ -26,12 +26,11 @@ public static AgentScope enter(@Advice.Argument(value = 1, readOnly = false) Req extractedContext = null; span = startSpan(DECORATE.spanName()); } - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); DECORATE.afterStart(span); - ctx = SprayHelper.wrapRequestContext(ctx, scope.span(), extractedContext); + ctx = SprayHelper.wrapRequestContext(ctx, span, extractedContext); return scope; } diff --git a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java index b45cd785996..57fd1f4e505 100644 --- a/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java +++ b/dd-java-agent/instrumentation/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java @@ -35,8 +35,7 @@ public Object invoke(final MethodInvocation methodInvocation) throws Throwable { DECORATOR.afterStart(span); DECORATOR.onOperation(span, invokedMethod, repositoryInterface); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); Object result = null; try { diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java index e7cf22a1a15..1e17fb6c621 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java @@ -45,8 +45,7 @@ private Object invokeWithContinuation(CharSequence spanName) throws Throwable { private Object invokeWithSpan(CharSequence spanName) throws Throwable { AgentSpan span = startSpan(spanName); - try (AgentScope scope = activateSpan(span)) { - scope.setAsyncPropagation(true); + try (AgentScope scope = activateSpan(span, true)) { return delegate.proceed(); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java index efe42cec0cd..62c5cedd2b0 100644 --- a/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java +++ b/dd-java-agent/instrumentation/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java @@ -26,9 +26,8 @@ public void run() { LEGACY_TRACING ? startSpan(SCHEDULED_CALL) : startSpan(SCHEDULED_CALL, null); DECORATE.afterStart(span); - try (final AgentScope scope = activateSpan(span)) { + try (final AgentScope scope = activateSpan(span, true)) { DECORATE.onRun(span, runnable); - scope.setAsyncPropagation(true); try { runnable.run(); diff --git a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java index aa38ebfffee..da69a94ea14 100644 --- a/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java +++ b/dd-java-agent/instrumentation/spring-webflux-5/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java @@ -44,8 +44,7 @@ public static AgentScope methodEnter( span.setSpanName(operationName); span.setTag("handler.type", handlerType); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); } final AgentSpan parentSpan = exchange.getAttribute(AdviceUtils.PARENT_SPAN_ATTRIBUTE); diff --git a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java index 14ecd3ab897..14194e6621c 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java @@ -81,9 +81,7 @@ public static AgentScope nameResourceAndStartSpan( DECORATE.afterStart(span); DECORATE.onHandle(span, handler); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java index 243cec8d051..76e2e0f0455 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java @@ -34,9 +34,7 @@ public static AgentScope nameResourceAndStartSpan( SpringWebHttpServerDecorator.DECORATE.afterStart(span); SpringWebHttpServerDecorator.DECORATE.onHandle(span, handler); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) diff --git a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java index 34f67a850ca..f2e77a3f966 100644 --- a/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java @@ -125,8 +125,7 @@ public static AgentScope onService(@Advice.Argument(0) org.apache.coyote.Request req.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, extractedContext); final AgentSpan span = DECORATE.startSpan(req, extractedContext); - final AgentScope scope = activateSpan(span); - scope.setAsyncPropagation(true); + final AgentScope scope = activateSpan(span, true); // This span is finished when Request.recycle() is called by RequestInstrumentation. DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java index 332d86f99c9..e5e59bbc4c4 100644 --- a/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java @@ -106,11 +106,9 @@ public static AgentScope methodEnter( DECORATE.afterStart(span); DECORATE.onServiceExecution(span, that, methodName); - final AgentScope scope = activateSpan(span); // Enable async propagation, so the newly spawned task will be associated back with this // original trace. - scope.setAsyncPropagation(true); - return scope; + return activateSpan(span, true); } /** Method exit instrumentation. */ diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java index c9bcd3d5a91..d7a959d5b72 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java @@ -93,8 +93,7 @@ public static void onEnter( final AgentSpan.Context.Extracted extractedContext = DECORATE.extract(exchange); final AgentSpan span = DECORATE.startSpan(exchange, extractedContext).setMeasured(true); - scope = activateSpan(span); - scope.setAsyncPropagation(true); + scope = activateSpan(span, true); DECORATE.afterStart(span); DECORATE.onRequest(span, exchange, exchange, extractedContext); diff --git a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java index c1280788741..c3755d1f17c 100644 --- a/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java @@ -56,8 +56,7 @@ public void handle(final RoutingContext routingContext) { updateRoutingContextWithRoute(routingContext); } try (final AgentScope scope = - span != null ? activateSpan(span) : AgentTracer.NoopAgentScope.INSTANCE) { - scope.setAsyncPropagation(true); + span != null ? activateSpan(span, true) : AgentTracer.NoopAgentScope.INSTANCE) { try { actual.handle(routingContext); } catch (final Throwable t) { diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java index ada3f018d69..8b08d6b91ef 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java @@ -50,8 +50,7 @@ public void handle(final RoutingContext routingContext) { } try (final AgentScope scope = - span != null ? activateSpan(span) : AgentTracer.NoopAgentScope.INSTANCE) { - scope.setAsyncPropagation(true); + span != null ? activateSpan(span, true) : AgentTracer.NoopAgentScope.INSTANCE) { try { actual.handle(routingContext); } catch (final Throwable t) { From 3ad344d782d2034fc10e524892641d36531caf7a Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:12:29 +0100 Subject: [PATCH 078/106] Mark JUnit 5 setup and teardown action spans as failed if there is an error (#8033) --- .../CiVisibilityInstrumentationTest.groovy | 16 +- .../junit5/BeforeAfterOperationsTracer.java | 3 + .../src/test/groovy/JUnit58Test.groovy | 4 + .../java/org/example/TestFailedAfterAll.java | 24 ++ .../java/org/example/TestFailedAfterEach.java | 24 ++ .../java/org/example/TestFailedBeforeAll.java | 24 ++ .../org/example/TestFailedBeforeEach.java | 24 ++ .../test-before-all-after-all/events.ftl | 16 +- .../test-before-each-after-each/events.ftl | 8 +- .../test-failed-after-all/coverages.ftl | 1 + .../test-failed-after-all/events.ftl | 224 ++++++++++++++++ .../test-failed-after-each/coverages.ftl | 1 + .../test-failed-after-each/events.ftl | 249 ++++++++++++++++++ .../test-failed-before-all/coverages.ftl | 1 + .../test-failed-before-all/events.ftl | 130 +++++++++ .../test-failed-before-each/coverages.ftl | 1 + .../test-failed-before-each/events.ftl | 249 ++++++++++++++++++ 17 files changed, 985 insertions(+), 14 deletions(-) create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index c232f6e4551..f38bf6e4779 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -263,15 +263,13 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { ] + replacements // uncomment to generate expected data templates - // def baseTemplatesPath = CiVisibilityInstrumentationTest.classLoader - // .getResource("test-succeed") - // .toURI() - // .schemeSpecificPart - // .replace('build/resources/test', 'src/test/resources') - // .replace('build/resources/latestDepTest', 'src/test/resources') - // .replace("test-succeed", testcaseName) - // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) - // return [:] + // def clazz = this.getClass() + // def resourceName = clazz.name.replace('.', '/') + ".class" + // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart + // def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes")) + // def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName + // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) + // return [:] return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements) } diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java index 7593abfc7bf..19d56086a4b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java @@ -53,6 +53,9 @@ private static void traceInvocation( agentSpan.setTag(Tags.TEST_CALLBACK, operationName); try (AgentScope agentScope = AgentTracer.activateSpan(agentSpan)) { invocation.proceed(); + } catch (Throwable t) { + agentSpan.addThrowable(t); + throw t; } finally { agentSpan.finish(); } diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 76c98102905..5c81fbcecab 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -22,6 +22,10 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { testcaseName | tests | expectedTracesCount "test-before-each-after-each" | [TestSucceedBeforeEachAfterEach] | 2 "test-before-all-after-all" | [TestSucceedBeforeAllAfterAll] | 2 + "test-failed-before-all" | [TestFailedBeforeAll] | 2 + "test-failed-after-all" | [TestFailedAfterAll] | 2 + "test-failed-before-each" | [TestFailedBeforeEach] | 2 + "test-failed-after-each" | [TestFailedAfterEach] | 2 } private static void runTests(List> tests) { diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java new file mode 100644 index 00000000000..b4ba2f5513c --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java @@ -0,0 +1,24 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; + +public class TestFailedAfterAll { + + @AfterAll + public static void tearDown() { + throw new RuntimeException("suite teardown failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java new file mode 100644 index 00000000000..8aac75d89c3 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java @@ -0,0 +1,24 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +public class TestFailedAfterEach { + + @AfterEach + public void tearDown() { + throw new RuntimeException("testcase teardown failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java new file mode 100644 index 00000000000..28687830add --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java @@ -0,0 +1,24 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class TestFailedBeforeAll { + + @BeforeAll + public static void setUp() { + throw new RuntimeException("suite setup failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java new file mode 100644 index 00000000000..122c43d22a2 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java @@ -0,0 +1,24 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class TestFailedBeforeEach { + + @BeforeEach + public void setUp() { + throw new RuntimeException("testcase setup failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl index b7a293bd9fa..22736145e85 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl @@ -16,6 +16,7 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", @@ -46,9 +47,10 @@ "duration" : ${content_duration_2}, "error" : 0, "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", "test.module" : "junit-5.8", "test.status" : "pass", @@ -76,9 +78,12 @@ "duration" : ${content_duration_3}, "error" : 0, "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "test.type" : "test", "test.source.file" : "dummy_source_path", "test.module" : "junit-5.8", @@ -86,6 +91,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", @@ -114,7 +120,7 @@ "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.source.end" : 18, "test.source.start" : 12 }, @@ -161,7 +167,7 @@ "process_id" : ${content_metrics_process_id}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "test.source.end" : 18, "test.source.start" : 12 }, @@ -203,6 +209,7 @@ "error" : 0, "metrics" : { }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "test.callback" : "BeforeAll", "library_version" : ${content_meta_library_version}, "env" : "none" @@ -223,6 +230,7 @@ "error" : 0, "metrics" : { }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "test.callback" : "AfterAll", "library_version" : ${content_meta_library_version}, "env" : "none" diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl index e3774da1dfa..2090ff27a32 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl @@ -16,6 +16,7 @@ "_dd.trace_span_attribute_schema" : 0 }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, "test.type" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "test.status" : "pass", @@ -49,6 +50,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "test.type" : "test", "test.module" : "junit-5.8", "test.status" : "pass", @@ -76,9 +78,12 @@ "duration" : ${content_duration_3}, "error" : 0, "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 }, "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "test.type" : "test", "test.source.file" : "dummy_source_path", "test.module" : "junit-5.8", @@ -86,6 +91,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "component" : "junit", "span.kind" : "test_suite_end", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl new file mode 100644 index 00000000000..2253dea2640 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl @@ -0,0 +1,224 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-5.8", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-5.8", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-5.8", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedAfterAll", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 1, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "span.kind" : "test_suite_end", + "error.message" : ${content_meta_error_message}, + "test.suite" : "org.example.TestFailedAfterAll", + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterAll.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterAll", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterAll.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterAll", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "AfterAll", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl new file mode 100644 index 00000000000..180f3341f04 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl @@ -0,0 +1,249 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-5.8", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-5.8", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-5.8", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedAfterEach", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedAfterEach", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterEach.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterEach", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterEach.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterEach", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack_2}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_3}, + "test.callback" : "AfterEach", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_4}, + "test.callback" : "AfterEach", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl new file mode 100644 index 00000000000..7f3a83d6454 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl @@ -0,0 +1,130 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-5.8", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-5.8", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-5.8", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedBeforeAll", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 1, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "span.kind" : "test_suite_end", + "error.message" : ${content_meta_error_message}, + "test.suite" : "org.example.TestFailedBeforeAll", + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setUp", + "resource" : "setUp", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "BeforeAll", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl new file mode 100644 index 00000000000..6809b426552 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl @@ -0,0 +1,249 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-5.8", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-5.8", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-5.8", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedBeforeEach", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-5.8", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedBeforeEach", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedBeforeEach.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedBeforeEach", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedBeforeEach.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-5.8", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedBeforeEach", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack_2}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit5" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setUp", + "resource" : "setUp", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_3}, + "test.callback" : "BeforeEach", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setUp", + "resource" : "setUp", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_4}, + "test.callback" : "BeforeEach", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file From dfe2b6d6bc27eb1c030ae9903353424fe1f463db Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 28 Nov 2024 15:46:51 +0100 Subject: [PATCH 079/106] Ensure instrumentation class is logged if helper class fails to be injected (#8009) --- .../java/datadog/trace/agent/tooling/HelperInjector.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java index 7751877baf7..dafc828bc2a 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java @@ -139,8 +139,11 @@ public DynamicType.Builder transform( } catch (final Exception e) { if (log.isErrorEnabled()) { + // requestingName is concatenated to ensure it is sent to telemetry log.error( - "Failed to inject helper classes - instrumentation.class={} instrumentation.target.classloader={} instrumentation.target.class={}", + "Failed to inject helper classes - instrumentation.class=" + + requestingName + + " instrumentation.target.classloader={} instrumentation.target.class={}", requestingName, classLoader, typeDescription, From 508c314d67b47be0299aa469cd7ad1a3a6cce522 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Thu, 28 Nov 2024 15:55:07 +0100 Subject: [PATCH 080/106] Remove support for X-Forwarded in client IP resolution (#7946) --- .../decorator/http/ClientIpAddressResolver.java | 8 -------- .../ClientIpAddressResolverSpecification.groovy | 13 ------------- .../smoketest/appsec/SpringBootSmokeTest.groovy | 2 +- .../trace/core/propagation/ContextInterpreter.java | 5 ----- .../datadog/trace/core/propagation/HttpCodec.java | 1 - .../core/propagation/B3HttpExtractorTest.groovy | 2 -- .../propagation/DatadogHttpExtractorTest.groovy | 2 -- .../propagation/HaystackHttpExtractorTest.groovy | 2 -- .../core/propagation/NoneHttpExtractorTest.groovy | 2 -- .../core/propagation/W3CHttpExtractorTest.groovy | 2 -- .../core/propagation/XRayHttpExtractorTest.groovy | 2 -- .../bootstrap/instrumentation/api/AgentSpan.java | 2 -- .../bootstrap/instrumentation/api/AgentTracer.java | 5 ----- .../bootstrap/instrumentation/api/TagContext.java | 8 +------- 14 files changed, 2 insertions(+), 54 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java index fa4d198becc..4c8ec9c9911 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolver.java @@ -92,14 +92,6 @@ private static InetAddress doResolve(AgentSpan.Context.Extracted context, Mutabl result = coalesce(result, addr); } - addr = tryHeader(context.getXForwarded(), FORWARDED_PARSER); - if (addr != null) { - if (!isIpAddrPrivate(addr)) { - return addr; - } - result = coalesce(result, addr); - } - addr = tryHeader(context.getForwardedFor(), PLAIN_IP_ADDRESS_PARSER); if (addr != null) { if (!isIpAddrPrivate(addr)) { diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolverSpecification.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolverSpecification.groovy index 35175f6d9b0..34607783f13 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolverSpecification.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/http/ClientIpAddressResolverSpecification.groovy @@ -60,15 +60,6 @@ class ClientIpAddressResolverSpecification extends Specification { 'x-real-ip' | '42' | '0.0.0.42' 'x-client-ip' | '2.2.2.2' | '2.2.2.2' - 'x-forwarded' | 'for="[2001::1]:1111"' | '2001::1' - 'x-forwarded' | 'fOr="[2001::1]:1111"' | '2001::1' - 'x-forwarded' | 'for=some_host' | null - 'x-forwarded' | 'for=127.0.0.1, FOR=1.1.1.1' | '1.1.1.1' - 'x-forwarded' |'for="\"foobar";proto=http,FOR="1.1.1.1"' | '1.1.1.1' - 'x-forwarded' | 'for="8.8.8.8:2222",' | '8.8.8.8' - 'x-forwarded' | 'for="8.8.8.8' | null // quote not closed - 'x-forwarded' | 'far="8.8.8.8",for=4.4.4.4;' | '4.4.4.4' - 'x-forwarded' | ' for=127.0.0.1,for= for=,for=;"for = for="" ,; for=8.8.8.8;' | '8.8.8.8' 'x-cluster-client-ip' | '2.2.2.2' | '2.2.2.2' @@ -119,9 +110,6 @@ class ClientIpAddressResolverSpecification extends Specification { then: 1 * context.getXClientIp() >> null - then: - 1 * context.getXForwarded() >> null - then: 1 * context.getForwardedFor() >> null @@ -174,7 +162,6 @@ class ClientIpAddressResolverSpecification extends Specification { 1 * context.getXForwardedFor() >> '127.0.0.1' 1 * context.getXRealIp() >> '127.0.0.2' 1 * context.getXClientIp() >> '127.0.0.3' - 1 * context.getXForwarded() >> 'for=127.0.0.4' 1 * context.getXClusterClientIp() >> '127.0.0.5' 1 * context.getForwardedFor() >> '127.0.0.6' 1 * context.getTrueClientIp() >> '127.0.0.9' diff --git a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy index 4942c15911a..adb0d15a85c 100644 --- a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy +++ b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SpringBootSmokeTest.groovy @@ -177,7 +177,7 @@ class SpringBootSmokeTest extends AbstractAppSecServerSmokeTest { def request = new Request.Builder() .url(url) .addHeader("User-Agent", "Arachni/v1") - .addHeader("X-Forwarded", 'for="[::ffff:1.2.3.4]"') + .addHeader("X-Client-Ip", '::ffff:1.2.3.4') .build() def response = client.newCall(request).execute() def responseBodyStr = response.body().string() diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java index 0b2b3c9c721..fba3a31de1d 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java @@ -11,7 +11,6 @@ import static datadog.trace.core.propagation.HttpCodec.X_CLUSTER_CLIENT_IP_KEY; import static datadog.trace.core.propagation.HttpCodec.X_FORWARDED_FOR_KEY; import static datadog.trace.core.propagation.HttpCodec.X_FORWARDED_HOST_KEY; -import static datadog.trace.core.propagation.HttpCodec.X_FORWARDED_KEY; import static datadog.trace.core.propagation.HttpCodec.X_FORWARDED_PORT_KEY; import static datadog.trace.core.propagation.HttpCodec.X_FORWARDED_PROTO_KEY; import static datadog.trace.core.propagation.HttpCodec.X_REAL_IP_KEY; @@ -122,10 +121,6 @@ protected final boolean handledXForwarding(String key, String value) { getHeaders().xForwardedPort = value; return true; } - if (X_FORWARDED_KEY.equalsIgnoreCase(key)) { - getHeaders().xForwarded = value; - return true; - } return false; } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java index b7e85429751..120d14f7ee5 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java @@ -37,7 +37,6 @@ public class HttpCodec { static final String FORWARDED_FOR_KEY = "forwarded-for"; static final String X_FORWARDED_PROTO_KEY = "x-forwarded-proto"; static final String X_FORWARDED_HOST_KEY = "x-forwarded-host"; - static final String X_FORWARDED_KEY = "x-forwarded"; static final String X_FORWARDED_FOR_KEY = "x-forwarded-for"; static final String X_FORWARDED_PORT_KEY = "x-forwarded-port"; diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy index 073908513e1..513628c9498 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/B3HttpExtractorTest.groovy @@ -367,7 +367,6 @@ class B3HttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -383,7 +382,6 @@ class B3HttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy index 62d07a03f06..c8d7c905694 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy @@ -438,7 +438,6 @@ class DatadogHttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -454,7 +453,6 @@ class DatadogHttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HaystackHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HaystackHttpExtractorTest.groovy index 0b7edccaf21..06d3fe492db 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HaystackHttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/HaystackHttpExtractorTest.groovy @@ -300,7 +300,6 @@ class HaystackHttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -316,7 +315,6 @@ class HaystackHttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/NoneHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/NoneHttpExtractorTest.groovy index 9e60f012f07..516fa007964 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/NoneHttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/NoneHttpExtractorTest.groovy @@ -303,7 +303,6 @@ class NoneHttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -319,7 +318,6 @@ class NoneHttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpExtractorTest.groovy index 54daf513643..d82b9b56fca 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/W3CHttpExtractorTest.groovy @@ -365,7 +365,6 @@ class W3CHttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -381,7 +380,6 @@ class W3CHttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/XRayHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/XRayHttpExtractorTest.groovy index f3565d23efd..b45c655cae6 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/XRayHttpExtractorTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/XRayHttpExtractorTest.groovy @@ -256,7 +256,6 @@ class XRayHttpExtractorTest extends DDSpecification { (HttpCodec.X_CLIENT_IP_KEY): '3.3.3.3', (HttpCodec.TRUE_CLIENT_IP_KEY): '4.4.4.4', (HttpCodec.FORWARDED_FOR_KEY): '5.5.5.5', - (HttpCodec.X_FORWARDED_KEY): '6.6.6.6', (HttpCodec.FASTLY_CLIENT_IP_KEY): '7.7.7.7', (HttpCodec.CF_CONNECTING_IP_KEY): '8.8.8.8', (HttpCodec.CF_CONNECTING_IP_V6_KEY): '9.9.9.9', @@ -272,7 +271,6 @@ class XRayHttpExtractorTest extends DDSpecification { assert context.XClientIp == '3.3.3.3' assert context.trueClientIp == '4.4.4.4' assert context.forwardedFor == '5.5.5.5' - assert context.XForwarded == '6.6.6.6' assert context.fastlyClientIp == '7.7.7.7' assert context.cfConnectingIp == '8.8.8.8' assert context.cfConnectingIpv6 == '9.9.9.9' diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java index 93c0dbde06f..f4e63553114 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java @@ -219,8 +219,6 @@ interface Extracted extends Context { String getForwardedFor(); - String getXForwarded(); - String getXForwardedFor(); String getXClusterClientIp(); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index 88f2e4e2b99..0518c92563b 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -1043,11 +1043,6 @@ public String getForwardedFor() { return null; } - @Override - public String getXForwarded() { - return null; - } - @Override public String getXForwardedFor() { return null; diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java index b351e7c585b..9b3cde847fb 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java @@ -125,11 +125,6 @@ public String getForwardedFor() { return httpHeaders.forwardedFor; } - @Override - public String getXForwarded() { - return httpHeaders.xForwarded; - } - @Override public String getXForwardedFor() { return httpHeaders.xForwardedFor; @@ -264,12 +259,11 @@ public static class HttpHeaders { public String fastlyClientIp; public String cfConnectingIp; public String cfConnectingIpv6; - public String xForwarded; - public String forwarded; public String xForwardedProto; public String xForwardedHost; public String xForwardedPort; public String xForwardedFor; + public String forwarded; public String forwardedFor; public String xClusterClientIp; public String xRealIp; From 896dd6b380533216e0bdee59614606c8272d313e Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Fri, 29 Nov 2024 08:06:40 +0100 Subject: [PATCH 081/106] fix(smoke-tests): Replace JAVA_TOOL_OPTIONS by jvm.options openliberty configuration file (#8031) JAVA_TOOL_OPTIONS is limited to 1024 characters and it starts reaching the limit. --- .../SpringBootOpenLibertySmokeTest.groovy | 61 ++++++++++++----- ...otOpenLibertySmokeVulnerabilityTest.groovy | 65 +++++++++++++------ .../SpringBootOpenLibertySmokeTest.groovy | 59 ++++++++++++----- ...otOpenLibertySmokeVulnerabilityTest.groovy | 61 ++++++++++++----- 4 files changed, 176 insertions(+), 70 deletions(-) diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index 600a81d2359..1693195a153 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -7,7 +7,10 @@ import okhttp3.Request import spock.lang.Requires import spock.lang.Shared -import java.util.stream.Collectors +import java.nio.file.FileSystems +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths // This test currently fails on IBM JVMs @Requires({ !Platform.isJ9() }) @@ -21,33 +24,59 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { @Override ProcessBuilder createProcessBuilder() { - List command = new ArrayList<>() - command.add(javaPath()) - - command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"]) - - List envParams = new ArrayList<>() - envParams.addAll(defaultJavaProperties) - envParams.addAll( - "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter", + // Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration + def applicationJar = copyApplicationJar().toAbsolutePath().toString() + + List command = [ + javaPath(), + "-jar", + applicationJar, + "--server.port=${httpPort}" as String + ] + + List jvmOptions = new ArrayList<>() + jvmOptions.addAll(defaultJavaProperties) + jvmOptions.addAll( + "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String, "-Ddd.jmxfetch.enabled=false", "-Ddd.appsec.enabled=true", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug", - "-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100", + "-Ddd.iast.enabled=true", + "-Ddd.iast.request-sampling=100", "-Ddd.integration.spring-boot.enabled=true" ) - - - String javaToolOptions = envParams.stream().collect(Collectors.joining(" ")) - + injectOpenLibertyJvmOptions(applicationJar, jvmOptions) ProcessBuilder processBuilder = new ProcessBuilder(command) - processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions) + processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application') processBuilder.directory(new File(buildDirectory)) return processBuilder } + Path copyApplicationJar() { + def applicationJar = Paths.get(openLibertyShadowJar) + def randomId = System.nanoTime() + def uniqueName = applicationJar.fileName.toString() + uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar" + def specificationJar = applicationJar.parent.parent.resolve(uniqueName) + Files.copy(applicationJar, specificationJar) + return specificationJar + } + + void injectOpenLibertyJvmOptions(String applicationJar, List options) { + def appUri = URI.create("jar:file:$applicationJar") + try (def fs = FileSystems.newFileSystem(appUri, [:])) { + def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options') + try (def writer = Files.newBufferedWriter(jvmOptionFile)) { + options.each { + writer.write(it) + writer.newLine() + } + } + } + } + @Override File createTemporaryFile() { return new File("${buildDirectory}/tmp/springboot-openliberty.out") diff --git a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index 84c9a4ebff6..7a8bbc0ba10 100644 --- a/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-20/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -1,6 +1,5 @@ package datadog.smoketest - import datadog.trace.api.Platform import datadog.trace.test.agent.decoder.DecodedSpan import okhttp3.Request @@ -8,47 +7,73 @@ import spock.lang.Requires import spock.lang.Shared import spock.util.concurrent.PollingConditions +import java.nio.file.FileSystems +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths import java.util.function.Function -import java.util.stream.Collectors // This test currently fails on IBM JVMs @Requires({ !Platform.isJ9() }) class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest { - @Shared - int totalInvocations = 100 - @Shared String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path") @Override ProcessBuilder createProcessBuilder() { - List command = new ArrayList<>() - command.add(javaPath()) - - command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"]) - - List envParams = new ArrayList<>() - envParams.addAll(defaultJavaProperties) - envParams.addAll( - "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter", + // Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration + def applicationJar = copyApplicationJar().toAbsolutePath().toString() + + List command = [ + javaPath(), + "-jar", + applicationJar, + "--server.port=${httpPort}" as String + ] + + List jvmOptions = new ArrayList<>() + jvmOptions.addAll(defaultJavaProperties) + jvmOptions.addAll( + "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String, "-Ddd.jmxfetch.enabled=false", "-Ddd.appsec.enabled=true", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug", - "-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100" + "-Ddd.iast.enabled=true", + "-Ddd.iast.request-sampling=100" ) - - - String javaToolOptions = envParams.stream().collect(Collectors.joining(" ")) - + injectOpenLibertyJvmOptions(applicationJar, jvmOptions) ProcessBuilder processBuilder = new ProcessBuilder(command) - processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions) + processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application') processBuilder.directory(new File(buildDirectory)) return processBuilder } + Path copyApplicationJar() { + def applicationJar = Paths.get(openLibertyShadowJar) + def randomId = System.nanoTime() + def uniqueName = applicationJar.fileName.toString() + uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar" + def specificationJar = applicationJar.parent.parent.resolve(uniqueName) + Files.copy(applicationJar, specificationJar) + return specificationJar + } + + void injectOpenLibertyJvmOptions(String applicationJar, List options) { + def appUri = URI.create("jar:file:$applicationJar") + try (def fs = FileSystems.newFileSystem(appUri, [:])) { + def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options') + try (def writer = Files.newBufferedWriter(jvmOptionFile)) { + options.each { + writer.write(it) + writer.newLine() + } + } + } + } + @Override File createTemporaryFile() { return new File("${buildDirectory}/tmp/springboot-openliberty.out") diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy index a19b1a7989c..9c473ded2a7 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeTest.groovy @@ -7,7 +7,10 @@ import okhttp3.Request import spock.lang.Requires import spock.lang.Shared -import java.util.stream.Collectors +import java.nio.file.FileSystems +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths // This test currently fails on IBM JVMs @Requires({ !Platform.isJ9() }) @@ -21,15 +24,20 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { @Override ProcessBuilder createProcessBuilder() { - List command = new ArrayList<>() - command.add(javaPath()) - - command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"]) - - List envParams = new ArrayList<>() - envParams.addAll(defaultJavaProperties) - envParams.addAll([ - "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()}:includeService,DDAgentWriter", + // Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration + def applicationJar = copyApplicationJar().toAbsolutePath().toString() + + List command = [ + javaPath(), + "-jar", + applicationJar, + "--server.port=${httpPort}" as String + ] + + List jvmOptions = new ArrayList<>() + jvmOptions.addAll(defaultJavaProperties) + jvmOptions.addAll([ + "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()}:includeService,DDAgentWriter" as String, "-Ddd.jmxfetch.enabled=false", "-Ddd.appsec.enabled=true", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", @@ -38,18 +46,37 @@ class SpringBootOpenLibertySmokeTest extends AbstractServerSmokeTest { "-Ddd.iast.request-sampling=100", "-Ddd.integration.spring-boot.enabled=true" ]) - - - String javaToolOptions = envParams.stream().collect(Collectors.joining(" ")) - + injectOpenLibertyJvmOptions(applicationJar, jvmOptions) ProcessBuilder processBuilder = new ProcessBuilder(command) - System.err.println(javaToolOptions) - processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions) + processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application') processBuilder.directory(new File(buildDirectory)) return processBuilder } + Path copyApplicationJar() { + def applicationJar = Paths.get(openLibertyShadowJar) + def randomId = System.nanoTime() + def uniqueName = applicationJar.fileName.toString() + uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar" + def specificationJar = applicationJar.parent.parent.resolve(uniqueName) + Files.copy(applicationJar, specificationJar) + return specificationJar + } + + void injectOpenLibertyJvmOptions(String applicationJar, List options) { + def appUri = URI.create("jar:file:$applicationJar") + try (def fs = FileSystems.newFileSystem(appUri, [:])) { + def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options') + try (def writer = Files.newBufferedWriter(jvmOptionFile)) { + options.each { + writer.write(it) + writer.newLine() + } + } + } + } + @Override def inferServiceName() { false // will use spring properties diff --git a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy index 84c9a4ebff6..b48bc0e615f 100644 --- a/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy +++ b/dd-smoke-tests/springboot-openliberty-23/src/test/groovy/datadog/smoketest/SpringBootOpenLibertySmokeVulnerabilityTest.groovy @@ -8,47 +8,72 @@ import spock.lang.Requires import spock.lang.Shared import spock.util.concurrent.PollingConditions +import java.nio.file.FileSystems +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths import java.util.function.Function -import java.util.stream.Collectors // This test currently fails on IBM JVMs @Requires({ !Platform.isJ9() }) class SpringBootOpenLibertySmokeVulnerabilityTest extends AbstractServerSmokeTest { - @Shared - int totalInvocations = 100 - @Shared String openLibertyShadowJar = System.getProperty("datadog.smoketest.openliberty.jar.path") @Override ProcessBuilder createProcessBuilder() { - List command = new ArrayList<>() - command.add(javaPath()) - - command.addAll((String[]) ["-jar", openLibertyShadowJar, "--server.port=${httpPort}"]) - - List envParams = new ArrayList<>() - envParams.addAll(defaultJavaProperties) - envParams.addAll( - "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter", + // Make a copy of the OpenLiberty runnable JAR before injecting JVM configuration + def applicationJar = copyApplicationJar().toAbsolutePath().toString() + + List command = [ + javaPath(), + "-jar", + applicationJar, + "--server.port=${httpPort}" as String + ] + + List jvmOptions = new ArrayList<>() + jvmOptions.addAll(defaultJavaProperties) + jvmOptions.addAll( + "-Ddd.writer.type=MultiWriter:TraceStructureWriter:${output.getAbsolutePath()},DDAgentWriter" as String, "-Ddd.jmxfetch.enabled=false", "-Ddd.appsec.enabled=true", "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug", "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug", "-Ddd.iast.enabled=true", "-Ddd.iast.request-sampling=100" ) - - - String javaToolOptions = envParams.stream().collect(Collectors.joining(" ")) - + injectOpenLibertyJvmOptions(applicationJar, jvmOptions) ProcessBuilder processBuilder = new ProcessBuilder(command) - processBuilder.environment().put("JAVA_TOOL_OPTIONS", javaToolOptions) + processBuilder.environment().put('WLP_JAR_EXTRACT_ROOT', 'application') processBuilder.directory(new File(buildDirectory)) return processBuilder } + Path copyApplicationJar() { + def applicationJar = Paths.get(openLibertyShadowJar) + def randomId = System.nanoTime() + def uniqueName = applicationJar.fileName.toString() + uniqueName = uniqueName.substring(0, uniqueName.length() - 4) + "-${randomId}.jar" + def specificationJar = applicationJar.parent.parent.resolve(uniqueName) + Files.copy(applicationJar, specificationJar) + return specificationJar + } + + void injectOpenLibertyJvmOptions(String applicationJar, List options) { + def appUri = URI.create("jar:file:$applicationJar") + try (def fs = FileSystems.newFileSystem(appUri, [:])) { + def jvmOptionFile = fs.getPath( 'wlp', 'usr', 'servers', 'defaultServer', 'jvm.options') + try (def writer = Files.newBufferedWriter(jvmOptionFile)) { + options.each { + writer.write(it) + writer.newLine() + } + } + } + } + @Override File createTemporaryFile() { return new File("${buildDirectory}/tmp/springboot-openliberty.out") From a62e471f06a1808cc0a9b96c3cf0e03c2a666c65 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Fri, 29 Nov 2024 10:14:24 +0000 Subject: [PATCH 082/106] Avoids NoClassDefFoundError: Could not initialize class DDSpanLink$EncoderHolder in Graal native-image (#8036) Both fromJson and toJson methods need to be registered, do the same for other JSON entries to be consistent. Also declare some JsonRule types need reflective access for a related issue using DD_TRACE_SAMPLING_RULES --- .../dd-java-agent/reflect-config.json | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json b/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json index ddefd1f2561..b65c1250a5f 100644 --- a/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json +++ b/dd-java-agent/agent-bootstrap/src/main/resources/META-INF/native-image/com.datadoghq/dd-java-agent/reflect-config.json @@ -38,24 +38,42 @@ { "name" : "datadog.trace.agent.common.sampling.SpanSamplingRules$RuleAdapter", "methods": [ - {"name": "fromJson"} + {"name": "fromJson"}, + {"name": "toJson"} ] }, + { + "name" : "datadog.trace.agent.common.sampling.SpanSamplingRules$JsonRule", + "allDeclaredConstructors" : true, + "allPublicConstructors" : true, + "allDeclaredFields" : true, + "allPublicFields" : true + }, { "name" : "datadog.trace.agent.common.sampling.TraceSamplingRules$RuleAdapter", "methods": [ - {"name": "fromJson"} + {"name": "fromJson"}, + {"name": "toJson"} ] }, + { + "name" : "datadog.trace.agent.common.sampling.TraceSamplingRules$JsonRule", + "allDeclaredConstructors" : true, + "allPublicConstructors" : true, + "allDeclaredFields" : true, + "allPublicFields" : true + }, { "name" : "datadog.trace.agent.core.TracingConfigPoller$TracingSamplingRulesAdapter", "methods": [ - {"name": "fromJson"} + {"name": "fromJson"}, + {"name": "toJson"} ] }, { "name" : "datadog.trace.agent.core.DDSpanLink$SpanLinkAdapter", "methods": [ + {"name": "fromSpanLinkJson"}, {"name": "toSpanLinkJson"} ] }, From b1bfb133d40b6f2ff47c2abb9f9e7168f6686014 Mon Sep 17 00:00:00 2001 From: Douglas Q Hawkins Date: Fri, 29 Nov 2024 05:21:44 -0500 Subject: [PATCH 083/106] feat(smoke-tests): Adding crash tracking (#7855) * Excluding J9 * Improving PortUtils to exitCode when process ends abnormally * Improving error reporting when process fails to start Wrapped PortUtils.waitForPortToOpen with exception handling, when exception is raised log file indicating error is added to exception message * Suppressed FileNotException in cleanUpSpec, when process exits abormally since no file is expected and it creates noise * Clarifying exception message * Refining exception suppression, some tests clean-up with test processes still running? * Adding ability to selectively suppress crash tracking * Adding some sanity checks that test processes are up and running as expected * Reworking exception handling logic around verifyLog * Modifying exception handling logic around verifyLog in response to review feedback * When process is alive or exited normally, the exception flows through as is * When process exited abnormally, the exception is wrapped in another exception that indicates the abnormal termination --- .../trace/agent/test/utils/PortUtils.java | 12 ++++++++- .../smoketest/AbstractServerSmokeTest.groovy | 25 +++++++++++++++++-- .../smoketest/AbstractSmokeTest.groovy | 18 ++++++++++++- .../datadog/smoketest/ProcessManager.groovy | 12 +++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java index 3f57d25666a..3ec28c72cd5 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/PortUtils.java @@ -115,7 +115,17 @@ public static void waitForPortToOpen( } if (!process.isAlive()) { - throw new RuntimeException("Process died before port " + port + " was opened"); + int exitCode = process.exitValue(); + if (exitCode != 0) { + throw new RuntimeException( + "Process exited abnormally exitCode=" + + exitCode + + " before port=" + + port + + " was opened"); + } else { + throw new RuntimeException("Process finished before port=" + port + " was opened"); + } } if (isPortOpen(port)) { diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy index a71b32de9cb..24f995bfa86 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractServerSmokeTest.groovy @@ -67,7 +67,12 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest { (0.. def port = httpPorts[idx] def process = testedProcesses[idx] - PortUtils.waitForPortToOpen(port, 240, TimeUnit.SECONDS, process) + + try { + PortUtils.waitForPortToOpen(port, 240, TimeUnit.SECONDS, process) + } catch ( Exception e ) { + throw new RuntimeException(e.getMessage() + " - log file " + logFilePaths[idx], e) + } } } @@ -77,7 +82,23 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest { if (null != (outputFile = outputs[idx])) { // check the structures written out to the log, // and fail the run if anything unexpected was recorded - verifyLog(idx, outputFile) + try { + verifyLog(idx, outputFile) + } catch (FileNotFoundException e) { + if (testedProcesses[idx].isAlive()) { + throw e + } + def exitCode = testedProcesses[idx].exitValue() + if (exitCode == 0) { + throw e + } else { + def logFile = logFilePaths[idx] + // highlight when process exited abnormally, since that may have contributed + // to the log verification failure + throw new RuntimeException( + "Server process exited abnormally - exit code: ${exitCode}; check log file: ${logFile}", e) + } + } } } } diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index 092c5b84fb9..423ab6de925 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -164,13 +164,18 @@ abstract class AbstractSmokeTest extends ProcessManager { "-Ddd.version=${VERSION}" ] + def testCrashTracking() { + return true + } def javaProperties() { + def tmpDir = "/tmp" + def ret = [ "${getMaxMemoryArgumentForFork()}", "${getMinMemoryArgumentForFork()}", "-javaagent:${shadowJarPath}", - isIBM ? "-Xdump:directory=/tmp" : "-XX:ErrorFile=/tmp/hs_err_pid%p.log", + isIBM ? "-Xdump:directory=${tmpDir}" : "-XX:ErrorFile=${tmpDir}/hs_err_pid%p.log", "-Ddd.trace.agent.port=${server.address.port}", "-Ddd.env=${ENV}", "-Ddd.version=${VERSION}", @@ -190,9 +195,20 @@ abstract class AbstractSmokeTest extends ProcessManager { if (testTelemetry()) { ret += "-Ddd.telemetry.heartbeat.interval=5" } + // DQH - Nov 2024 - skipping for J9 which doesn't have full crash tracking support + if (testCrashTracking() && !Platform.isJ9()) { + def extension = getScriptExtension() + ret += "-XX:OnError=\"${tmpDir}/dd_crash_uploader.${extension} %p\"" + // Unlike crash tracking smoke test, keep the default delay; otherwise, otherwise other tests will fail + // ret += "-Ddd.dogstatsd.start-delay=0" + } ret as String[] } + static String getScriptExtension() { + return Platform.isWindows() ? "bat" : "sh" + } + def inferServiceName() { true } diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy index 3240620fd70..f2993c256f5 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy @@ -196,6 +196,18 @@ abstract class ProcessManager extends Specification { outputThreads.captureOutput(p, new File(logFilePaths[idx])) } testedProcess = numberOfProcesses == 1 ? testedProcesses[0] : null + + + (0.. + def curProc = testedProcesses[idx] + + if ( !curProc.isAlive() && curProc.exitValue() != 0 ) { + def exitCode = curProc.exitValue() + def logFile = logFilePaths[idx] + + throw new RuntimeException("Process exited abormally - exitCode:${exitCode}; logFile=${logFile}") + } + } } String javaPath() { From 9f01834ab718c3d1c07c1ca44ca98e2d6eb40a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Vidal=20Dom=C3=ADnguez?= <60353145+Mariovido@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:40:20 +0100 Subject: [PATCH 084/106] Increase IAST propagation to StringBuilder subSequence (#8026) --- .../java/lang/StringBuilderCallSite.java | 17 +++++++ .../lang/StringBuilderCallSiteTest.groovy | 44 ++++++------------- .../bar/TestAbstractStringBuilderSuite.java | 6 +++ .../java/foo/bar/TestStringBufferSuite.java | 15 ++++++- .../java/foo/bar/TestStringBuilderSuite.java | 15 ++++++- 5 files changed, 63 insertions(+), 34 deletions(-) diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java index 80feb171f2a..4fa3ff9e017 100644 --- a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java +++ b/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java @@ -139,4 +139,21 @@ public static String afterSubstring( } return result; } + + @CallSite.After("java.lang.CharSequence java.lang.StringBuilder.subSequence(int, int)") + public static CharSequence afterSubSequence( + @CallSite.This final CharSequence self, + @CallSite.Argument final int beginIndex, + @CallSite.Argument final int endIndex, + @CallSite.Return final CharSequence result) { + final StringModule module = InstrumentationBridge.STRING; + if (module != null) { + try { + module.onStringSubSequence(self, beginIndex, endIndex, result); + } catch (final Throwable e) { + module.onUnexpectedException("afterSubSequence threw", e); + } + } + return result; + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy index a9680db938f..4d5de890f0a 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy @@ -174,13 +174,13 @@ class StringBuilderCallSiteTest extends AgentTestRunner { ex.stackTrace.find { it.className == StringBuilderCallSite.name } == null } - def 'test string builder substring call site'() { + def 'test string #type substring call site'() { setup: final iastModule = Mock(StringModule) InstrumentationBridge.registerIastModule(iastModule) when: - final result = TestStringBuilderSuite.substring(param, beginIndex) + final result = suite.substring(param, beginIndex) then: result == expected @@ -188,35 +188,18 @@ class StringBuilderCallSiteTest extends AgentTestRunner { 0 * _ where: - param | beginIndex | expected - sb('012345') | 1 | '12345' + type | suite | param | beginIndex | expected + "builder" | new TestStringBuilderSuite() | sb('012345') | 1 | '12345' + "buffer" | new TestStringBufferSuite() | sbf('012345') | 1 | '12345' } - def 'test string buffer substring call site'() { + def 'test string #type substring with endIndex call site'() { setup: final iastModule = Mock(StringModule) InstrumentationBridge.registerIastModule(iastModule) when: - final result = TestStringBufferSuite.substring(param, beginIndex) - - then: - result == expected - 1 * iastModule.onStringSubSequence(param, beginIndex, param.length(), expected) - 0 * _ - - where: - param | beginIndex | expected - sbf('012345') | 1 | '12345' - } - - def 'test string builder substring with endIndex call site'() { - setup: - final iastModule = Mock(StringModule) - InstrumentationBridge.registerIastModule(iastModule) - - when: - final result = TestStringBuilderSuite.substring(param, beginIndex, endIndex) + final result = suite.substring(param, beginIndex, endIndex) then: result == expected @@ -224,17 +207,18 @@ class StringBuilderCallSiteTest extends AgentTestRunner { 0 * _ where: - param | beginIndex | endIndex | expected - sb('012345') | 1 | 5 | '1234' + type | suite | param | beginIndex | endIndex | expected + "builder" | new TestStringBuilderSuite() | sb('012345') | 1 | 5 | '1234' + "buffer" | new TestStringBufferSuite() | sbf('012345') | 1 | 5 | '1234' } - def 'test string buffer substring with endIndex call site'() { + def 'test string #type subSequence with endIndex call site'() { setup: final iastModule = Mock(StringModule) InstrumentationBridge.registerIastModule(iastModule) when: - final result = TestStringBufferSuite.substring(param, beginIndex, endIndex) + final result = suite.subSequence(param, beginIndex, endIndex) then: result == expected @@ -242,8 +226,8 @@ class StringBuilderCallSiteTest extends AgentTestRunner { 0 * _ where: - param | beginIndex | endIndex | expected - sbf('012345') | 1 | 5 | '1234' + type | suite | param | beginIndex | endIndex | expected + "builder" | new TestStringBuilderSuite() | sb('012345') | 1 | 5 | '1234' } private static class BrokenToString { diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java index 9fbf35809d4..9a3dbaab202 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java @@ -12,5 +12,11 @@ public interface TestAbstractStringBuilderSuite { void append(final E target, final Object param); + String substring(final E self, final int beginIndex, final int endIndex); + + String substring(final E self, final int beginIndex); + + CharSequence subSequence(final E self, final int beginIndex, final int endIndex); + String toString(final E target); } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java index 94b7f04e732..7f9f488870a 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java @@ -52,17 +52,28 @@ public String toString(final StringBuffer buffer) { return result; } - public static String substring(StringBuffer self, int beginIndex, int endIndex) { + @Override + public String substring(final StringBuffer self, final int beginIndex, final int endIndex) { LOGGER.debug("Before string buffer substring {} from {} to {}", self, beginIndex, endIndex); final String result = self.substring(beginIndex, endIndex); LOGGER.debug("After string buffer substring {}", result); return result; } - public static String substring(StringBuffer self, int beginIndex) { + @Override + public String substring(final StringBuffer self, final int beginIndex) { LOGGER.debug("Before string buffer substring {} from {}", self, beginIndex); final String result = self.substring(beginIndex); LOGGER.debug("After string buffer substring {}", result); return result; } + + @Override + public CharSequence subSequence( + final StringBuffer self, final int beginIndex, final int endIndex) { + LOGGER.debug("Before string builder subSequence {} from {} to {}", self, beginIndex, endIndex); + final CharSequence result = self.subSequence(beginIndex, endIndex); + LOGGER.debug("After string builder subSequence {}", result); + return result; + } } diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java index 1edd8b1500b..a613773a3a4 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java +++ b/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java @@ -77,17 +77,28 @@ public String plus(final Object... items) { return result; } - public static String substring(StringBuilder self, int beginIndex, int endIndex) { + @Override + public String substring(final StringBuilder self, final int beginIndex, final int endIndex) { LOGGER.debug("Before string builder substring {} from {} to {}", self, beginIndex, endIndex); final String result = self.substring(beginIndex, endIndex); LOGGER.debug("After string builder substring {}", result); return result; } - public static String substring(StringBuilder self, int beginIndex) { + @Override + public String substring(final StringBuilder self, final int beginIndex) { LOGGER.debug("Before string builder substring {} from {}", self, beginIndex); final String result = self.substring(beginIndex); LOGGER.debug("After string builder substring {}", result); return result; } + + @Override + public CharSequence subSequence( + final StringBuilder self, final int beginIndex, final int endIndex) { + LOGGER.debug("Before string builder subSequence {} from {} to {}", self, beginIndex, endIndex); + final CharSequence result = self.subSequence(beginIndex, endIndex); + LOGGER.debug("After string builder subSequence {}", result); + return result; + } } From 626485fbaf53cb93d9acbc53d03d82a96eba8dc6 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Mon, 2 Dec 2024 10:43:24 +0100 Subject: [PATCH 085/106] fix(smoke-tests): Fix crash tracking setup (#8037) --- .../groovy/datadog/smoketest/Jersey2SmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/Jersey3SmokeTest.groovy | 2 +- .../datadog/smoketest/PlayNettySmokeTest.groovy | 2 +- .../datadog/smoketest/PlayNettySmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/PlaySmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/PlaySmokeTest.groovy | 2 +- .../datadog/smoketest/Play28OTelSmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/PlaySmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/PlaySmokeTest.groovy | 2 +- .../test/groovy/smoketest/ResteasySmokeTest.groovy | 11 ++++++----- .../smoketest/SpringBootTomcatSmokeTest.groovy | 11 +++++++---- .../groovy/datadog/smoketest/AbstractSmokeTest.groovy | 2 +- .../groovy/datadog/smoketest/WildflySmokeTest.groovy | 11 +++++++---- 13 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy index 506a1f6c90b..120d34c2a08 100644 --- a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy +++ b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy @@ -21,7 +21,7 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest { if (Platform.isJavaVersionAtLeast(17)) { command.addAll((String[]) ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']) } - command.addAll((String[]) ['-jar', jarPath, httpPort]) + command.addAll(['-jar', jarPath, Integer.toString(httpPort)]) ProcessBuilder processBuilder = new ProcessBuilder(command) processBuilder.directory(new File(buildDirectory)) return processBuilder diff --git a/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy b/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy index 529348fba98..4ee050d62f4 100644 --- a/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy +++ b/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy @@ -19,7 +19,7 @@ class Jersey3SmokeTest extends AbstractJerseySmokeTest { command.add(withSystemProperty('integration.grizzly.enabled', true)) //command.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000") //command.add("-Xdebug") - command.addAll((String[]) ['-jar', jarPath, httpPort]) + command.addAll(['-jar', jarPath, Integer.toString(httpPort)]) ProcessBuilder processBuilder = new ProcessBuilder(command) processBuilder.directory(new File(buildDirectory)) return processBuilder diff --git a/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy b/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy index a67d0c2397d..9559dfa3538 100644 --- a/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy +++ b/dd-smoke-tests/play-2.4/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy @@ -49,7 +49,7 @@ class PlayNettySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy b/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy index 5e786c6c8a6..b5ddcaad542 100644 --- a/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy +++ b/dd-smoke-tests/play-2.5/src/test/groovy/datadog/smoketest/PlayNettySmokeTest.groovy @@ -47,7 +47,7 @@ class PlayNettySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy index b8a0a865e08..4e6f0877ff4 100644 --- a/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy +++ b/dd-smoke-tests/play-2.6/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy @@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy index e008b0828a5..c1fa4de7883 100644 --- a/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy +++ b/dd-smoke-tests/play-2.7/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy @@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy b/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy index 052b22f80e9..c814e0e4de6 100644 --- a/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy +++ b/dd-smoke-tests/play-2.8-otel/src/test/groovy/datadog/smoketest/Play28OTelSmokeTest.groovy @@ -47,7 +47,7 @@ abstract class Play28OTelSmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.8-split-routes/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.8-split-routes/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy index f44b1fad512..370cc9992ee 100644 --- a/dd-smoke-tests/play-2.8-split-routes/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy +++ b/dd-smoke-tests/play-2.8-split-routes/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy @@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy b/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy index 03c645345bd..66010d3832c 100644 --- a/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy +++ b/dd-smoke-tests/play-2.8/src/test/groovy/datadog/smoketest/PlaySmokeTest.groovy @@ -47,7 +47,7 @@ abstract class PlaySmokeTest extends AbstractServerSmokeTest { new ProcessBuilder("${playDirectory}/bin/${command}") processBuilder.directory(playDirectory) processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") + defaultJavaProperties.collect({ it.replace(' ', '\\ ')}).join(" ") + " -Dconfig.file=${playDirectory}/conf/application.conf" + " -Dhttp.port=${httpPort}" + " -Dhttp.address=127.0.0.1" diff --git a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy index f24340966a5..b53ae383594 100644 --- a/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy +++ b/dd-smoke-tests/resteasy/src/test/groovy/smoketest/ResteasySmokeTest.groovy @@ -2,6 +2,7 @@ package smoketest import datadog.smoketest.AbstractIastServerSmokeTest import datadog.trace.api.Platform +import datadog.trace.api.config.IastConfig import okhttp3.Request import spock.lang.IgnoreIf @@ -18,14 +19,14 @@ class ResteasySmokeTest extends AbstractIastServerSmokeTest { command.add(javaPath()) command.addAll(defaultJavaProperties) command.addAll([ - withSystemProperty(datadog.trace.api.config.IastConfig.IAST_ENABLED, true), - withSystemProperty(datadog.trace.api.config.IastConfig.IAST_DETECTION_MODE, 'FULL'), - withSystemProperty(datadog.trace.api.config.IastConfig.IAST_DEBUG_ENABLED, true) + withSystemProperty(IastConfig.IAST_ENABLED, true), + withSystemProperty(IastConfig.IAST_DETECTION_MODE, 'FULL'), + withSystemProperty(IastConfig.IAST_DEBUG_ENABLED, true) ]) if (Platform.isJavaVersionAtLeast(17)) { - command.addAll((String[]) ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]) + command.addAll(["--add-opens", "java.base/java.lang=ALL-UNNAMED"]) } - command.addAll((String[]) ["-jar", jarPath, httpPort]) + command.addAll(["-jar", jarPath, Integer.toString(httpPort)]) ProcessBuilder processBuilder = new ProcessBuilder(command) processBuilder.directory(new File(buildDirectory)) } diff --git a/dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy b/dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy index 9236c7d441b..53a88721c75 100644 --- a/dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy +++ b/dd-smoke-tests/springboot-tomcat/src/test/groovy/datadog/smoketest/SpringBootTomcatSmokeTest.groovy @@ -24,7 +24,7 @@ class SpringBootTomcatSmokeTest extends AbstractServerSmokeTest { def permissions = new HashSet<>(Files.getPosixFilePermissions(catalinaPath)) permissions.add(PosixFilePermission.OWNER_EXECUTE) Files.setPosixFilePermissions(catalinaPath, permissions) - } catch (Exception e) { + } catch (Exception ignored) { // not posix ... continue } Files.copy(springBootShadowWar, tomcatDirectory.resolve("webapps/smoke.war"), StandardCopyOption.REPLACE_EXISTING) @@ -40,9 +40,12 @@ class SpringBootTomcatSmokeTest extends AbstractServerSmokeTest { ProcessBuilder processBuilder = new ProcessBuilder("bin/catalina.sh", "run") processBuilder.directory(tomcatDirectory.toFile()) - defaultJavaProperties += "-Ddd.writer.type=TraceStructureWriter:${output.getAbsolutePath()}:includeService:includeResource" - defaultJavaProperties += "-Ddd.integration.spring-boot.enabled=true" - processBuilder.environment().put("CATALINA_OPTS", defaultJavaProperties.join(" ")) + List catalinaOpts = [ + *defaultJavaProperties, + "-Ddd.writer.type=TraceStructureWriter:${output.getAbsolutePath()}:includeService:includeResource", + "-Ddd.integration.spring-boot.enabled=true" + ] + processBuilder.environment().put("CATALINA_OPTS", catalinaOpts.collect({ it.replace(' ', '\\ ')}).join(" ")) return processBuilder } diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index 423ab6de925..17e33ce4aa4 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -198,7 +198,7 @@ abstract class AbstractSmokeTest extends ProcessManager { // DQH - Nov 2024 - skipping for J9 which doesn't have full crash tracking support if (testCrashTracking() && !Platform.isJ9()) { def extension = getScriptExtension() - ret += "-XX:OnError=\"${tmpDir}/dd_crash_uploader.${extension} %p\"" + ret += "-XX:OnError=${tmpDir}/dd_crash_uploader.${extension} %p" // Unlike crash tracking smoke test, keep the default delay; otherwise, otherwise other tests will fail // ret += "-Ddd.dogstatsd.start-delay=0" } diff --git a/dd-smoke-tests/wildfly/src/test/groovy/datadog/smoketest/WildflySmokeTest.groovy b/dd-smoke-tests/wildfly/src/test/groovy/datadog/smoketest/WildflySmokeTest.groovy index 924adb9e3fb..5da6a415260 100644 --- a/dd-smoke-tests/wildfly/src/test/groovy/datadog/smoketest/WildflySmokeTest.groovy +++ b/dd-smoke-tests/wildfly/src/test/groovy/datadog/smoketest/WildflySmokeTest.groovy @@ -20,10 +20,13 @@ class WildflySmokeTest extends AbstractServerSmokeTest { ProcessBuilder processBuilder = new ProcessBuilder("${wildflyDirectory}/bin/standalone.sh") processBuilder.directory(wildflyDirectory) - processBuilder.environment().put("JAVA_OPTS", - defaultJavaProperties.join(" ") - + " -Djboss.http.port=${httpPort} -Djboss.https.port=${httpsPort}" - + " -Djboss.management.http.port=${managementPort}") + List javaOpts = [ + *defaultJavaProperties, + "-Djboss.http.port=${httpPort}", + "-Djboss.https.port=${httpsPort}", + "-Djboss.management.http.port=${managementPort}" + ] + processBuilder.environment().put("JAVA_OPTS", javaOpts.collect({ it.replace(' ', '\\ ')}).join(' ')) return processBuilder } From cdee1c878d5e7b03215e0637eb04b396fcab77a8 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Mon, 2 Dec 2024 12:04:48 +0100 Subject: [PATCH 086/106] Tracing of setup and teardown actions in JUnit 4 (#8030) --- .../junit-4.10/junit-4.13/build.gradle | 28 ++ .../junit-4.10/junit-4.13/gradle.lockfile | 228 ++++++++++++++ .../JUnit4BeforeAfterInstrumentation.java | 69 +++++ .../JUnit4BeforeAfterOperationsTracer.java | 41 +++ .../src/test/groovy/JUnit413Test.groovy | 59 ++++ .../java/org/example/TestFailedAfter.java | 23 ++ .../org/example/TestFailedAfterClass.java | 23 ++ .../org/example/TestFailedAfterParam.java | 40 +++ .../java/org/example/TestFailedBefore.java | 23 ++ .../org/example/TestFailedBeforeClass.java | 23 ++ .../org/example/TestFailedBeforeParam.java | 40 +++ .../org/example/TestSucceedBeforeAfter.java | 25 ++ .../TestSucceedBeforeClassAfterClass.java | 25 ++ .../TestSucceedBeforeParamAfterParam.java | 38 +++ .../test-failed-after-class/coverages.ftl | 1 + .../test-failed-after-class/events.ftl | 224 ++++++++++++++ .../test-failed-after-param/coverages.ftl | 1 + .../test-failed-after-param/events.ftl | 289 ++++++++++++++++++ .../resources/test-failed-after/coverages.ftl | 1 + .../resources/test-failed-after/events.ftl | 249 +++++++++++++++ .../test-failed-before-class/coverages.ftl | 1 + .../test-failed-before-class/events.ftl | 130 ++++++++ .../test-failed-before-param/coverages.ftl | 1 + .../test-failed-before-param/events.ftl | 193 ++++++++++++ .../test-failed-before/coverages.ftl | 1 + .../resources/test-failed-before/events.ftl | 249 +++++++++++++++ .../test-succeed-before-after/coverages.ftl | 1 + .../test-succeed-before-after/events.ftl | 277 +++++++++++++++++ .../coverages.ftl | 1 + .../events.ftl | 239 +++++++++++++++ .../coverages.ftl | 1 + .../events.ftl | 283 +++++++++++++++++ gradle/configure_tests.gradle | 1 + settings.gradle | 1 + 34 files changed, 2829 insertions(+) create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl create mode 100644 dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle new file mode 100644 index 00000000000..0de58ffa9c0 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle @@ -0,0 +1,28 @@ +apply from: "$rootDir/gradle/java.gradle" + +muzzle { + pass { + group = 'junit' + module = 'junit' + versions = '[4.13,5)' + } +} + +addTestSuiteForDir('latestDepTest', 'test') + +dependencies { + implementation project(':dd-java-agent:instrumentation:junit-4.10') + compileOnly group: 'junit', name: 'junit', version: '4.13' + + testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility')) + + // version used below is not the minimum one that we support, + // but the tests need to use it in order to be compliant with Spock 2.x + testImplementation(group: 'junit', name: 'junit') { + version { + strictly '4.13.2' + } + } + + latestDepTestImplementation group: 'junit', name: 'junit', version: '4.+' +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile new file mode 100644 index 00000000000..092cf2a268d --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile @@ -0,0 +1,228 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc +com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4=zinc +com.eed3si9n:sjson-new-core_2.13:0.9.1=zinc +com.eed3si9n:sjson-new-scalajson_2.13:0.9.1=zinc +com.fasterxml.jackson.core:jackson-annotations:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.16.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs:4.7.3=spotbugs +com.github.stefanbirkner:system-rules:1.19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:0.10=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.9.1=spotbugs +com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.8.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.lmax:disruptor:3.4.2=zinc +com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.swoval:file-tree-views:2.1.10=zinc +com.thoughtworks.qdox:qdox:1.12.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +com.vaadin.external.google:android-json:0.0.20131108.vaadin1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.15=spotbugs +commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.1=compileClasspath +info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.github.java-diff-utils:java-diff-utils:4.12=zinc +io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:1.2.0=spotbugs +jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath +junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.13.0=zinc +net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.13.0=zinc +net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.minidev:json-smart:2.4.10=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.openhft:zero-allocation-hashing:0.10.1=zinc +net.sf.saxon:Saxon-HE:11.4=spotbugs +org.apache.ant:ant-antlr:1.10.12=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant-antlr:1.9.15=codenarc +org.apache.ant:ant-junit:1.10.12=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant-junit:1.9.15=codenarc +org.apache.ant:ant-launcher:1.10.12=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant:1.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.bcel:bcel:6.5.0=spotbugs +org.apache.commons:commons-lang3:3.12.0=spotbugs +org.apache.commons:commons-text:1.10.0=spotbugs +org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.logging.log4j:log4j-api:2.17.1=zinc +org.apache.logging.log4j:log4j-api:2.19.0=spotbugs +org.apache.logging.log4j:log4j-core:2.17.1=zinc +org.apache.logging.log4j:log4j-core:2.19.0=spotbugs +org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath +org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.codehaus.groovy:groovy-all:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:2.5.14=codenarc +org.codehaus.groovy:groovy-ant:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:2.5.14=codenarc +org.codehaus.groovy:groovy-json:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:2.5.14=codenarc +org.codehaus.groovy:groovy-templates:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:2.5.14=codenarc +org.codehaus.groovy:groovy-xml:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:2.5.14=codenarc +org.codehaus.groovy:groovy:3.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.codenarc:CodeNarc:2.2.0=codenarc +org.dom4j:dom4j:2.1.3=spotbugs +org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.freemarker:freemarker:2.3.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.fusesource.jansi:jansi:2.1.0=zinc +org.gmetrics:GMetrics:1.1=codenarc +org.hamcrest:hamcrest-core:1.3=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.core:0.8.12=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.report:0.8.12=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.6.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jline:jline-terminal-jansi:3.19.0=zinc +org.jline:jline-terminal-jna:3.19.0=zinc +org.jline:jline-terminal:3.19.0=zinc +org.jline:jline:3.22.0=zinc +org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.1=spotbugs +org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.4=spotbugs +org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm-commons:9.4=spotbugs +org.ow2.asm:asm-commons:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-tree:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.4=spotbugs +org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm:9.4=spotbugs +org.ow2.asm:asm:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc +org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=zinc +org.scala-lang.modules:scala-xml_2.13:2.1.0=zinc +org.scala-lang:scala-compiler:2.13.11=zinc +org.scala-lang:scala-library:2.13.10=testCompileClasspath,testRuntimeClasspath +org.scala-lang:scala-library:2.13.11=zinc +org.scala-lang:scala-library:2.13.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scala-lang:scala-library:2.13.6=compileClasspath +org.scala-lang:scala-reflect:2.13.11=zinc +org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc +org.scala-sbt:collections_2.13:1.9.2=zinc +org.scala-sbt:compiler-bridge_2.13:1.9.3=zinc +org.scala-sbt:compiler-interface:1.9.3=zinc +org.scala-sbt:core-macros_2.13:1.9.2=zinc +org.scala-sbt:io_2.13:1.9.1=zinc +org.scala-sbt:launcher-interface:1.4.2=zinc +org.scala-sbt:sbinary_2.13:0.5.1=zinc +org.scala-sbt:test-interface:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.scala-sbt:util-control_2.13:1.9.2=zinc +org.scala-sbt:util-interface:1.9.2=zinc +org.scala-sbt:util-logging_2.13:1.9.2=zinc +org.scala-sbt:util-position_2.13:1.9.2=zinc +org.scala-sbt:util-relation_2.13:1.9.2=zinc +org.scala-sbt:zinc-apiinfo_2.13:1.9.3=zinc +org.scala-sbt:zinc-classfile_2.13:1.9.3=zinc +org.scala-sbt:zinc-classpath_2.13:1.9.3=zinc +org.scala-sbt:zinc-compile-core_2.13:1.9.3=zinc +org.scala-sbt:zinc-core_2.13:1.9.3=zinc +org.scala-sbt:zinc-persist-core-assembly:1.9.3=zinc +org.scala-sbt:zinc-persist_2.13:1.9.3=zinc +org.scala-sbt:zinc_2.13:1.9.3=zinc +org.scalameta:junit-interface:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.scalameta:junit-interface:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit-diff_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit_2.13:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.scalameta:munit_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath +org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j +org.spockframework:spock-core:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:4.4.3=spotbugs +xml-apis:xml-apis:1.4.01=spotbugs +empty=scalaCompilerPlugins,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java new file mode 100644 index 00000000000..64fa95ca93c --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java @@ -0,0 +1,69 @@ +package datadog.trace.instrumentation.junit4; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import net.bytebuddy.asm.Advice; +import org.junit.runner.manipulation.InvalidOrderingException; +import org.junit.runner.manipulation.Ordering; +import org.junit.runners.model.FrameworkMethod; + +@AutoService(InstrumenterModule.class) +public class JUnit4BeforeAfterInstrumentation extends InstrumenterModule.CiVisibility + implements Instrumenter.ForKnownTypes { + + public JUnit4BeforeAfterInstrumentation() { + super("ci-visibility", "junit-4", "setup-teardown"); + } + + @Override + public String[] knownMatchingTypes() { + return new String[] { + "org.junit.internal.runners.statements.RunBefores", + "org.junit.internal.runners.statements.RunAfters", + "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunBeforeParams", + "org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters$RunAfterParams", + }; + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".JUnit4BeforeAfterOperationsTracer", + }; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("invokeMethod") + .and(takesArgument(0, named("org.junit.runners.model.FrameworkMethod"))), + JUnit4BeforeAfterInstrumentation.class.getName() + "$RunBeforesAftersAdvice"); + } + + public static class RunBeforesAftersAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static AgentScope startCallSpan(@Advice.Argument(0) final FrameworkMethod method) { + return JUnit4BeforeAfterOperationsTracer.startTrace(method.getMethod()); + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void finishCallSpan( + @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + JUnit4BeforeAfterOperationsTracer.endTrace(scope, throwable); + } + + // JUnit 4.13 and above + public static void muzzleCheck(final Ordering ord) { + try { + ord.apply(null); + } catch (InvalidOrderingException e) { + throw new RuntimeException(e); + } + } + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java new file mode 100644 index 00000000000..1e41f817349 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java @@ -0,0 +1,41 @@ +package datadog.trace.instrumentation.junit4; + +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import java.lang.reflect.Method; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.runners.Parameterized; + +public class JUnit4BeforeAfterOperationsTracer { + public static AgentScope startTrace(final Method method) { + final AgentSpan span = AgentTracer.startSpan("junit", method.getName()); + if (method.isAnnotationPresent(Before.class)) { + span.setTag(Tags.TEST_CALLBACK, "Before"); + } else if (method.isAnnotationPresent(After.class)) { + span.setTag(Tags.TEST_CALLBACK, "After"); + } else if (method.isAnnotationPresent(BeforeClass.class)) { + span.setTag(Tags.TEST_CALLBACK, "BeforeClass"); + } else if (method.isAnnotationPresent(AfterClass.class)) { + span.setTag(Tags.TEST_CALLBACK, "AfterClass"); + } else if (method.isAnnotationPresent(Parameterized.BeforeParam.class)) { + span.setTag(Tags.TEST_CALLBACK, "BeforeParam"); + } else if (method.isAnnotationPresent(Parameterized.AfterParam.class)) { + span.setTag(Tags.TEST_CALLBACK, "AfterParam"); + } + return AgentTracer.activateSpan(span); + } + + public static void endTrace(final AgentScope scope, final Throwable throwable) { + final AgentSpan span = scope.span(); + if (throwable != null) { + span.addThrowable(throwable); + } + scope.close(); + span.finish(); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy new file mode 100644 index 00000000000..a31d757f760 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy @@ -0,0 +1,59 @@ +import datadog.trace.api.DisableTestTrace +import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder +import junit.runner.Version +import org.example.TestFailedAfter +import org.example.TestFailedAfterClass +import org.example.TestFailedAfterParam +import org.example.TestFailedBefore +import org.example.TestFailedBeforeClass +import org.example.TestFailedBeforeParam +import org.example.TestSucceedBeforeAfter +import org.example.TestSucceedBeforeClassAfterClass +import org.example.TestSucceedBeforeParamAfterParam +import org.junit.runner.JUnitCore + +@DisableTestTrace(reason = "avoid self-tracing") +class JUnit413Test extends CiVisibilityInstrumentationTest { + + def runner = new JUnitCore() + + def "test #testcaseName"() { + runTests(tests) + + assertSpansData(testcaseName, expectedTracesCount) + + where: + testcaseName | tests | expectedTracesCount + "test-succeed-before-after" | [TestSucceedBeforeAfter] | 3 + "test-succeed-before-class-after-class" | [TestSucceedBeforeClassAfterClass] | 3 + "test-succeed-before-param-after-param" | [TestSucceedBeforeParamAfterParam] | 2 + "test-failed-before-class" | [TestFailedBeforeClass] | 1 + "test-failed-after-class" | [TestFailedAfterClass] | 3 + "test-failed-before" | [TestFailedBefore] | 3 + "test-failed-after" | [TestFailedAfter] | 3 + "test-failed-before-param" | [TestFailedBeforeParam] | 2 + "test-failed-after-param" | [TestFailedAfterParam] | 2 + } + + private void runTests(Collection> tests) { + TestEventsHandlerHolder.start() + try { + Class[] array = tests.toArray(new Class[0]) + runner.run(array) + } catch (Throwable ignored) { + // Ignored + } + TestEventsHandlerHolder.stop() + } + + @Override + String instrumentedLibraryName() { + return "junit4" + } + + @Override + String instrumentedLibraryVersion() { + return Version.id() + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java new file mode 100644 index 00000000000..7581a79c5ca --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java @@ -0,0 +1,23 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.After; +import org.junit.Test; + +public class TestFailedAfter { + @After + public void tearDown() { + throw new RuntimeException("testcase teardown failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java new file mode 100644 index 00000000000..24470257301 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java @@ -0,0 +1,23 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.AfterClass; +import org.junit.Test; + +public class TestFailedAfterClass { + @AfterClass + public static void tearDown() { + throw new RuntimeException("suite teardown failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java new file mode 100644 index 00000000000..6faee23ed5d --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java @@ -0,0 +1,40 @@ +package org.example; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class TestFailedAfterParam { + private final int num1; + private final int num2; + private final int sum; + + public TestFailedAfterParam(final int num1, final int num2, final int sum) { + this.num1 = num1; + this.num2 = num2; + this.sum = sum; + } + + @Parameterized.BeforeParam + public static void setup() {} + + @Parameterized.AfterParam + public static void tearDown() { + throw new RuntimeException("after param setup failed"); + } + + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}}); + } + + @Test + public void parameterized_test_succeed() { + assertEquals(num1 + num2, sum); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java new file mode 100644 index 00000000000..bca82898209 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java @@ -0,0 +1,23 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +public class TestFailedBefore { + @Before + public void setup() { + throw new RuntimeException("testcase setup failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java new file mode 100644 index 00000000000..a7b0c38b059 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java @@ -0,0 +1,23 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class TestFailedBeforeClass { + @BeforeClass + public static void setup() { + throw new RuntimeException("suite setup failed"); + } + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java new file mode 100644 index 00000000000..77f5b1a682b --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java @@ -0,0 +1,40 @@ +package org.example; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class TestFailedBeforeParam { + private final int num1; + private final int num2; + private final int sum; + + public TestFailedBeforeParam(final int num1, final int num2, final int sum) { + this.num1 = num1; + this.num2 = num2; + this.sum = sum; + } + + @Parameterized.BeforeParam + public static void setup() { + throw new RuntimeException("before param setup failed"); + } + + @Parameterized.AfterParam + public static void tearDown() {} + + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}}); + } + + @Test + public void parameterized_test_succeed() { + assertEquals(num1 + num2, sum); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java new file mode 100644 index 00000000000..347c4ce185c --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java @@ -0,0 +1,25 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class TestSucceedBeforeAfter { + @Before + public void setup() {} + + @After + public void tearDown() {} + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java new file mode 100644 index 00000000000..6c39c071486 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java @@ -0,0 +1,25 @@ +package org.example; + +import static org.junit.Assert.assertTrue; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class TestSucceedBeforeClassAfterClass { + @BeforeClass + public static void setup() {} + + @AfterClass + public static void tearDown() {} + + @Test + public void test_succeed() { + assertTrue(true); + } + + @Test + public void another_test_succeed() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java new file mode 100644 index 00000000000..a5ffd17a693 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java @@ -0,0 +1,38 @@ +package org.example; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class TestSucceedBeforeParamAfterParam { + private final int num1; + private final int num2; + private final int sum; + + public TestSucceedBeforeParamAfterParam(final int num1, final int num2, final int sum) { + this.num1 = num1; + this.num2 = num2; + this.sum = sum; + } + + @Parameterized.BeforeParam + public static void setup() {} + + @Parameterized.AfterParam + public static void tearDown() {} + + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][] {{0, 0, 0}, {1, 1, 2}}); + } + + @Test + public void parameterized_test_succeed() { + assertEquals(num1 + num2, sum); + } +} diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl new file mode 100644 index 00000000000..25474df8081 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl @@ -0,0 +1,224 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedAfterClass", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 1, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "span.kind" : "test_suite_end", + "error.message" : ${content_meta_error_message}, + "test.suite" : "org.example.TestFailedAfterClass", + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterClass.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterClass", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterClass.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterClass", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "AfterClass", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl new file mode 100644 index 00000000000..33a0c175bfd --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl @@ -0,0 +1,289 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedAfterParam", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedAfterParam", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "parameterized_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "parameterized_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterParam", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[0]\"}}", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "parameterized_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "parameterized_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfterParam", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[1]\"}}", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "error.stack" : ${content_meta_error_stack}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl new file mode 100644 index 00000000000..bf98663d9e0 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl @@ -0,0 +1,249 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedAfter", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedAfter", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfter.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfter", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedAfter.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedAfter", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack_2}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_3}, + "test.callback" : "After", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_4}, + "test.callback" : "After", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl new file mode 100644 index 00000000000..ee89aa70ba7 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl @@ -0,0 +1,130 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedBeforeClass", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 1, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "span.kind" : "test_suite_end", + "error.message" : ${content_meta_error_message}, + "test.suite" : "org.example.TestFailedBeforeClass", + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "BeforeClass", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl new file mode 100644 index 00000000000..2399e8b5b57 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl @@ -0,0 +1,193 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "skip", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "skip", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedBeforeParam", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "skip", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedBeforeParam", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "error.stack" : ${content_meta_error_stack}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 1, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "error.stack" : ${content_meta_error_stack_2}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl new file mode 100644 index 00000000000..8ffd3be0f0e --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl @@ -0,0 +1,249 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "fail", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestFailedBefore", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "fail", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestFailedBefore", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedBefore.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedBefore", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestFailedBefore.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 1, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "fail", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestFailedBefore", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "error.type" : "java.lang.RuntimeException", + "_dd.profiling.ctx" : "test", + "error.message" : ${content_meta_error_message}, + "error.stack" : ${content_meta_error_stack_2}, + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_3}, + "test.callback" : "Before", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 1, + "metrics" : { }, + "meta" : { + "error.stack" : ${content_meta_error_stack_4}, + "test.callback" : "Before", + "library_version" : ${content_meta_library_version}, + "error.type" : "java.lang.RuntimeException", + "env" : "none", + "error.message" : ${content_meta_error_message} + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl new file mode 100644 index 00000000000..4d08b025bb8 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl @@ -0,0 +1,277 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestSucceedBeforeAfter", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestSucceedBeforeAfter", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeAfter.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeAfter", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeAfter.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeAfter", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "test.callback" : "Before", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "test.callback" : "Before", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_span_id_2}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "test.callback" : "After", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_span_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "test.callback" : "After", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl new file mode 100644 index 00000000000..03682ac982c --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl @@ -0,0 +1,239 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestSucceedBeforeClassAfterClass", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestSucceedBeforeClassAfterClass", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeClassAfterClass.another_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "another_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "another_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeClassAfterClass", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeClassAfterClass.test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeClassAfterClass", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "test.callback" : "BeforeClass", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.callback" : "AfterClass", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl new file mode 100644 index 00000000000..8878e547a79 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl @@ -0,0 +1 @@ +[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl new file mode 100644 index 00000000000..d74bcbb5294 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl @@ -0,0 +1,283 @@ +[ { + "type" : "test_session_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_session", + "resource" : "junit-4.13", + "start" : ${content_start}, + "duration" : ${content_duration}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid}, + "test.type" : "test", + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.status" : "pass", + "test_session.name" : "session-name", + "language" : "jvm", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "_dd.profiling.ctx" : "test", + "span.kind" : "test_session_end", + "runtime-id" : ${content_meta_runtime_id}, + "test.command" : "junit-4.13", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_module_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_module", + "resource" : "junit-4.13", + "start" : ${content_start_2}, + "duration" : ${content_duration_2}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_2}, + "test.type" : "test", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_module_end", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test_suite_end", + "version" : 1, + "content" : { + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test_suite", + "resource" : "org.example.TestSucceedBeforeParamAfterParam", + "start" : ${content_start_3}, + "duration" : ${content_duration_3}, + "error" : 0, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_3}, + "test.type" : "test", + "test.source.file" : "dummy_source_path", + "test.module" : "junit-4.13", + "test.status" : "pass", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "component" : "junit", + "span.kind" : "test_suite_end", + "test.suite" : "org.example.TestSucceedBeforeParamAfterParam", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id}, + "span_id" : ${content_span_id}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", + "start" : ${content_start_4}, + "duration" : ${content_duration_4}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "parameterized_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "parameterized_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeParamAfterParam", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[0]\"}}", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "test", + "version" : 2, + "content" : { + "trace_id" : ${content_trace_id_2}, + "span_id" : ${content_span_id_2}, + "parent_id" : ${content_parent_id}, + "test_session_id" : ${content_test_session_id}, + "test_module_id" : ${content_test_module_id}, + "test_suite_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "junit.test", + "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", + "start" : ${content_start_5}, + "duration" : ${content_duration_5}, + "error" : 0, + "metrics" : { + "process_id" : ${content_metrics_process_id}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "meta" : { + "_dd.tracer_host" : ${content_meta__dd_tracer_host}, + "test.source.file" : "dummy_source_path", + "test.source.method" : "parameterized_test_succeed()V", + "test.module" : "junit-4.13", + "test.status" : "pass", + "language" : "jvm", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "library_version" : ${content_meta_library_version}, + "test.name" : "parameterized_test_succeed", + "span.kind" : "test", + "test.suite" : "org.example.TestSucceedBeforeParamAfterParam", + "runtime-id" : ${content_meta_runtime_id}, + "test.type" : "test", + "test_session.name" : "session-name", + "env" : "none", + "dummy_ci_tag" : "dummy_ci_tag_value", + "test.parameters" : "{\"metadata\":{\"test_name\":\"parameterized_test_succeed[1]\"}}", + "component" : "junit", + "_dd.profiling.ctx" : "test", + "test.framework_version" : ${content_meta_test_framework_version}, + "test.framework" : "junit4" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_3}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_6}, + "duration" : ${content_duration_6}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_4}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_4}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "setup", + "resource" : "setup", + "start" : ${content_start_7}, + "duration" : ${content_duration_7}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_5}, + "test.callback" : "BeforeParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_5}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_8}, + "duration" : ${content_duration_8}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_6}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +}, { + "type" : "span", + "version" : 1, + "content" : { + "trace_id" : ${content_test_session_id}, + "span_id" : ${content_span_id_6}, + "parent_id" : ${content_test_suite_id}, + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "name" : "tearDown", + "resource" : "tearDown", + "start" : ${content_start_9}, + "duration" : ${content_duration_9}, + "error" : 0, + "metrics" : { }, + "meta" : { + "_dd.p.tid" : ${content_meta__dd_p_tid_7}, + "test.callback" : "AfterParam", + "library_version" : ${content_meta_library_version}, + "env" : "none" + } + } +} ] \ No newline at end of file diff --git a/gradle/configure_tests.gradle b/gradle/configure_tests.gradle index a06eeaf4ddb..79efc51c7e5 100644 --- a/gradle/configure_tests.gradle +++ b/gradle/configure_tests.gradle @@ -5,6 +5,7 @@ def isTestingInstrumentation(Project project) { return [ "junit-4.10", "cucumber-junit-4", + "junit-4.13", "munit-junit-4", "junit-5.3", "junit-5.8", diff --git a/settings.gradle b/settings.gradle index 60456d9c0be..fb2bb69f846 100644 --- a/settings.gradle +++ b/settings.gradle @@ -336,6 +336,7 @@ include ':dd-java-agent:instrumentation:org-json' include ':dd-java-agent:instrumentation:jsp-2.3' include ':dd-java-agent:instrumentation:junit-4.10' include ':dd-java-agent:instrumentation:junit-4.10:cucumber-junit-4' +include ':dd-java-agent:instrumentation:junit-4.10:junit-4.13' include ':dd-java-agent:instrumentation:junit-4.10:munit-junit-4' include ':dd-java-agent:instrumentation:junit-5.3' include ':dd-java-agent:instrumentation:junit-5.3:junit-5.8' From 722c8f7af58a893a1aa9dcf8418056a478c52fad Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Mon, 2 Dec 2024 12:54:29 +0100 Subject: [PATCH 087/106] Set unexpected IAST exceptions to debug log level (#8044) --- .../src/main/java/datadog/trace/api/iast/IastModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java b/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java index bd328848149..2dd561e8713 100644 --- a/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java +++ b/internal-api/src/main/java/datadog/trace/api/iast/IastModule.java @@ -12,7 +12,7 @@ public interface IastModule { Logger LOG = LoggerFactory.getLogger(IastModule.class); default void onUnexpectedException(final String message, final Throwable error) { - LOG.warn(message, error); + LOG.debug(message, error); } @Retention(RetentionPolicy.RUNTIME) From 46dcd32b34736cb71c6cb3918b9b5199d62a060f Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 2 Dec 2024 13:25:18 +0100 Subject: [PATCH 088/106] Use lower priorities for grpc server errors (#8043) --- .../instrumentation/decorator/BaseDecorator.java | 9 ++++++++- .../instrumentation/decorator/BaseDecoratorTest.groovy | 7 ++----- .../armeria/grpc/server/GrpcServerDecorator.java | 6 ++++-- .../instrumentation/grpc/server/GrpcServerDecorator.java | 6 ++++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java index 71e3927d90a..ae38ea8af3c 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java @@ -9,6 +9,7 @@ import datadog.trace.api.cache.QualifiedClassNameCache; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities; import datadog.trace.bootstrap.instrumentation.api.Tags; import java.lang.reflect.Method; import java.net.Inet4Address; @@ -86,8 +87,14 @@ public AgentScope onError(final AgentScope scope, final Throwable throwable) { } public AgentSpan onError(final AgentSpan span, final Throwable throwable) { + return onError(span, throwable, ErrorPriorities.DEFAULT); + } + + public AgentSpan onError(final AgentSpan span, final Throwable throwable, byte errorPriority) { if (throwable != null) { - span.addThrowable(throwable instanceof ExecutionException ? throwable.getCause() : throwable); + span.addThrowable( + throwable instanceof ExecutionException ? throwable.getCause() : throwable, + errorPriority); } return span; } diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy index d720a061f5b..5cd64c11304 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy +++ b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy @@ -2,6 +2,7 @@ package datadog.trace.bootstrap.instrumentation.decorator import datadog.trace.bootstrap.instrumentation.api.AgentSpan +import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.test.util.DDSpecification import spock.lang.Shared @@ -62,11 +63,7 @@ class BaseDecoratorTest extends DDSpecification { then: if (error) { - if (errorPriority != null) { - 1 * span.addThrowable(error, errorPriority) - } else { - 1 * span.addThrowable(error) - } + 1 * span.addThrowable(error, errorPriority != null ? errorPriority : ErrorPriorities.DEFAULT) } 0 * _ diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java index 7d51b672439..40c1ec23736 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java +++ b/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java @@ -9,6 +9,7 @@ import datadog.trace.api.cache.DDCaches; import datadog.trace.api.naming.SpanNaming; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.ServerDecorator; @@ -102,7 +103,8 @@ public AgentSpan onCall(final AgentSpan span, ServerCall AgentSpan onCall(final AgentSpan span, ServerCall Date: Mon, 2 Dec 2024 13:43:28 +0100 Subject: [PATCH 089/106] Update Gradle dependencies (#8041) * chore: Update Gradle dependencies * chore: Update Gradle dependencies --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../aws-java-eventbridge-2.0/gradle.lockfile | 52 ++++++++-------- .../aws-java-sdk-1.11.0/gradle.lockfile | 20 +++---- .../aws-java-sdk-2.2/gradle.lockfile | 60 +++++++++---------- .../aws-java-sns-1.0/gradle.lockfile | 8 +-- .../aws-java-sns-2.0/gradle.lockfile | 52 ++++++++-------- .../aws-java-sqs-1.0/gradle.lockfile | 6 +- .../instrumentation/grpc-1.5/gradle.lockfile | 29 +++++---- .../jackson-core/gradle.lockfile | 8 +-- .../jackson-core-2.16/gradle.lockfile | 8 +-- .../owasp-esapi-2/gradle.lockfile | 26 ++++---- .../instrumentation/play-2.6/gradle.lockfile | 32 +++++----- .../instrumentation/selenium/gradle.lockfile | 60 +++++++++---------- .../spring-webmvc-6.0/gradle.lockfile | 1 + dd-smoke-tests/opentelemetry/gradle.lockfile | 5 +- 14 files changed, 187 insertions(+), 180 deletions(-) diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile index 778d47268c1..1b0623b9f58 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile @@ -186,83 +186,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.27.19=compileClasspath software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.27.19=compileClasspath software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.27.19=compileClasspath software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.27.19=compileClasspath software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:eventbridge:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.27.19=compileClasspath software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.27.19=compileClasspath software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.27.19=compileClasspath software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.27.19=compileClasspath software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.27.19=compileClasspath software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.27.19=compileClasspath software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.27.19=compileClasspath software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.27.19=compileClasspath software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.27.19=compileClasspath software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile index c0f5741c878..ce0ff896b5a 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/gradle.lockfile @@ -9,39 +9,39 @@ com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath,test_before_1_11_106Comp com.amazonaws:aws-java-sdk-core:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-dynamodb:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-dynamodb:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-dynamodb:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-dynamodb:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-ec2:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-ec2:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-ec2:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-ec2:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-kinesis:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-kinesis:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-kms:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-kms:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-kms:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-kms:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-rds:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-rds:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-rds:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-rds:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-s3:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-s3:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-s3:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-s3:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.11.106=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.106=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.11.106=testCompileClasspath,testRuntimeClasspath com.amazonaws:jmespath-java:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.12.643=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.beust:jcommander:1.78=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,instrumentPluginClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile index ae74e1bf839..5d8e756c2a6 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile @@ -268,14 +268,14 @@ software.amazon.awssdk:annotations:2.2.0=compileClasspath,testCompileClasspath,t software.amazon.awssdk:annotations:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:annotations:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:annotations:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:annotations:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:apache-client:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath @@ -287,40 +287,40 @@ software.amazon.awssdk:auth:2.2.0=compileClasspath,testCompileClasspath,testRunt software.amazon.awssdk:auth:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:auth:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:aws-cbor-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:crt-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -331,68 +331,68 @@ software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClass software.amazon.awssdk:endpoints-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:http-client-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:json-utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:kinesis:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:kinesis:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:kinesis:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:kinesis:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:kinesis:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.18.40=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.2.0=testRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.20.33=latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.23.8=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.20=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.23=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:profiles:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:profiles:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:profiles:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:protocol-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:rds:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath @@ -401,9 +401,9 @@ software.amazon.awssdk:regions:2.2.0=compileClasspath,testCompileClasspath,testR software.amazon.awssdk:regions:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:regions:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:s3:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -413,12 +413,12 @@ software.amazon.awssdk:sdk-core:2.2.0=compileClasspath,testCompileClasspath,test software.amazon.awssdk:sdk-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sns:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sns:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sqs:2.18.40=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sqs:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -428,18 +428,18 @@ software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestC software.amazon.awssdk:third-party-jackson-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:utils:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:utils:2.29.20=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile index c6afe7c8e00..15a4bb287b4 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/gradle.lockfile @@ -6,13 +6,13 @@ cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepFor ch.qos.logback:logback-classic:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:jmespath-java:1.12.710=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile index a5d85d4e57a..c5c9949aa4f 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile @@ -186,56 +186,56 @@ org.testng:testng:7.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeCl org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile index f2f8c926df8..d99ecd58960 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/gradle.lockfile @@ -10,12 +10,12 @@ com.amazonaws:amazon-sqs-java-messaging-lib:1.0.8=testCompileClasspath,testRunti com.amazonaws:amazon-sqs-java-messaging-lib:1.1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath com.amazonaws:aws-java-sdk-core:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.0=compileClasspath com.amazonaws:aws-java-sdk-sqs:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.amazonaws:jmespath-java:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.778=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.779=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.beust:jcommander:1.78=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index 4af0327ca4e..f38e07402f7 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -63,21 +63,21 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestCompileP de.thetaphi:forbiddenapis:3.1=compileClasspath,compileProtoPath info.picocli:picocli:4.6.3=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath io.grpc:grpc-api:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-api:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-context:1.68.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.68.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-core:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-inprocess:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-inprocess:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-netty:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-netty:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-netty:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.68.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.68.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-stub:1.68.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.68.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.68.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.68.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:protoc-gen-grpc-java:1.42.2=protobufToolsLocator_grpc io.netty:netty-buffer:4.1.110.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -185,18 +185,23 @@ org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestCompileProtoPath, org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-tree:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-tree:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-util:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath +org.ow2.asm:asm:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm:9.4=spotbugs +org.ow2.asm:asm:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/gradle.lockfile index 5ad94d955d6..f6a5da5b18a 100644 --- a/dd-java-agent/instrumentation/jackson-core/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/gradle.lockfile @@ -13,13 +13,13 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClas com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile index 90447ab5e7f..6efa88e682f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/gradle.lockfile @@ -13,13 +13,13 @@ com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClas com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.16.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.18.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile b/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile index 7cb9353fff8..a3d2a869708 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2/gradle.lockfile @@ -57,7 +57,7 @@ commons-fileupload:commons-fileupload:1.2=compileClasspath,csiCompileClasspath commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-httpclient:commons-httpclient:3.1=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.16.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-io:commons-io:2.18.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-lang:commons-lang:2.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath commons-lang:commons-lang:2.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-logging:commons-logging:1.1=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath @@ -92,22 +92,22 @@ org.apache.commons:commons-collections4:4.5.0-M2=latestDepTestCompileClasspath,l org.apache.commons:commons-lang3:3.12.0=spotbugs org.apache.commons:commons-text:1.10.0=spotbugs org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.client5:httpclient5:5.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.client5:httpclient5:5.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5-h2:5.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.2.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5:5.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.xmlgraphics:batik-constants:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.xmlgraphics:batik-css:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:batik-constants:1.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:batik-css:1.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.xmlgraphics:batik-css:1.7=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.xmlgraphics:batik-ext:1.7=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.xmlgraphics:batik-i18n:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.xmlgraphics:batik-shared-resources:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.xmlgraphics:batik-util:1.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:batik-i18n:1.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:batik-shared-resources:1.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:batik-util:1.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.xmlgraphics:batik-util:1.7=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.xmlgraphics:xmlgraphics-commons:2.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.xmlgraphics:xmlgraphics-commons:2.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.beanshell:bsh-core:2.0b4=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -150,7 +150,7 @@ org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepTestCompileClasspath,late org.gmetrics:GMetrics:1.1=codenarc org.hamcrest:hamcrest-core:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.htmlunit:neko-htmlunit:4.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:neko-htmlunit:4.6.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -175,9 +175,9 @@ org.ow2.asm:asm-util:9.4=spotbugs org.ow2.asm:asm:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.4=spotbugs org.owasp.antisamy:antisamy:1.4.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.owasp.antisamy:antisamy:1.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.owasp.antisamy:antisamy:1.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.owasp.esapi:esapi:2.1.0=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.owasp.esapi:esapi:2.5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.owasp.esapi:esapi:2.6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/play-2.6/gradle.lockfile b/dd-java-agent/instrumentation/play-2.6/gradle.lockfile index 7fb465129ad..fccafbde3e2 100644 --- a/dd-java-agent/instrumentation/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play-2.6/gradle.lockfile @@ -8,10 +8,10 @@ cglib:cglib-nodep:3.2.4=baseTestCompileClasspath,baseTestRuntimeClasspath cglib:cglib:3.3.0=latestDepTestRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=baseTestCompileClasspath,baseTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -ch.qos.logback:logback-classic:1.5.6=latestDepTestGeneratedCompileClasspath +ch.qos.logback:logback-classic:1.5.12=latestDepTestGeneratedCompileClasspath ch.qos.logback:logback-core:1.2.3=baseTestCompileClasspath,baseTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.4.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -ch.qos.logback:logback-core:1.5.6=latestDepTestGeneratedCompileClasspath +ch.qos.logback:logback-core:1.5.12=latestDepTestGeneratedCompileClasspath com.beust:jcommander:1.78=baseTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,main_play27CompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -112,34 +112,34 @@ com.typesafe.akka:akka-stream_2.13:2.6.21=latestDepTestCompileClasspath,latestDe com.typesafe.play:build-link:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:build-link:2.7.0=main_play27CompileClasspath com.typesafe.play:play-akka-http-server_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath -com.typesafe.play:play-akka-http-server_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.play:play-build-link:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.play:play-configuration_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-akka-http-server_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-build-link:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-configuration_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-exceptions:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-exceptions:2.7.0=main_play27CompileClasspath -com.typesafe.play:play-exceptions:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-exceptions:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-functional_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-functional_2.11:2.7.0=main_play27CompileClasspath com.typesafe.play:play-functional_2.13:2.10.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-guice_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath -com.typesafe.play:play-guice_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-guice_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-java_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-java_2.11:2.7.0=main_play27CompileClasspath -com.typesafe.play:play-java_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-java_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-json_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-json_2.11:2.7.0=main_play27CompileClasspath com.typesafe.play:play-json_2.13:2.10.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-netty-utils:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-server_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath -com.typesafe.play:play-server_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-server_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-streams_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play-streams_2.11:2.7.0=main_play27CompileClasspath -com.typesafe.play:play-streams_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-streams_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play-test_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath -com.typesafe.play:play-test_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play-test_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:play_2.11:2.6.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:play_2.11:2.7.0=main_play27CompileClasspath -com.typesafe.play:play_2.13:2.9.5=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.play:play_2.13:2.9.6=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.play:routes-compiler_2.13:2.9.0-M6=routeGeneratorCompileClasspath,routeGeneratorRuntimeClasspath com.typesafe.play:twirl-api_2.11:1.3.2=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath com.typesafe.play:twirl-api_2.11:1.4.0=main_play27CompileClasspath @@ -343,7 +343,7 @@ org.scala-lang:scala-compiler:2.13.11=zinc org.scala-lang:scala-library:2.11.11=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath org.scala-lang:scala-library:2.11.12=main_play27CompileClasspath org.scala-lang:scala-library:2.13.11=routeGeneratorCompileClasspath,routeGeneratorRuntimeClasspath,zinc -org.scala-lang:scala-library:2.13.14=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +org.scala-lang:scala-library:2.13.15=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath org.scala-lang:scala-reflect:2.11.11=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath org.scala-lang:scala-reflect:2.11.12=main_play27CompileClasspath org.scala-lang:scala-reflect:2.13.11=zinc @@ -387,15 +387,15 @@ org.seleniumhq.selenium:selenium-support:3.4.0=baseTestCompileClasspath,baseTest org.seleniumhq.selenium:selenium-support:4.14.1=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.25=compileClasspath,main_play27CompileClasspath org.slf4j:jcl-over-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:2.0.13=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.16=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.25=compileClasspath,main_play27CompileClasspath org.slf4j:jul-to-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:2.0.13=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.16=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=baseTestCompileClasspath,compileClasspath,instrumentPluginClasspath,main_play27CompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath org.slf4j:slf4j-api:1.7.32=baseTestRuntimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-api:2.0.13=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:slf4j-api:2.0.16=latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.spockframework:spock-core:2.2-groovy-3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.spockframework:spock-junit4:2.2-groovy-3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestGeneratedCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/selenium/gradle.lockfile b/dd-java-agent/instrumentation/selenium/gradle.lockfile index b47b7a18b2d..f6342c4888d 100644 --- a/dd-java-agent/instrumentation/selenium/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium/gradle.lockfile @@ -66,17 +66,17 @@ de.thetaphi:forbiddenapis:3.1=compileClasspath dev.failsafe:failsafe:3.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-api-incubator:1.43.0-alpha=latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-exporter-logging:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-sdk:1.43.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api-incubator:1.44.1-alpha=latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs @@ -85,7 +85,7 @@ junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.15.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -205,33 +205,33 @@ org.ow2.asm:asm:9.7=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,t org.seleniumhq.selenium:htmlunit-driver:2.70.0=testCompileClasspath,testRuntimeClasspath org.seleniumhq.selenium:htmlunit-driver:4.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-api:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-api:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-api:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-chrome-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-chrome-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-chromium-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v128:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v129:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v130:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v85:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chrome-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chromium-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v129:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v130:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v131:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v85:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-edge-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-edge-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-edge-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-firefox-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-firefox-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-http:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-firefox-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-http:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-ie-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-ie-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-ie-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-java:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-java:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-json:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-manager:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-java:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-json:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-manager:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-opera-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-os:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-os:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-remote-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-remote-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-remote-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-safari-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-safari-driver:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-safari-driver:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-support:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-support:4.26.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-support:4.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile b/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile index 569459c6f0f..c4673a40e82 100644 --- a/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/spring-webmvc-6.0/gradle.lockfile @@ -48,6 +48,7 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.27.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index 2d37a2b3f7b..ee68422080c 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -39,8 +39,9 @@ commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClassp commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:11.2.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs From 0d905c6e4067217a04922ead4bfa0fa0337d2ee4 Mon Sep 17 00:00:00 2001 From: Justin Lee Date: Mon, 2 Dec 2024 10:25:54 -0500 Subject: [PATCH 090/106] Cache entry span code origin information to avoid unnecessary repeated stack walks. (#8029) --- .../InstrumentationResult.java | 35 ++++++++++++++-- .../debugger/instrumentation/MethodInfo.java | 4 ++ .../debugger/probe/CodeOriginProbe.java | 42 +++++++++++++++++-- .../datadog/debugger/util/ClassFileLines.java | 6 +++ .../debugger/origin/CodeOriginTest.java | 13 ++++-- 5 files changed, 89 insertions(+), 11 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java index 04225ccdb5d..58817ebebf1 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java @@ -18,8 +18,10 @@ public enum Status { private final Status status; private final Map> diagnostics; - private String typeName; - private String methodName; + private final String sourceFileName; + private final String typeName; + private final String methodName; + private final int methodStart; public static class Factory { public static InstrumentationResult blocked(String className) { @@ -41,8 +43,10 @@ public InstrumentationResult( this( status, diagnostics, + methodInfo.getClassNode().sourceFile, methodInfo.getClassNode().name.replace('/', '.'), - methodInfo.getMethodNode().name); + methodInfo.getMethodNode().name, + methodInfo.getMethodStart()); } public InstrumentationResult( @@ -54,6 +58,23 @@ public InstrumentationResult( this.diagnostics = diagnostics; this.typeName = className; this.methodName = methodName; + this.methodStart = -1; + this.sourceFileName = null; + } + + public InstrumentationResult( + Status status, + Map> diagnostics, + String sourceFileName, + String className, + String methodName, + int methodStart) { + this.status = status; + this.diagnostics = diagnostics; + this.sourceFileName = sourceFileName; + this.typeName = className; + this.methodName = methodName; + this.methodStart = methodStart; } public boolean isError() { @@ -80,6 +101,14 @@ public String getMethodName() { return methodName; } + public int getMethodStart() { + return methodStart; + } + + public String getSourceFileName() { + return sourceFileName; + } + @Generated @Override public String toString() { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java index d7bf3631eb9..085e1b1510c 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/MethodInfo.java @@ -37,4 +37,8 @@ public MethodNode getMethodNode() { public ClassFileLines getClassFileLines() { return classFileLines; } + + public int getMethodStart() { + return classFileLines != null ? classFileLines.getMethodStart(methodNode) : -1; + } } diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java index a520720aa55..a84be2ad11a 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java @@ -5,6 +5,7 @@ import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_TYPE; import static java.lang.String.format; import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import com.datadog.debugger.agent.DebuggerAgent; @@ -31,6 +32,8 @@ public class CodeOriginProbe extends LogProbe implements ForceMethodInstrumentat private final boolean entrySpanProbe; + private List stackTraceElements; + public CodeOriginProbe(ProbeId probeId, boolean entry, Where where, int maxFrames) { super(LANGUAGE, probeId, null, where, MethodLocation.EXIT, null, null, true, null, null, null); this.entrySpanProbe = entry; @@ -82,8 +85,25 @@ public void commit( span.getLocalRootSpan().setTag(getId(), (String) null); // clear possible span reference } + private List findLocation() { + if (entrySpanProbe && stackTraceElements == null) { + ProbeLocation probeLocation = getLocation(); + List lines = probeLocation.getLines(); + int line = lines == null ? -1 : Integer.parseInt(lines.get(0)); + stackTraceElements = + singletonList( + new StackTraceElement( + probeLocation.getType(), + probeLocation.getMethod(), + probeLocation.getFile(), + line)); + } + return stackTraceElements != null ? stackTraceElements : emptyList(); + } + private void applySpanOriginTags(AgentSpan span, String snapshotId) { - List entries = getUserStackFrames(); + List entries = + stackTraceElements != null ? stackTraceElements : getUserStackFrames(); List agentSpans = entrySpanProbe ? asList(span, span.getLocalRootSpan()) : singletonList(span); @@ -92,7 +112,8 @@ private void applySpanOriginTags(AgentSpan span, String snapshotId) { for (int i = 0; i < entries.size(); i++) { StackTraceElement info = entries.get(i); - s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "file"), info.getFileName()); + String fileName = info.getFileName(); + s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "file"), fileName); s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "method"), info.getMethodName()); s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "line"), info.getLineNumber()); s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "type"), info.getClassName()); @@ -127,12 +148,25 @@ private AgentSpan findSpan(AgentSpan candidate) { public void buildLocation(InstrumentationResult result) { String type = where.getTypeName(); String method = where.getMethodName(); + List lines = null; + + String file = where.getSourceFile(); + if (result != null) { type = result.getTypeName(); method = result.getMethodName(); + if (result.getMethodStart() != -1) { + lines = singletonList(String.valueOf(result.getMethodStart())); + } + if (file == null) { + file = result.getSourceFileName(); + } + if (entrySpanProbe) { + stackTraceElements = + singletonList(new StackTraceElement(type, method, file, result.getMethodStart())); + } } - // drop line number for code origin probe - this.location = new ProbeLocation(type, method, where.getSourceFile(), null); + this.location = new ProbeLocation(type, method, file, lines); } private List getUserStackFrames() { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java index ad9fecb54f4..6d6aca41e7b 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ClassFileLines.java @@ -13,6 +13,7 @@ public class ClassFileLines { private final Map> methodByLine = new HashMap<>(); + private final Map methodStarts = new HashMap<>(); private final TreeMap lineLabels = new TreeMap<>(); public ClassFileLines(ClassNode classNode) { @@ -21,6 +22,7 @@ public ClassFileLines(ClassNode classNode) { while (currentNode != null) { if (currentNode.getType() == AbstractInsnNode.LINE) { LineNumberNode lineNode = (LineNumberNode) currentNode; + methodStarts.putIfAbsent(methodNode.name + methodNode.desc, lineNode.line); // on the same line, we can have multiple methods (lambdas, inner classes, etc) List methodNodes = methodByLine.computeIfAbsent(lineNode.line, k -> new ArrayList<>()); @@ -40,6 +42,10 @@ public ClassFileLines(ClassNode classNode) { } } + public int getMethodStart(MethodNode node) { + return methodStarts.getOrDefault(node.name + node.desc, -1); + } + public List getMethodsByLine(int line) { return methodByLine.get(line); } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java index bcd555cb480..cfeb3866788 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java @@ -8,6 +8,7 @@ import static java.util.Arrays.asList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -234,6 +235,7 @@ private static void checkEntrySpanTags(MutableSpan span, boolean includeSnapshot assertKeyPresent(span, DD_CODE_ORIGIN_TYPE); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "file")); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "line")); + assertNotEquals(-1, span.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "line"))); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "method")); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "signature")); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "type")); @@ -263,6 +265,7 @@ private static void checkExitSpanTags(MutableSpan span, boolean includeSnapshot) assertKeyPresent(span, DD_CODE_ORIGIN_TYPE); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "file")); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "line")); + assertNotEquals(-1, span.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "line"))); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "method")); assertKeyPresent(span, format(DD_CODE_ORIGIN_FRAME, 0, "type")); if (includeSnapshot) { @@ -271,10 +274,12 @@ private static void checkExitSpanTags(MutableSpan span, boolean includeSnapshot) MutableSpan rootSpan = span.getLocalRootSpan(); assertEquals(rootSpan.getTag(DD_CODE_ORIGIN_TYPE), "entry", keys); - assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 1, "file"))); - assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 1, "line"))); - assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 1, "method"))); - assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 1, "type"))); + Object file = rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "file")); + assertNotNull(file, rootSpan.getTags().toString()); + assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "line"))); + assertNotEquals(-1, rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "line"))); + assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "method"))); + assertNotNull(rootSpan.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "type"))); } private static Set ldKeys(MutableSpan span) { From a9708ea2a1e5aaeae3c43d50bd66ee1290d6be6f Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 3 Dec 2024 10:33:26 +0100 Subject: [PATCH 091/106] fix(crash-tracking): Remove exception logging (#8045) Only log exception in debug mode Decrease the log level --- .../crashtracking/OOMENotifierScriptInitializer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifierScriptInitializer.java b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifierScriptInitializer.java index d8e63fe9702..c395c8cb40a 100644 --- a/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifierScriptInitializer.java +++ b/dd-java-agent/agent-crashtracking/src/main/java/com/datadog/crashtracking/OOMENotifierScriptInitializer.java @@ -124,7 +124,11 @@ static void run(Path dir) { Files.walkFileTree(dir, new ScriptCleanupVisitor()); } } catch (IOException e) { - LOG.warn("Failed cleaning up process specific files in {}", dir, e); + if (LOG.isDebugEnabled()) { + LOG.info("Failed cleaning up process specific files in {}", dir, e); + } else { + LOG.info("Failed cleaning up process specific files in {}: {}", dir, e.toString()); + } } } From 64347d6daf8aaa40840349975210d1a05ff5956d Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Tue, 3 Dec 2024 11:12:04 +0100 Subject: [PATCH 092/106] feat(ci): Fix JUnit test case name uniqueness (#8046) --- .circleci/collect_results.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/collect_results.sh b/.circleci/collect_results.sh index 1d67afda889..dc6a0eb7682 100755 --- a/.circleci/collect_results.sh +++ b/.circleci/collect_results.sh @@ -28,9 +28,11 @@ do cp "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME" # Replace Java Object hashCode by marker in testcase XML nodes to get stable test names sed -i '/ Date: Tue, 3 Dec 2024 12:14:37 -0500 Subject: [PATCH 093/106] Only check that the first frame tags are present. (#8049) mock the code origin recorder and simply check for invocations restrict the test dep to a narrower scope --- .../instrumentation/grpc-1.5/build.gradle | 2 +- .../src/test/groovy/GrpcCodeOriginTest.groovy | 173 +++++++----------- 2 files changed, 64 insertions(+), 111 deletions(-) diff --git a/dd-java-agent/instrumentation/grpc-1.5/build.gradle b/dd-java-agent/instrumentation/grpc-1.5/build.gradle index 8c0db536c82..206eed5cb4f 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/build.gradle +++ b/dd-java-agent/instrumentation/grpc-1.5/build.gradle @@ -39,7 +39,7 @@ dependencies { testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' - testImplementation project(':dd-java-agent:agent-debugger') + testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') testImplementation libs.bundles.mockito latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy index fb1204ae45e..137ef1809f3 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy +++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy @@ -1,22 +1,9 @@ -import com.datadog.debugger.agent.ClassesToRetransformFinder -import com.datadog.debugger.agent.Configuration -import com.datadog.debugger.agent.ConfigurationUpdater -import com.datadog.debugger.agent.DebuggerTransformer -import com.datadog.debugger.agent.DenyListHelper -import com.datadog.debugger.agent.JsonSnapshotSerializer -import com.datadog.debugger.codeorigin.DefaultCodeOriginRecorder -import com.datadog.debugger.instrumentation.InstrumentationResult -import com.datadog.debugger.probe.ProbeDefinition -import com.datadog.debugger.sink.DebuggerSink -import com.datadog.debugger.sink.ProbeStatusSink +import datadog.trace.bootstrap.debugger.DebuggerContext.CodeOriginRecorder import com.google.common.util.concurrent.MoreExecutors import datadog.trace.agent.test.naming.VersionedNamingTestBase -import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.bootstrap.debugger.DebuggerContext import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.util.AgentTaskScheduler import example.GreeterGrpc import example.Helloworld import io.grpc.BindableService @@ -25,7 +12,7 @@ import io.grpc.Server import io.grpc.inprocess.InProcessChannelBuilder import io.grpc.inprocess.InProcessServerBuilder import io.grpc.stub.StreamObserver -import net.bytebuddy.agent.ByteBuddyAgent +import org.mockito.internal.util.MockUtil import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.Executors @@ -33,12 +20,10 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference import static datadog.trace.api.config.TraceInstrumentationConfig.* -import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER -import static java.lang.String.format -import static org.mockito.Mockito.mock -import static org.mockito.Mockito.when +import org.mockito.Mockito abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { + private CodeOriginRecorder codeOriginRecorder @Override final String service() { @@ -81,79 +66,78 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { def error = new AtomicReference() BindableService greeter = new GreeterGrpc.GreeterImplBase() { - @Override - StreamObserver conversation(StreamObserver observer) { - return new StreamObserver() { - @Override - void onNext(Helloworld.Response value) { - - serverReceived << value.message - - (1..msgCount).each { - if (TEST_TRACER.activeScope().isAsyncPropagating()) { - observer.onNext(value) - } else { - observer.onError(new IllegalStateException("not async propagating!")) + @Override + StreamObserver conversation(StreamObserver observer) { + return new StreamObserver() { + @Override + void onNext(Helloworld.Response value) { + + serverReceived << value.message + + (1..msgCount).each { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + observer.onNext(value) + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } } - } - } - @Override - void onError(Throwable t) { - if (TEST_TRACER.activeScope().isAsyncPropagating()) { - error.set(t) - observer.onError(t) - } else { - observer.onError(new IllegalStateException("not async propagating!")) - } - } + @Override + void onError(Throwable t) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(t) + observer.onError(t) + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } - @Override - void onCompleted() { - if (TEST_TRACER.activeScope().isAsyncPropagating()) { - observer.onCompleted() - } else { - observer.onError(new IllegalStateException("not async propagating!")) + @Override + void onCompleted() { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + observer.onCompleted() + } else { + observer.onError(new IllegalStateException("not async propagating!")) + } + } } - } } } - } Server server = InProcessServerBuilder.forName(getClass().name).addService(greeter) - .executor(directExecutor ? MoreExecutors.directExecutor() : Executors.newCachedThreadPool()) - .build().start() + .executor(directExecutor ? MoreExecutors.directExecutor() : Executors.newCachedThreadPool()) + .build().start() - Thread.sleep(1000) ManagedChannel channel = InProcessChannelBuilder.forName(getClass().name).build() GreeterGrpc.GreeterStub client = GreeterGrpc.newStub(channel).withWaitForReady() when: def streamObserver = client.conversation(new StreamObserver() { - @Override - void onNext(Helloworld.Response value) { - if (TEST_TRACER.activeScope().isAsyncPropagating()) { - clientReceived << value.message - } else { - error.set(new IllegalStateException("not async propagating!")) + @Override + void onNext(Helloworld.Response value) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + clientReceived << value.message + } else { + error.set(new IllegalStateException("not async propagating!")) + } } - } - @Override - void onError(Throwable t) { - if (TEST_TRACER.activeScope().isAsyncPropagating()) { - error.set(t) - } else { - error.set(new IllegalStateException("not async propagating!")) + @Override + void onError(Throwable t) { + if (TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(t) + } else { + error.set(new IllegalStateException("not async propagating!")) + } } - } - @Override - void onCompleted() { - if (!TEST_TRACER.activeScope().isAsyncPropagating()) { - error.set(new IllegalStateException("not async propagating!")) + @Override + void onCompleted() { + if (!TEST_TRACER.activeScope().isAsyncPropagating()) { + error.set(new IllegalStateException("not async propagating!")) + } } - } - }) + }) clientRange.each { def message = Helloworld.Response.newBuilder().setMessage("call $it").build() @@ -172,6 +156,9 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { } }.flatten().sort() + + def invocations = MockUtil.getInvocationContainer(codeOriginRecorder) + assert invocations.invocations.stream().anyMatch { it.method.name == "captureCodeOrigin" } assertTraces(2) { trace((hasClientMessageSpans() ? clientMessageCount * serverMessageCount : 0) + 1) { span { @@ -220,14 +207,7 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { "$Tags.COMPONENT" "grpc-server" "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER "status.code" "OK" - isPresent(DDTags.DD_CODE_ORIGIN_TYPE) - isPresent(format(DDTags.DD_CODE_ORIGIN_FRAME, 0, "signature")) - for (i in 0..<8) { - for (label in ["file", "line", "method", "type"]) { - isPresent(format(DDTags.DD_CODE_ORIGIN_FRAME, i, label)) - } - } defaultTags(true) } } @@ -273,35 +253,8 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { void codeOriginSetup() { injectSysConfig(CODE_ORIGIN_FOR_SPANS_ENABLED, "true", true) - - def configuration = Configuration.builder() - .setService("grpc code origin test") - .build() - - def config = mock(Config.class) - when(config.isDebuggerEnabled()).thenReturn(true) - when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true) - when(config.isDebuggerVerifyByteCode()).thenReturn(false) - when(config.getFinalDebuggerSnapshotUrl()) - .thenReturn("http://localhost:8126/debugger/v1/input") - when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input") - when(config.getDebuggerCodeOriginMaxUserFrames()).thenReturn(8) - - def probeStatusSink = mock(ProbeStatusSink.class) - - def sink = new DebuggerSink(config, probeStatusSink) - def configurationUpdater = new ConfigurationUpdater(INSTRUMENTATION, DebuggerTransformer::new, config, sink, new ClassesToRetransformFinder()) - - def currentTransformer = new DebuggerTransformer(config, configuration, { - ProbeDefinition definition, InstrumentationResult result -> - }, sink) - INSTRUMENTATION.addTransformer(currentTransformer) - - DebuggerContext.initProbeResolver(configurationUpdater) - DebuggerContext.initClassFilter(new DenyListHelper(null)) - DebuggerContext.initValueSerializer(new JsonSnapshotSerializer()) - - DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater)) + codeOriginRecorder = Mockito.mock(CodeOriginRecorder) + DebuggerContext.initCodeOrigin(codeOriginRecorder) } } From 310d00c241872561f4fd54715cd3af084bafa7af Mon Sep 17 00:00:00 2001 From: Justin Lee Date: Tue, 3 Dec 2024 13:20:25 -0500 Subject: [PATCH 094/106] Use stubs instead of mocks (#8052) --- .../instrumentation/grpc-1.5/build.gradle | 1 - .../src/test/groovy/GrpcCodeOriginTest.groovy | 23 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/instrumentation/grpc-1.5/build.gradle b/dd-java-agent/instrumentation/grpc-1.5/build.gradle index 206eed5cb4f..e63f8c1e7ed 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/build.gradle +++ b/dd-java-agent/instrumentation/grpc-1.5/build.gradle @@ -40,7 +40,6 @@ dependencies { testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') - testImplementation libs.bundles.mockito latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes latestDepTestCompileOnly group: 'io.grpc', name: 'grpc-core', version: '1.+' diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy index 137ef1809f3..cde6156d66f 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy +++ b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy @@ -12,18 +12,17 @@ import io.grpc.Server import io.grpc.inprocess.InProcessChannelBuilder import io.grpc.inprocess.InProcessServerBuilder import io.grpc.stub.StreamObserver -import org.mockito.internal.util.MockUtil +import java.lang.reflect.Method import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference import static datadog.trace.api.config.TraceInstrumentationConfig.* -import org.mockito.Mockito abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { - private CodeOriginRecorder codeOriginRecorder + def codeOriginRecorder @Override final String service() { @@ -157,8 +156,7 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { }.flatten().sort() - def invocations = MockUtil.getInvocationContainer(codeOriginRecorder) - assert invocations.invocations.stream().anyMatch { it.method.name == "captureCodeOrigin" } + assert codeOriginRecorder.invoked assertTraces(2) { trace((hasClientMessageSpans() ? clientMessageCount * serverMessageCount : 0) + 1) { span { @@ -253,7 +251,20 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase { void codeOriginSetup() { injectSysConfig(CODE_ORIGIN_FOR_SPANS_ENABLED, "true", true) - codeOriginRecorder = Mockito.mock(CodeOriginRecorder) + codeOriginRecorder = new CodeOriginRecorder() { + def invoked = false + @Override + String captureCodeOrigin(boolean entry) { + invoked = true + return "done" + } + + @Override + String captureCodeOrigin(Method method, boolean entry) { + invoked = true + return "done" + } + } DebuggerContext.initCodeOrigin(codeOriginRecorder) } } From d2c8a74d9d37b886c228668b70b7914e734d2215 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 4 Dec 2024 09:23:40 +0100 Subject: [PATCH 095/106] Instrument Mulesoft 4.5.0+ (#7981) * Instrument mulesoft 4.5.0+ * add muzzle checks * fix helper classes * Enable grizzly when mule is enabled * Test interactions with otel exporter * Limit 4.5.0 tests to <=11 * add lockfile * test with latest 4 * codenarc * enforce logback-core * Separate domain dir per mule version * Clean up build * exclude old pull parser lib * clean latestDep * Get doc name to enrich resource name * change parent-child propagatoin * fix span ordering in tests * Refactor * fix thread propagation on late scheduled stuff * fix comparator * cleanup * review --- .../AsyncHttpClientInstrumentation.java | 4 +- .../DefaultFilterChainInstrumentation.java | 4 +- .../HttpCodecFilterInstrumentation.java | 4 +- .../HttpServerFilterInstrumentation.java | 4 +- .../mule-4/application/pom.xml | 10 +- .../instrumentation/mule-4/build.gradle | 192 +++++-- .../instrumentation/mule-4/gradle.lockfile | 530 ++++++++++-------- .../mule4/AbstractMuleInstrumentation.java | 36 ++ ...ponentMessageProcessorInstrumentation.java | 67 +++ .../mule4/CurrentEventHelper.java | 34 -- .../instrumentation/mule4/DDEventTracer.java | 222 ++++++++ .../mule4/EventContextCreationAdvice.java | 25 +- .../mule4/EventContextInstrumentation.java | 23 +- .../mule4/EventTracerInstrumentation.java | 43 ++ ...ecutionInitialSpanInfoInstrumentation.java | 39 ++ .../instrumentation/mule4/MuleDecorator.java | 94 ++++ .../instrumentation/mule4/NoopMuleSpan.java | 43 ++ .../mule4/PrivilegedEventInstrumentation.java | 51 -- .../PrivilegedEventSetCurrentAdvice.java | 15 - .../instrumentation/mule4/SpanState.java | 43 ++ .../test/groovy/mule4/MuleForkedTest.groovy | 89 ++- .../mule4/MuleHttpServerForkedTest.groovy | 49 +- .../api/util/HttpServerTestBridge.groovy | 1 - .../mule/runtime/api/util/MuleTestUtil.groovy | 38 ++ .../test/java/mule4/MuleTestContainer.java | 21 +- .../mule-4/src/test/resources/log4j2.xml | 20 + .../test/asserts/ListWriterAssert.groovy | 13 +- .../agent/test/asserts/TraceAssert.groovy | 10 +- .../agent/test/base/HttpServerTest.groovy | 6 +- .../trace/agent/test/utils/OkHttpUtils.java | 6 +- .../java/datadog/trace/api/DDSpanTypes.java | 2 + gradle/libs.versions.toml | 2 + .../api/InstrumentationTags.java | 3 + .../api/InternalSpanTypes.java | 1 + 34 files changed, 1290 insertions(+), 454 deletions(-) create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/CurrentEventHelper.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java delete mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventInstrumentation.java delete mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventSetCurrentAdvice.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java create mode 100644 dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/MuleTestUtil.groovy create mode 100644 dd-java-agent/instrumentation/mule-4/src/test/resources/log4j2.xml diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java index f514b230d52..0a4eb8c1cdc 100644 --- a/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java @@ -15,8 +15,10 @@ import com.ning.http.client.Request; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator; +import java.util.Collections; import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -29,7 +31,7 @@ public AsyncHttpClientInstrumentation() { @Override protected boolean defaultEnabled() { - return false; + return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); } @Override diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java index 091dbd8322e..37c5d2123fb 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/DefaultFilterChainInstrumentation.java @@ -8,6 +8,8 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.InstrumenterConfig; +import java.util.Collections; @AutoService(InstrumenterModule.class) public class DefaultFilterChainInstrumentation extends InstrumenterModule.Tracing @@ -37,7 +39,7 @@ public String[] helperClassNames() { @Override protected boolean defaultEnabled() { - return false; + return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); } @Override diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java index 53821ca2d9d..bde405ddbe3 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpCodecFilterInstrumentation.java @@ -7,6 +7,8 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.InstrumenterConfig; +import java.util.Collections; @AutoService(InstrumenterModule.class) public final class HttpCodecFilterInstrumentation extends InstrumenterModule.Tracing @@ -23,7 +25,7 @@ public String instrumentedType() { @Override protected boolean defaultEnabled() { - return false; + return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); } @Override diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java index 7c92014d73f..583fb166846 100644 --- a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/HttpServerFilterInstrumentation.java @@ -7,6 +7,8 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.InstrumenterConfig; +import java.util.Collections; @AutoService(InstrumenterModule.class) public class HttpServerFilterInstrumentation extends InstrumenterModule.Tracing @@ -23,7 +25,7 @@ public String instrumentedType() { @Override protected boolean defaultEnabled() { - return false; + return InstrumenterConfig.get().isIntegrationEnabled(Collections.singleton("mule"), false); } @Override diff --git a/dd-java-agent/instrumentation/mule-4/application/pom.xml b/dd-java-agent/instrumentation/mule-4/application/pom.xml index f684ba37979..39f32ab235d 100644 --- a/dd-java-agent/instrumentation/mule-4/application/pom.xml +++ b/dd-java-agent/instrumentation/mule-4/application/pom.xml @@ -6,8 +6,8 @@ UTF-8 UTF-8 - 4.2.2-20210129 - 3.4.2 + 4.5.0 + 3.8.6 ${project.basedir} mule-test-application 1.0.0-SNAPSHOT @@ -57,19 +57,19 @@ org.mule.connectors mule-http-connector - 1.5.23 + 1.9.2 mule-plugin org.mule.connectors mule-sockets-connector - 1.2.0 + 1.2.4 mule-plugin org.mule.module mule-java-module - 1.2.7 + 1.2.13 mule-plugin diff --git a/dd-java-agent/instrumentation/mule-4/build.gradle b/dd-java-agent/instrumentation/mule-4/build.gradle index e11ec54f47e..70ea3c665d3 100644 --- a/dd-java-agent/instrumentation/mule-4/build.gradle +++ b/dd-java-agent/instrumentation/mule-4/build.gradle @@ -1,68 +1,94 @@ ext { - // TODO Java 17: Mule 4 doesn't support Java 17 - maxJavaVersionForTests = JavaVersion.VERSION_15 + forkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11 + mule46ForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11 + latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_17 + latestDepForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_17 } +def muleVersion = '4.5.0' +def appDir = "$projectDir/application" muzzle { - extraRepository('anypoint-releases', 'https://maven.anypoint.mulesoft.com/api/v2/maven') extraRepository('mulesoft-releases', 'https://repository.mulesoft.org/releases') extraRepository('mulesoft-public', 'https://repository.mulesoft.org/nexus/content/repositories/public') pass { group = 'org.mule.runtime' module = 'mule-core' - versions = '[,]' - assertInverse = true - - excludeDependency 'com.google.code.findbugs:jsr305' // avoid dependency issue with mule-4.5.0 + versions = "[$muleVersion,)" + javaVersion = "17" + excludeDependency 'om.google.guava:guava' + excludeDependency 'com.google.code.findbugs:jsr305' + additionalDependencies +="org.mule.runtime:mule-tracer-customization-impl:$muleVersion" } - - fail { - group = 'org.mule' + pass { + group = 'org.mule.runtime' + module = 'mule-tracer-customization-impl' + versions = "[$muleVersion,)" + javaVersion = "17" + excludeDependency 'om.google.guava:guava' + excludeDependency 'com.google.code.findbugs:jsr305' + additionalDependencies +="org.mule.runtime:mule-core:$muleVersion" + } + pass { + name = 'before-4.5.0' + group = 'org.mule.runtime' module = 'mule-core' - versions = '[3.2.0,)' // First version where muzzle can resolve all dependencies - skipVersions += "3.9.5" // bad release + versions = "[$muleVersion,)" + javaVersion = "17" + assertInverse true + excludeDependency 'om.google.guava:guava' + excludeDependency 'com.google.code.findbugs:jsr305' + additionalDependencies +="org.mule.runtime:mule-tracer-customization-impl:$muleVersion" } } apply from: "$rootDir/gradle/java.gradle" -def muleVersion = '4.2.2' -def muleBaseDir = "$buildDir/mule" -def appDir = "$projectDir/application" -def generatedResourcesDir = "$buildDir/generated-resources/test" - -clean.doFirst { - delete muleBaseDir -} +addTestSuiteForDir('mule46ForkedTest', 'test') +addTestSuiteForDir('latestDepForkedTest', 'test') repositories { - maven { - name "anypoint-releases" - url "https://maven.anypoint.mulesoft.com/api/v2/maven" - } maven { name "mulesoft-releases" url "https://repository.mulesoft.org/releases" + mavenContent { + releasesOnly() + } } maven { name "mulesoft-public" url "https://repository.mulesoft.org/nexus/content/repositories/public" + mavenContent { + releasesOnly() + } } } configurations { muleServices + mule46Services + latestMuleServices } configurations.all { - // don't allow mule to do slf4j over log4j - exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + exclude group: 'pull-parser', module: 'pull-parser' + + resolutionStrategy { + // avoid bringing in logback based on java 11 + force libs.logback.classic + force libs.logback.core + } } sourceSets { test { - output.dir(generatedResourcesDir, builtBy: 'generateAppResources') + output.dir("$buildDir/generated-resources/test", builtBy: 'generateAppResources') + } + mule46ForkedTest { + output.dir("$buildDir/generated-resources/mule46ForkedTest", builtBy: 'generateAppResources46') + } + latestDepForkedTest { + output.dir("$buildDir/generated-resources/latestDepForkedTest", builtBy: 'generateAppResourcesLatest') } } @@ -70,42 +96,104 @@ tasks.named("compileTestGroovy").configure { dependsOn 'mvnPackage', 'extractMuleServices' } +tasks.named("compileMule46ForkedTestGroovy").configure { + dependsOn 'mvnPackage', 'extractMule46Services' +} + +tasks.named("compileLatestDepForkedTestGroovy").configure { + dependsOn 'mvnPackage', 'extractLatestMuleServices' + setJavaVersion(it, 17) +} + +tasks.named("compileLatestDepForkedTestJava").configure { + setJavaVersion(it, 17) +} + dependencies { compileOnly group: 'org.mule.runtime', name: 'mule-core', version: muleVersion - testImplementation project(':dd-java-agent:instrumentation:aws-common') + compileOnly group: 'org.mule.runtime', name: 'mule-tracer-customization-impl', version: muleVersion + testImplementation project(':dd-java-agent:instrumentation:aws-common') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') + testImplementation project(':dd-java-agent:instrumentation:grizzly-2') testImplementation project(':dd-java-agent:instrumentation:grizzly-http-2.3.20') testImplementation project(':dd-java-agent:instrumentation:grizzly-client-1.9') testImplementation project(':dd-java-agent:instrumentation:caffeine') + testImplementation project(':dd-java-agent:instrumentation:quartz-2') + testImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: muleVersion testImplementation group: 'org.mule.runtime', name: 'mule-core', version: muleVersion - testImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: muleVersion + //testImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: muleVersion testImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: muleVersion // this is needed for mule to find removed javax.* APIs on Java 11+ testImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: muleVersion - - muleServices group: 'org.mule.services', name: 'mule-service-http', version: '1.4.7', classifier: 'mule-service' - muleServices group: 'org.mule.services', name: 'mule-service-scheduler', version: '1.2.4', classifier: 'mule-service' - muleServices group: 'org.mule.services', name: 'mule-service-weave', version: '2.2.2', classifier: 'mule-service' + testImplementation group: 'org.mule.runtime', name: 'mule-dwb-api', version: '2.5.0' + // testImplementation group: 'xml-apis', name: 'xml-apis', version: '1.4.01' + muleServices group: 'org.mule.services', name: 'mule-service-http', version: '1.5.21', classifier: 'mule-service' + muleServices group: 'org.mule.services', name: 'mule-service-scheduler', version: '1.5.0', classifier: 'mule-service' + muleServices group: 'org.mule.services', name: 'mule-service-weave', version: '2.5.0', classifier: 'mule-service' + + mule46ForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: '4.6.0' + mule46ForkedTestImplementation group: 'org.mule.runtime', name: 'mule-core', version: '4.6.0' + mule46ForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: '4.6.0' + mule46ForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: '4.6.0' + // this is needed for mule to find removed javax.* APIs on Java 11+ + mule46ForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: '4.6.0' + mule46Services group: 'org.mule.services', name: 'mule-service-http', version: '1.5.21', classifier: 'mule-service' + mule46Services group: 'org.mule.services', name: 'mule-service-scheduler', version: '1.5.0', classifier: 'mule-service' + mule46Services group: 'org.mule.services', name: 'mule-service-weave', version: '2.5.0', classifier: 'mule-service' + + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: '4.8.+' + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-core', version: '4.8.+' + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-extensions-spring-support', version: '4.8.+' + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-service', version: '4.8.+' + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-module-javaee', version: '4.8.+' + + + //TODO: 4.9.0 is not yet out but it looks like using 4.+ instead of above 4.8.+ brings in 4.9.0-SNAPSHOT artifacts. + /* + When testing with them, the mule container does not bootstrap because of: + None of [protected void java.lang.Object.finalize() throws java.lang.Throwable, public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException, public final void java.lang.Object.wait() throws java.lang.InterruptedException, public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException, public boolean java.lang.Object.equals(java.lang.Object), public java.lang.String java.lang.Object.toString(), public native int java.lang.Object.hashCode(), public final native java.lang.Class java.lang.Object.getClass(), protected native java.lang.Object java.lang.Object.clone() throws java.lang.CloneNotSupportedException, public final native void java.lang.Object.notify(), public final native void java.lang.Object.notifyAll(), public abstract java.lang.Object java.lang.reflect.InvocationHandler.invoke(java.lang.Object,java.lang.reflect.Method,java.lang.Object[]) throws java.lang.Throwable] allows for delegation from public boolean org.springframework.beans.factory.SmartFactoryBean.isEagerInit() + */ + latestDepForkedTestImplementation group: 'org.mule.runtime', name: 'mule-extensions-soap-api', version: '1.8.+' + + latestDepForkedTestImplementation group: 'jakarta.xml.ws', name: 'jakarta.xml.ws-api', version: '4.0.2' + // back to the future + latestDepForkedTestImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0' + latestDepForkedTestImplementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0' + latestDepForkedTestImplementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0' + + latestMuleServices group: 'org.mule.services', name: 'mule-service-http', version: '1.+', classifier: 'mule-service' + latestMuleServices group: 'org.mule.services', name: 'mule-service-scheduler', version: '1.+', classifier: 'mule-service' + latestMuleServices group: 'org.mule.services', name: 'mule-service-weave', version: '2.8.1', classifier: 'mule-service' } -// extract the enabled services into the mule base directory -tasks.register('extractMuleServices', Sync) { - dependsOn configurations.muleServices - - configurations.muleServices.resolvedConfiguration.resolvedArtifacts.findAll { +def copyMuleArtifacts(String configName, String muleBaseDir, Sync sync) { + configurations[configName].resolvedConfiguration.resolvedArtifacts.findAll { it.classifier == "mule-service" } collect { artifact -> def id = artifact.moduleVersion.id - from(zipTree(artifact.file)) { + sync.from(zipTree(artifact.file)) { into("${id.name}-${id.version}") } } + sync.into "$muleBaseDir/services" +} - into "$muleBaseDir/services" +// extract the enabled services into the mule base directory +tasks.register('extractMuleServices', Sync) { + dependsOn configurations.muleServices + copyMuleArtifacts("muleServices", "$buildDir/mule/test", it) +} +tasks.register('extractMule46Services', Sync) { + dependsOn configurations.mule46Services + copyMuleArtifacts("mule46Services", "$buildDir/mule/mule46ForkedTest", it) +} +tasks.register('extractLatestMuleServices', Sync) { + dependsOn configurations.latestMuleServices + copyMuleArtifacts("latestMuleServices", "$buildDir/mule/latestDepForkedTest", it) } // build the mule application via maven @@ -118,23 +206,29 @@ tasks.register('mvnPackage', Exec) { inputs.file("$appDir/mule-artifact.json") } + // generate a properties file so the test knows where to run mule, and what jar to deploy tasks.register('generateAppResources') { - outputs.dir generatedResourcesDir - doLast { + createAppResourceTask(it, "test") +} +tasks.register('generateAppResources46') { + createAppResourceTask(it, "mule46ForkedTest") +} +tasks.register('generateAppResourcesLatest') { + createAppResourceTask(it, "latestDepForkedTest") +} + +def createAppResourceTask(Task task, String name) { + def generatedResourcesDir = "$buildDir/generated-resources/$name" + task.outputs.dir generatedResourcesDir + task.doLast { def generated = new File(generatedResourcesDir, "test-build.properties") - generated.text = """|mule.base=$muleBaseDir + generated.text = """|mule.base=$buildDir/mule/$name |MuleTestApplicationConstants.jar=$buildDir/target/mule-test-application-$version-mule-application.jar |MuleTestApplicationConstants.name=mule-test-application-$version-mule-application""".stripMargin() } } -tasks.named("test").configure { - outputs.upToDateWhen { - !mvnPackage.didWork && !extractMuleServices.didWork - } -} - spotless { java { target "**/*.java" diff --git a/dd-java-agent/instrumentation/mule-4/gradle.lockfile b/dd-java-agent/instrumentation/mule-4/gradle.lockfile index 8c7b7436cc6..da2508ae972 100644 --- a/dd-java-agent/instrumentation/mule-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4/gradle.lockfile @@ -3,34 +3,39 @@ # This file is expected to be part of source control. cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cglib:cglib-nodep:3.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.78=testRuntimeClasspath +com.beust:jcommander:1.78=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.chuusai:shapeless_2.12:2.3.3=muleServices +com.conversantmedia:disruptor:1.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.damnhandy:handy-uri-templates:2.1.8=muleServices com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.9.0=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.9.10=muleServices -com.fasterxml.jackson.core:jackson-core:2.9.10=muleServices -com.fasterxml.jackson.core:jackson-core:2.9.9=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.9.10=muleServices -com.fasterxml.jackson.core:jackson-databind:2.9.9=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-jsonSchema:2.9.9=testCompileClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:5.0.2=muleServices -com.fasterxml:aalto-xml:1.0.0=muleServices -com.github.ben-manes.caffeine:caffeine:2.6.2=muleServices +com.fasterxml.jackson.core:jackson-annotations:2.10.0=compileClasspath +com.fasterxml.jackson.core:jackson-annotations:2.12.7=muleServices +com.fasterxml.jackson.core:jackson-annotations:2.15.0=testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.10.0=compileClasspath +com.fasterxml.jackson.core:jackson-core:2.15.0=muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.10.0=compileClasspath +com.fasterxml.jackson.core:jackson-databind:2.12.7=muleServices +com.fasterxml.jackson.core:jackson-databind:2.15.0=testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0=testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-jsonSchema:2.10.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:6.4.0=muleServices +com.fasterxml:aalto-xml:1.3.2=muleServices com.github.ben-manes.caffeine:caffeine:2.8.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.fge:btf:1.2=testCompileClasspath,testRuntimeClasspath -com.github.fge:msg-simple:1.1=testCompileClasspath,testRuntimeClasspath -com.github.fge:uri-template:0.9=testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:jackson-coreutils:1.9=testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:json-schema-core:1.2.10=testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:json-schema-validator:2.2.10=testCompileClasspath,testRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:2.9.0=muleServices +com.github.erosb:everit-json-schema:1.14.2=muleServices +com.github.fge:btf:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.fge:msg-simple:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.fge:uri-template:0.9=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:jackson-coreutils:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:json-schema-core:1.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:json-schema-validator:2.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -40,84 +45,105 @@ com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeCla com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.7.3=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.7.3=spotbugs com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor -com.google.code.findbugs:annotations:3.0.0=testCompileClasspath,testRuntimeClasspath -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,muleServices,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.8.5=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.code.gson:gson:2.9.0=testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs -com.google.errorprone:error_prone_annotations:2.1.3=muleServices +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0=testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:25.1-jre=compileClasspath,muleServices -com.google.guava:guava:27.0-jre=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=muleServices +com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,compileClasspath,muleServices,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.1.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.6=muleServices com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.googlecode.juniversalchardet:juniversalchardet:1.0.3=testCompileClasspath,testRuntimeClasspath -com.googlecode.libphonenumber:libphonenumber:8.0.0=testCompileClasspath,testRuntimeClasspath -com.lmax:disruptor:3.3.7=testCompileClasspath,testRuntimeClasspath -com.mchange:c3p0:0.9.5.4=muleServices -com.mchange:mchange-commons-java:0.2.15=muleServices +com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.googlecode.libphonenumber:libphonenumber:8.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.ibm.icu:icu4j:67.1=muleServices +com.lmax:disruptor:3.4.3=testCompileClasspath,testRuntimeClasspath +com.mchange:c3p0:0.9.5.5=muleServices +com.mchange:mchange-commons-java:0.2.19=muleServices com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.1=muleServices,testCompileClasspath,testRuntimeClasspath -com.sun.activation:javax.activation:1.2.0=compileClasspath,muleServices,testCompileClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.7=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.mail:jakarta.mail:1.6.3=testCompileClasspath,testRuntimeClasspath -com.sun.mail:jakarta.mail:1.6.4=muleServices +com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath +com.squareup.okhttp3:okhttp:4.11.0=testRuntimeClasspath +com.squareup.okio:okio-jvm:3.2.0=testRuntimeClasspath +com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath +com.squareup.okio:okio:3.2.0=testRuntimeClasspath +com.sun.activation:jakarta.activation:1.2.1=muleServices +com.sun.activation:jakarta.activation:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.activation:javax.activation:1.2.0=muleServices +com.sun.mail:jakarta.mail:1.6.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.mail:jakarta.mail:1.6.7=muleServices com.sun.mail:mailapi:1.6.4=muleServices -com.sun.xml.bind:jaxb-core:2.3.0.1=testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1-MULE-001=testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.15=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.xml.bind:jaxb-impl:2.3.8=compileClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath com.typesafe:config:1.3.1=testCompileClasspath,testRuntimeClasspath -com.vdurmont:semver4j:2.0.3=testCompileClasspath,testRuntimeClasspath +com.vdurmont:semver4j:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP-java7:2.4.13=muleServices commons-beanutils:commons-beanutils:1.9.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -commons-cli:commons-cli:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.10=testRuntimeClasspath +commons-cli:commons-cli:1.2=testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=testCompileClasspath commons-codec:commons-codec:1.15=spotbugs -commons-codec:commons-codec:1.9=testCompileClasspath -commons-collections:commons-collections:3.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.16.0=testRuntimeClasspath +commons-collections:commons-collections:3.2.2=muleServices +commons-digester:commons-digester:2.1=muleServices commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.6=compileClasspath,muleServices -commons-lang:commons-lang:2.6=testCompileClasspath,testRuntimeClasspath -commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath -commons-pool:commons-pool:1.6=compileClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=muleServices +commons-io:commons-io:2.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +commons-lang:commons-lang:2.6=compileClasspath,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=muleServices +commons-validator:commons-validator:1.7=muleServices de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=testRuntimeClasspath -io.projectreactor.addons:reactor-extra:3.1.6.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.2.12.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.2.0=testRuntimeClasspath -it.unimi.dsi:fastutil:8.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:javax.activation-api:1.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.annotation:javax.annotation-api:1.3.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.helidon.grpc:io.grpc:2.6.1=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-api-events:1.27.0-alpha=testRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-extension-incubator:1.27.0-alpha=testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.27.0=testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-testing:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-semconv:1.27.0-alpha=testRuntimeClasspath +io.perfmark:perfmark-api:0.25.0=testCompileClasspath,testRuntimeClasspath +io.projectreactor.addons:reactor-extra:3.4.8=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.4.22=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.1.0=testRuntimeClasspath +it.unimi.dsi:fastutil:8.5.11=testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:1.2.2=testCompileClasspath,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.jms:jakarta.jms-api:2.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.jws:jakarta.jws-api:1.1.1=testCompileClasspath +jakarta.jws:jakarta.jws-api:2.1.0=testRuntimeClasspath +jakarta.resource:jakarta.resource-api:1.7.4=testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=testCompileClasspath,testRuntimeClasspath +jakarta.xml.ws:jakarta.xml.ws-api:2.3.3=testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.jms:javax.jms-api:2.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.json:javax.json-api:1.0=testCompileClasspath,testRuntimeClasspath -javax.jws:javax.jws-api:1.1=testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath -javax.transaction:javax.transaction-api:1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.validation:validation-api:1.1.0.Final=testCompileClasspath,testRuntimeClasspath -javax.xml.bind:jaxb-api:2.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.xml.soap:javax.xml.soap-api:1.4.0=testCompileClasspath,testRuntimeClasspath -javax.xml.ws:jaxws-api:2.3.1=testCompileClasspath,testRuntimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs -jboss:javassist:3.7.ga=testCompileClasspath,testRuntimeClasspath jline:jline:2.14.6=testRuntimeClasspath -joda-time:joda-time:2.9.1=testCompileClasspath,testRuntimeClasspath +joda-time:joda-time:2.10.2=muleServices +joda-time:joda-time:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -126,53 +152,57 @@ net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runt net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath net.jodah:failsafe:2.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -net.sf.jopt-simple:jopt-simple:5.0.3=testCompileClasspath,testRuntimeClasspath +net.sf.jopt-simple:jopt-simple:5.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:11.4=spotbugs -org.antlr:antlr-runtime:3.5=testCompileClasspath,testRuntimeClasspath -org.antlr:stringtemplate:3.2.1=testCompileClasspath,testRuntimeClasspath +org.antlr:antlr-runtime:3.5.2=testCompileClasspath,testRuntimeClasspath org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath org.apache.ant:ant-antlr:1.9.15=codenarc org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath org.apache.ant:ant-junit:1.9.15=codenarc org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath -org.apache.avro:avro:1.10.0-MULE_3=muleServices +org.apache.avro:avro:1.11.1=muleServices org.apache.bcel:bcel:6.5.0=spotbugs -org.apache.commons:commons-compress:1.19=muleServices -org.apache.commons:commons-lang3:3.12.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=compileClasspath,muleServices,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-math3:3.6.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-pool2:2.6.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-collections4:4.4=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-compress:1.21=muleServices +org.apache.commons:commons-lang3:3.12.0=compileClasspath,muleServices,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-pool2:2.11.1=compileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.10.0=spotbugs org.apache.commons:commons-text:1.3=muleServices -org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:2.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=muleServices org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.3=testCompileClasspath -org.apache.httpcomponents:httpclient:4.5.4=testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.6=testCompileClasspath -org.apache.httpcomponents:httpcore:4.4.7=testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.11.0=testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.11.0=testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.20.0=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.11.0=testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.20.0=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.maven:maven-aether-provider:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-artifact:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-builder-support:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-model-builder:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-model:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-repository-metadata:3.3.9=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-settings-builder:3.3.9=testRuntimeClasspath -org.apache.maven:maven-settings:3.3.9=testRuntimeClasspath -org.apache.ws.xmlschema:xmlschema-core:2.2.1=testCompileClasspath,testRuntimeClasspath -org.apache.xmlbeans:xmlbeans:2.6.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.0.0=muleServices -org.checkerframework:checker-qual:2.10.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.20.0=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-api:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-impl:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-named-locks:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-spi:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-supplier:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-file:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-http:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-util:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-http-shared:3.4.2=testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-http:3.4.2=testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-provider-api:3.4.2=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-builder-support:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-resolver-provider:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-settings-builder:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-settings:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.ws.xmlschema:xmlschema-core:2.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.xmlbeans:xmlbeans:3.1.0=compileClasspath,muleServices,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor +org.checkerframework:checker-qual:3.10.0=muleServices +org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:2.5.14=codenarc org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath @@ -202,120 +232,174 @@ org.codehaus.groovy:groovy-xml:2.5.14=codenarc org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy:2.5.14=codenarc org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,muleServices -org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-component-annotations:1.6=testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-interpolation:1.21=testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-utils:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.woodstox:stax2-api:4.0.0=muleServices +org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor +org.codehaus.plexus:plexus-cipher:2.0=testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-component-annotations:1.5.5=testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-interpolation:1.26=testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-sec-dispatcher:2.0=testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-utils:3.5.1=testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.2.1=muleServices org.codenarc:CodeNarc:2.2.0=codenarc -org.dom4j:dom4j:2.1.1=testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.3=spotbugs -org.eclipse.aether:aether-api:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-connector-basic:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-impl:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-spi:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-transport-file:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-transport-http:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath -org.eclipse.aether:aether-util:1.0.2.v20150114=testCompileClasspath,testRuntimeClasspath +org.dom4j:dom4j:2.1.3=spotbugs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.2=testRuntimeClasspath +org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=testCompileClasspath,testRuntimeClasspath +org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5=testCompileClasspath,testRuntimeClasspath org.everit.json:org.everit.json.schema:1.5.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish:javax.json:1.0.4=testCompileClasspath,testRuntimeClasspath +org.glassfish:jakarta.json:1.1.6=compileClasspath,testCompileClasspath,testRuntimeClasspath org.gmetrics:GMetrics:1.1=codenarc +org.graalvm.js:js-scriptengine:21.0.0.2=muleServices +org.graalvm.js:js:21.0.0.2=muleServices +org.graalvm.regex:regex:21.0.0.2=muleServices +org.graalvm.sdk:graal-sdk:21.0.0.2=muleServices +org.graalvm.truffle:truffle-api:21.0.0.2=muleServices org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.jgrapht:jgrapht-jdk1.5:0.7.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.6.20=testRuntimeClasspath +org.jetbrains:annotations:13.0=testRuntimeClasspath +org.jgrapht:jgrapht-core:1.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jheaps:jheaps:0.10=compileClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20160810=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.jsoup:jsoup:1.11.3=testCompileClasspath,testRuntimeClasspath +org.json:json:20230227=muleServices +org.jsoup:jsoup:1.15.3=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.9.2=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.0=testCompileClasspath +org.junit.platform:junit-platform-engine:1.9.2=testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.0=testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.0=testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.0=testRuntimeClasspath +org.junit:junit-bom:5.9.0=testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs -org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath -org.jvnet.staxex:stax-ex:1.8=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mozilla:rhino:1.7.7.1=testCompileClasspath,testRuntimeClasspath -org.mule.apache:xerces2-xsd11:2.11.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mozilla:rhino:1.7.12=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.apache:xerces2-xsd11:2.11.3=muleServices +org.mule.apache:xerces2-xsd11:2.11.3-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath org.mule.com.github.stephenc.eaio-uuid:uuid:3.4.2-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.common:scala-common_2.12:0.4.0=muleServices -org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-011=muleServices -org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-011=muleServices -org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-012=muleServices -org.mule.glassfish.grizzly:grizzly-http-server:2.3.36-MULE-011=muleServices -org.mule.glassfish.grizzly:grizzly-http-servlet:2.3.36-MULE-011=muleServices -org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-011=muleServices -org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-011=muleServices -org.mule.glassfish.jaxb:jaxb-runtime:2.3.1-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.glassfish.jaxb:txw2:2.3.1-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.mvel:mule-mvel2:2.1.9-MULE-018=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:api-annotations:1.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-api:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-artifact-declaration:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-core:4.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-extensions-api-dsql:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-extensions-api-persistence:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-extensions-api:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-extensions-soap-api:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-message-metadata-model:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-api:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-catalog:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-java:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-json:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-persistence:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-raml:1.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-metadata-model-xml:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-artifact:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-container:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-deployment-model-impl:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-deployment-model:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-deployment:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-dsl-api:1.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-extensions-soap-support:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-extensions-spring-support:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-extensions-support:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-extensions-xml-support:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-global-config:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-http-policy-api:1.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-javaee:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-launcher:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-license-api:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-logging:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-policy-api:1.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-reboot:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-repository:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-service:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-spring-config:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-tls:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-module-tooling-support:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-service-http-api:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-service-oauth-api:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-service-soap-api:4.2.2=testCompileClasspath,testRuntimeClasspath -org.mule.services:mule-service-http:1.4.7=muleServices -org.mule.services:mule-service-scheduler:1.2.4=muleServices -org.mule.services:mule-service-weave:2.2.2=muleServices -org.mule.syaml:syaml_2.12:0.6.8=muleServices -org.mule.tools.maven:mule-classloader-model:3.3.4=testCompileClasspath,testRuntimeClasspath -org.mule.weave:avro-module:2.2.2=muleServices -org.mule.weave:core-modules:2.2.2=muleServices -org.mule.weave:core:2.2.2=muleServices -org.mule.weave:debugger:2.2.2=muleServices -org.mule.weave:java-module:2.2.2=muleServices -org.mule.weave:ndjson-module:2.2.2=muleServices -org.mule.weave:parser:2.2.2=muleServices -org.mule.weave:runtime:2.2.2=muleServices -org.mule.weave:wlang:2.2.2=muleServices -org.mule.weave:yaml-module:2.2.2=muleServices -org.mule:mule-maven-client-api:1.4.2=testCompileClasspath,testRuntimeClasspath -org.mule:mule-maven-client-impl:1.4.2=testRuntimeClasspath +org.mule.common:scala-common_2.12:2.0.99=muleServices +org.mule.commons:mule-oauth-client-api:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-025=muleServices +org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-008=muleServices +org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-021=muleServices +org.mule.glassfish.grizzly:grizzly-http-server:2.3.36-MULE-025=muleServices +org.mule.glassfish.grizzly:grizzly-http-servlet:2.3.36-MULE-025=muleServices +org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-008=muleServices +org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-025=muleServices +org.mule.mvel:mule-mvel2:2.1.9-MULE-020=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:api-annotations:1.4.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-dependency-graph:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-serialization:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-xml-parser:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-declaration-persistence:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-declaration:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core-components:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core-mvel:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-dwb-api:2.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api-dsql:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api-persistence:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-soap-api:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-jar-handling-utils:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-message-metadata-model:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-catalog:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-java:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-json:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-persistence:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-raml:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-xml:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-artifact-activation:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-artifact:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-container:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment-model-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment-model:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-dsl-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-soap-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-spring-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-xml-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-feature-management:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-global-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-http-policy-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-javaee:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-jpms-utils:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-launcher:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-license-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-log4j-boot-configurator:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-log4j-configurator:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-logging:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-memory-management:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-metadata-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-policy-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-properties-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-reboot:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-repository:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-service:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-spring-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-tls:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-tooling-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-troubleshooting:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-profiling-api:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-properties-api:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-runtime-extension-model:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-http-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-oauth-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-soap-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-common:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-customization-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-customization-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-internal-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.sdk:mule-sdk-api:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.sdk:mule-sdk-compatibility-api:0.7.0=testCompileClasspath,testRuntimeClasspath +org.mule.services:mule-service-http:1.5.21=muleServices +org.mule.services:mule-service-scheduler:1.5.0=muleServices +org.mule.services:mule-service-weave:2.5.0=muleServices +org.mule.syaml:syaml_2.12:2.0.334=muleServices +org.mule.tools.maven:mule-classloader-model:3.8.5=testCompileClasspath,testRuntimeClasspath +org.mule.weave:avro-module:2.5.0=muleServices +org.mule.weave:core-modules:2.5.0=muleServices +org.mule.weave:core:2.5.0=muleServices +org.mule.weave:debugger:2.5.0=muleServices +org.mule.weave:dwb-api:2.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.weave:dwb-module:2.5.0=muleServices +org.mule.weave:java-module:2.5.0=muleServices +org.mule.weave:jsonschema-module:2.5.0=muleServices +org.mule.weave:ndjson-module:2.5.0=muleServices +org.mule.weave:parser:2.5.0=muleServices +org.mule.weave:runtime:2.5.0=muleServices +org.mule.weave:wlang:2.5.0=muleServices +org.mule.weave:xmlschema-module:2.5.0=muleServices +org.mule.weave:yaml-module:2.5.0=muleServices +org.mule:maven-model-shaded:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-client-api:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-client-impl:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-pom-parser-api:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-pom-parser-impl:2.0.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -328,42 +412,32 @@ org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspat org.ow2.asm:asm-util:9.4=spotbugs org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.4=spotbugs -org.parboiled:parboiled_2.12:2.1.5=muleServices +org.parboiled:parboiled_2.12:2.1.8=muleServices org.quartz-scheduler:quartz:2.3.2=muleServices -org.raml:raml-parser-2:1.0.40=testCompileClasspath,testRuntimeClasspath -org.raml:yagi:1.0.40=testCompileClasspath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.raml:raml-parser-2:1.0.44-10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.raml:yagi:1.0.44-10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath org.reflections:reflections:0.9.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.12.7=muleServices -org.scala-lang:scala-reflect:2.12.0=muleServices -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.scala-lang:scala-library:2.12.15=muleServices +org.slf4j:jcl-over-slf4j:2.0.7=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.7=testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.25=muleServices -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath -org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muleServices,muzzleBootstrap,muzzleTooling,runtimeClasspath,spotbugs,spotbugsSlf4j,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.sonatype.plexus:plexus-cipher:1.4=testRuntimeClasspath -org.sonatype.plexus:plexus-sec-dispatcher:1.3=testRuntimeClasspath org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:5.1.6.RELEASE=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:5.3.27=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-beans:5.3.27=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-context:5.3.27=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-core:5.3.27=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-expression:5.3.27=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-jcl:5.3.27=testCompileClasspath,testRuntimeClasspath org.testng:testng:7.5=testRuntimeClasspath -org.typelevel:algebra_2.12:0.7.0=muleServices -org.typelevel:cats-kernel_2.12:0.9.0=muleServices -org.typelevel:machinist_2.12:0.6.1=muleServices +org.togglz:togglz-core:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.typelevel:macro-compat_2.12:1.1.1=muleServices -org.typelevel:spire-macros_2.12:0.14.1=muleServices -org.typelevel:spire_2.12:0.14.1=muleServices +org.vibur:vibur-object-pool:23.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.webjars:jquery:3.5.1=testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs -org.yaml:snakeyaml:1.21=compileClasspath,testCompileClasspath,testRuntimeClasspath -tanukisoft:wrapper:3.2.3=testCompileClasspath,testRuntimeClasspath -xml-apis:xml-apis:1.4.01=spotbugs +org.yaml:snakeyaml:2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +xml-apis:xml-apis:1.4.01=spotbugs,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java new file mode 100644 index 00000000000..be26ff448b1 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/AbstractMuleInstrumentation.java @@ -0,0 +1,36 @@ +package datadog.trace.instrumentation.mule4; + +import datadog.trace.agent.tooling.InstrumenterModule; +import java.util.HashMap; +import java.util.Map; + +public abstract class AbstractMuleInstrumentation extends InstrumenterModule.Tracing { + public AbstractMuleInstrumentation() { + super("mule"); + } + + @Override + protected boolean defaultEnabled() { + return false; + } + + @Override + public Map contextStore() { + final Map contextStore = new HashMap<>(); + contextStore.put("org.mule.runtime.api.event.EventContext", packageName + ".SpanState"); + contextStore.put( + "org.mule.runtime.tracer.api.span.info.InitialSpanInfo", + "org.mule.runtime.api.component.Component"); + return contextStore; + } + + @Override + public String[] helperClassNames() { + return new String[] { + packageName + ".MuleDecorator", + packageName + ".DDEventTracer", + packageName + ".SpanState", + packageName + ".NoopMuleSpan", + }; + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java new file mode 100644 index 00000000000..91e45d89c70 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.mule4; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import net.bytebuddy.asm.Advice; +import org.mule.runtime.api.event.EventContext; +import org.mule.runtime.core.api.event.CoreEvent; +import org.mule.runtime.tracer.api.EventTracer; + +/** + * Tries to activate the current event context span before dispatching the event to the current + * handler. + */ +@AutoService(InstrumenterModule.class) +public class ComponentMessageProcessorInstrumentation extends AbstractMuleInstrumentation + implements Instrumenter.ForSingleType { + + @Override + public String instrumentedType() { + return "org.mule.runtime.module.extension.internal.runtime.operation.ComponentMessageProcessor"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod() + .and(namedOneOf("onEvent", "onEventSynchronous", "prepareAndExecuteOperation")) + .and(takesArgument(0, named("org.mule.runtime.core.api.event.CoreEvent"))), + getClass().getName() + "$ProcessAdvice"); + } + + public static class ProcessAdvice { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static AgentScope before(@Advice.Argument(0) final CoreEvent event) { + if (event == null || event.getContext() == null) { + return null; + } + SpanState spanState = + InstrumentationContext.get(EventContext.class, SpanState.class).get(event.getContext()); + if (spanState != null && spanState.getEventContextSpan() != null) { + return activateSpan(spanState.getSpanContextSpan()); + } + return null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void after(@Advice.Enter final AgentScope scope) { + if (scope != null) { + scope.close(); + } + } + + private static void muzzleCheck(final EventTracer tracer) { + // introduced in 4.5.0 + tracer.endCurrentSpan(null); + } + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/CurrentEventHelper.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/CurrentEventHelper.java deleted file mode 100644 index c575cc07176..00000000000 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/CurrentEventHelper.java +++ /dev/null @@ -1,34 +0,0 @@ -package datadog.trace.instrumentation.mule4; - -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; - -import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import org.mule.runtime.api.event.EventContext; -import org.mule.runtime.core.privileged.event.PrivilegedEvent; - -public class CurrentEventHelper { - // Keeps track of the activated scope for the currently processing event, so it can be closed - // properly - private static final ThreadLocal currentEventScope = new ThreadLocal<>(); - - public static void handleEventChange( - final PrivilegedEvent event, ContextStore contextStore) { - final AgentScope currentScope = currentEventScope.get(); - if (null != currentScope) { - currentScope.close(); - } - AgentScope newScope = null; - if (null != event) { - EventContext eventContext = event.getContext(); - if (null != eventContext) { - AgentSpan span = contextStore.get(eventContext); - if (null != span) { - newScope = activateSpan(span); - } - } - } - currentEventScope.set(newScope); - } -} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java new file mode 100644 index 00000000000..64ac273326b --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/DDEventTracer.java @@ -0,0 +1,222 @@ +package datadog.trace.instrumentation.mule4; + +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; +import static datadog.trace.instrumentation.mule4.MuleDecorator.DECORATE; + +import datadog.trace.bootstrap.ContextStore; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import java.util.Map; +import java.util.Optional; +import java.util.function.Supplier; +import javax.annotation.Nonnull; +import org.mule.runtime.api.component.Component; +import org.mule.runtime.api.event.EventContext; +import org.mule.runtime.api.message.Error; +import org.mule.runtime.api.profiling.tracing.Span; +import org.mule.runtime.core.api.event.CoreEvent; +import org.mule.runtime.tracer.api.EventTracer; +import org.mule.runtime.tracer.api.context.getter.DistributedTraceContextGetter; +import org.mule.runtime.tracer.api.sniffer.SpanSnifferManager; +import org.mule.runtime.tracer.api.span.info.EnrichedInitialSpanInfo; +import org.mule.runtime.tracer.api.span.info.InitialSpanInfo; +import org.mule.runtime.tracer.api.span.validation.Assertion; +import org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo; +import org.mule.runtime.tracer.customization.impl.provider.LazyInitialSpanInfo; + +/** + * This class is responsible for translating span reported by mule internal observability into DD + * ones. + */ +public class DDEventTracer implements EventTracer { + /** Holds the link between mule event context <-> ddSpan */ + private final ContextStore eventContextStore; + + private final ContextStore componentContextStore; + + private final EventTracer delegate; + + public DDEventTracer( + ContextStore eventContextStore, + ContextStore componentContextStore, + EventTracer delegate) { + this.eventContextStore = eventContextStore; + this.componentContextStore = componentContextStore; + this.delegate = delegate; + } + + private AgentSpan maybeExtractCurrentSpan(final CoreEvent coreEvent) { + if (coreEvent == null || coreEvent.getContext() == null) { + return null; + } + SpanState spanState = eventContextStore.get(coreEvent.getContext()); + return spanState != null ? spanState.getSpanContextSpan() : null; + } + + private AgentSpan findParent(final EventContext eventContext) { + SpanState spanState = eventContextStore.get(eventContext); + if (spanState != null) { + return spanState.getEventContextSpan(); + } + return activeSpan(); + } + + private Component findComponent(final InitialSpanInfo initialSpanInfo) { + if (initialSpanInfo instanceof ExecutionInitialSpanInfo) { + return componentContextStore.get(initialSpanInfo); + } else if (initialSpanInfo instanceof LazyInitialSpanInfo) { + return findComponent(((LazyInitialSpanInfo) initialSpanInfo).getDelegate()); + } else if (initialSpanInfo instanceof EnrichedInitialSpanInfo) { + return findComponent(((EnrichedInitialSpanInfo) initialSpanInfo).getBaseInitialSpanInfo()); + } + return null; + } + + private void linkToContext(@Nonnull final EventContext eventContext, final AgentSpan span) { + final SpanState previousState = eventContextStore.get(eventContext); + final AgentSpan spanToLink; + if (span != null) { + spanToLink = span; + } else if (previousState != null) { + spanToLink = previousState.getEventContextSpan(); + } else { + spanToLink = null; + } + + eventContextStore.put( + eventContext, new SpanState(spanToLink, previousState).withSpanContextSpan(span)); + } + + private void handleNewSpan(CoreEvent event, InitialSpanInfo spanInfo) { + if (event == null || event.getContext() == null) { + // we cannot store properly the span in the context. + return; + } + + final EventContext eventContext = event.getContext(); + + final AgentSpan span = + DECORATE.onMuleSpan(findParent(eventContext), spanInfo, event, findComponent(spanInfo)); + linkToContext(eventContext, span); + } + + private void handleEndOfSpan(CoreEvent event) { + if (event == null || event.getContext() == null) { + return; + } + final EventContext eventContext = event.getContext(); + final SpanState spanState = eventContextStore.get(eventContext); + if (spanState == null) { + return; + } + if (spanState.getSpanContextSpan() != null) { + final AgentSpan span = spanState.getSpanContextSpan(); + DECORATE.beforeFinish(span).finish(); + } + eventContextStore.put(eventContext, spanState.getPreviousState()); + } + + @Override + public Optional startSpan(CoreEvent event, InitialSpanInfo spanInfo) { + handleNewSpan(event, spanInfo); + final Optional span = delegate.startSpan(event, spanInfo); + if (span.isPresent()) { + return span; + } + return NoopMuleSpan.INSTANCE; + } + + @Override + public Optional startSpan(CoreEvent event, InitialSpanInfo spanInfo, Assertion assertion) { + handleNewSpan(event, spanInfo); + final Optional span = delegate.startSpan(event, spanInfo, assertion); + if (span.isPresent()) { + return span; + } + return NoopMuleSpan.INSTANCE; + } + + @Override + public void endCurrentSpan(CoreEvent event) { + try { + delegate.endCurrentSpan(event); + } finally { + handleEndOfSpan(event); + } + } + + @Override + public void endCurrentSpan(CoreEvent event, Assertion condition) { + try { + delegate.endCurrentSpan(event, condition); + } finally { + handleEndOfSpan(event); + } + } + + @Override + public void injectDistributedTraceContext( + EventContext eventContext, DistributedTraceContextGetter distributedTraceContextGetter) { + // TODO: we do not use it today since we've our injectors. However it can be handy in case we do + // not support some connectors + delegate.injectDistributedTraceContext(eventContext, distributedTraceContextGetter); + } + + @Override + public void recordErrorAtCurrentSpan( + CoreEvent event, Supplier errorSupplier, boolean isErrorEscapingCurrentSpan) { + try { + delegate.recordErrorAtCurrentSpan(event, errorSupplier, isErrorEscapingCurrentSpan); + } finally { + final AgentSpan span = maybeExtractCurrentSpan(event); + if (span != null) { + final Error error = errorSupplier.get(); + if (error != null && error.getCause() != null) { + DECORATE.onError(span, error.getCause()); + } + } + } + } + + @Override + public void setCurrentSpanName(CoreEvent event, String name) { + try { + delegate.setCurrentSpanName(event, name); + } finally { + final AgentSpan span = maybeExtractCurrentSpan(event); + if (span != null) { + span.setResourceName(name); + } + } + } + + @Override + public void addCurrentSpanAttribute(CoreEvent event, String key, String value) { + try { + delegate.addCurrentSpanAttribute(event, key, value); + } finally { + final AgentSpan span = maybeExtractCurrentSpan(event); + if (span != null) { + span.setTag(key, value); + } + } + } + + @Override + public void addCurrentSpanAttributes(CoreEvent event, Map attributes) { + try { + delegate.addCurrentSpanAttributes(event, attributes); + } finally { + final AgentSpan span = maybeExtractCurrentSpan(event); + if (span != null) { + for (Map.Entry entry : attributes.entrySet()) { + span.setTag(entry.getKey(), entry.getValue()); + } + } + } + } + + @Override + public SpanSnifferManager getSpanSnifferManager() { + return delegate.getSpanSnifferManager(); + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java index a41cf2cb60d..478584e33bb 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextCreationAdvice.java @@ -5,10 +5,10 @@ import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import org.mule.runtime.api.event.EventContext; import org.mule.runtime.core.internal.event.DefaultEventContext; +import org.mule.runtime.tracer.api.EventTracer; public class EventContextCreationAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) @@ -27,21 +27,28 @@ public static void onExit( } CallDepthThreadLocalMap.reset(EventContext.class); - final ContextStore contextStore = - InstrumentationContext.get(EventContext.class, AgentSpan.class); - AgentSpan span = null; + final ContextStore contextStore = + InstrumentationContext.get(EventContext.class, SpanState.class); + SpanState spanState = null; // This is a roundabout way to know if we are in the constructor for DefaultEventContext or // ChildContext. Since ChildContext is is a private inner class, we can't access it from here. if (zis instanceof DefaultEventContext) { - span = activeSpan(); + spanState = new SpanState(activeSpan(), null); } else if (arg instanceof EventContext) { // This means that we are in the constructor for ChildContext and we should copy the span // from the parent EventContext which is the first argument. - span = contextStore.get((EventContext) arg); - } - if (null != span) { - contextStore.put(zis, span); + final SpanState parentState = contextStore.get((EventContext) arg); + if (parentState != null) { + spanState = new SpanState(parentState.getEventContextSpan(), null); + } } + + contextStore.put(zis, spanState); + } + + private static void muzzleCheck(final EventTracer tracer) { + // introduced in 4.5.0 + tracer.endCurrentSpan(null); } } diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java index ee0681098d1..bcc465d19cc 100644 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventContextInstrumentation.java @@ -1,12 +1,10 @@ package datadog.trace.instrumentation.mule4; -import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import java.util.Map; /** * Events in Mule have an {@code EventContext} attached to them, that travels with the event through @@ -14,18 +12,9 @@ * and activate/deactivate the span when mule changes which event it is processing. */ @AutoService(InstrumenterModule.class) -public final class EventContextInstrumentation extends InstrumenterModule.Tracing +public final class EventContextInstrumentation extends AbstractMuleInstrumentation implements Instrumenter.ForKnownTypes { - public EventContextInstrumentation() { - super("mule"); - } - - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public String[] knownMatchingTypes() { return new String[] { @@ -35,14 +24,12 @@ public String[] knownMatchingTypes() { } @Override - public Map contextStore() { - return singletonMap( - "org.mule.runtime.api.event.EventContext", - "datadog.trace.bootstrap.instrumentation.api.AgentSpan"); + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), packageName + ".EventContextCreationAdvice"); } @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice(isConstructor(), packageName + ".EventContextCreationAdvice"); + public String muzzleDirective() { + return "before-4.5.0"; } } diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java new file mode 100644 index 00000000000..82069ff2d74 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/EventTracerInstrumentation.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.mule4; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; +import datadog.trace.bootstrap.InstrumentationContext; +import net.bytebuddy.asm.Advice; +import org.mule.runtime.api.component.Component; +import org.mule.runtime.api.event.EventContext; +import org.mule.runtime.core.api.event.CoreEvent; +import org.mule.runtime.tracer.api.EventTracer; +import org.mule.runtime.tracer.api.span.info.InitialSpanInfo; + +@AutoService(InstrumenterModule.class) +public class EventTracerInstrumentation extends AbstractMuleInstrumentation + implements Instrumenter.ForSingleType { + + @Override + public String instrumentedType() { + return "org.mule.runtime.tracer.impl.SelectableCoreEventTracer"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + NameMatchers.named("updateSelectedCoreEventTracer"), + getClass().getName() + "$SwapCoreTracerAdvice"); + } + + public static class SwapCoreTracerAdvice { + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void afterInit( + @Advice.FieldValue(value = "selectedCoreEventTracer", readOnly = false) + EventTracer eventTracer) { + eventTracer = + new DDEventTracer( + InstrumentationContext.get(EventContext.class, SpanState.class), + InstrumentationContext.get(InitialSpanInfo.class, Component.class), + eventTracer); + } + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java new file mode 100644 index 00000000000..80083de1848 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/ExecutionInitialSpanInfoInstrumentation.java @@ -0,0 +1,39 @@ +package datadog.trace.instrumentation.mule4; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.InstrumentationContext; +import net.bytebuddy.asm.Advice; +import org.mule.runtime.api.component.Component; +import org.mule.runtime.tracer.api.span.info.InitialSpanInfo; +import org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo; + +@AutoService(InstrumenterModule.class) +public class ExecutionInitialSpanInfoInstrumentation extends AbstractMuleInstrumentation + implements Instrumenter.ForSingleType { + + @Override + public String instrumentedType() { + return "org.mule.runtime.tracer.customization.impl.info.ExecutionInitialSpanInfo"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isConstructor().and(takesArgument(0, named("org.mule.runtime.api.component.Component"))), + getClass().getName() + "$StoreComponentAdvice"); + } + + public static class StoreComponentAdvice { + @Advice.OnMethodExit(suppress = Throwable.class) + public static void afterConstruct( + @Advice.This ExecutionInitialSpanInfo self, @Advice.Argument(0) final Component component) { + InstrumentationContext.get(InitialSpanInfo.class, Component.class).put(self, component); + } + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java new file mode 100644 index 00000000000..ecd17b30a15 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java @@ -0,0 +1,94 @@ +package datadog.trace.instrumentation.mule4; + +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.MULE_CORRELATION_ID; +import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.MULE_LOCATION; + +import datadog.trace.api.Functions; +import datadog.trace.api.cache.DDCache; +import datadog.trace.api.cache.DDCaches; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; +import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; +import java.util.function.Function; +import org.mule.runtime.api.component.Component; +import org.mule.runtime.core.api.event.CoreEvent; +import org.mule.runtime.tracer.api.span.info.InitialSpanInfo; + +public class MuleDecorator extends BaseDecorator { + private static final CharSequence MULE = UTF8BytesString.create("mule"); + private static final CharSequence OPERATION_NAME = UTF8BytesString.create("mule.action"); + public static final MuleDecorator DECORATE = new MuleDecorator(); + private static final DDCache TAG_CACHE = DDCaches.newFixedSizeCache(128); + private static final Function TAG_ADDER = + new Functions.Prefix("mule.").andThen(new Functions.ToString<>()); + private static final DDCache COMPONENT_DOC_CACHE = + DDCaches.newFixedSizeCache(1014); + private static final Function COMPONENT_DOC_ADDER = + component -> { + final Object ret = component.getAnnotation(Component.Annotations.NAME_ANNOTATION_KEY); + if (ret != null) { + return ret.toString(); + } + return null; + }; + + @Override + protected String[] instrumentationNames() { + return new String[] {MULE.toString()}; + } + + @Override + protected CharSequence spanType() { + return InternalSpanTypes.MULE; + } + + @Override + protected CharSequence component() { + return MULE; + } + + @Override + public AgentSpan afterStart(final AgentSpan span) { + span.setMeasured(true); + span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_INTERNAL); + return super.afterStart(span); + } + + public AgentSpan onMuleSpan( + AgentSpan parentSpan, InitialSpanInfo spanInfo, CoreEvent event, Component component) { + // we stick with the same level of detail of OTEL exporter. + // if not exportable we're not going to create a real span but we still need to track those + // spans to keep a correct hierarchy. + if (spanInfo.getInitialExportInfo() != null + && !spanInfo.getInitialExportInfo().isExportable()) { + return null; + } + final AgentSpan span; + if (parentSpan == null) { + span = startSpan(OPERATION_NAME); + } else { + span = startSpan(OPERATION_NAME, parentSpan.context()); + } + // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add + // different things through this method. Using the map version is not the same. + spanInfo.forEachAttribute((s, s2) -> span.setTag(TAG_CACHE.computeIfAbsent(s, TAG_ADDER), s2)); + span.setTag(MULE_CORRELATION_ID, event.getCorrelationId()); + // cache the resource name might be complex since it depends on a couple of keys + String extraDetail = null; + if (component != null) { + extraDetail = COMPONENT_DOC_CACHE.computeIfAbsent(component, COMPONENT_DOC_ADDER); + } + if (extraDetail == null) { + extraDetail = (String) span.getTag(MULE_LOCATION); + } + if (extraDetail != null) { + span.setResourceName(spanInfo.getName() + " " + extraDetail); + } else { + span.setResourceName(spanInfo.getName()); + } + return afterStart(span); + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java new file mode 100644 index 00000000000..c5aa1cc8ca4 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/NoopMuleSpan.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.mule4; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import org.mule.runtime.api.profiling.tracing.Span; +import org.mule.runtime.api.profiling.tracing.SpanDuration; +import org.mule.runtime.api.profiling.tracing.SpanError; +import org.mule.runtime.api.profiling.tracing.SpanIdentifier; + +public class NoopMuleSpan implements Span { + public static final Optional INSTANCE = Optional.of(new NoopMuleSpan()); + + @Override + public Span getParent() { + return null; + } + + @Override + public SpanIdentifier getIdentifier() { + return SpanIdentifier.INVALID_SPAN_IDENTIFIER; + } + + @Override + public String getName() { + return ""; + } + + @Override + public SpanDuration getDuration() { + return null; + } + + @Override + public List getErrors() { + return Collections.emptyList(); + } + + @Override + public boolean hasErrors() { + return false; + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventInstrumentation.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventInstrumentation.java deleted file mode 100644 index 1dbc1c93385..00000000000 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventInstrumentation.java +++ /dev/null @@ -1,51 +0,0 @@ -package datadog.trace.instrumentation.mule4; - -import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static java.util.Collections.singletonMap; - -import com.google.auto.service.AutoService; -import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.agent.tooling.InstrumenterModule; -import java.util.Map; - -/** - * The {@code PrivilegedEvent} has a method that is called to set which {@code Event} is currently - * being processed on this {@code Thread}. We activate/deactivate the span associated to that {@code - * Event} via its {@code EventContext}. - */ -@AutoService(InstrumenterModule.class) -public final class PrivilegedEventInstrumentation extends InstrumenterModule.Tracing - implements Instrumenter.ForSingleType { - - public PrivilegedEventInstrumentation() { - super("mule"); - } - - @Override - protected boolean defaultEnabled() { - return false; - } - - @Override - public String instrumentedType() { - return "org.mule.runtime.core.privileged.event.PrivilegedEvent"; - } - - @Override - public Map contextStore() { - return singletonMap( - "org.mule.runtime.api.event.EventContext", - "datadog.trace.bootstrap.instrumentation.api.AgentSpan"); - } - - @Override - public void methodAdvice(MethodTransformer transformer) { - transformer.applyAdvice( - named("setCurrentEvent"), packageName + ".PrivilegedEventSetCurrentAdvice"); - } - - @Override - public String[] helperClassNames() { - return new String[] {packageName + ".CurrentEventHelper"}; - } -} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventSetCurrentAdvice.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventSetCurrentAdvice.java deleted file mode 100644 index 0abe4f13675..00000000000 --- a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/PrivilegedEventSetCurrentAdvice.java +++ /dev/null @@ -1,15 +0,0 @@ -package datadog.trace.instrumentation.mule4; - -import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import net.bytebuddy.asm.Advice; -import org.mule.runtime.api.event.EventContext; -import org.mule.runtime.core.privileged.event.PrivilegedEvent; - -public class PrivilegedEventSetCurrentAdvice { - @Advice.OnMethodEnter(suppress = Throwable.class) - public static void onEnter(@Advice.Argument(0) final PrivilegedEvent event) { - CurrentEventHelper.handleEventChange( - event, InstrumentationContext.get(EventContext.class, AgentSpan.class)); - } -} diff --git a/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java new file mode 100644 index 00000000000..2a531689289 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/SpanState.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.mule4; + +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; + +public class SpanState { + private final AgentSpan eventContextSpan; + private final SpanState previousState; + private AgentSpan spanContextSpan; + + public SpanState(AgentSpan eventContextSpan, SpanState previousState) { + this.eventContextSpan = eventContextSpan; + this.previousState = previousState; + } + + public AgentSpan getEventContextSpan() { + return eventContextSpan; + } + + public SpanState getPreviousState() { + return previousState; + } + + public AgentSpan getSpanContextSpan() { + return spanContextSpan; + } + + public SpanState withSpanContextSpan(AgentSpan spanContextSpan) { + this.spanContextSpan = spanContextSpan; + return this; + } + + @Override + public String toString() { + return "SpanState{" + + "eventContextSpan=" + + eventContextSpan + + ", previousState=" + + previousState + + ", spanContextSpan=" + + spanContextSpan + + '}'; + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy index 7edddae3ce4..e77c2469f81 100644 --- a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy +++ b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleForkedTest.groovy @@ -1,10 +1,16 @@ package mule4 +import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer +import static mule4.MuleTestApplicationConstants.TEST_APPLICATION_JAR +import static mule4.MuleTestApplicationConstants.TEST_APPLICATION_NAME +import static org.mule.runtime.api.util.MuleTestUtil.muleSpan + import com.squareup.moshi.Moshi import com.squareup.moshi.Types import datadog.trace.agent.test.base.WithHttpServer import datadog.trace.api.DDSpanTypes import datadog.trace.bootstrap.instrumentation.api.Tags +import datadog.trace.core.DDSpan import datadog.trace.instrumentation.aws.ExpectedQueryParams import okhttp3.HttpUrl import okhttp3.MediaType @@ -13,9 +19,6 @@ import okhttp3.RequestBody import spock.lang.AutoCleanup import spock.lang.Shared -import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer -import static mule4.MuleTestApplicationConstants.* - class MuleForkedTest extends WithHttpServer { // TODO since mule uses reactor core, things sometime propagate to places where they're not closed @@ -27,10 +30,7 @@ class MuleForkedTest extends WithHttpServer { @Override protected void configurePreAgent() { super.configurePreAgent() - - injectSysConfig("integration.grizzly-filterchain.enabled", "true") injectSysConfig("integration.mule.enabled", "true") - injectSysConfig("integration.grizzly-client.enabled", "true") } @AutoCleanup @@ -64,8 +64,8 @@ class MuleForkedTest extends WithHttpServer { container.start() def appProperties = new Properties() def reqUri = requestServer.address - ["test.server.port": "$port", "test.server.host": "localhost", "test.request.port": "${reqUri.port}", - "test.request.host": "${reqUri.host}", "test.request.path": "/remote-client-request", + ["test.server.port" : "$port", "test.server.host": "localhost", "test.request.port": "${reqUri.port}", + "test.request.host" : "${reqUri.host}", "test.request.path": "/remote-client-request", "test.request.pfe_path": "/remote-pfe-request"].each { // Force cast GStringImpl to String since Mule code does String casts of some properties appProperties.put((String) it.key, (String) it.value) @@ -93,9 +93,9 @@ class MuleForkedTest extends WithHttpServer { response.code() == 200 response.body().string() == "Hello Client." assertTraces(1) { - trace(2) { + trace(4) { sortSpansByStart() - span(0) { + span { operationName operation() resourceName "GET /client-request" spanType DDSpanTypes.HTTP_SERVER @@ -113,8 +113,10 @@ class MuleForkedTest extends WithHttpServer { defaultTags() } } - span(1) { - childOf(span(0)) + muleSpan(it, "mule:flow", "MuleHttpServerClientTestFlow") + muleSpan(it, "http:request", "Http Request") + span { + childOfPrevious() operationName "http.request" resourceName "GET /remote-client-request" spanType DDSpanTypes.HTTP_CLIENT @@ -125,7 +127,7 @@ class MuleForkedTest extends WithHttpServer { "$Tags.HTTP_STATUS" 200 "$Tags.HTTP_URL" "${requestServer.address.resolve("/remote-client-request")}" "$Tags.PEER_HOSTNAME" "localhost" - "$Tags.PEER_PORT" { true } // is this really the best way to ignore tags? + "$Tags.PEER_PORT" { Integer } defaultTags() } } @@ -138,7 +140,7 @@ class MuleForkedTest extends WithHttpServer { def names = ["Alyssa", "Ben", "Cy", "Eva", "Lem", "Louis"] def jsonAdapter = new Moshi.Builder().build().adapter(Types.newParameterizedType(List, String)) def input = jsonAdapter.toJson(names) - def output = names.collect {name -> "Hello $name" } + def output = names.collect { name -> "Hello $name" } def url = HttpUrl.get(address.resolve("/pfe-request")).newBuilder().build() def body = RequestBody.create(MediaType.get("application/json"), input) def request = new Request.Builder().url(url).method("PUT", body).build() @@ -149,9 +151,10 @@ class MuleForkedTest extends WithHttpServer { then: response.code() == 200 jsonAdapter.fromJson(response.body().string()) == output + assertTraces(1) { - trace(1 + names.size()) { traceAssert -> - traceAssert.span(0) { + trace(4 + 3 * names.size(), new TreeComparator(trace(0))) { traceAssert -> + span { operationName operation() resourceName "PUT /pfe-request" spanType DDSpanTypes.HTTP_SERVER @@ -165,13 +168,24 @@ class MuleForkedTest extends WithHttpServer { "$Tags.HTTP_USER_AGENT" String "$Tags.PEER_HOST_IPV4" "127.0.0.1" "$Tags.HTTP_CLIENT_IP" "127.0.0.1" - "$Tags.PEER_PORT" { true } // is this really the best way to ignore tags? + "$Tags.PEER_PORT" { Integer } defaultTags() } } + def flowParent = muleSpan(traceAssert, "mule:flow", "MulePFETestFlow") + def foreachParent = muleSpan(traceAssert, "mule:parallel-foreach", "PFE", flowParent) + muleSpan(traceAssert, "mule:set-payload", "PFE Set Payload", flowParent) + def iterationParents = [] for (def pos = 1; pos <= names.size(); pos++) { - traceAssert.span(pos) { - childOf(span(0)) + iterationParents += muleSpan(traceAssert, "mule:parallel-foreach:iteration", "PFE", foreachParent) + } + def requestParents =[] + iterationParents.each { parent -> + requestParents += muleSpan(traceAssert, "http:request", "PFE Request", parent) + } + requestParents.each {parent -> + traceAssert.span { + childOf parent operationName "http.request" resourceName "GET /remote-pfe-request" spanType DDSpanTypes.HTTP_CLIENT @@ -191,6 +205,42 @@ class MuleForkedTest extends WithHttpServer { } } + /** + * Sorts the spans by level in the trace (how many parents). + * If in the same level, the one with lower parent it will come first. + */ + private static class TreeComparator implements Comparator { + private final Map levels + private final Map traceMap + + TreeComparator(List trace) { + traceMap = trace.collectEntries { [(it.spanId): it] } + levels = trace.collectEntries({ + [(it): walkUp(traceMap, it, 0)] + }) + } + + @Override + int compare(DDSpan o1, DDSpan o2) { + def len = levels[o1] <=> levels[o2] + // if they are not on the same tree level, take the one with shortest path to the root + if (len != 0) { + return len + } + if (o1.parentId == o2.parentId) { + return o1.spanId <=> o2.spanId + } + return compare(traceMap.get(o1.parentId), traceMap.get(o2.parentId)) + } + + def walkUp(Map traceMap, DDSpan span, int size) { + if (span.parentId == 0) { + return size + } + return walkUp(traceMap, traceMap.get(span.parentId), size + 1) + } + } + //test for v1 will be added once grizzly will support v1 naming @Override int version() { @@ -206,4 +256,5 @@ class MuleForkedTest extends WithHttpServer { String operation() { return "grizzly.request" } + } diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy index 66330c7b6ac..bf80cb123e9 100644 --- a/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy +++ b/dd-java-agent/instrumentation/mule-4/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy @@ -1,10 +1,11 @@ package mule4 +import static org.mule.runtime.api.util.MuleTestUtil.muleSpan + +import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.base.HttpServerTest import spock.lang.Shared -import static mule4.MuleTestApplicationConstants.* - class MuleHttpServerForkedTest extends HttpServerTest { // TODO since mule uses reactor core, things sometime propagate to places where they're not closed @@ -26,11 +27,35 @@ class MuleHttpServerForkedTest extends HttpServerTest { return false } + @Override + boolean testNotFound() { + false + } + + @Override + void controllerSpan(TraceAssert trace, ServerEndpoint endpoint = null) { + def expectsError = endpoint == ServerEndpoint.EXCEPTION + def flowSpan = muleSpan(trace, "mule:flow", "MuleHttpServerTestFlow", null, expectsError) + muleSpan(trace, "java:new", "Create Handler", flowSpan) + muleSpan(trace, "java:invoke", "Handle Message", flowSpan, expectsError) + super.controllerSpan(trace, endpoint) + if (!expectsError) { + muleSpan(trace, "mule:set-variable", "Set Response Code", flowSpan) + muleSpan(trace, "mule:set-payload", "Set Response Body",flowSpan) + } else { + muleSpan(trace, "mule:on-error-propagate", "unknown",flowSpan) + } + } + + + @Override + int spanCount(ServerEndpoint endpoint) { + return super.spanCount(endpoint) + (endpoint == ServerEndpoint.EXCEPTION ? 4 : 5) + } + @Override protected void configurePreAgent() { super.configurePreAgent() - - injectSysConfig("integration.grizzly-filterchain.enabled", "true") injectSysConfig("integration.mule.enabled", "true") } @@ -63,14 +88,26 @@ class MuleHttpServerForkedTest extends HttpServerTest { // Force cast GStringImpl to String since Mule code does String casts of some properties appProperties.put((String) it.key, (String) it.value) } - def app = new URI("file:" + new File(String.valueOf(buildProperties.get(TEST_APPLICATION_JAR))).canonicalPath) + def app = new URI("file:" + new File(String.valueOf(buildProperties.get(MuleTestApplicationConstants.TEST_APPLICATION_JAR))).canonicalPath) container.deploy(app, appProperties) return container } @Override void stopServer(MuleTestContainer container) { - container.undeploy(String.valueOf(buildProperties.get(TEST_APPLICATION_NAME))) + container.undeploy(String.valueOf(buildProperties.get(MuleTestApplicationConstants.TEST_APPLICATION_NAME))) container.stop() } } + +/** + * This test wants to check that we built otel tracing (based on the sdk) does not interfere with our + */ +class MuleHttpServerOTELEnabledForkedTest extends MuleHttpServerForkedTest { + + @Override + MuleTestContainer startServer(int port) { + System.setProperty("mule.openTelemetry.tracer.exporter.enabled", "true") + return super.startServer(port) + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/HttpServerTestBridge.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/HttpServerTestBridge.groovy index c2892382945..b0e6fa26578 100644 --- a/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/HttpServerTestBridge.groovy +++ b/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/HttpServerTestBridge.groovy @@ -13,7 +13,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint class HttpServerTestBridge { static Object[] testHandle(String requestPath) { ServerEndpoint endpoint = ServerEndpoint.forPath(requestPath) - if (endpoint == ServerEndpoint.EXCEPTION) { controller(endpoint) { throw new Exception(endpoint.body) diff --git a/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/MuleTestUtil.groovy b/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/MuleTestUtil.groovy new file mode 100644 index 00000000000..62f3e193e15 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/test/groovy/org/mule/runtime/api/util/MuleTestUtil.groovy @@ -0,0 +1,38 @@ +package org.mule.runtime.api.util + +import datadog.trace.agent.test.asserts.TraceAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags +import datadog.trace.bootstrap.instrumentation.api.Tags +import datadog.trace.core.DDSpan + +class MuleTestUtil { + static DDSpan muleSpan(TraceAssert traceAssert, String componentType, String componentName, DDSpan parent = null, boolean error = false) { + def ret + traceAssert.span { + ret = it.span + operationName "mule.action" + resourceName "$componentType $componentName" + if (parent != null) { + childOf parent + } else { + childOfPrevious() + } + errored error + spanType DDSpanTypes.MULE + tags { + "$Tags.COMPONENT" "mule" + "$Tags.SPAN_KIND" "$Tags.SPAN_KIND_INTERNAL" + "mule.location" { String } + "mule.correlation_id" { String } + if (error) { + "$DDTags.ERROR_TYPE" { String } + "$DDTags.ERROR_MSG" { String } + "$DDTags.ERROR_STACK" { String } + } + defaultTags() + } + } + ret + } +} diff --git a/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/MuleTestContainer.java b/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/MuleTestContainer.java index b42151ebd26..5b249d35759 100644 --- a/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/MuleTestContainer.java +++ b/dd-java-agent/instrumentation/mule-4/src/test/java/mule4/MuleTestContainer.java @@ -7,7 +7,7 @@ import org.mule.runtime.api.exception.MuleException; import org.mule.runtime.api.util.MuleSystemProperties; import org.mule.runtime.core.api.config.MuleProperties; -import org.mule.runtime.module.launcher.MuleContainer; +import org.mule.runtime.module.launcher.DefaultMuleContainer; /** * A Mule test container where it is possible to deploy and undeploy mule applications. @@ -16,7 +16,7 @@ * mule directory. */ public class MuleTestContainer { - final MuleContainer container; + DefaultMuleContainer container; public MuleTestContainer(File muleBaseDirectory) throws IOException { if (!muleBaseDirectory.exists()) { @@ -28,6 +28,7 @@ public MuleTestContainer(File muleBaseDirectory) throws IOException { // This is the Mule runtime folder where files are stored System.setProperty(MuleProperties.MULE_BASE_DIRECTORY_PROPERTY, basePath); System.setProperty(MuleProperties.MULE_HOME_DIRECTORY_PROPERTY, basePath); + System.setProperty("mule.classloader.container.jpmsModuleLayer", "false"); // Mule is a bit picky with some directories existing, so let's create them for (String dirName : new String[] {"domains/default", "apps"}) { File dir = new File(muleBaseDirectory, dirName); @@ -35,7 +36,19 @@ public MuleTestContainer(File muleBaseDirectory) throws IOException { dir.mkdirs(); } } - this.container = new MuleContainer(new String[0]); + try { + this.container = DefaultMuleContainer.class.newInstance(); + } catch (Throwable t) { + t.printStackTrace(); + try { + this.container = + DefaultMuleContainer.class + .getDeclaredConstructor(String[].class) + .newInstance((Object) new String[0]); + } catch (Throwable t2) { + throw new RuntimeException("Unable to instantiate MuleContainer", t2); + } + } } public void start() throws MuleException { @@ -50,7 +63,7 @@ public void undeploy(String appName) { container.getDeploymentService().undeploy(appName); } - public void stop() throws MuleException { + public void stop() throws Exception { container.shutdown(); } } diff --git a/dd-java-agent/instrumentation/mule-4/src/test/resources/log4j2.xml b/dd-java-agent/instrumentation/mule-4/src/test/resources/log4j2.xml new file mode 100644 index 00000000000..d2ec675c2d1 --- /dev/null +++ b/dd-java-agent/instrumentation/mule-4/src/test/resources/log4j2.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy index c89f7f5da9c..166eb92f6b6 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy @@ -1,5 +1,7 @@ package datadog.trace.agent.test.asserts +import static TraceAssert.assertTrace + import datadog.trace.common.writer.ListWriter import datadog.trace.core.DDSpan import groovy.transform.stc.ClosureParams @@ -11,8 +13,6 @@ import org.spockframework.runtime.model.TextPosition import java.util.concurrent.atomic.AtomicInteger -import static TraceAssert.assertTrace - class ListWriterAssert { public static final Comparator> SORT_TRACES_BY_ID = new SortTracesById() public static final Comparator> SORT_TRACES_BY_START = new SortTracesByStart() @@ -108,8 +108,13 @@ class ListWriterAssert { @DelegatesTo(value = TraceAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) { trace(expectedSize, false, spec) } - void trace(int expectedSize, boolean sortByName, + @ClosureParams(value = SimpleType, options = ['datadog.trace.agent.test.asserts.TraceAssert']) + @DelegatesTo(value = TraceAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) { + trace(expectedSize, sortByName ? TraceAssert.NAME_COMPARATOR : null, spec) + } + + void trace(int expectedSize, Comparator sorter, @ClosureParams(value = SimpleType, options = ['datadog.trace.agent.test.asserts.TraceAssert']) @DelegatesTo(value = TraceAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) { def index = traceAssertCount.getAndIncrement() @@ -121,7 +126,7 @@ class ListWriterAssert { throw new ConcurrentModificationException("ListWriter modified during assertion") } assertedIndexes.add(index) - assertTrace(trace(index), expectedSize, sortByName, spec) + assertTrace(trace(index), expectedSize, sorter, spec) } void assertTracesAllVerified() { diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TraceAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TraceAssert.groovy index cb43d5af702..e82262b95fd 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TraceAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TraceAssert.groovy @@ -19,7 +19,7 @@ class TraceAssert { size = trace.size() } - private static final NAME_COMPARATOR = new Comparator() { + static final NAME_COMPARATOR = new Comparator() { @Override int compare(DDSpan o1, DDSpan o2) { int compare = o1.spanName.toString() <=> o2.spanName.toString() @@ -30,18 +30,18 @@ class TraceAssert { static void assertTrace(List trace, int expectedSize, @ClosureParams(value = SimpleType, options = ['datadog.trace.agent.test.asserts.TraceAssert']) @DelegatesTo(value = TraceAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) { - assertTrace(trace, expectedSize, false, spec) + assertTrace(trace, expectedSize, null, spec) } - static void assertTrace(List trace, int expectedSize, boolean sortByName, + static void assertTrace(List trace, int expectedSize, Comparator sorter, @ClosureParams(value = SimpleType, options = ['datadog.trace.agent.test.asserts.TraceAssert']) @DelegatesTo(value = TraceAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) { // Some tests do their own sorting of the spans which can happen concurrently with other code doing // iterations, so we make a copy of the list here to not cause a ConcurrentModificationException trace = new ArrayList(trace) assert trace.size() == expectedSize - if (sortByName) { - Collections.sort(trace, NAME_COMPARATOR) + if (sorter != null) { + Collections.sort(trace, sorter) } def asserter = new TraceAssert(trace) def clone = (Closure) spec.clone() diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy index 22d8dd0028e..2c2784ec889 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy @@ -97,7 +97,11 @@ abstract class HttpServerTest extends WithHttpServer { return key + ":" + value } static { - ((ch.qos.logback.classic.Logger) SERVER_LOGGER).setLevel(Level.DEBUG) + try { + ((ch.qos.logback.classic.Logger) SERVER_LOGGER).setLevel(Level.DEBUG) + } catch (Throwable t) { + SERVER_LOGGER.warn("Unable to set debug level for server logger", t) + } } @Override diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java index 115b0524bc5..361aab3845c 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.java @@ -28,7 +28,11 @@ public class OkHttpUtils { private static final Logger CLIENT_LOGGER = LoggerFactory.getLogger("http-client"); static { - ((ch.qos.logback.classic.Logger) CLIENT_LOGGER).setLevel(ch.qos.logback.classic.Level.DEBUG); + try { + ((ch.qos.logback.classic.Logger) CLIENT_LOGGER).setLevel(ch.qos.logback.classic.Level.DEBUG); + } catch (Throwable t) { + CLIENT_LOGGER.warn("Unable to set debug level to client logger", t); + } } private static final HttpLoggingInterceptor LOGGING_INTERCEPTOR = diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java index d8cbdad6048..908421d8538 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java @@ -34,4 +34,6 @@ public class DDSpanTypes { public static final String VULNERABILITY = "vulnerability"; public static final String PROTOBUF = "protobuf"; + + public static final String MULE = "mule"; } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a364186fdc8..0fef6ba4664 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -75,6 +75,8 @@ byte-buddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "b testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } +logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" } + log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j" } jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" } jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java index 430f74924da..f21559fcbf4 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InstrumentationTags.java @@ -116,4 +116,7 @@ public class InstrumentationTags { public static final String TIBCO_NODE = "tibco.node"; public static final String TIBCO_VERSION = "tibco.version"; + + public static final String MULE_CORRELATION_ID = "mule.correlation_id"; + public static final String MULE_LOCATION = "mule.location"; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java index 1bbc8931471..38944151d45 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/InternalSpanTypes.java @@ -47,4 +47,5 @@ public class InternalSpanTypes { public static final UTF8BytesString PROTOBUF = UTF8BytesString.create(DDSpanTypes.PROTOBUF); public static final UTF8BytesString TIBCO_BW = UTF8BytesString.create("tibco_bw"); + public static final UTF8BytesString MULE = UTF8BytesString.create(DDSpanTypes.MULE); } From 686f51ad82571f5a472b4bb7352791ed127d70c4 Mon Sep 17 00:00:00 2001 From: Bruce Bujon Date: Wed, 4 Dec 2024 12:54:52 +0100 Subject: [PATCH 096/106] =?UTF-8?q?Add=20JSON=E2=80=AFcomponent=20(#7973)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(json): Add JSON component * feat(internal-api): Remove Strings toJson and escapeToJson methods * feat(ci-visibility): Migrate to JSON component * feat(junit-4.10): Migrate to JSON component * feat(junit-5.3): Migrate to JSON component * feat(karate): Migrate to JSON component * feat(testng): Migrate to JSON component * feat(bootstrap): Migrate to JSON component * feat(json): Improve structure performance --- components/json/build.gradle.kts | 9 + .../datadog/json/JsonWriterBenchmark.java | 106 ++++++ .../main/java/datadog/json/JsonMapper.java | 106 ++++++ .../main/java/datadog/json/JsonStructure.java | 56 +++ .../main/java/datadog/json/JsonWriter.java | 339 ++++++++++++++++++ .../datadog/json/LenientJsonStructure.java | 34 ++ .../java/datadog/json/SafeJsonStructure.java | 89 +++++ .../groovy/datadog/json/JsonMapperTest.groovy | 89 +++++ .../java/datadog/json/JsonStructureTest.java | 33 ++ .../java/datadog/json/JsonWriterTest.java | 168 +++++++++ .../java/datadog/json/SafeJsonWriterTest.java | 132 +++++++ dd-java-agent/agent-bootstrap/build.gradle | 1 + .../agent-ci-visibility/build.gradle | 1 + .../trace/civisibility/ci/BuildkiteInfo.java | 2 +- .../trace/civisibility/ci/CITagsProvider.java | 2 +- .../trace/civisibility/ci/JenkinsInfo.java | 7 +- .../trace/civisibility/domain/TestImpl.java | 2 +- .../civisibility/domain/TestSuiteImpl.java | 2 +- .../events/TestEventsHandlerImpl.java | 21 +- dd-java-agent/build.gradle | 1 + .../instrumentation/junit4/JUnit4Utils.java | 5 +- .../junit5/JUnitPlatformUtils.java | 5 +- .../instrumentation/karate/KarateUtils.java | 4 +- .../karate/src/test/groovy/KarateTest.groovy | 2 +- .../events.ftl | 14 +- .../events.ftl | 4 +- .../events.ftl | 12 +- .../events.ftl | 4 +- .../resources/test-parameterized/events.ftl | 4 +- .../test-retry-parameterized/events.ftl | 12 +- .../instrumentation/testng/TestNGUtils.java | 19 +- .../BootstrapInitializationTelemetry.java | 113 +++--- .../datadog/trace/bootstrap/JsonBuffer.java | 264 -------------- ...ootstrapInitializationTelemetryTest.groovy | 14 +- .../trace/bootstrap/JsonBufferTest.groovy | 126 ------- dd-trace-core/build.gradle | 1 + .../writer/ddintake/CiTestCycleMapperV1.java | 4 +- gradle/dependencies.gradle | 1 + .../main/java/datadog/trace/util/Strings.java | 122 +------ .../datadog/trace/util/StringsTest.groovy | 59 --- settings.gradle | 1 + 41 files changed, 1291 insertions(+), 699 deletions(-) create mode 100644 components/json/build.gradle.kts create mode 100644 components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java create mode 100644 components/json/src/main/java/datadog/json/JsonMapper.java create mode 100644 components/json/src/main/java/datadog/json/JsonStructure.java create mode 100644 components/json/src/main/java/datadog/json/JsonWriter.java create mode 100644 components/json/src/main/java/datadog/json/LenientJsonStructure.java create mode 100644 components/json/src/main/java/datadog/json/SafeJsonStructure.java create mode 100644 components/json/src/test/groovy/datadog/json/JsonMapperTest.groovy create mode 100644 components/json/src/test/java/datadog/json/JsonStructureTest.java create mode 100644 components/json/src/test/java/datadog/json/JsonWriterTest.java create mode 100644 components/json/src/test/java/datadog/json/SafeJsonWriterTest.java delete mode 100644 dd-java-agent/src/main/java/datadog/trace/bootstrap/JsonBuffer.java delete mode 100644 dd-java-agent/src/test/groovy/datadog/trace/bootstrap/JsonBufferTest.groovy diff --git a/components/json/build.gradle.kts b/components/json/build.gradle.kts new file mode 100644 index 00000000000..4dca7fc3036 --- /dev/null +++ b/components/json/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + id("me.champeau.jmh") +} + +apply(from = "$rootDir/gradle/java.gradle") + +jmh { + version = "1.28" +} diff --git a/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java b/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java new file mode 100644 index 00000000000..6e9adc62efc --- /dev/null +++ b/components/json/src/jmh/java/datadog/json/JsonWriterBenchmark.java @@ -0,0 +1,106 @@ +package datadog.json; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; +import static org.openjdk.jmh.annotations.Mode.AverageTime; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.infra.Blackhole; + +@BenchmarkMode(AverageTime) +@OutputTimeUnit(MICROSECONDS) +@Fork(value = 1) +@SuppressWarnings("unused") +public class JsonWriterBenchmark { + @Benchmark + public void writeSimpleArray(Blackhole blackhole) { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginArray() + .beginObject() + .name("true") + .value(true) + .endObject() + .beginObject() + .name("false") + .value(false) + .endObject() + .endArray(); + blackhole.consume(writer.toString()); + } + } + + @Benchmark + public void writeComplexArray(Blackhole blackhole) { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginArray() + .value("first level") + .beginArray() + .value("second level") + .beginArray() + .value("third level") + .beginObject() + .name("key") + .value("value") + .endObject() + .beginObject() + .name("key") + .value("value") + .endObject() + .endArray() // second level + .beginObject() + .name("key") + .value("value") + .endObject() + .endArray() // first level + .beginObject() + .name("key") + .value("value") + .endObject() + .value("last value") + .endArray(); + blackhole.consume(writer.toString()); + } + } + + @Benchmark + public void writeComplexObject(Blackhole blackhole) { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginObject() + .name("attrs") + .beginObject() + .name("attr1") + .value("value1") + .name("attr2") + .value("value2") + .endObject() + .name("data") + .beginArray() + .beginObject() + .name("x") + .value(1) + .name("y") + .value(12.3) + .endObject() + .beginObject() + .name("x") + .value(2) + .name("y") + .value(4.56) + .endObject() + .beginObject() + .name("x") + .value(3) + .name("y") + .value(789) + .endObject() + .endArray() + .endObject(); + blackhole.consume(writer.toString()); + } + } +} diff --git a/components/json/src/main/java/datadog/json/JsonMapper.java b/components/json/src/main/java/datadog/json/JsonMapper.java new file mode 100644 index 00000000000..83b8c7f59b8 --- /dev/null +++ b/components/json/src/main/java/datadog/json/JsonMapper.java @@ -0,0 +1,106 @@ +package datadog.json; + +import java.util.Collection; +import java.util.Map; + +/** Utility class for simple Java structure mapping into JSON strings. */ +public final class JsonMapper { + + private JsonMapper() {} + + /** + * Converts a {@link String} to a JSON string. + * + * @param string The string to convert. + * @return The converted JSON string. + */ + public static String toJson(String string) { + if (string == null || string.isEmpty()) { + return ""; + } + try (JsonWriter writer = new JsonWriter()) { + writer.value(string); + return writer.toString(); + } + } + + /** + * Converts a {@link Map} to a JSON object. + * + * @param map The map to convert. + * @return The converted JSON object as Java string. + */ + public static String toJson(Map map) { + if (map == null || map.isEmpty()) { + return "{}"; + } + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + for (Map.Entry entry : map.entrySet()) { + writer.name(entry.getKey()); + Object value = entry.getValue(); + if (value == null) { + writer.nullValue(); + } else if (value instanceof String) { + writer.value((String) value); + } else if (value instanceof Double) { + writer.value((Double) value); + } else if (value instanceof Float) { + writer.value((Float) value); + } else if (value instanceof Long) { + writer.value((Long) value); + } else if (value instanceof Integer) { + writer.value((Integer) value); + } else if (value instanceof Boolean) { + writer.value((Boolean) value); + } else { + writer.value(value.toString()); + } + } + writer.endObject(); + return writer.toString(); + } + } + + /** + * Converts a {@link Iterable} to a JSON array. + * + * @param items The iterable to convert. + * @return The converted JSON array as Java string. + */ + @SuppressWarnings("DuplicatedCode") + public static String toJson(Collection items) { + if (items == null || items.isEmpty()) { + return "[]"; + } + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray(); + for (String item : items) { + writer.value(item); + } + writer.endArray(); + return writer.toString(); + } + } + + /** + * Converts a String array to a JSON array. + * + * @param items The array to convert. + * @return The converted JSON array as Java string. + */ + @SuppressWarnings("DuplicatedCode") + public static String toJson(String[] items) { + if (items == null) { + return "[]"; + } + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray(); + for (String item : items) { + writer.value(item); + } + writer.endArray(); + return writer.toString(); + } + } +} diff --git a/components/json/src/main/java/datadog/json/JsonStructure.java b/components/json/src/main/java/datadog/json/JsonStructure.java new file mode 100644 index 00000000000..72efe81ec31 --- /dev/null +++ b/components/json/src/main/java/datadog/json/JsonStructure.java @@ -0,0 +1,56 @@ +package datadog.json; + +/** The {@link JsonStructure} keeps track of JSON value being built. */ +interface JsonStructure { + /** + * Begins an object. + * + * @throws IllegalStateException if the object can not be started at this position. + */ + void beginObject(); + + /** + * Checks whether the current position is within an object. + * + * @return {@code true} if the current position is within an object, {@code false} otherwise. + */ + boolean objectStarted(); + + /** + * Ends the current object. + * + * @throws IllegalStateException if the current position is not within an object. + */ + void endObject(); + + /** Begins an array. */ + void beginArray(); + + /** + * Checks whether the current position is within an array. + * + * @return {@code true} if the current position is within an array, {@code false} otherwise. + */ + boolean arrayStarted(); + + /** + * Ends the current array. + * + * @throws IllegalStateException if the current position is not within an array. + */ + void endArray(); + + /** + * Adds a name to the current object. + * + * @throws IllegalStateException if the current position is not within an object. + */ + void addName(); + + /** + * Adds a value. + * + * @throws IllegalStateException if the current position can not have a value. + */ + void addValue(); +} diff --git a/components/json/src/main/java/datadog/json/JsonWriter.java b/components/json/src/main/java/datadog/json/JsonWriter.java new file mode 100644 index 00000000000..7e09b800717 --- /dev/null +++ b/components/json/src/main/java/datadog/json/JsonWriter.java @@ -0,0 +1,339 @@ +package datadog.json; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Locale.ROOT; + +import java.io.ByteArrayOutputStream; +import java.io.Flushable; +import java.io.IOException; +import java.io.OutputStreamWriter; + +/** + * A lightweight JSON writer without dependencies. It performs minimal JSON structure checks unless + * using the lenient mode. + */ +public final class JsonWriter implements Flushable, AutoCloseable { + private static final int INITIAL_CAPACITY = 256; + private final ByteArrayOutputStream outputStream; + private final OutputStreamWriter writer; + private final JsonStructure structure; + + private boolean requireComma; + + /** Creates a writer with structure check. */ + public JsonWriter() { + this(true); + } + + /** + * Creates a writer. + * + * @param safe {@code true} to use safe structure check, {@code false} for lenient mode. + */ + public JsonWriter(boolean safe) { + this.outputStream = new ByteArrayOutputStream(INITIAL_CAPACITY); + this.writer = new OutputStreamWriter(this.outputStream, UTF_8); + this.structure = safe ? new SafeJsonStructure() : new LenientJsonStructure(); + this.requireComma = false; + } + + /** + * Starts a JSON object. + * + * @return This writer instance. + */ + public JsonWriter beginObject() { + this.structure.beginObject(); + injectCommaIfNeeded(); + write('{'); + return this; + } + + /** + * * Ends the current JSON object. + * + * @return This writer. + */ + public JsonWriter endObject() { + this.structure.endObject(); + write('}'); + endsValue(); + return this; + } + + /** + * Writes an object property name. + * + * @param name The property name. + * @return This writer. + */ + public JsonWriter name(String name) { + if (name == null) { + throw new IllegalArgumentException("name cannot be null"); + } + this.structure.addName(); + injectCommaIfNeeded(); + writeStringLiteral(name); + write(':'); + return this; + } + + /** + * Writes a {@code null} value. + * + * @return This writer. + */ + public JsonWriter nullValue() { + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw("null"); + endsValue(); + return this; + } + + /** + * Writes JSON value without escaping it. + * + * @param value The JSON value to write. + * @return This writer. + */ + public JsonWriter jsonValue(String value) { + // No structure check here assuming raw JSON is safe to write + injectCommaIfNeeded(); + writeStringRaw(value); + endsValue(); + return this; + } + + /** + * Writes a boolean value. + * + * @param value The value to write. + * @return This writer. + */ + public JsonWriter value(boolean value) { + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw(value ? "true" : "false"); + endsValue(); + return this; + } + + /** + * Writes a string value. + * + * @param value The value to write. + * @return This writer. + */ + public JsonWriter value(String value) { + if (value == null) { + return nullValue(); + } + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringLiteral(value); + endsValue(); + return this; + } + + /** + * Writes an integer as a number value. + * + * @param value The integer to write. + * @return This writer. + */ + public JsonWriter value(int value) { + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw(Integer.toString(value)); + endsValue(); + return this; + } + + /** + * Writes a long as a number value. + * + * @param value The long to write. + * @return This writer. + */ + public JsonWriter value(long value) { + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw(Long.toString(value)); + endsValue(); + return this; + } + + /** + * Writes a float as a number value. + * + * @param value The float to write. + * @return This writer. + */ + public JsonWriter value(float value) { + if (Float.isNaN(value)) { + return nullValue(); + } + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw(Float.toString(value)); + endsValue(); + return this; + } + + /** + * Writes a double as a number value. + * + * @param value The value to write. + * @return This writer. + */ + public JsonWriter value(double value) { + if (Double.isNaN(value)) { + return nullValue(); + } + this.structure.addValue(); + injectCommaIfNeeded(); + writeStringRaw(Double.toString(value)); + endsValue(); + return this; + } + + /** + * Starts a JSON array. + * + * @return This writer. + */ + public JsonWriter beginArray() { + this.structure.beginArray(); + injectCommaIfNeeded(); + write('['); + return this; + } + + /** + * Ends the current JSON array. + * + * @return This writer. + */ + public JsonWriter endArray() { + this.structure.endArray(); + endsValue(); + write(']'); + return this; + } + + /** + * Gets the JSON String as a UTF-8 byte array. + * + * @return The JSON String as a UTF-8 byte array. + */ + public byte[] toByteArray() { + flush(); + return this.outputStream.toByteArray(); + } + + @Override + public String toString() { + return new String(toByteArray(), UTF_8); + } + + @Override + public void flush() { + try { + this.writer.flush(); + } catch (IOException ignored) { + } + } + + @Override + public void close() { + try { + this.outputStream.close(); + this.writer.close(); + } catch (IOException ignored) { + } + } + + private void injectCommaIfNeeded() { + if (this.requireComma) { + write(','); + } + this.requireComma = false; + } + + private void endsValue() { + this.requireComma = true; + } + + private void write(char ch) { + try { + this.writer.write(ch); + } catch (IOException ignored) { + } + } + + private void writeStringLiteral(String str) { + try { + this.writer.write('"'); + + for (int i = 0; i < str.length(); ++i) { + char c = str.charAt(i); + // Escape any char outside ASCII to their Unicode equivalent + if (c > 127) { + this.writer.write('\\'); + this.writer.write('u'); + String hexCharacter = Integer.toHexString(c).toUpperCase(ROOT); + if (c < 4096) { + this.writer.write('0'); + if (c < 256) { + this.writer.write('0'); + } + } + this.writer.append(hexCharacter); + } else { + switch (c) { + case '"': // Quotation mark + case '\\': // Reverse solidus + case '/': // Solidus + this.writer.write('\\'); + this.writer.write(c); + break; + case '\b': // Backspace + this.writer.write('\\'); + this.writer.write('b'); + break; + case '\f': // Form feed + this.writer.write('\\'); + this.writer.write('f'); + break; + case '\n': // Line feed + this.writer.write('\\'); + this.writer.write('n'); + break; + case '\r': // Carriage return + this.writer.write('\\'); + this.writer.write('r'); + break; + case '\t': // Horizontal tab + this.writer.write('\\'); + this.writer.write('t'); + break; + default: + this.writer.write(c); + break; + } + } + } + + this.writer.write('"'); + } catch (IOException ignored) { + } + } + + private void writeStringRaw(String str) { + try { + this.writer.write(str); + } catch (IOException ignored) { + } + } +} diff --git a/components/json/src/main/java/datadog/json/LenientJsonStructure.java b/components/json/src/main/java/datadog/json/LenientJsonStructure.java new file mode 100644 index 00000000000..ee1cfd7331e --- /dev/null +++ b/components/json/src/main/java/datadog/json/LenientJsonStructure.java @@ -0,0 +1,34 @@ +package datadog.json; + +/** A permissive {@link JsonStructure} that performs no structural checks on the built JSON. */ +class LenientJsonStructure implements JsonStructure { + LenientJsonStructure() {} + + @Override + public void beginObject() {} + + @Override + public boolean objectStarted() { + return true; + } + + @Override + public void endObject() {} + + @Override + public void beginArray() {} + + @Override + public boolean arrayStarted() { + return true; + } + + @Override + public void endArray() {} + + @Override + public void addName() {} + + @Override + public void addValue() {} +} diff --git a/components/json/src/main/java/datadog/json/SafeJsonStructure.java b/components/json/src/main/java/datadog/json/SafeJsonStructure.java new file mode 100644 index 00000000000..d6ac0adabf5 --- /dev/null +++ b/components/json/src/main/java/datadog/json/SafeJsonStructure.java @@ -0,0 +1,89 @@ +package datadog.json; + +import java.util.BitSet; + +/** + * This {@link JsonStructure} performs minimal structure checks to ensure the built JSON is + * coherent. + */ +class SafeJsonStructure implements JsonStructure { + private final BitSet structure; + private int depth; + private boolean complete; + + SafeJsonStructure() { + this.structure = new BitSet(); + this.depth = -1; + this.complete = false; + } + + @Override + public void beginObject() { + if (this.complete) { + throw new IllegalStateException("Object is complete"); + } + this.structure.set(++this.depth); + } + + @Override + public boolean objectStarted() { + return this.depth >= 0 && this.structure.get(this.depth); + } + + @Override + public void endObject() { + if (!objectStarted()) { + throw new IllegalStateException("Object not started"); + } + this.depth--; + if (this.depth < 0) { + this.complete = true; + } + } + + @Override + public void beginArray() { + if (this.complete) { + throw new IllegalStateException("Object is complete"); + } + this.structure.clear(++this.depth); + } + + @Override + public boolean arrayStarted() { + return this.depth >= 0 && !this.structure.get(this.depth); + } + + @Override + public void endArray() { + if (!arrayStarted()) { + throw new IllegalStateException("Array not started"); + } + this.depth--; + if (this.depth < 0) { + this.complete = true; + } + } + + @Override + public void addName() { + if (!objectStarted()) { + throw new IllegalStateException("Object not started"); + } + } + + @Override + public void addValue() { + if (this.complete) { + throw new IllegalStateException("Object is complete"); + } + if (this.depth < 0) { + this.complete = true; + } + } + + @Override + public String toString() { + return (this.complete ? "complete" : "") + this.structure; + } +} diff --git a/components/json/src/test/groovy/datadog/json/JsonMapperTest.groovy b/components/json/src/test/groovy/datadog/json/JsonMapperTest.groovy new file mode 100644 index 00000000000..2c17cd87e53 --- /dev/null +++ b/components/json/src/test/groovy/datadog/json/JsonMapperTest.groovy @@ -0,0 +1,89 @@ +package datadog.json + +import spock.lang.Specification + +import static java.lang.Math.PI + +class JsonMapperTest extends Specification { + + def "test mapping to JSON object: #input"() { + when: + String json = JsonMapper.toJson((Map) input) + + then: + json == expected + + where: + input | expected + null | '{}' + new HashMap<>() | '{}' + ['key1': 'value1'] | '{"key1":"value1"}' + ['key1': 'value1', 'key2': 'value2'] | '{"key1":"value1","key2":"value2"}' + ['key1': 'va"lu"e1', 'ke"y2': 'value2'] | '{"key1":"va\\"lu\\"e1","ke\\"y2":"value2"}' + ['key1': null, 'key2': 'bar', 'key3': 3, 'key4': 3456789123L, 'key5': 3.142f, 'key6': PI, 'key7': true, 'key8': new UnsupportedType()] | '{"key1":null,"key2":"bar","key3":3,"key4":3456789123,"key5":3.142,"key6":3.141592653589793,"key7":true,"key8":"toString"}' + } + + private class UnsupportedType { + @Override + String toString() { + 'toString' + } + } + + def "test mapping iterable to JSON array: #input"() { + when: + String json = JsonMapper.toJson(input as Collection) + + then: + json == expected + + where: + input | expected + null | "[]" + new ArrayList<>() | "[]" + ['value1'] | "[\"value1\"]" + ['value1', 'value2'] | "[\"value1\",\"value2\"]" + ['va"lu"e1', 'value2'] | "[\"va\\\"lu\\\"e1\",\"value2\"]" + } + + def "test mapping array to JSON array: #input"() { + when: + String json = JsonMapper.toJson((String[]) input) + + then: + json == expected + + where: + input | expected + null | "[]" + [] | "[]" + ['value1'] | "[\"value1\"]" + ['value1', 'value2'] | "[\"value1\",\"value2\"]" + ['va"lu"e1', 'value2'] | "[\"va\\\"lu\\\"e1\",\"value2\"]" + } + + def "test mapping to JSON string: input"() { + when: + String escaped = JsonMapper.toJson((String) string) + + then: + escaped == expected + + where: + string | expected + null | "" + "" | "" + ((char) 4096).toString() | '"\\u1000"' + ((char) 256).toString() | '"\\u0100"' + ((char) 128).toString() | '"\\u0080"' + "\b" | '"\\b"' + "\t" | '"\\t"' + "\n" | '"\\n"' + "\f" | '"\\f"' + "\r" | '"\\r"' + '"' | '"\\\""' + '/' | '"\\/"' + '\\' | '"\\\\"' + "a" | '"a"' + } +} diff --git a/components/json/src/test/java/datadog/json/JsonStructureTest.java b/components/json/src/test/java/datadog/json/JsonStructureTest.java new file mode 100644 index 00000000000..e3fb9d16802 --- /dev/null +++ b/components/json/src/test/java/datadog/json/JsonStructureTest.java @@ -0,0 +1,33 @@ +package datadog.json; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class JsonStructureTest { + // toString is only for debug purpose and has no behavior to cover + @Test + void coverToString() { + SafeJsonStructure safeJsonStructure = new SafeJsonStructure(); + assertNotNull(safeJsonStructure.toString()); + safeJsonStructure.beginObject(); + safeJsonStructure.endObject(); + assertNotNull(safeJsonStructure.toString()); + } + + // Lenient is a stub and has no behavior to cover + @Test + void lenientStructure() { + LenientJsonStructure lenientJsonStructure = new LenientJsonStructure(); + lenientJsonStructure.beginObject(); + assertTrue(lenientJsonStructure.objectStarted()); + lenientJsonStructure.endObject(); + lenientJsonStructure.beginArray(); + assertTrue(lenientJsonStructure.arrayStarted()); + lenientJsonStructure.endArray(); + assertDoesNotThrow(lenientJsonStructure::addName); + assertDoesNotThrow(lenientJsonStructure::addValue); + } +} diff --git a/components/json/src/test/java/datadog/json/JsonWriterTest.java b/components/json/src/test/java/datadog/json/JsonWriterTest.java new file mode 100644 index 00000000000..9a4b913e36d --- /dev/null +++ b/components/json/src/test/java/datadog/json/JsonWriterTest.java @@ -0,0 +1,168 @@ +package datadog.json; + +import static java.lang.Math.PI; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +class JsonWriterTest { + @Test + void testObject() { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginObject() + .name("string") + .value("bar") + .name("int") + .value(3) + .name("long") + .value(3456789123L) + .name("float") + .value(3.142) + .name("double") + .value(PI) + .name("true") + .value(true) + .name("false") + .value(false) + .name("null") + .nullValue() + .endObject(); + + assertEquals( + "{\"string\":\"bar\",\"int\":3,\"long\":3456789123,\"float\":3.142,\"double\":3.141592653589793,\"true\":true,\"false\":false,\"null\":null}", + writer.toString(), + "Check object writer"); + } + } + + @Test + void testNullName() { + assertThrows( + IllegalArgumentException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + writer.name(null); + } + }, + "Check null name"); + } + + @Test + void testNullValue() { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + writer.name("string").value(null); + writer.endObject(); + assertEquals("{\"string\":null}", writer.toString(), "Check null string"); + } + } + + @Test + void testNaNValues() { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + writer.name("float").value(Float.NaN); + writer.name("double").value(Double.NaN); + writer.endObject(); + assertEquals("{\"float\":null,\"double\":null}", writer.toString(), "Check NaN values"); + } + } + + @Test + void testArray() { + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray().value("foo").value("baz").value("bar").value("quux").endArray(); + + assertEquals("[\"foo\",\"baz\",\"bar\",\"quux\"]", writer.toString(), "Check array writer"); + } + } + + @Test + void testStringEscaping() { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginArray() + .value("\"") + .value("\\") + .value("/") + .value("\b") + .value("\f") + .value("\n") + .value("\r") + .value("\t") + .endArray(); + + assertEquals( + "[\"\\\"\",\"\\\\\",\"\\/\",\"\\b\",\"\\f\",\"\\n\",\"\\r\",\"\\t\"]", + writer.toString(), + "Check string escaping"); + } + } + + @Test + void testArrayObjectNesting() { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginObject() + .name("array") + .beginArray() + .value("true") + .value("false") + .endArray() + .endObject(); + + assertEquals( + "{\"array\":[\"true\",\"false\"]}", writer.toString(), "Check array / object nesting"); + } + } + + @Test + void testObjectArrayNesting() { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginArray() + .beginObject() + .name("true") + .value(true) + .endObject() + .beginObject() + .name("false") + .value(false) + .endObject() + .endArray(); + + assertEquals( + "[{\"true\":true},{\"false\":false}]", writer.toString(), "Check object / array nesting"); + } + } + + @Test + void testNameOnlyInObject() { + try (JsonWriter writer = new JsonWriter()) { + assertThrows( + IllegalStateException.class, () -> writer.name("key"), "Check name only in object"); + } + } + + @Test + void testCompleteObject() { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + writer.endObject(); + assertThrows(IllegalStateException.class, writer::beginObject, "Check complete object"); + assertThrows(IllegalStateException.class, writer::beginArray, "Check complete object"); + } + } + + @Test + void testCompleteArray() { + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray(); + writer.endArray(); + assertThrows(IllegalStateException.class, writer::beginObject, "Check complete array"); + assertThrows(IllegalStateException.class, writer::beginArray, "Check complete array"); + } + } +} diff --git a/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java b/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java new file mode 100644 index 00000000000..5299f961f05 --- /dev/null +++ b/components/json/src/test/java/datadog/json/SafeJsonWriterTest.java @@ -0,0 +1,132 @@ +package datadog.json; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +class SafeJsonWriterTest { + @Test + void testRootElement() { + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().endObject(); + } + }, + "Check object allowed as root element"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().beginArray(); + } + }, + "Check array allowed as root element"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.value("string"); + } + }, + "Check string allowed as root element"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.value(1); + } + }, + "Check number allowed as root element"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.value(true); + } + }, + "Check boolean allowed as root element"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.nullValue(); + } + }, + "Check null value allowed as root element"); + } + + @Test + void testNestedElements() { + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginObject() + .beginObject() + .beginObject() + .endObject() + .beginObject() + .endObject() + .endObject() + .endObject(); + } + }, + "Check nested objects"); + assertDoesNotThrow( + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer + .beginArray() + .beginArray() + .beginArray() + .endArray() + .beginArray() + .endArray() + .endArray() + .endArray(); + } + }, + "Check nested arrays"); + + assertThrows( + IllegalStateException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().beginObject().endObject().endArray(); + } + }, + "Check invalid array end"); + assertThrows( + IllegalStateException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray().beginArray().endArray().endObject(); + } + }, + "Check invalid object end"); + } + + @Test + void testCompleteJson() { + assertThrows( + IllegalStateException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().endObject().value("invalid"); + } + }, + "Check complete object"); + assertThrows( + IllegalStateException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.beginArray().endArray().value("invalid"); + } + }, + "Check complete array"); + assertThrows( + IllegalStateException.class, + () -> { + try (JsonWriter writer = new JsonWriter()) { + writer.value("string").value("invalid"); + } + }, + "Check complete value"); + } +} diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle index 3aa57b554e2..6e5ed6223de 100644 --- a/dd-java-agent/agent-bootstrap/build.gradle +++ b/dd-java-agent/agent-bootstrap/build.gradle @@ -22,6 +22,7 @@ dependencies { api project(':internal-api:internal-api-9') api project(':dd-java-agent:agent-logging') api project(':dd-java-agent:agent-debugger:debugger-bootstrap') + api project(':components:json') api libs.slf4j // ^ Generally a bad idea for libraries, but we're shadowing. diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index 7f15e8abefb..92329277890 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -29,6 +29,7 @@ dependencies { implementation group: 'org.jacoco', name: 'org.jacoco.report', version: '0.8.12' implementation project(':communication') + implementation project(':components:json') implementation project(':internal-api') implementation project(':internal-api:internal-api-9') diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java index 4aa2a6781b9..a558543e791 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java @@ -1,10 +1,10 @@ package datadog.trace.civisibility.ci; +import static datadog.json.JsonMapper.toJson; import static datadog.trace.api.git.GitUtils.filterSensitiveInfo; import static datadog.trace.api.git.GitUtils.normalizeBranch; import static datadog.trace.api.git.GitUtils.normalizeTag; import static datadog.trace.civisibility.utils.FileUtils.expandTilde; -import static datadog.trace.util.Strings.toJson; import datadog.trace.api.civisibility.telemetry.tag.Provider; import datadog.trace.api.git.CommitInfo; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java index 6dbced9cc04..469cc5762de 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java @@ -1,6 +1,6 @@ package datadog.trace.civisibility.ci; -import static datadog.trace.util.Strings.toJson; +import static datadog.json.JsonMapper.toJson; import datadog.trace.api.DDTags; import datadog.trace.api.git.GitInfo; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java index bb3d56f81e3..0d0ec299ac6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/JenkinsInfo.java @@ -1,5 +1,6 @@ package datadog.trace.civisibility.ci; +import static datadog.json.JsonMapper.toJson; import static datadog.trace.api.git.GitUtils.filterSensitiveInfo; import static datadog.trace.api.git.GitUtils.isTagReference; import static datadog.trace.api.git.GitUtils.normalizeBranch; @@ -10,11 +11,8 @@ import datadog.trace.api.git.CommitInfo; import datadog.trace.api.git.GitInfo; import datadog.trace.civisibility.ci.env.CiEnvironment; -import datadog.trace.util.Strings; import de.thetaphi.forbiddenapis.SuppressForbidden; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; @@ -75,8 +73,7 @@ private String buildCiNodeLabels() { if (labels == null || labels.isEmpty()) { return labels; } - List labelsList = Arrays.asList(labels.split(" ")); - return Strings.toJson(labelsList); + return toJson(labels.split(" ")); } private String buildGitRepositoryUrl() { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 9479fe3c0e9..ea3dcff6c2b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -1,8 +1,8 @@ package datadog.trace.civisibility.domain; +import static datadog.json.JsonMapper.toJson; import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.util.Strings.toJson; import datadog.trace.api.Config; import datadog.trace.api.DDTraceId; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index fb546111375..7caae522969 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -1,8 +1,8 @@ package datadog.trace.civisibility.domain; +import static datadog.json.JsonMapper.toJson; import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import static datadog.trace.util.Strings.toJson; import datadog.trace.api.Config; import datadog.trace.api.civisibility.DDTestSuite; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java index 9d07f0d2e32..a634586f5cd 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java @@ -1,7 +1,6 @@ package datadog.trace.civisibility.events; -import static datadog.trace.util.Strings.toJson; - +import datadog.json.JsonWriter; import datadog.trace.api.DisableTestTrace; import datadog.trace.api.civisibility.DDTest; import datadog.trace.api.civisibility.DDTestSuite; @@ -21,7 +20,6 @@ import datadog.trace.civisibility.domain.TestSuiteImpl; import java.lang.reflect.Method; import java.util.Collection; -import java.util.Collections; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.objectweb.asm.Type; @@ -76,13 +74,23 @@ public void onTestSuiteStart( } } if (categories != null && !categories.isEmpty()) { - testSuite.setTag( - Tags.TEST_TRAITS, toJson(Collections.singletonMap("category", toJson(categories)), true)); + testSuite.setTag(Tags.TEST_TRAITS, getTestTraits(categories)); } inProgressTestSuites.put(descriptor, testSuite); } + private String getTestTraits(Collection categories) { + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().name("category").beginArray(); + for (String category : categories) { + writer.value(category); + } + writer.endArray().endObject(); + return writer.toString(); + } + } + @Override public void onTestSuiteFinish(SuiteKey descriptor) { if (skipTrace(descriptor.getClass())) { @@ -160,8 +168,7 @@ public void onTestStart( test.setTag(Tags.TEST_SOURCE_METHOD, testMethodName + Type.getMethodDescriptor(testMethod)); } if (categories != null && !categories.isEmpty()) { - String json = toJson(Collections.singletonMap("category", toJson(categories)), true); - test.setTag(Tags.TEST_TRAITS, json); + test.setTag(Tags.TEST_TRAITS, getTestTraits(categories)); for (String category : categories) { if (category.endsWith(InstrumentationBridge.ITR_UNSKIPPABLE_TAG)) { diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle index af6a9b84792..d8ce652266e 100644 --- a/dd-java-agent/build.gradle +++ b/dd-java-agent/build.gradle @@ -201,6 +201,7 @@ tasks.withType(GenerateMavenPom).configureEach { task -> } dependencies { + implementation project(path: ':components:json') modules { module("com.squareup.okio:okio") { replacedBy("com.datadoghq.okio:okio") // embed our patched fork diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java index af26acf3b0e..4d4c82675e0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java @@ -1,10 +1,11 @@ package datadog.trace.instrumentation.junit4; +import static datadog.json.JsonMapper.toJson; + import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.util.MethodHandles; -import datadog.trace.util.Strings; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; @@ -201,7 +202,7 @@ public static String getParameters(final Description description) { // No public access to the test parameters map in JUnit4. // In this case, we store the fullTestName in the "metadata.test_name" object. - return "{\"metadata\":{\"test_name\":\"" + Strings.escapeToJson(methodName) + "\"}}"; + return "{\"metadata\":{\"test_name\":" + toJson(methodName) + "}}"; } public static List getCategories(Class testClass, @Nullable Method testMethod) { diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 8059de35721..2a10d78066c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -1,12 +1,13 @@ package datadog.trace.instrumentation.junit5; +import static datadog.json.JsonMapper.toJson; + import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; import datadog.trace.util.MethodHandles; -import datadog.trace.util.Strings; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; import java.util.List; @@ -89,7 +90,7 @@ public static String getParameters(MethodSource methodSource, String displayName || methodSource.getMethodParameterTypes().isEmpty()) { return null; } - return "{\"metadata\":{\"test_name\":\"" + Strings.escapeToJson(displayName) + "\"}}"; + return "{\"metadata\":{\"test_name\":" + toJson(displayName) + "}}"; } public static TestIdentifier toTestIdentifier(TestDescriptor testDescriptor) { diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index b0b00872a55..74cc1bc4ab3 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -1,5 +1,7 @@ package datadog.trace.instrumentation.karate; +import static datadog.json.JsonMapper.toJson; + import com.intuit.karate.core.Feature; import com.intuit.karate.core.FeatureRuntime; import com.intuit.karate.core.Result; @@ -76,7 +78,7 @@ public static List getCategories(List tags) { } public static String getParameters(Scenario scenario) { - return scenario.getExampleData() != null ? Strings.toJson(scenario.getExampleData()) : null; + return scenario.getExampleData() != null ? toJson(scenario.getExampleData()) : null; } public static TestIdentifier toTestIdentifier(Scenario scenario) { diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index 9646681d7c4..76cc50de5d5 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -59,7 +59,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { testcaseName | tests | expectedTracesCount | skippedTests "test-itr-skipping" | [TestSucceedKarate] | 3 | [new TestIdentifier("[org/example/test_succeed] test succeed", "first scenario", null)] "test-itr-skipping-parameterized" | [TestParameterizedKarate] | 3 | [ - new TestIdentifier("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\\\'a\\\'","value":"aa"}') + new TestIdentifier("[org/example/test_parameterized] test parameterized", "first scenario as an outline", '{"param":"\'a\'","value":"aa"}') ] "test-itr-unskippable" | [TestUnskippableKarate] | 3 | [new TestIdentifier("[org/example/test_unskippable] test unskippable", "first scenario", null)] } diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 005eb1c5ee9..8565d778131 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -567,7 +567,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -611,7 +611,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -655,7 +655,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -698,7 +698,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -742,7 +742,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -786,7 +786,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -829,7 +829,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'c\\'\",\"value\":\"cc\"}", + "test.parameters" : "{\"param\":\"'c'\",\"value\":\"cc\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl index 70811f5f9af..afab8ca8e38 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -201,7 +201,7 @@ "language" : "jvm", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", @@ -243,7 +243,7 @@ "language" : "jvm", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl index 5adac82097a..2bc327270fa 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -495,7 +495,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -539,7 +539,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -583,7 +583,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -626,7 +626,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -670,7 +670,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, @@ -714,7 +714,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl index 5664bd058e7..98e2ff99d88 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -136,7 +136,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.skipped_by_itr" : "true", @@ -180,7 +180,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "component" : "karate", "_dd.profiling.ctx" : "test", "test.framework_version" : ${content_meta_test_framework_version}, diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl index 11ae6fb4373..671fe8561cf 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-parameterized/events.ftl @@ -201,7 +201,7 @@ "language" : "jvm", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aa\"}", "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", @@ -243,7 +243,7 @@ "language" : "jvm", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl index f134e05256c..f3c8ac0740d 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl @@ -497,7 +497,7 @@ "test_session.name" : "session-name", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}", "component" : "karate", "error.type" : "com.intuit.karate.KarateException", "_dd.profiling.ctx" : "test", @@ -543,7 +543,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}", "component" : "karate", "error.type" : "com.intuit.karate.KarateException", "_dd.profiling.ctx" : "test", @@ -589,7 +589,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}", "component" : "karate", "error.type" : "com.intuit.karate.KarateException", "_dd.profiling.ctx" : "test", @@ -635,7 +635,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}", "component" : "karate", "error.type" : "com.intuit.karate.KarateException", "_dd.profiling.ctx" : "test", @@ -681,7 +681,7 @@ "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", "test.is_retry" : "true", - "test.parameters" : "{\"param\":\"\\'a\\'\",\"value\":\"aaa\"}", + "test.parameters" : "{\"param\":\"'a'\",\"value\":\"aaa\"}", "component" : "karate", "error.type" : "com.intuit.karate.KarateException", "_dd.profiling.ctx" : "test", @@ -721,7 +721,7 @@ "language" : "jvm", "env" : "none", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.parameters" : "{\"param\":\"\\'b\\'\",\"value\":\"bb\"}", + "test.parameters" : "{\"param\":\"'b'\",\"value\":\"bb\"}", "library_version" : ${content_meta_library_version}, "component" : "karate", "_dd.profiling.ctx" : "test", diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index 4ec7cb4d464..af62c182d10 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.testng; +import datadog.json.JsonWriter; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; -import datadog.trace.util.Strings; import java.io.InputStream; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; @@ -75,19 +75,14 @@ public static String getParameters(Object[] parameters) { // We build manually the JSON for test.parameters tag. // Example: {"arguments":{"0":"param1","1":"param2"}} - final StringBuilder sb = new StringBuilder("{\"arguments\":{"); - for (int i = 0; i < parameters.length; i++) { - sb.append('\"') - .append(i) - .append("\":\"") - .append(Strings.escapeToJson(String.valueOf(parameters[i]))) - .append('\"'); - if (i != parameters.length - 1) { - sb.append(','); + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject().name("arguments").beginObject(); + for (int i = 0; i < parameters.length; i++) { + writer.name(Integer.toString(i)).value(String.valueOf(parameters[i])); } + writer.endObject().endObject(); + return writer.toString(); } - sb.append("}}"); - return sb.toString(); } public static List getGroups(ITestResult result) { diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java index c423e0175d0..c896983af22 100644 --- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java +++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java @@ -1,13 +1,16 @@ package datadog.trace.bootstrap; +import datadog.json.JsonWriter; import java.io.IOException; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.TimeUnit; /** Thread safe telemetry class used to relay information about tracer activation. */ public abstract class BootstrapInitializationTelemetry { /** Returns a singleton no op instance of initialization telemetry */ - public static final BootstrapInitializationTelemetry noOpInstance() { + public static BootstrapInitializationTelemetry noOpInstance() { return NoOp.INSTANCE; } @@ -17,8 +20,7 @@ public static final BootstrapInitializationTelemetry noOpInstance() { * * @param forwarderPath - a String - path to forwarding executable */ - public static final BootstrapInitializationTelemetry createFromForwarderPath( - String forwarderPath) { + public static BootstrapInitializationTelemetry createFromForwarderPath(String forwarderPath) { return new JsonBased(new ForwarderJsonSender(forwarderPath)); } @@ -85,27 +87,29 @@ public void finish() {} public static final class JsonBased extends BootstrapInitializationTelemetry { private final JsonSender sender; - private JsonBuffer metaBuffer = new JsonBuffer(); - private JsonBuffer pointsBuffer = new JsonBuffer(); + private final List meta; + private final List points; // one way false to true private volatile boolean incomplete = false; JsonBased(JsonSender sender) { this.sender = sender; + this.meta = new ArrayList<>(); + this.points = new ArrayList<>(); } @Override public void initMetaInfo(String attr, String value) { - synchronized (metaBuffer) { - metaBuffer.name(attr).value(value); + synchronized (this.meta) { + this.meta.add(attr); + this.meta.add(value); } } @Override public void onAbort(String reasonCode) { onPoint("library_entrypoint.abort", "reason:" + reasonCode); - markIncomplete(); } @@ -117,7 +121,6 @@ public void onError(Throwable t) { @Override public void onFatalError(Throwable t) { onError(t); - markIncomplete(); } @@ -126,62 +129,48 @@ public void onError(String reasonCode) { onPoint("library_entrypoint.error", "error_type:" + reasonCode); } - @Override - public void markIncomplete() { - incomplete = true; - } - - void onPoint(String pointName) { - synchronized (pointsBuffer) { - pointsBuffer.beginObject(); - pointsBuffer.name("name").value(pointName); - pointsBuffer.endObject(); + private void onPoint(String name, String tag) { + synchronized (this.points) { + this.points.add(name); + this.points.add(tag); } } - void onPoint(String pointName, String tag) { - synchronized (pointsBuffer) { - pointsBuffer.beginObject(); - pointsBuffer.name("name").value(pointName); - pointsBuffer.name("tags").array(tag); - pointsBuffer.endObject(); - } - } - - void onPoint(String pointName, String[] tags) { - synchronized (pointsBuffer) { - pointsBuffer.beginObject(); - pointsBuffer.name("name").value(pointName); - pointsBuffer.name("tags").array(tags); - pointsBuffer.endObject(); - } + @Override + public void markIncomplete() { + this.incomplete = true; } @Override public void finish() { - if (!incomplete) { - onPoint("library_entrypoint.complete"); - } - - JsonBuffer buffer = new JsonBuffer(); - buffer.beginObject(); - - buffer.name("metadata"); - synchronized (metaBuffer) { - buffer.object(metaBuffer); - } - - buffer.name("points"); - synchronized (pointsBuffer) { - buffer.array(pointsBuffer); - - pointsBuffer.reset(); - } - - buffer.endObject(); - - try { - sender.send(buffer); + try (JsonWriter writer = new JsonWriter()) { + writer.beginObject(); + writer.name("metadata").beginObject(); + synchronized (this.meta) { + for (int i = 0; i + 1 < this.meta.size(); i = i + 2) { + writer.name(this.meta.get(i)); + writer.value(this.meta.get(i + 1)); + } + } + writer.endObject(); + + writer.name("points").beginArray(); + synchronized (this.points) { + for (int i = 0; i + 1 < this.points.size(); i = i + 2) { + writer.beginObject(); + writer.name("name").value(this.points.get(i)); + writer.name("tags").beginArray().value(this.points.get(i + 1)).endArray(); + writer.endObject(); + } + this.points.clear(); + } + if (!this.incomplete) { + writer.beginObject().name("name").value("library_entrypoint.complete").endObject(); + } + writer.endArray(); + writer.endObject(); + + this.sender.send(writer.toByteArray()); } catch (Throwable t) { // Since this is the reporting mechanism, there's little recourse here // Decided to simply ignore - arguably might want to write to stderr @@ -189,8 +178,8 @@ public void finish() { } } - public static interface JsonSender { - public abstract void send(JsonBuffer buffer) throws IOException; + public interface JsonSender { + void send(byte[] payload) throws IOException; } public static final class ForwarderJsonSender implements JsonSender { @@ -201,12 +190,12 @@ public static final class ForwarderJsonSender implements JsonSender { } @Override - public void send(JsonBuffer buffer) throws IOException { + public void send(byte[] payload) throws IOException { ProcessBuilder builder = new ProcessBuilder(forwarderPath, "library_entrypoint"); Process process = builder.start(); try (OutputStream out = process.getOutputStream()) { - out.write(buffer.toByteArray()); + out.write(payload); } try { diff --git a/dd-java-agent/src/main/java/datadog/trace/bootstrap/JsonBuffer.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/JsonBuffer.java deleted file mode 100644 index 003007ab0b8..00000000000 --- a/dd-java-agent/src/main/java/datadog/trace/bootstrap/JsonBuffer.java +++ /dev/null @@ -1,264 +0,0 @@ -package datadog.trace.bootstrap; - -import java.io.ByteArrayOutputStream; -import java.io.Flushable; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; - -/** - * Light weight JSON writer with no dependencies other than JDK. Loosely modeled after GSON - * JsonWriter - */ -public final class JsonBuffer implements Flushable { - private ByteArrayOutputStream bytesOut; - private OutputStreamWriter writer; - - private byte[] cachedBytes = null; - private boolean requireComma = false; - - public JsonBuffer() { - this.reset(); - } - - public void reset() { - bytesOut = new ByteArrayOutputStream(); - writer = new OutputStreamWriter(bytesOut, Charset.forName("utf-8")); - - cachedBytes = null; - requireComma = false; - } - - public JsonBuffer beginObject() { - injectCommaIfNeeded(); - - return write('{'); - } - - public JsonBuffer endObject() { - endsValue(); - - return write('}'); - } - - public JsonBuffer object(JsonBuffer objectContents) { - beginObject(); - writeBytesRaw(objectContents.toByteArray()); - endObject(); - - return this; - } - - public JsonBuffer name(String name) { - injectCommaIfNeeded(); - - return writeStringLiteral(name).write(':'); - } - - public JsonBuffer nullValue() { - injectCommaIfNeeded(); - endsValue(); - - return writeStringRaw("null"); - } - - public JsonBuffer value(JsonBuffer buffer) { - injectCommaIfNeeded(); - endsValue(); - - return writeBytesRaw(buffer.toByteArray()); - } - - public JsonBuffer value(boolean value) { - injectCommaIfNeeded(); - endsValue(); - - return writeStringRaw(value ? "true" : "false"); - } - - public JsonBuffer value(String value) { - injectCommaIfNeeded(); - endsValue(); - - return writeStringLiteral(value); - } - - public JsonBuffer value(int value) { - injectCommaIfNeeded(); - endsValue(); - - return writeStringRaw(Integer.toString(value)); - } - - public JsonBuffer beginArray() { - injectCommaIfNeeded(); - - return write('['); - } - - public JsonBuffer endArray() { - endsValue(); - - return write(']'); - } - - public JsonBuffer array(String element) { - beginArray(); - value(element); - endArray(); - - return this; - } - - public JsonBuffer array(String[] elements) { - beginArray(); - for (String e : elements) { - value(e); - } - endArray(); - - return this; - } - - public JsonBuffer array(JsonBuffer arrayContents) { - beginArray(); - writeBytesRaw(arrayContents.toByteArray()); - endArray(); - - return this; - } - - public void flush() { - try { - writer.flush(); - } catch (IOException e) { - // ignore - } - } - - public byte[] toByteArray() { - byte[] cachedBytes = this.cachedBytes; - if (cachedBytes != null) { - return cachedBytes; - } - - flush(); - - cachedBytes = bytesOut.toByteArray(); - this.cachedBytes = cachedBytes; - return cachedBytes; - } - - void injectCommaIfNeeded() { - if (requireComma) { - write(','); - } - requireComma = false; - } - - void endsValue() { - requireComma = true; - } - - void clearBytesCache() { - cachedBytes = null; - } - - private JsonBuffer write(char ch) { - clearBytesCache(); - - try { - writer.write(ch); - } catch (IOException e) { - // ignore - } - return this; - } - - private JsonBuffer writeStringLiteral(String str) { - clearBytesCache(); - - try { - writer.write('"'); - - for (int i = 0; i < str.length(); ++i) { - char ch = str.charAt(i); - - // Based on https://keploy.io/blog/community/json-escape-and-unescape - switch (ch) { - case '"': - writer.write("\\\""); - break; - - case '\\': - writer.write("\\\\"); - break; - - case '/': - writer.write("\\/"); - break; - - case '\b': - writer.write("\\b"); - break; - - case '\f': - writer.write("\\f"); - break; - - case '\n': - writer.write("\\n"); - break; - - case '\r': - writer.write("\\r"); - break; - - case '\t': - writer.write("\\t"); - break; - - default: - writer.write(ch); - break; - } - } - - writer.write('"'); - } catch (IOException e) { - // ignore - } - - return this; - } - - private JsonBuffer writeStringRaw(String str) { - clearBytesCache(); - - try { - writer.write(str); - } catch (IOException e) { - // ignore - } - return this; - } - - private JsonBuffer writeBytesRaw(byte[] bytes) { - clearBytesCache(); - - try { - writer.flush(); - - bytesOut.write(bytes); - } catch (IOException e) { - // ignore - } - return this; - } - - @Override - public String toString() { - return new String(this.toByteArray(), StandardCharsets.UTF_8); - } -} diff --git a/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/BootstrapInitializationTelemetryTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/BootstrapInitializationTelemetryTest.groovy index 1116a068298..da0dafa6d4a 100644 --- a/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/BootstrapInitializationTelemetryTest.groovy +++ b/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/BootstrapInitializationTelemetryTest.groovy @@ -1,9 +1,9 @@ -package datadog.trace.agent +package datadog.trace.bootstrap -import datadog.trace.bootstrap.BootstrapInitializationTelemetry -import datadog.trace.bootstrap.JsonBuffer import spock.lang.Specification +import static java.nio.charset.StandardCharsets.UTF_8 + class BootstrapInitializationTelemetryTest extends Specification { def initTelemetry, capture @@ -77,14 +77,14 @@ class BootstrapInitializationTelemetryTest extends Specification { } static class Capture implements BootstrapInitializationTelemetry.JsonSender { - JsonBuffer buffer + String json - void send(JsonBuffer buffer) { - this.buffer = buffer + void send(byte[] payload) { + this.json = new String(payload, UTF_8) } String json() { - return this.buffer.toString() + return this.json } } } diff --git a/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/JsonBufferTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/JsonBufferTest.groovy deleted file mode 100644 index 8ff26b88c21..00000000000 --- a/dd-java-agent/src/test/groovy/datadog/trace/bootstrap/JsonBufferTest.groovy +++ /dev/null @@ -1,126 +0,0 @@ -package datadog.trace.agent - -import datadog.trace.bootstrap.JsonBuffer -import spock.lang.Specification - -class JsonBufferTest extends Specification { - def "object"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginObject() - jsonBuffer.name("foo").value("bar") - jsonBuffer.name("pi").value(3_142) - jsonBuffer.name("true").value(true) - jsonBuffer.name("false").value(false) - jsonBuffer.endObject() - - then: - jsonBuffer.toString() == '{"foo":"bar","pi":3142,"true":true,"false":false}' - } - - def "array"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginArray() - jsonBuffer.value("foo") - jsonBuffer.value("baz") - jsonBuffer.value("bar") - jsonBuffer.value("quux") - jsonBuffer.endArray() - - then: - jsonBuffer.toString() == '["foo","baz","bar","quux"]' - } - - def "escaping"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginArray() - jsonBuffer.value('"') - jsonBuffer.value("\\") - jsonBuffer.value("/") - jsonBuffer.value("\b") - jsonBuffer.value("\f") - jsonBuffer.value("\n") - jsonBuffer.value("\r") - jsonBuffer.value("\t") - jsonBuffer.endArray() - - then: - jsonBuffer.toString() == '["\\"","\\\\","\\/","\\b","\\f","\\n","\\r","\\t"]' - } - - def "nesting array in object"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginObject() - jsonBuffer.name("array") - jsonBuffer.beginArray() - jsonBuffer.value("true") - jsonBuffer.value("false") - jsonBuffer.endArray() - jsonBuffer.endObject() - - then: - jsonBuffer.toString() == '{"array":["true","false"]}' - } - - def "nesting object in array"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginArray() - jsonBuffer.beginObject() - jsonBuffer.name("true").value(true) - jsonBuffer.endObject() - jsonBuffer.beginObject() - jsonBuffer.name("false").value(false) - jsonBuffer.endObject() - jsonBuffer.endArray() - - then: - jsonBuffer.toString() == '[{"true":true},{"false":false}]' - } - - def "partial object buffer"() { - when: - def partialJsonBuffer = new JsonBuffer() - partialJsonBuffer.name("foo").value("bar") - partialJsonBuffer.name("quux").value("baz") - - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginObject() - jsonBuffer.name("partial").object(partialJsonBuffer) - jsonBuffer.endObject() - - then: - jsonBuffer.toString() == '{"partial":{"foo":"bar","quux":"baz"}}' - } - - def "partial array buffer"() { - when: - def partialJsonBuffer = new JsonBuffer() - partialJsonBuffer.value("foo") - partialJsonBuffer.value("bar") - - def jsonBuffer = new JsonBuffer() - jsonBuffer.beginObject() - jsonBuffer.name("partial").array(partialJsonBuffer) - jsonBuffer.endObject() - - then: - jsonBuffer.toString() == '{"partial":["foo","bar"]}' - } - - def "reset"() { - when: - def jsonBuffer = new JsonBuffer() - jsonBuffer.name("foo").value("quux") - - jsonBuffer.reset() - - jsonBuffer.array("bar", "baz") - - then: - jsonBuffer.toString() == '["bar","baz"]' - } -} diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 4abfb557d16..f19c0f3935d 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -61,6 +61,7 @@ dependencies { api project(':dd-trace-api') api project(':communication') api project(':internal-api') + implementation project(':components:json') implementation project(':utils:container-utils') implementation project(':utils:socket-utils') // for span exception debugging diff --git a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java index 7d1ec19b786..b2ed0bffebf 100644 --- a/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java +++ b/dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java @@ -2,6 +2,7 @@ import static datadog.communication.http.OkHttpUtils.gzippedMsgpackRequestBodyOf; import static datadog.communication.http.OkHttpUtils.msgpackRequestBodyOf; +import static datadog.json.JsonMapper.toJson; import datadog.communication.serialization.GrowableBuffer; import datadog.communication.serialization.Writable; @@ -20,7 +21,6 @@ import datadog.trace.core.CoreSpan; import datadog.trace.core.Metadata; import datadog.trace.core.MetadataConsumer; -import datadog.trace.util.Strings; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; @@ -357,7 +357,7 @@ public void accept(Metadata metadata) { if (!(value instanceof Iterable)) { writable.writeObjectString(value, null); } else { - String serializedValue = Strings.toJson((Iterable) value); + String serializedValue = toJson((Collection) value); writable.writeString(serializedValue, null); } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 54de0d30daa..42c12af3cea 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -15,6 +15,7 @@ final class CachedData { exclude(project(':internal-api')) exclude(project(':internal-api:internal-api-9')) exclude(project(':communication')) + exclude(project(':components:json')) exclude(project(':remote-config:remote-config-api')) exclude(project(':remote-config:remote-config-core')) exclude(project(':telemetry')) diff --git a/internal-api/src/main/java/datadog/trace/util/Strings.java b/internal-api/src/main/java/datadog/trace/util/Strings.java index 6715604260f..2fea0e107e5 100644 --- a/internal-api/src/main/java/datadog/trace/util/Strings.java +++ b/internal-api/src/main/java/datadog/trace/util/Strings.java @@ -5,10 +5,6 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; import java.util.concurrent.ThreadLocalRandom; import javax.annotation.Nonnull; @@ -18,70 +14,6 @@ public final class Strings { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - public static String escapeToJson(String string) { - if (string == null || string.isEmpty()) { - return ""; - } - - final StringBuilder sb = new StringBuilder(); - int sz = string.length(); - for (int i = 0; i < sz; ++i) { - char ch = string.charAt(i); - if (ch > 4095) { - sb.append("\\u").append(hex(ch)); - } else if (ch > 255) { - sb.append("\\u0").append(hex(ch)); - } else if (ch > 127) { - sb.append("\\u00").append(hex(ch)); - } else if (ch < ' ') { - switch (ch) { - case '\b': - sb.append((char) 92).append((char) 98); - break; - case '\t': - sb.append((char) 92).append((char) 116); - break; - case '\n': - sb.append((char) 92).append((char) 110); - break; - case '\u000b': - default: - if (ch > 15) { - sb.append("\\u00").append(hex(ch)); - } else { - sb.append("\\u000").append(hex(ch)); - } - break; - case '\f': - sb.append((char) 92).append((char) 102); - break; - case '\r': - sb.append((char) 92).append((char) 114); - break; - } - } else { - switch (ch) { - case '"': - sb.append((char) 92).append((char) 34); - break; - case '\'': - sb.append((char) 92).append((char) 39); - break; - case '/': - sb.append((char) 92).append((char) 47); - break; - case '\\': - sb.append((char) 92).append((char) 92); - break; - default: - sb.append(ch); - } - } - } - - return sb.toString(); - } - public static String toEnvVar(String string) { return string.replace('.', '_').replace('-', '_').toUpperCase(); } @@ -209,16 +141,12 @@ public static String trim(final String string) { return null == string ? "" : string.trim(); } - private static String hex(char ch) { - return Integer.toHexString(ch).toUpperCase(Locale.ENGLISH); - } - public static String sha256(String input) throws NoSuchAlgorithmException { MessageDigest digest = MessageDigest.getInstance("SHA-256"); byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8)); StringBuilder hexString = new StringBuilder(2 * hash.length); - for (int i = 0; i < hash.length; i++) { - String hex = Integer.toHexString(0xFF & hash[i]); + for (byte b : hash) { + String hex = Integer.toHexString(0xFF & b); if (hex.length() == 1) { hexString.append('0'); } @@ -238,52 +166,6 @@ public static CharSequence truncate(CharSequence input, int limit) { return input.subSequence(0, limit); } - public static String toJson(final Map map) { - return toJson(map, false); - } - - public static String toJson(final Map map, boolean valuesAreJson) { - if (map == null || map.isEmpty()) { - return "{}"; - } - final StringBuilder sb = new StringBuilder("{"); - final Iterator> entriesIter = map.entrySet().iterator(); - while (entriesIter.hasNext()) { - final Entry entry = entriesIter.next(); - - sb.append('\"').append(escapeToJson(entry.getKey())).append("\":"); - - if (valuesAreJson) { - sb.append(entry.getValue()); - } else { - sb.append('\"').append(escapeToJson(String.valueOf(entry.getValue()))).append('\"'); - } - - if (entriesIter.hasNext()) { - sb.append(','); - } - } - sb.append('}'); - return sb.toString(); - } - - public static String toJson(final Iterable items) { - if (items == null) { - return "[]"; - } - StringBuilder json = new StringBuilder("["); - Iterator it = items.iterator(); - while (it.hasNext()) { - String item = it.next(); - json.append('"').append(escapeToJson(item)).append('"'); - if (it.hasNext()) { - json.append(','); - } - } - json.append(']'); - return json.toString(); - } - /** * Checks that a string is not blank, i.e. contains at least one character that is not a * whitespace diff --git a/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy b/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy index 503922c724f..b7958191c8d 100644 --- a/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy @@ -88,33 +88,6 @@ class StringsTest extends DDSpecification { // spotless:on } - def "test escape javascript"() { - when: - String escaped = Strings.escapeToJson(string) - - then: - escaped == expected - - where: - string | expected - null | "" - "" | "" - ((char) 4096).toString() | '\\u1000' - ((char) 256).toString() | '\\u0100' - ((char) 128).toString() | '\\u0080' - "\b" | "\\b" - "\t" | "\\t" - "\n" | "\\n" - "\f" | "\\f" - "\r" | "\\r" - '"' | '\\"' - '\'' | '\\\'' - '/' | '\\/' - '\\' | '\\\\' - "\u000b" | "\\u000B" - "a" | "a" - } - def "test sha256"() { when: String sha256 = Strings.sha256(input) @@ -144,38 +117,6 @@ class StringsTest extends DDSpecification { "hélló wórld" | 5 | "hélló" } - def "test map toJson: #input"() { - when: - String json = Strings.toJson((Map) input) - - then: - json == expected - - where: - input | expected - null | "{}" - new HashMap<>() | "{}" - ['key1': 'value1'] | "{\"key1\":\"value1\"}" - ['key1': 'value1', 'key2': 'value2'] | "{\"key1\":\"value1\",\"key2\":\"value2\"}" - ['key1': 'va"lu"e1', 'ke"y2': 'value2'] | "{\"key1\":\"va\\\"lu\\\"e1\",\"ke\\\"y2\":\"value2\"}" - } - - def "test iterable toJson: #input"() { - when: - String json = Strings.toJson((Iterable) input) - - then: - json == expected - - where: - input | expected - null | "[]" - new ArrayList<>() | "[]" - ['value1'] | "[\"value1\"]" - ['value1', 'value2'] | "[\"value1\",\"value2\"]" - ['va"lu"e1', 'value2'] | "[\"va\\\"lu\\\"e1\",\"value2\"]" - } - def "test isNotBlank: #input"() { when: def notBlank = Strings.isNotBlank(input) diff --git a/settings.gradle b/settings.gradle index fb2bb69f846..0422e36fce6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -66,6 +66,7 @@ include ':dd-java-agent:agent-otel:otel-shim' include ':dd-java-agent:agent-otel:otel-tooling' include ':communication' +include ':components:json' include ':telemetry' include ':remote-config:remote-config-api' include ':remote-config:remote-config-core' From 5b587720dd7b8e4aa600edcf70c09f1b157be2d5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Wed, 4 Dec 2024 14:10:32 +0100 Subject: [PATCH 097/106] Add Micronaut 4 support for code origin for spans (#8039) Make Code Origin for spans feature independent from dynamic instrumentation so it could be enabled while DI is not Add in Status Logger the code origin feature status --- .../java/datadog/trace/bootstrap/Agent.java | 7 ++- .../datadog/debugger/agent/DebuggerAgent.java | 1 + .../codeorigin/DefaultCodeOriginRecorder.java | 50 +++++++------------ .../instrumentation/micronaut/build.gradle | 10 ++++ .../http-server-netty-4.0/build.gradle | 2 + .../src/test/groovy/MicronautTest.groovy | 32 ++++++++++++ .../MicronautCodeOriginInstrumentation.java | 36 +++++++++++++ .../codeorigin/CodeOriginInstrumentation.java | 4 +- .../java/datadog/trace/core/StatusLogger.java | 2 + .../main/java/datadog/trace/api/Config.java | 2 + 10 files changed, 111 insertions(+), 35 deletions(-) create mode 100644 dd-java-agent/instrumentation/micronaut/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java index 7a4b446e7de..9baf349f8b9 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java @@ -105,6 +105,9 @@ private enum AgentFeature { DEBUGGER(propertyNameToSystemPropertyName(DebuggerConfig.DEBUGGER_ENABLED), false), EXCEPTION_DEBUGGING( propertyNameToSystemPropertyName(DebuggerConfig.EXCEPTION_REPLAY_ENABLED), false), + SPAN_ORIGIN( + propertyNameToSystemPropertyName(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED), + false), DATA_JOBS(propertyNameToSystemPropertyName(GeneralConfig.DATA_JOBS_ENABLED), false), AGENTLESS_LOG_SUBMISSION( propertyNameToSystemPropertyName(GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED), false); @@ -152,6 +155,7 @@ public boolean isEnabledByDefault() { private static boolean telemetryEnabled = true; private static boolean debuggerEnabled = false; private static boolean exceptionDebuggingEnabled = false; + private static boolean spanOriginEnabled = false; private static boolean agentlessLogSubmissionEnabled = false; /** @@ -263,6 +267,7 @@ public static void start( telemetryEnabled = isFeatureEnabled(AgentFeature.TELEMETRY); debuggerEnabled = isFeatureEnabled(AgentFeature.DEBUGGER); exceptionDebuggingEnabled = isFeatureEnabled(AgentFeature.EXCEPTION_DEBUGGING); + spanOriginEnabled = isFeatureEnabled(AgentFeature.SPAN_ORIGIN); agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION); if (profilingEnabled) { @@ -1073,7 +1078,7 @@ private static void shutdownProfilingAgent(final boolean sync) { } private static void maybeStartDebugger(Instrumentation inst, Class scoClass, Object sco) { - if (!debuggerEnabled && !exceptionDebuggingEnabled) { + if (!debuggerEnabled && !exceptionDebuggingEnabled && !spanOriginEnabled) { return; } if (!remoteConfigEnabled) { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java index cf15e6698d4..ac7432a61b4 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java @@ -100,6 +100,7 @@ public static synchronized void run( DebuggerContext.initExceptionDebugger(defaultExceptionDebugger); } if (config.isDebuggerCodeOriginEnabled()) { + LOGGER.info("Starting Code Origin for spans"); DebuggerContext.initCodeOrigin(new DefaultCodeOriginRecorder(config, configurationUpdater)); } if (config.isDebuggerInstrumentTheWorld()) { diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java index 73f6b0b5cc5..0f53e64ed0b 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java @@ -30,7 +30,7 @@ public class DefaultCodeOriginRecorder implements CodeOriginRecorder { private final ConfigurationUpdater configurationUpdater; - private final Map fingerprints = new HashMap<>(); + private final Map probesByFingerprint = new HashMap<>(); private final Map probes = new ConcurrentHashMap<>(); @@ -45,36 +45,28 @@ public DefaultCodeOriginRecorder(Config config, ConfigurationUpdater configurati public String captureCodeOrigin(boolean entry) { StackTraceElement element = findPlaceInStack(); String fingerprint = Fingerprinter.fingerprint(element); - CodeOriginProbe probe; - - if (isAlreadyInstrumented(fingerprint)) { - probe = fingerprints.get(fingerprint); - } else { - probe = - createProbe( - fingerprint, - entry, - Where.of( - element.getClassName(), - element.getMethodName(), - null, - String.valueOf(element.getLineNumber()))); + CodeOriginProbe probe = probesByFingerprint.get(fingerprint); + if (probe == null) { + Where where = + Where.of( + element.getClassName(), + element.getMethodName(), + null, + String.valueOf(element.getLineNumber())); + probe = createProbe(fingerprint, entry, where); + LOG.debug("Creating probe for location {}", where); } - return probe.getId(); } @Override public String captureCodeOrigin(Method method, boolean entry) { - CodeOriginProbe probe; - - String fingerPrint = method.toString(); - if (isAlreadyInstrumented(fingerPrint)) { - probe = fingerprints.get(fingerPrint); - } else { - probe = createProbe(fingerPrint, entry, Where.of(method)); + String fingerprint = method.toString(); + CodeOriginProbe probe = probesByFingerprint.get(fingerprint); + if (probe == null) { + probe = createProbe(fingerprint, entry, Where.of(method)); + LOG.debug("Creating probe for method {}", fingerprint); } - return probe.getId(); } @@ -106,22 +98,16 @@ private StackTraceElement findPlaceInStack() { .orElse(null)); } - public boolean isAlreadyInstrumented(String fingerprint) { - return fingerprints.containsKey(fingerprint); - } - void addFingerprint(String fingerprint, CodeOriginProbe probe) { - fingerprints.putIfAbsent(fingerprint, probe); + probesByFingerprint.putIfAbsent(fingerprint, probe); } - public String installProbe(CodeOriginProbe probe) { + public void installProbe(CodeOriginProbe probe) { CodeOriginProbe installed = probes.putIfAbsent(probe.getId(), probe); if (installed == null) { AgentTaskScheduler.INSTANCE.execute( () -> configurationUpdater.accept(CODE_ORIGIN, getProbes())); - return probe.getId(); } - return installed.getId(); } public CodeOriginProbe getProbe(String probeId) { diff --git a/dd-java-agent/instrumentation/micronaut/build.gradle b/dd-java-agent/instrumentation/micronaut/build.gradle index 37d3fd78c5f..3a18071d009 100644 --- a/dd-java-agent/instrumentation/micronaut/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/build.gradle @@ -4,6 +4,16 @@ apply from: "$rootDir/gradle/java.gradle" +muzzle { + pass { + name = "micronaut-common" + group = "io.micronaut" + module = "micronaut-http-server-netty" + versions = "[2,)" + } +} + dependencies { compileOnly group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0' + implementation project(':dd-java-agent:instrumentation:span-origin') } diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle index acd4b65cf52..ffb10fb10c3 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle @@ -30,11 +30,13 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { main_java17CompileOnly group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '4.0.0' + implementation project(':dd-java-agent:instrumentation:micronaut') // Added to ensure cross compatibility: testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-2.0') testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-3.0') testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:agent-debugger') testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '4.0.0', { exclude group: 'org.slf4j', module: 'slf4j-api' exclude group: 'ch.qos.logback', module: 'logback-classic' diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/test/groovy/MicronautTest.groovy b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/test/groovy/MicronautTest.groovy index ad5ada99bf4..ddae4eccf59 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/test/groovy/MicronautTest.groovy +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/src/test/groovy/MicronautTest.groovy @@ -2,20 +2,49 @@ import datadog.trace.agent.test.asserts.TraceAssert import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.api.DDSpanTypes +import datadog.trace.bootstrap.debugger.DebuggerContext import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator import datadog.trace.instrumentation.netty41.server.NettyHttpServerDecorator import test.MicronautServer +import java.lang.reflect.Method + import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_ENCODED_BOTH import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED class MicronautTest extends HttpServerTest { + def codeOriginRecorder + + @Override + protected void configurePreAgent() { + super.configurePreAgent() + injectSysConfig(CODE_ORIGIN_FOR_SPANS_ENABLED, "true") + codeOriginRecorder = new DebuggerContext.CodeOriginRecorder() { + def invoked = false + @Override + String captureCodeOrigin(boolean entry) { + invoked = true + return "done" + } + + @Override + String captureCodeOrigin(Method method, boolean entry) { + invoked = true + return "done" + } + } + DebuggerContext.initCodeOrigin(codeOriginRecorder) + } + + + @Override HttpServer server() { return new MicronautServer() @@ -67,6 +96,9 @@ class MicronautTest extends HttpServerTest { @Override void handlerSpan(TraceAssert trace, ServerEndpoint endpoint = SUCCESS) { + if (endpoint != NOT_FOUND) { + assert codeOriginRecorder.invoked + } trace.span { serviceName expectedServiceName() operationName "micronaut-controller" diff --git a/dd-java-agent/instrumentation/micronaut/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java b/dd-java-agent/instrumentation/micronaut/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java new file mode 100644 index 00000000000..67094a62106 --- /dev/null +++ b/dd-java-agent/instrumentation/micronaut/src/main/java/datadog/trace/instrumentation/micronaut/MicronautCodeOriginInstrumentation.java @@ -0,0 +1,36 @@ +package datadog.trace.instrumentation.micronaut; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.instrumentation.codeorigin.CodeOriginInstrumentation; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +@AutoService(InstrumenterModule.class) +public class MicronautCodeOriginInstrumentation extends CodeOriginInstrumentation { + + public static final String IO_MICRONAUT_HTTP_ANNOTATION = "io.micronaut.http.annotation."; + + public MicronautCodeOriginInstrumentation() { + super("micronaut", "micronaut-span-origin"); + } + + @Override + public String muzzleDirective() { + return "micronaut-common"; + } + + @Override + protected Set getAnnotations() { + return new HashSet<>( + Arrays.asList( + IO_MICRONAUT_HTTP_ANNOTATION + "Get", + IO_MICRONAUT_HTTP_ANNOTATION + "Post", + IO_MICRONAUT_HTTP_ANNOTATION + "Put", + IO_MICRONAUT_HTTP_ANNOTATION + "Delete", + IO_MICRONAUT_HTTP_ANNOTATION + "Patch", + IO_MICRONAUT_HTTP_ANNOTATION + "Head", + IO_MICRONAUT_HTTP_ANNOTATION + "Options")); + } +} diff --git a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java b/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java index 7e07c03bfbb..f299114706e 100644 --- a/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java +++ b/dd-java-agent/instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java @@ -17,8 +17,8 @@ public abstract class CodeOriginInstrumentation extends Tracing implements ForTy private final OneOf matcher; @SuppressForbidden - public CodeOriginInstrumentation(String instrumentationName) { - super(instrumentationName); + public CodeOriginInstrumentation(String instrumentationName, String... additionalNames) { + super(instrumentationName, additionalNames); this.matcher = NameMatchers.namedOneOf(getAnnotations()); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java index f7e63505d23..c4ad753687f 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java @@ -114,6 +114,8 @@ public void toJson(JsonWriter writer, Config config) throws IOException { writer.value(config.isDebuggerEnabled()); writer.name("debugger_exception_enabled"); writer.value(config.isDebuggerExceptionEnabled()); + writer.name("debugger_span_origin_enabled"); + writer.value(config.isDebuggerCodeOriginEnabled()); writer.name("appsec_enabled"); writer.value(config.getAppSecActivation().toString()); writer.name("appsec_rules_file_path"); diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index a67d0c519bb..d0b3c7e8235 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -4326,6 +4326,8 @@ public String toString() { + debuggerSymbolIncludes + ", debuggerExceptionEnabled=" + debuggerExceptionEnabled + + ", debuggerCodeOriginEnabled=" + + debuggerCodeOriginEnabled + ", awsPropagationEnabled=" + awsPropagationEnabled + ", sqsPropagationEnabled=" From 70a9d0475ec954ffd749c12d8b898a4d51a630d6 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:55:32 +0100 Subject: [PATCH 098/106] Implement fail-fast tests ordering for JUnit 5 (#8055) --- .../config/ConfigurationApiImpl.java | 16 ++- .../config/ExecutionSettings.java | 1 - .../config/ExecutionSettingsFactoryImpl.java | 9 +- .../config/TestIdentifierSerializer.java | 4 +- .../domain/AbstractTestSession.java | 9 +- .../domain/TestFrameworkModule.java | 2 + .../domain/buildsystem/ProxyTestModule.java | 5 + .../domain/headless/HeadlessTestModule.java | 5 + .../events/TestEventsHandlerImpl.java | 10 ++ .../civisibility/test/ExecutionStrategy.java | 5 + .../CiVisibilityInstrumentationTest.groovy | 44 +++++- .../src/test/groovy/CucumberTest.groovy | 2 + .../src/test/groovy/MUnitTest.groovy | 2 + .../src/test/groovy/JUnit4Test.groovy | 2 + .../instrumentation/junit-5.3/build.gradle | 12 +- .../junit-5.3/cucumber-junit-5/build.gradle | 1 + .../junit5/JUnit5CucumberInstrumentation.java | 16 --- .../src/test/groovy/CucumberTest.groovy | 2 + .../junit-5.3/junit-5.8/build.gradle | 12 +- .../junit5/order/FailFastClassOrderer.java | 65 +++++++++ .../junit5/order/FailFastMethodOrderer.java | 46 +++++++ .../junit5/order/JUnit5OrderUtils.java | 27 ++++ .../order/JUnit5TestOrderInstrumentation.java | 127 ++++++++++++++++++ .../src/test/groovy/JUnit58Test.groovy | 57 ++++++++ .../java/org/example/TestParameterized.java | 35 +++++ .../test/java/org/example/TestSucceed.java | 18 +++ .../java/org/example/TestSucceedAnother.java | 13 ++ .../test-before-all-after-all/events.ftl | 2 + .../test-before-each-after-each/events.ftl | 18 +-- .../test-failed-after-all/events.ftl | 2 + .../test-failed-after-each/events.ftl | 10 +- .../test-failed-before-each/events.ftl | 10 +- .../junit-5.3/spock-junit-5/build.gradle | 1 + .../junit5/JUnit5SpockInstrumentation.java | 16 --- .../src/test/groovy/SpockTest.groovy | 9 ++ .../junit5/JUnit5Instrumentation.java | 26 +++- .../junit5/JUnitPlatformUtils.java | 7 + .../src/test/groovy/JUnit5Test.groovy | 2 + .../karate/src/test/groovy/KarateTest.groovy | 2 + .../src/test/groovy/ScalatestTest.groovy | 2 + .../instrumentation/testng/TestNGTest.groovy | 2 + .../trace/api/config/CiVisibilityConfig.java | 1 + .../main/java/datadog/trace/api/Config.java | 6 + .../trace/api/civisibility/CIConstants.java | 2 + .../events/TestEventsHandler.java | 4 + .../telemetry/CiVisibilityCountMetric.java | 19 ++- .../CiVisibilityDistributionMetric.java | 8 +- .../tag/AgentlessLogSubmissionEnabled.java | 12 ++ .../tag/FailFastTestOrderEnabled.java | 12 ++ .../tag/FlakyTestRetriesEnabled.java | 12 ++ 50 files changed, 654 insertions(+), 78 deletions(-) create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java create mode 100644 dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java create mode 100644 internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java create mode 100644 internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java create mode 100644 internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java index b13979809a4..fb4b59b280c 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java @@ -15,6 +15,7 @@ import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.api.civisibility.telemetry.tag.CoverageEnabled; import datadog.trace.api.civisibility.telemetry.tag.EarlyFlakeDetectionEnabled; +import datadog.trace.api.civisibility.telemetry.tag.FlakyTestRetriesEnabled; import datadog.trace.api.civisibility.telemetry.tag.ItrEnabled; import datadog.trace.api.civisibility.telemetry.tag.ItrSkipEnabled; import datadog.trace.api.civisibility.telemetry.tag.RequireGit; @@ -132,6 +133,7 @@ public CiVisibilitySettings getSettings(TracerEnvironment tracerEnvironment) thr settings.getEarlyFlakeDetectionSettings().isEnabled() ? EarlyFlakeDetectionEnabled.TRUE : null, + settings.isFlakyTestRetriesEnabled() ? FlakyTestRetriesEnabled.TRUE : null, settings.isGitUploadRequired() ? RequireGit.TRUE : null); return settings; @@ -185,6 +187,14 @@ public SkippableTests getSkippableTests(TracerEnvironment tracerEnvironment) thr @Override public Map> getFlakyTestsByModule( TracerEnvironment tracerEnvironment) throws IOException { + OkHttpUtils.CustomListener telemetryListener = + new TelemetryListener.Builder(metricCollector) + .requestCount(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST) + .requestErrors(CiVisibilityCountMetric.FLAKY_TESTS_REQUEST_ERRORS) + .requestDuration(CiVisibilityDistributionMetric.FLAKY_TESTS_REQUEST_MS) + .responseBytes(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_BYTES) + .build(); + String uuid = uuidGenerator.get(); EnvelopeDto request = new EnvelopeDto<>( @@ -196,11 +206,12 @@ public Map> getFlakyTestsByModule( FLAKY_TESTS_URI, requestBody, is -> testIdentifiersResponseAdapter.fromJson(Okio.buffer(Okio.source(is))).data, - null, + telemetryListener, false); LOGGER.debug("Received {} flaky tests in total", response.size()); + int flakyTestsCount = 0; Map> testIdentifiers = new HashMap<>(); for (DataDto dataDto : response) { TestIdentifierJson testIdentifierJson = dataDto.getAttributes(); @@ -209,7 +220,10 @@ public Map> getFlakyTestsByModule( testIdentifiers .computeIfAbsent(moduleName, k -> new HashSet<>()) .add(testIdentifierJson.toTestIdentifier()); + flakyTestsCount++; } + + metricCollector.add(CiVisibilityDistributionMetric.FLAKY_TESTS_RESPONSE_TESTS, flakyTestsCount); return testIdentifiers; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java index 20a653576b9..dce2f5dffc7 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java @@ -114,7 +114,6 @@ public Collection getKnownTests() { @Nullable public Collection getFlakyTests() { - // backend does not store module info for flaky tests yet return flakyTests; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java index 117fdb90447..d1b345c1808 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java @@ -1,6 +1,7 @@ package datadog.trace.civisibility.config; import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CIConstants; import datadog.trace.api.civisibility.CiVisibilityWellKnownTags; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; @@ -139,11 +140,17 @@ private TracerEnvironment buildTracerEnvironment( Map> flakyTestsByModule = flakyTestRetriesEnabled && config.isCiVisibilityFlakyRetryOnlyKnownFlakes() + || CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase( + config.getCiVisibilityTestOrder()) ? getFlakyTestsByModule(tracerEnvironment) : null; Map> knownTestsByModule = - earlyFlakeDetectionEnabled ? getKnownTestsByModule(tracerEnvironment) : null; + earlyFlakeDetectionEnabled + || CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase( + config.getCiVisibilityTestOrder()) + ? getKnownTestsByModule(tracerEnvironment) + : null; Set moduleNames = new HashSet<>(Collections.singleton(DEFAULT_SETTINGS)); moduleNames.addAll(skippableTestIdentifiers.keySet()); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java index 2d45a6c9979..73a6e113ca4 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestIdentifierSerializer.java @@ -13,8 +13,10 @@ public static void serialize(Serializer serializer, TestIdentifier testIdentifie } public static TestIdentifier deserialize(ByteBuffer buffer) { + String suiteName = Serializer.readString(buffer); return new TestIdentifier( - Serializer.readString(buffer), + // suite name repeats a lot; interning it to save memory + suiteName != null ? suiteName.intern() : null, Serializer.readString(buffer), Serializer.readString(buffer)); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java index 1eb3caaf9c6..ff1de16e33e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java @@ -5,11 +5,14 @@ import datadog.trace.api.Config; import datadog.trace.api.DDTraceId; import datadog.trace.api.IdGenerationStrategy; +import datadog.trace.api.civisibility.CIConstants; import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.api.civisibility.telemetry.TagValue; +import datadog.trace.api.civisibility.telemetry.tag.AgentlessLogSubmissionEnabled; import datadog.trace.api.civisibility.telemetry.tag.AutoInjected; import datadog.trace.api.civisibility.telemetry.tag.EventType; +import datadog.trace.api.civisibility.telemetry.tag.FailFastTestOrderEnabled; import datadog.trace.api.civisibility.telemetry.tag.HasCodeowner; import datadog.trace.api.civisibility.telemetry.tag.IsHeadless; import datadog.trace.api.civisibility.telemetry.tag.IsUnsupportedCI; @@ -109,7 +112,11 @@ public AbstractTestSession( CiVisibilityCountMetric.TEST_SESSION, 1, ciProvider, - config.isCiVisibilityAutoInjected() ? AutoInjected.TRUE : null); + config.isCiVisibilityAutoInjected() ? AutoInjected.TRUE : null, + config.isAgentlessLogSubmissionEnabled() ? AgentlessLogSubmissionEnabled.TRUE : null, + CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(config.getCiVisibilityTestOrder()) + ? FailFastTestOrderEnabled.TRUE + : null); if (instrumentationType == InstrumentationType.MANUAL_API) { metricCollector.add(CiVisibilityCountMetric.MANUAL_API_EVENTS, 1, EventType.SESSION); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java index 42723fcffd1..6c98136fa7e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkModule.java @@ -25,6 +25,8 @@ TestSuiteImpl testSuiteStart( */ boolean isNew(TestIdentifier test); + boolean isFlaky(TestIdentifier test); + /** * Checks if a given test should be skipped with Intelligent Test Runner or not * diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index 0758a693361..cc0fb403234 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -87,6 +87,11 @@ public boolean isNew(TestIdentifier test) { return executionStrategy.isNew(test); } + @Override + public boolean isFlaky(TestIdentifier test) { + return executionStrategy.isFlaky(test); + } + @Override public boolean shouldBeSkipped(TestIdentifier test) { return executionStrategy.shouldBeSkipped(test); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index fc92ba099c2..2a527fa5580 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -72,6 +72,11 @@ public boolean isNew(TestIdentifier test) { return executionStrategy.isNew(test); } + @Override + public boolean isFlaky(TestIdentifier test) { + return executionStrategy.isFlaky(test); + } + @Override public boolean shouldBeSkipped(TestIdentifier test) { return executionStrategy.shouldBeSkipped(test); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java index a634586f5cd..94958461f41 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java @@ -272,6 +272,16 @@ public TestRetryPolicy retryPolicy(TestIdentifier test) { return testModule.retryPolicy(test); } + @Override + public boolean isNew(TestIdentifier test) { + return testModule.isNew(test); + } + + @Override + public boolean isFlaky(TestIdentifier test) { + return testModule.isFlaky(test); + } + @Override public void close() { testModule.end(null); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java index 12639864f4b..819a54fa2c9 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java @@ -43,6 +43,11 @@ public boolean isNew(TestIdentifier test) { return knownTests != null && !knownTests.contains(test.withoutParameters()); } + public boolean isFlaky(TestIdentifier test) { + Collection flakyTests = executionSettings.getFlakyTests(); + return flakyTests != null && flakyTests.contains(test.withoutParameters()); + } + public boolean shouldBeSkipped(TestIdentifier test) { if (test == null) { return false; diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index f38bf6e4779..d1c0fc936be 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -5,6 +5,7 @@ import datadog.communication.serialization.GrowableBuffer import datadog.communication.serialization.msgpack.MsgPackWriter import datadog.trace.agent.test.AgentTestRunner import datadog.trace.api.Config +import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.DDTest import datadog.trace.api.civisibility.DDTestSuite import datadog.trace.api.civisibility.InstrumentationBridge @@ -124,7 +125,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { skippableTestsWithMetadata, [:], flakyTests, - earlyFlakinessDetectionEnabled ? knownTests : null) + earlyFlakinessDetectionEnabled || CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(Config.get().ciVisibilityTestOrder) ? knownTests : null) } } @@ -224,12 +225,22 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { def givenFlakyTests(List tests) { flakyTests.addAll(tests) - flakyRetryEnabled = true } def givenKnownTests(List tests) { knownTests.addAll(tests) - earlyFlakinessDetectionEnabled = true + } + + def givenFlakyRetryEnabled(boolean flakyRetryEnabled) { + this.flakyRetryEnabled = flakyRetryEnabled + } + + def givenEarlyFlakinessDetectionEnabled(boolean earlyFlakinessDetectionEnabled) { + this.earlyFlakinessDetectionEnabled = earlyFlakinessDetectionEnabled + } + + def givenTestsOrder(String testsOrder) { + injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, testsOrder) } @Override @@ -274,6 +285,33 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements) } + def assertTestsOrder(List expectedOrder) { + TEST_WRITER.waitForTraces(expectedOrder.size() + 1) + def traces = TEST_WRITER.toList() + def events = getEventsAsJson(traces) + def identifiers = getTestIdentifiers(events) + if (identifiers != expectedOrder) { + throw new AssertionError("Expected order: $expectedOrder, but got: $identifiers") + } + return true + } + + def getTestIdentifiers(List events) { + events.sort(Comparator.comparing { it['content']['start'] as Long }) + def testIdentifiers = [] + for (Map event : events) { + if (event['content']['meta']['test.name']) { + testIdentifiers.add(test(event['content']['meta']['test.suite'] as String, event['content']['meta']['test.name'] as String)) + } + } + return testIdentifiers + } + + def test(String suite, String name, String parameters = null) { + + return new TestIdentifier(suite, name, parameters) + } + def getEventsAsJson(List> traces) { return getSpansAsJson(new CiTestCycleMapperV1(Config.get().getCiVisibilityWellKnownTags(), false), traces) } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 1eef3e38000..13fb5ca7215 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -53,6 +53,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runFeatures(features) @@ -71,6 +72,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runFeatures(features) diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 68d12b2efd3..43ac216a46b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -31,6 +31,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -45,6 +46,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index a97d82a7225..38f51a32850 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -90,6 +90,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -110,6 +111,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit-5.3/build.gradle index 132c4805010..10e805e4010 100644 --- a/dd-java-agent/instrumentation/junit-5.3/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/build.gradle @@ -33,9 +33,9 @@ dependencies { // versions used below are not the minimum ones that we support, // but the tests need to use them in order to be compliant with Spock 2.x - testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' + testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2' latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+' latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+' @@ -44,8 +44,8 @@ dependencies { configurations.matching({ it.name.startsWith('test') }).each({ it.resolutionStrategy { - force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' - force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' + force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2' + force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2' + force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2' } }) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle index 40057b40131..53e87629257 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle @@ -13,6 +13,7 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { implementation project(':dd-java-agent:instrumentation:junit-5.3') + compileOnly group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '5.4.0' compileOnly group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0' diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java index 35649a927d1..01939287fed 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java @@ -7,17 +7,12 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.InstrumentationContext; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.cucumber.junit.platform.engine.CucumberTestEngine; -import java.util.Collections; -import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.matcher.ElementMatcher; import org.junit.platform.engine.EngineExecutionListener; import org.junit.platform.engine.ExecutionRequest; -import org.junit.platform.engine.TestDescriptor; import org.junit.platform.engine.TestEngine; import org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService; @@ -51,11 +46,6 @@ public String[] helperClassNames() { }; } - @Override - public Map contextStore() { - return Collections.singletonMap("org.junit.platform.engine.TestDescriptor", "java.lang.Object"); - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( @@ -87,12 +77,6 @@ public static void addTracingListener( return; } - ContextStore contextStore = - InstrumentationContext.get(TestDescriptor.class, Object.class); - TestEventsHandlerHolder.setContextStores( - (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(); - CucumberTracingListener tracingListener = new CucumberTracingListener(testEngine); EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener(); EngineExecutionListener compositeListener = diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index 2fc55fca889..15096e6601b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -55,6 +55,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runFeatures(features, false) @@ -76,6 +77,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runFeatures(features, false) diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle index c4418493d73..9ef5699a265 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle @@ -36,9 +36,9 @@ dependencies { // versions used below are not the minimum ones that we support, // but the tests need to use them in order to be compliant with Spock 2.x - testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' + testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2' latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+' latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+' @@ -47,8 +47,8 @@ dependencies { configurations.matching({ it.name.startsWith('test') }).each({ it.resolutionStrategy { - force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' - force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2' + force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2' + force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2' + force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2' } }) diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java new file mode 100644 index 00000000000..32e89b901c3 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java @@ -0,0 +1,65 @@ +package datadog.trace.instrumentation.junit5.order; + +import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils; +import java.util.Comparator; +import java.util.Set; +import javax.annotation.Nullable; +import org.junit.jupiter.api.ClassDescriptor; +import org.junit.jupiter.api.ClassOrderer; +import org.junit.jupiter.api.ClassOrdererContext; +import org.junit.platform.engine.TestDescriptor; + +public class FailFastClassOrderer implements ClassOrderer { + + private final TestEventsHandler testEventsHandler; + private final @Nullable ClassOrderer delegate; + private final Comparator knownTestSuitesComparator; + + public FailFastClassOrderer( + TestEventsHandler testEventsHandler, + @Nullable ClassOrderer delegate) { + this.testEventsHandler = testEventsHandler; + this.delegate = delegate; + this.knownTestSuitesComparator = Comparator.comparing(this::knownAndStableTestsPercentage); + } + + private int knownAndStableTestsPercentage(ClassDescriptor classDescriptor) { + TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(classDescriptor); + return 100 - unknownAndFlakyTestsPercentage(testDescriptor); + } + + private int unknownAndFlakyTestsPercentage(TestDescriptor testDescriptor) { + if (testDescriptor == null) { + return 0; + } + if (testDescriptor.isTest() || JUnitPlatformUtils.isParameterizedTest(testDescriptor)) { + TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor); + return testEventsHandler.isNew(testIdentifier) || testEventsHandler.isFlaky(testIdentifier) + ? 100 + : 0; + } + Set children = testDescriptor.getChildren(); + if (children.isEmpty()) { + return 0; + } + + int uknownTestsPercentage = 0; + for (TestDescriptor child : children) { + uknownTestsPercentage += unknownAndFlakyTestsPercentage(child); + } + return uknownTestsPercentage / children.size(); + } + + @Override + public void orderClasses(ClassOrdererContext classOrdererContext) { + if (delegate != null) { + // first use delegate if available + delegate.orderClasses(classOrdererContext); + } + // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for + // classes with the same "known/stable" status) + classOrdererContext.getClassDescriptors().sort(knownTestSuitesComparator); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java new file mode 100644 index 00000000000..2b1d1385c89 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java @@ -0,0 +1,46 @@ +package datadog.trace.instrumentation.junit5.order; + +import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils; +import java.util.Comparator; +import javax.annotation.Nullable; +import org.junit.jupiter.api.MethodDescriptor; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.MethodOrdererContext; +import org.junit.platform.engine.TestDescriptor; + +public class FailFastMethodOrderer implements MethodOrderer { + + private final TestEventsHandler testEventsHandler; + private final @Nullable MethodOrderer delegate; + private final Comparator knownTestMethodsComparator; + + public FailFastMethodOrderer( + TestEventsHandler testEventsHandler, + @Nullable MethodOrderer delegate) { + this.testEventsHandler = testEventsHandler; + this.delegate = delegate; + this.knownTestMethodsComparator = Comparator.comparing(this::isKnownAndStable); + } + + private boolean isKnownAndStable(MethodDescriptor methodDescriptor) { + TestDescriptor testDescriptor = JUnit5OrderUtils.getTestDescriptor(methodDescriptor); + if (testDescriptor == null) { + return true; + } + TestIdentifier testIdentifier = JUnitPlatformUtils.toTestIdentifier(testDescriptor); + return !testEventsHandler.isNew(testIdentifier) && !testEventsHandler.isFlaky(testIdentifier); + } + + @Override + public void orderMethods(MethodOrdererContext methodOrdererContext) { + if (delegate != null) { + // first use delegate if available + delegate.orderMethods(methodOrdererContext); + } + // then apply our ordering (since sorting is stable, delegate's ordering will be preserved for + // methods with the same "known/stable" status) + methodOrdererContext.getMethodDescriptors().sort(knownTestMethodsComparator); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java new file mode 100644 index 00000000000..8fcd20ef126 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java @@ -0,0 +1,27 @@ +package datadog.trace.instrumentation.junit5.order; + +import datadog.trace.util.MethodHandles; +import java.lang.invoke.MethodHandle; +import org.junit.jupiter.api.ClassDescriptor; +import org.junit.jupiter.api.MethodDescriptor; +import org.junit.platform.commons.util.ClassLoaderUtils; +import org.junit.platform.engine.TestDescriptor; + +public class JUnit5OrderUtils { + + private static final MethodHandles METHOD_HANDLES = + new MethodHandles(ClassLoaderUtils.getDefaultClassLoader()); + + private static final MethodHandle GET_TEST_DESCRIPTOR = + METHOD_HANDLES.privateFieldGetter( + "org.junit.jupiter.engine.discovery.AbstractAnnotatedDescriptorWrapper", + "testDescriptor"); + + public static TestDescriptor getTestDescriptor(ClassDescriptor classDescriptor) { + return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, classDescriptor); + } + + public static TestDescriptor getTestDescriptor(MethodDescriptor methodDescriptor) { + return METHOD_HANDLES.invoke(GET_TEST_DESCRIPTOR, methodDescriptor); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java new file mode 100644 index 00000000000..fb58e56327b --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java @@ -0,0 +1,127 @@ +package datadog.trace.instrumentation.junit5.order; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CIConstants; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils; +import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder; +import datadog.trace.util.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Optional; +import java.util.Set; +import net.bytebuddy.asm.Advice; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.matcher.ElementMatcher; +import org.junit.jupiter.api.ClassOrderer; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.engine.config.JupiterConfiguration; + +@AutoService(InstrumenterModule.class) +public class JUnit5TestOrderInstrumentation extends InstrumenterModule.CiVisibility + implements Instrumenter.ForTypeHierarchy { + + private final String parentPackageName = + Strings.getPackageName(JUnitPlatformUtils.class.getName()); + + public JUnit5TestOrderInstrumentation() { + super("ci-visibility", "junit-5", "test-order"); + } + + @Override + public boolean isApplicable(Set enabledSystems) { + return super.isApplicable(enabledSystems) && Config.get().getCiVisibilityTestOrder() != null; + } + + @Override + public String hierarchyMarkerType() { + return "org.junit.jupiter.engine.config.JupiterConfiguration"; + } + + @Override + public ElementMatcher hierarchyMatcher() { + return implementsInterface(named(hierarchyMarkerType())); + } + + @Override + public String[] helperClassNames() { + return new String[] { + parentPackageName + ".TestEventsHandlerHolder", + parentPackageName + ".JUnitPlatformUtils", + packageName + ".JUnit5OrderUtils", + packageName + ".FailFastClassOrderer", + packageName + ".FailFastMethodOrderer", + }; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("getDefaultTestClassOrderer"), + JUnit5TestOrderInstrumentation.class.getName() + "$ClassOrdererAdvice"); + transformer.applyAdvice( + named("getDefaultTestMethodOrderer"), + JUnit5TestOrderInstrumentation.class.getName() + "$MethodOrdererAdvice"); + } + + public static class ClassOrdererAdvice { + @Advice.OnMethodEnter + public static void onGetClassOrdererEnter() { + CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class); + } + + @SuppressFBWarnings( + value = "UC_USELESS_OBJECT", + justification = "classOrderer is the return value of the instrumented method") + @Advice.OnMethodExit + public static void onGetClassOrdererExit( + @Advice.Return(readOnly = false) Optional classOrderer) { + if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) { + // nested call + return; + } + String testOrder = Config.get().getCiVisibilityTestOrder(); + if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) { + classOrderer = + Optional.of( + new FailFastClassOrderer( + TestEventsHandlerHolder.TEST_EVENTS_HANDLER, classOrderer.orElse(null))); + } else { + throw new IllegalArgumentException("Unknown test order: " + testOrder); + } + } + } + + public static class MethodOrdererAdvice { + @Advice.OnMethodEnter + public static void onGetMethodOrdererEnter() { + CallDepthThreadLocalMap.incrementCallDepth(JupiterConfiguration.class); + } + + @SuppressFBWarnings( + value = "UC_USELESS_OBJECT", + justification = "methodOrderer is the return value of the instrumented method") + @Advice.OnMethodExit + public static void onGetMethodOrdererExit( + @Advice.Return(readOnly = false) Optional methodOrderer) { + if (CallDepthThreadLocalMap.decrementCallDepth(JupiterConfiguration.class) != 0) { + // nested call + return; + } + String testOrder = Config.get().getCiVisibilityTestOrder(); + if (CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)) { + methodOrderer = + Optional.of( + new FailFastMethodOrderer( + TestEventsHandlerHolder.TEST_EVENTS_HANDLER, methodOrderer.orElse(null))); + } else { + throw new IllegalArgumentException("Unknown test order: " + testOrder); + } + } + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 5c81fbcecab..dbfdaba2b67 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -1,7 +1,11 @@ import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.CIConstants import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.* +import org.junit.jupiter.api.ClassOrderer +import org.junit.jupiter.api.MethodOrderer +import org.junit.jupiter.engine.Constants import org.junit.jupiter.engine.JupiterTestEngine import org.junit.platform.engine.DiscoverySelector import org.junit.platform.launcher.core.LauncherConfig @@ -13,6 +17,12 @@ import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass @DisableTestTrace(reason = "avoid self-tracing") class JUnit58Test extends CiVisibilityInstrumentationTest { + @Override + void configurePreAgent() { + super.configurePreAgent() + givenTestsOrder(CIConstants.FAIL_FAST_TEST_ORDER) + } + def "test #testcaseName"() { runTests(tests) @@ -28,6 +38,51 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { "test-failed-after-each" | [TestFailedAfterEach] | 2 } + def "test known tests ordering #testcaseName"() { + givenKnownTests(knownTestsList) + + runTests(tests) + + assertTestsOrder(expectedOrder) + + where: + testcaseName | tests | knownTestsList | expectedOrder + "ordering-methods" | [TestSucceed] | [test("org.example.TestSucceed", "test_succeed_1")] | [ + test("org.example.TestSucceed", "test_succeed_2"), + test("org.example.TestSucceed", "test_succeed_1") + ] + "ordering-classes" | [TestSucceed, TestSucceedAnother] | [test("org.example.TestSucceed", "test_succeed_1")] | [ + test("org.example.TestSucceedAnother", "test_succeed_1"), + test("org.example.TestSucceed", "test_succeed_2"), + test("org.example.TestSucceed", "test_succeed_1") + ] + "ordering-parameterized-methods" | [TestParameterized] | [test("org.example.TestParameterized", "test_another_parameterized")] | [ + test("org.example.TestParameterized", "test_parameterized"), + test("org.example.TestParameterized", "test_another_parameterized") + ] + } + + def "test flaky tests ordering #testcaseName"() { + givenKnownTests(expectedOrder) + givenFlakyTests(flakyTestsList) + + runTests(tests) + + assertTestsOrder(expectedOrder) + + where: + testcaseName | tests | flakyTestsList | expectedOrder + "ordering-methods" | [TestSucceed] | [test("org.example.TestSucceed", "test_succeed_2")] | [ + test("org.example.TestSucceed", "test_succeed_2"), + test("org.example.TestSucceed", "test_succeed_1") + ] + "ordering-classes" | [TestSucceed, TestSucceedAnother] | [test("org.example.TestSucceedAnother", "test_succeed_1")] | [ + test("org.example.TestSucceedAnother", "test_succeed_1"), + test("org.example.TestSucceed", "test_succeed_1"), + test("org.example.TestSucceed", "test_succeed_2") + ] + } + private static void runTests(List> tests) { TestEventsHandlerHolder.startForcefully() @@ -37,6 +92,8 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { } def launcherReq = LauncherDiscoveryRequestBuilder.request() + .configurationParameter(Constants.DEFAULT_TEST_CLASS_ORDER_PROPERTY_NAME, ClassOrderer.ClassName.name) + .configurationParameter(Constants.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME, MethodOrderer.MethodName.name) .selectors(selectors) .build() diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java new file mode 100644 index 00000000000..0b28259cfa5 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java @@ -0,0 +1,35 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class TestParameterized { + + static List parameters() { + return Collections.singletonList(() -> new Object[] {0, 0, "0", "some:\"parameter\""}); + } + + @ParameterizedTest + @MethodSource("parameters") + public void test_parameterized( + final int first, final int second, final int expectedSum, final String message) { + final int actualSum = first + second; + assertEquals(expectedSum, actualSum); + assertNotNull(message); + } + + @ParameterizedTest + @MethodSource("parameters") + public void test_another_parameterized( + final int first, final int second, final int expectedSum, final String message) { + final int actualSum = first + second; + assertEquals(expectedSum, actualSum); + assertNotNull(message); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java new file mode 100644 index 00000000000..22907b66d3e --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java @@ -0,0 +1,18 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +public class TestSucceed { + + @Test + public void test_succeed_1() { + assertTrue(true); + } + + @Test + public void test_succeed_2() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java new file mode 100644 index 00000000000..f336cac5c27 --- /dev/null +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java @@ -0,0 +1,13 @@ +package org.example; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +public class TestSucceedAnother { + + @Test + public void test_succeed_1() { + assertTrue(true); + } +} diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl index 22736145e85..66970704b3d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl @@ -131,6 +131,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "another_test_succeed", @@ -178,6 +179,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl index 2090ff27a32..a0f2336c5ab 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl @@ -131,6 +131,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "another_test_succeed", @@ -178,6 +179,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", @@ -198,9 +200,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id_2}, + "trace_id" : ${content_trace_id}, "span_id" : ${content_span_id_3}, - "parent_id" : ${content_span_id_2}, + "parent_id" : ${content_span_id}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "setUp", "resource" : "setUp", @@ -218,9 +220,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id}, + "trace_id" : ${content_trace_id_2}, "span_id" : ${content_span_id_4}, - "parent_id" : ${content_span_id}, + "parent_id" : ${content_span_id_2}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "setUp", "resource" : "setUp", @@ -238,9 +240,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id_2}, + "trace_id" : ${content_trace_id}, "span_id" : ${content_span_id_5}, - "parent_id" : ${content_span_id_2}, + "parent_id" : ${content_span_id}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "tearDown", "resource" : "tearDown", @@ -258,9 +260,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id}, + "trace_id" : ${content_trace_id_2}, "span_id" : ${content_span_id_6}, - "parent_id" : ${content_span_id}, + "parent_id" : ${content_span_id_2}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "tearDown", "resource" : "tearDown", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl index 2253dea2640..a12043d16d6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl @@ -134,6 +134,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "another_test_succeed", @@ -181,6 +182,7 @@ "test.module" : "junit-5.8", "test.status" : "pass", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl index 180f3341f04..a758ae37c46 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl @@ -131,6 +131,7 @@ "test.module" : "junit-5.8", "test.status" : "fail", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "another_test_succeed", @@ -181,6 +182,7 @@ "test.module" : "junit-5.8", "test.status" : "fail", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", @@ -204,9 +206,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id_2}, + "trace_id" : ${content_trace_id}, "span_id" : ${content_span_id_3}, - "parent_id" : ${content_span_id_2}, + "parent_id" : ${content_span_id}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "tearDown", "resource" : "tearDown", @@ -227,9 +229,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id}, + "trace_id" : ${content_trace_id_2}, "span_id" : ${content_span_id_4}, - "parent_id" : ${content_span_id}, + "parent_id" : ${content_span_id_2}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "tearDown", "resource" : "tearDown", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl index 6809b426552..d395452b0d9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl @@ -131,6 +131,7 @@ "test.module" : "junit-5.8", "test.status" : "fail", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "another_test_succeed", @@ -181,6 +182,7 @@ "test.module" : "junit-5.8", "test.status" : "fail", "language" : "jvm", + "test.is_new" : "true", "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, "test.name" : "test_succeed", @@ -204,9 +206,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id_2}, + "trace_id" : ${content_trace_id}, "span_id" : ${content_span_id_3}, - "parent_id" : ${content_span_id_2}, + "parent_id" : ${content_span_id}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "setUp", "resource" : "setUp", @@ -227,9 +229,9 @@ "type" : "span", "version" : 1, "content" : { - "trace_id" : ${content_trace_id}, + "trace_id" : ${content_trace_id_2}, "span_id" : ${content_span_id_4}, - "parent_id" : ${content_span_id}, + "parent_id" : ${content_span_id_2}, "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "name" : "setUp", "resource" : "setUp", diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle index b6ca4dfd623..3419895640f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle @@ -15,6 +15,7 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { implementation project(':dd-java-agent:instrumentation:junit-5.3') + compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.7.2' compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2' compileOnly group: 'org.spockframework', name: 'spock-core', version: "2.0-groovy-${spockGroovyVersion}" diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java index e7e4d07c01d..b82dae34334 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java @@ -7,16 +7,11 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.InstrumentationContext; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.util.Collections; -import java.util.Map; import net.bytebuddy.asm.Advice; import net.bytebuddy.matcher.ElementMatcher; import org.junit.platform.engine.EngineExecutionListener; import org.junit.platform.engine.ExecutionRequest; -import org.junit.platform.engine.TestDescriptor; import org.junit.platform.engine.TestEngine; import org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService; import org.spockframework.runtime.SpockEngine; @@ -51,11 +46,6 @@ public String[] helperClassNames() { }; } - @Override - public Map contextStore() { - return Collections.singletonMap("org.junit.platform.engine.TestDescriptor", "java.lang.Object"); - } - @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( @@ -87,12 +77,6 @@ public static void addTracingListener( return; } - ContextStore contextStore = - InstrumentationContext.get(TestDescriptor.class, Object.class); - TestEventsHandlerHolder.setContextStores( - (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(); - SpockTracingListener tracingListener = new SpockTracingListener(testEngine); EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener(); EngineExecutionListener compositeListener = diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 8e45825c72e..6d316ee4de1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -1,4 +1,5 @@ import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder @@ -27,6 +28,12 @@ import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass @DisableTestTrace(reason = "avoid self-tracing") class SpockTest extends CiVisibilityInstrumentationTest { + @Override + void configurePreAgent() { + super.configurePreAgent() + givenTestsOrder(CIConstants.FAIL_FAST_TEST_ORDER) + } + def "test #testcaseName"() { runTests(tests) @@ -63,6 +70,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -83,6 +91,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java index 8caf64042f0..33049b4975f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java @@ -61,11 +61,31 @@ public Map contextStore() { @Override public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("discover") + .and( + takesArgument(0, named("org.junit.platform.engine.EngineDiscoveryRequest")) + .and(takesArgument(1, named("org.junit.platform.engine.UniqueId")))), + JUnit5Instrumentation.class.getName() + "$ContextStoreAdvice"); transformer.applyAdvice( named("execute").and(takesArgument(0, named("org.junit.platform.engine.ExecutionRequest"))), JUnit5Instrumentation.class.getName() + "$JUnit5Advice"); } + public static class ContextStoreAdvice { + @SuppressFBWarnings( + value = "UC_USELESS_OBJECT", + justification = "executionRequest is the argument of the original method") + @Advice.OnMethodEnter + public static void setContextStores() { + ContextStore contextStore = + InstrumentationContext.get(TestDescriptor.class, Object.class); + TestEventsHandlerHolder.setContextStores( + (ContextStore) contextStore, (ContextStore) contextStore); + TestEventsHandlerHolder.start(); + } + } + public static class JUnit5Advice { @SuppressFBWarnings( value = "UC_USELESS_OBJECT", @@ -94,12 +114,6 @@ public static void addTracingListener( return; } - ContextStore contextStore = - InstrumentationContext.get(TestDescriptor.class, Object.class); - TestEventsHandlerHolder.setContextStores( - (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(); - TracingListener tracingListener = new TracingListener(testEngine); EngineExecutionListener originalListener = executionRequest.getEngineExecutionListener(); EngineExecutionListener compositeListener = diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 2a10d78066c..48b64fb5de7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -157,6 +157,13 @@ public static boolean isSuite(TestDescriptor testDescriptor) { || "nested-class".equals(lastSegment.getType()); // nested JUnit test class } + public static boolean isParameterizedTest(TestDescriptor testDescriptor) { + UniqueId uniqueId = testDescriptor.getUniqueId(); + List segments = uniqueId.getSegments(); + UniqueId.Segment lastSegment = segments.get(segments.size() - 1); + return "test-template".equals(lastSegment.getType()); + } + public static boolean isRetry(TestDescriptor testDescriptor) { UniqueId uniqueId = testDescriptor.getUniqueId(); List segments = uniqueId.getSegments(); diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index dea3e7eaae6..8f58d5f18ec 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -97,6 +97,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -117,6 +118,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index 76cc50de5d5..73ec97a0cbd 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -65,6 +65,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -84,6 +85,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index e28262c55a4..1646f5173ac 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -51,6 +51,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests) @@ -68,6 +69,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index 0713854760d..28a892fd542 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -110,6 +110,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { + givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) runTests(tests, null) @@ -128,6 +129,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { def "test early flakiness detection #testcaseName"() { Assumptions.assumeTrue(isEFDSupported()) + givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) runTests(tests) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java index bfd00a91fcd..2e8324e4224 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java @@ -71,6 +71,7 @@ public final class CiVisibilityConfig { "civisibility.remote.env.vars.provider.url"; public static final String CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY = "civisibility.remote.env.vars.provider.key"; + public static final String CIVISIBILITY_TEST_ORDER = "civisibility.test.order"; /* COVERAGE SETTINGS */ public static final String CIVISIBILITY_CODE_COVERAGE_ENABLED = diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index d0b3c7e8235..cde58e539ca 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -360,6 +360,7 @@ public static String getHostName() { private final boolean ciVisibilityAutoInjected; private final String ciVisibilityRemoteEnvVarsProviderUrl; private final String ciVisibilityRemoteEnvVarsProviderKey; + private final String ciVisibilityTestOrder; private final boolean remoteConfigEnabled; private final boolean remoteConfigIntegrityCheckEnabled; @@ -1453,6 +1454,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) configProvider.getString(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_URL); ciVisibilityRemoteEnvVarsProviderKey = configProvider.getString(CIVISIBILITY_REMOTE_ENV_VARS_PROVIDER_KEY); + ciVisibilityTestOrder = configProvider.getString(CIVISIBILITY_TEST_ORDER); remoteConfigEnabled = configProvider.getBoolean( @@ -2837,6 +2839,10 @@ public String getCiVisibilityRemoteEnvVarsProviderKey() { return ciVisibilityRemoteEnvVarsProviderKey; } + public String getCiVisibilityTestOrder() { + return ciVisibilityTestOrder; + } + public String getAppSecRulesFile() { return appSecRulesFile; } diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java b/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java index 262732e7fd3..bc5e89eb5e5 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/CIConstants.java @@ -10,4 +10,6 @@ public interface CIConstants { String SELENIUM_BROWSER_DRIVER = "selenium"; String CI_VISIBILITY_INSTRUMENTATION_NAME = "civisibility"; + + String FAIL_FAST_TEST_ORDER = "FAILFAST"; } diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java index 218017b68e6..767c2663c0c 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java @@ -78,6 +78,10 @@ void onTestIgnore( @Nonnull TestRetryPolicy retryPolicy(TestIdentifier test); + boolean isNew(TestIdentifier test); + + boolean isFlaky(TestIdentifier test); + @Override void close(); diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java index bdbfbc163fe..1a3c87085d3 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityCountMetric.java @@ -1,5 +1,6 @@ package datadog.trace.api.civisibility.telemetry; +import datadog.trace.api.civisibility.telemetry.tag.AgentlessLogSubmissionEnabled; import datadog.trace.api.civisibility.telemetry.tag.AutoInjected; import datadog.trace.api.civisibility.telemetry.tag.BrowserDriver; import datadog.trace.api.civisibility.telemetry.tag.Command; @@ -11,6 +12,8 @@ import datadog.trace.api.civisibility.telemetry.tag.ErrorType; import datadog.trace.api.civisibility.telemetry.tag.EventType; import datadog.trace.api.civisibility.telemetry.tag.ExitCode; +import datadog.trace.api.civisibility.telemetry.tag.FailFastTestOrderEnabled; +import datadog.trace.api.civisibility.telemetry.tag.FlakyTestRetriesEnabled; import datadog.trace.api.civisibility.telemetry.tag.HasCodeowner; import datadog.trace.api.civisibility.telemetry.tag.IsBenchmark; import datadog.trace.api.civisibility.telemetry.tag.IsHeadless; @@ -33,7 +36,12 @@ public enum CiVisibilityCountMetric { * The number of test sessions started. This metric is separate from event_created to avoid * increasing the cardinality too much */ - TEST_SESSION("test_session", Provider.class, AutoInjected.class), + TEST_SESSION( + "test_session", + Provider.class, + AutoInjected.class, + AgentlessLogSubmissionEnabled.class, + FailFastTestOrderEnabled.class), /** The number of events created */ EVENT_CREATED( "event_created", @@ -97,6 +105,7 @@ public enum CiVisibilityCountMetric { ItrSkipEnabled.class, CoverageEnabled.class, EarlyFlakeDetectionEnabled.class, + FlakyTestRetriesEnabled.class, RequireGit.class), /** The number of requests sent to the itr skippable tests endpoint */ ITR_SKIPPABLE_TESTS_REQUEST("itr_skippable_tests.request", RequestCompressed.class), @@ -116,8 +125,12 @@ public enum CiVisibilityCountMetric { ITR_FORCED_RUN("itr_forced_run", EventType.class), /** The number of requests sent to the known tests endpoint */ EFD_REQUEST("early_flake_detection.request", RequestCompressed.class), - /** The number of known tests requests sent to the endpoint that errored */ - EFD_REQUEST_ERRORS("early_flake_detection.request_errors", ErrorType.class, StatusCode.class); + /** The number of known tests requests sent to the known tests endpoint that errored */ + EFD_REQUEST_ERRORS("early_flake_detection.request_errors", ErrorType.class, StatusCode.class), + /** The number of requests sent to the flaky tests endpoint */ + FLAKY_TESTS_REQUEST("flaky_tests.request", RequestCompressed.class), + /** The number of known tests requests sent to the flaky tests that errored */ + FLAKY_TESTS_REQUEST_ERRORS("flaky_tests.request_errors", ErrorType.class, StatusCode.class); // need a "holder" class, as accessing static fields from enum constructors is illegal static class IndexHolder { diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java index 78bdba67119..7b8ef4a9d15 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/CiVisibilityDistributionMetric.java @@ -44,7 +44,13 @@ public enum CiVisibilityDistributionMetric { /** The number of bytes received by the known tests endpoint */ EFD_RESPONSE_BYTES("early_flake_detection.response_bytes", ResponseCompressed.class), /** The number of tests received by the known tests endpoint */ - EFD_RESPONSE_TESTS("early_flake_detection.response_tests"); + EFD_RESPONSE_TESTS("early_flake_detection.response_tests"), + /* The time it takes to get the response of the flaky tests endpoint request in ms */ + FLAKY_TESTS_REQUEST_MS("flaky_tests.request_ms"), + /** The number of bytes received by the flaky tests endpoint */ + FLAKY_TESTS_RESPONSE_BYTES("flaky_tests.response_bytes", ResponseCompressed.class), + /** The number of tests received by the flaky tests endpoint */ + FLAKY_TESTS_RESPONSE_TESTS("flaky_tests.response_tests"); private static final String NAMESPACE = "civisibility"; diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java new file mode 100644 index 00000000000..c82f10e7ee9 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/AgentlessLogSubmissionEnabled.java @@ -0,0 +1,12 @@ +package datadog.trace.api.civisibility.telemetry.tag; + +import datadog.trace.api.civisibility.telemetry.TagValue; + +public enum AgentlessLogSubmissionEnabled implements TagValue { + TRUE; + + @Override + public String asString() { + return "agentless_log_submission_enabled:true"; + } +} diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java new file mode 100644 index 00000000000..2c66e7a0122 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FailFastTestOrderEnabled.java @@ -0,0 +1,12 @@ +package datadog.trace.api.civisibility.telemetry.tag; + +import datadog.trace.api.civisibility.telemetry.TagValue; + +public enum FailFastTestOrderEnabled implements TagValue { + TRUE; + + @Override + public String asString() { + return "fail_fast_test_order_enabled:true"; + } +} diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java new file mode 100644 index 00000000000..b1008fe66a6 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/telemetry/tag/FlakyTestRetriesEnabled.java @@ -0,0 +1,12 @@ +package datadog.trace.api.civisibility.telemetry.tag; + +import datadog.trace.api.civisibility.telemetry.TagValue; + +public enum FlakyTestRetriesEnabled implements TagValue { + TRUE; + + @Override + public String asString() { + return "flaky_test_retries_enabled:true"; + } +} From 6d420cca514b8cf31c01d6228938f6c693188f47 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 5 Dec 2024 13:57:07 +0000 Subject: [PATCH 099/106] Custom ScopeManagers are deprecated and will be removed in a future release of dd-trace-ot (#8058) --- dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index be2db34e368..eb419c514a7 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -123,7 +123,10 @@ public DDTracerBuilder extractor(HttpCodec.Extractor extractor) { return this; } + @Deprecated public DDTracerBuilder scopeManager(ScopeManager scopeManager) { + log.warn( + "Custom ScopeManagers are deprecated and will be removed in a future release of dd-trace-ot"); this.scopeManager = scopeManager; return this; } From 39e43da11f628ee31fa5c5cedd7c4053f4f6c835 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Thu, 5 Dec 2024 16:24:26 +0100 Subject: [PATCH 100/106] Add debugger bootstrap module in excludeShared (#8059) --- gradle/dependencies.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 42c12af3cea..24b06c8351b 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,6 +10,7 @@ final class CachedData { excludeShared : (Closure) { // projects bundled with shared or on bootstrap exclude(project(':dd-java-agent:agent-bootstrap')) + exclude(project(':dd-java-agent:agent-debugger:debugger-bootstrap')) exclude(project(':dd-java-agent:agent-logging')) exclude(project(':dd-trace-api')) exclude(project(':internal-api')) From 2b246971a163746c7affffd0e19b63499112a7db Mon Sep 17 00:00:00 2001 From: cecile <32452337+cecile75@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:38:55 +0100 Subject: [PATCH 101/106] Add a built-in trace interceptor for keeping traces depending of their latency (#8040) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add latency trace interceptor * Fix test * add comments * improve comments * changes after review * Add "experimental" in configuration key Co-authored-by: Brian Marks * Add "experimental" in configuration key (for tests) Co-authored-by: Brian Marks * spotlessApply --------- Co-authored-by: Cecile Terpin <“cecile.terpin@datadoghq.com”> Co-authored-by: Brian Marks --- .../datadog/trace/api/ConfigDefaults.java | 2 + .../trace/api/config/TracerConfig.java | 4 +- .../interceptor/AbstractTraceInterceptor.java | 3 ++ .../java/datadog/trace/core/CoreTracer.java | 5 ++ .../LatencyTraceInterceptor.java | 45 +++++++++++++++++ .../LatencyTraceInterceptorTest.groovy | 48 +++++++++++++++++++ .../main/java/datadog/trace/api/Config.java | 20 ++++++++ 7 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java create mode 100644 dd-trace-core/src/test/groovy/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.groovy diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java index 5319aa9a18f..9c12e7dda8c 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java @@ -69,6 +69,8 @@ public final class ConfigDefaults { static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX = false; static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST = false; static final String DEFAULT_DB_DBM_PROPAGATION_MODE_MODE = "disabled"; + // Default value is set to 0, it disables the latency trace interceptor + static final int DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS = 0; static final int DEFAULT_SCOPE_DEPTH_LIMIT = 100; static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java index cd48250cb27..b3426d8d989 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java @@ -73,7 +73,9 @@ public final class TracerConfig { public static final String TRACE_HTTP_CLIENT_ERROR_STATUSES = "trace.http.client.error.statuses"; public static final String SPLIT_BY_TAGS = "trace.split-by-tags"; - + // trace latency interceptor value should be in ms + public static final String TRACE_KEEP_LATENCY_THRESHOLD_MS = + "trace.experimental.keep.latency.threshold.ms"; public static final String SCOPE_DEPTH_LIMIT = "trace.scope.depth.limit"; public static final String SCOPE_STRICT_MODE = "trace.scope.strict.mode"; public static final String SCOPE_ITERATION_KEEP_ALIVE = "trace.scope.iteration.keep.alive"; diff --git a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java index 0afc6229083..b155e585a94 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/interceptor/AbstractTraceInterceptor.java @@ -22,6 +22,9 @@ public enum Priority { DD_INTAKE(2), GIT_METADATA(3), + // trace custom sampling + ROOT_SPAN_LATENCY(Integer.MAX_VALUE - 2), + // trace data collection CI_VISIBILITY_TELEMETRY(Integer.MAX_VALUE - 1), SERVICE_NAME_COLLECTING(Integer.MAX_VALUE); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index d4e01b3adfc..4be835039a2 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -88,6 +88,7 @@ import datadog.trace.core.scopemanager.ContinuableScopeManager; import datadog.trace.core.taginterceptor.RuleFlags; import datadog.trace.core.taginterceptor.TagInterceptor; +import datadog.trace.core.traceinterceptor.LatencyTraceInterceptor; import datadog.trace.lambda.LambdaHandler; import datadog.trace.relocate.api.RatelimitedLogger; import datadog.trace.util.AgentTaskScheduler; @@ -745,6 +746,10 @@ private CoreTracer( addTraceInterceptor(GitMetadataTraceInterceptor.INSTANCE); } + if (config.isTraceKeepLatencyThresholdEnabled()) { + addTraceInterceptor(LatencyTraceInterceptor.INSTANCE); + } + this.instrumentationGateway = instrumentationGateway; callbackProviderAppSec = instrumentationGateway.getCallbackProvider(RequestContextSlot.APPSEC); callbackProviderIast = instrumentationGateway.getCallbackProvider(RequestContextSlot.IAST); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java b/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java new file mode 100644 index 00000000000..1f6f5818aa0 --- /dev/null +++ b/dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java @@ -0,0 +1,45 @@ +package datadog.trace.core.traceinterceptor; + +import datadog.trace.api.Config; +import datadog.trace.api.DDTags; +import datadog.trace.api.interceptor.AbstractTraceInterceptor; +import datadog.trace.api.interceptor.MutableSpan; +import datadog.trace.api.interceptor.TraceInterceptor; +import java.util.Collection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This trace latency interceptor is disabled by default. We can activate it by setting the value of + * dd.trace.latency.interceptor.value to a positive value This value should be in milliseconds and + * this interceptor will retain any local trace who has a root span duration greater than this + * value. The activation of this interceptor is ignored if partial flush is enabled in order to + * avoid incomplete local trace (incomplete chunk of trace). Note that since we're changing the + * sampling priority at the end of local trace, there is no guarantee to get complete traces, since + * the original sampling priority for this trace may have already been propagated. + */ +public class LatencyTraceInterceptor extends AbstractTraceInterceptor { + private static final Logger log = LoggerFactory.getLogger(LatencyTraceInterceptor.class); + // duration configured in ms, need to be converted in nano seconds + private static final long LATENCY = Config.get().getTraceKeepLatencyThreshold() * 1000000L; + + public static final TraceInterceptor INSTANCE = + new LatencyTraceInterceptor(Priority.ROOT_SPAN_LATENCY); + + protected LatencyTraceInterceptor(Priority priority) { + super(priority); + } + + @Override + public Collection onTraceComplete( + Collection latencyTrace) { + if (latencyTrace.isEmpty()) { + return latencyTrace; + } + MutableSpan rootSpan = latencyTrace.iterator().next().getLocalRootSpan(); + if (rootSpan != null && rootSpan.getDurationNano() > LATENCY) { + rootSpan.setTag(DDTags.MANUAL_KEEP, true); + } + return latencyTrace; + } +} diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.groovy new file mode 100644 index 00000000000..e0ed91db723 --- /dev/null +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.groovy @@ -0,0 +1,48 @@ +package datadog.trace.core.traceinterceptor + +import datadog.trace.api.DDTags +import datadog.trace.common.writer.ListWriter + +import datadog.trace.core.test.DDCoreSpecification + +import spock.lang.Timeout + +@Timeout(10) +class LatencyTraceInterceptorTest extends DDCoreSpecification { + + + def "test set sampling priority according to latency"() { + setup: + + injectSysConfig("trace.partial.flush.enabled", partialFlushEnabled) + injectSysConfig("trace.experimental.keep.latency.threshold.ms", latencyThreshold) + + when: + def writer = new ListWriter() + def tracer = tracerBuilder().writer(writer).build() + + def spanSetup = tracer.buildSpan("test","my_operation_name").withTag(priorityTag, true).start() + sleep(minDuration) + spanSetup.finish() + + then: + def trace = writer.firstTrace() + trace.size() == 1 + def span = trace[0] + span.context().getSamplingPriority() == expected + + cleanup: + tracer.close() + + where: + partialFlushEnabled | latencyThreshold | priorityTag | minDuration | expected + "true" | "200" | DDTags.MANUAL_KEEP | 10 | 2 + "true" | "200" | DDTags.MANUAL_DROP | 10 | -1 + "true" | "200" | DDTags.MANUAL_KEEP | 300 | 2 + "true" | "200" | DDTags.MANUAL_DROP | 300 | -1 + "false" | "200" | DDTags.MANUAL_KEEP | 10 | 2 + "false" | "200" | DDTags.MANUAL_DROP | 10 | -1 + "false" | "200" | DDTags.MANUAL_KEEP | 300 | 2 + "false" | "200" | DDTags.MANUAL_DROP | 300 | 2 + } +} diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index cde58e539ca..e925bd5aaf1 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -176,6 +176,8 @@ public static String getHostName() { private final boolean scopeStrictMode; private final int scopeIterationKeepAlive; private final int partialFlushMinSpans; + private final int traceKeepLatencyThreshold; + private final boolean traceKeepLatencyThresholdEnabled; private final boolean traceStrictWritesEnabled; private final boolean logExtractHeaderNames; private final Set propagationStylesToExtract; @@ -861,6 +863,12 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins ? 0 : configProvider.getInteger(PARTIAL_FLUSH_MIN_SPANS, DEFAULT_PARTIAL_FLUSH_MIN_SPANS); + traceKeepLatencyThreshold = + configProvider.getInteger( + TRACE_KEEP_LATENCY_THRESHOLD_MS, DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS); + + traceKeepLatencyThresholdEnabled = !partialFlushEnabled && (traceKeepLatencyThreshold > 0); + traceStrictWritesEnabled = configProvider.getBoolean(TRACE_STRICT_WRITES_ENABLED, false); logExtractHeaderNames = @@ -2077,6 +2085,14 @@ public int getPartialFlushMinSpans() { return partialFlushMinSpans; } + public int getTraceKeepLatencyThreshold() { + return traceKeepLatencyThreshold; + } + + public boolean isTraceKeepLatencyThresholdEnabled() { + return traceKeepLatencyThresholdEnabled; + } + public boolean isTraceStrictWritesEnabled() { return traceStrictWritesEnabled; } @@ -4164,6 +4180,10 @@ public String toString() { + scopeIterationKeepAlive + ", partialFlushMinSpans=" + partialFlushMinSpans + + ", traceKeepLatencyThresholdEnabled=" + + traceKeepLatencyThresholdEnabled + + ", traceKeepLatencyThreshold=" + + traceKeepLatencyThreshold + ", traceStrictWritesEnabled=" + traceStrictWritesEnabled + ", tracePropagationStylesToExtract=" From 32c64c46c343555a111c52040644d544a3499a30 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 6 Dec 2024 10:19:09 +0100 Subject: [PATCH 102/106] Protect mdb from instrumenting multiple time the same event (#8062) --- .../jakarta/jms/MDBMessageConsumerInstrumentation.java | 6 ++++++ .../jms/MDBMessageConsumerInstrumentation.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java index 1217e383aad..b9b651110bf 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jakarta/jms/MDBMessageConsumerInstrumentation.java @@ -19,11 +19,13 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.Message; +import jakarta.jms.MessageListener; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -72,6 +74,9 @@ public void methodAdvice(MethodTransformer transformer) { public static class MDBAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(0) final Message message) { + if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) { + return null; + } AgentSpan.Context propagatedContext = propagate().extract(message, GETTER); AgentSpan span = startSpan(JMS_CONSUME, propagatedContext); CONSUMER_DECORATE.afterStart(span); @@ -93,6 +98,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final Message message) public static void methodExit( @Advice.Enter AgentScope scope, @Advice.Thrown final Throwable throwable) { if (null != scope) { + CallDepthThreadLocalMap.reset(MessageListener.class); CONSUMER_DECORATE.onError(scope, throwable); scope.close(); scope.span().finish(); diff --git a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java index 2c55e314141..c5f2233cabb 100644 --- a/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java @@ -19,11 +19,13 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Message; +import javax.jms.MessageListener; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -72,6 +74,9 @@ public void methodAdvice(MethodTransformer transformer) { public static class MDBAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) public static AgentScope methodEnter(@Advice.Argument(0) final Message message) { + if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) { + return null; + } AgentSpan.Context propagatedContext = propagate().extract(message, GETTER); AgentSpan span = startSpan(JMS_CONSUME, propagatedContext); CONSUMER_DECORATE.afterStart(span); @@ -93,6 +98,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final Message message) public static void methodExit( @Advice.Enter AgentScope scope, @Advice.Thrown final Throwable throwable) { if (null != scope) { + CallDepthThreadLocalMap.reset(MessageListener.class); CONSUMER_DECORATE.onError(scope, throwable); scope.close(); scope.span().finish(); From 6e8f3a582800211922cf6322af732ae3126d0665 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 6 Dec 2024 12:03:36 +0100 Subject: [PATCH 103/106] Exclude jboss mdb proxies from instrumenting (#8061) --- .../trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java index 7b9a0394cc9..041ba7198fe 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ProxyClassIgnores.java @@ -12,6 +12,7 @@ public static boolean isIgnored(String name) { || name.contains("$$EnhancerByGuice$$") || name.contains("$$EnhancerByProxool$$") || name.contains("$$$view") + || name.contains("$$$endpoint") // jboss mdb proxies || name.contains("$$_Weld") || name.contains("_$$_jvst")) { return true; From 74967dd9f460785bd0b3085d8cf6f9e77f6ef3d4 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 6 Dec 2024 15:18:15 +0100 Subject: [PATCH 104/106] Remove dangling stderr print (#8063) --- .../instrumentation/ignite/v2/cache/SpanFinishingCallback.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java index 469ed829492..a25c2f658f7 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/SpanFinishingCallback.java @@ -21,8 +21,6 @@ public SpanFinishingCallback(final AgentSpan span) { public void apply(IgniteFuture igniteFuture) { IgniteCacheDecorator.DECORATE.beforeFinish(span); - System.err.println("Called callback: " + igniteFuture); - try { Object result = igniteFuture.get(); IgniteCacheDecorator.DECORATE.beforeFinish(span); From 0db63127b0047492c2f5eb30ae055d6696b28be0 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko <21974069+kr-igor@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:41:34 -0600 Subject: [PATCH 105/106] New tag for DSM checkpoints - a bitmask representing enabled products / features (#8051) Tag dsm checkpoints with product mask --- .../MsgPackDatastreamsPayloadWriter.java | 29 ++++++++++++++++++- .../datastreams/DataStreamsWritingTest.groovy | 7 +++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java index e6dc2a18e05..2baa8943de0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/MsgPackDatastreamsPayloadWriter.java @@ -6,6 +6,7 @@ import datadog.communication.serialization.Writable; import datadog.communication.serialization.WritableFormatter; import datadog.communication.serialization.msgpack.MsgPackWriter; +import datadog.trace.api.Config; import datadog.trace.api.WellKnownTags; import datadog.trace.common.metrics.Sink; import java.util.Collection; @@ -31,6 +32,7 @@ public class MsgPackDatastreamsPayloadWriter implements DatastreamsPayloadWriter private static final byte[] PARENT_HASH = "ParentHash".getBytes(ISO_8859_1); private static final byte[] BACKLOG_VALUE = "Value".getBytes(ISO_8859_1); private static final byte[] BACKLOG_TAGS = "Tags".getBytes(ISO_8859_1); + private static final byte[] PRODUCTS_MASK = "ProductMask".getBytes(ISO_8859_1); private static final int INITIAL_CAPACITY = 512 * 1024; @@ -55,9 +57,30 @@ public void reset() { buffer.reset(); } + // extend the list as needed + private static final int APM_PRODUCT = 1; // 00000001 + private static final int DSM_PRODUCT = 2; // 00000010 + private static final int DJM_PRODUCT = 4; // 00000100 + private static final int PROFILING_PRODUCT = 8; // 00001000 + + public long getProductsMask() { + long productsMask = APM_PRODUCT; + if (Config.get().isDataStreamsEnabled()) { + productsMask |= DSM_PRODUCT; + } + if (Config.get().isDataJobsEnabled()) { + productsMask |= DJM_PRODUCT; + } + if (Config.get().isProfilingEnabled()) { + productsMask |= PROFILING_PRODUCT; + } + + return productsMask; + } + @Override public void writePayload(Collection data, String serviceNameOverride) { - writer.startMap(7); + writer.startMap(8); /* 1 */ writer.writeUTF8(ENV); writer.writeUTF8(wellKnownTags.getEnv()); @@ -112,6 +135,10 @@ public void writePayload(Collection data, String serviceNameOverrid } } + /* 8 */ + writer.writeUTF8(PRODUCTS_MASK); + writer.writeLong(getProductsMask()); + buffer.mark(); sink.accept(buffer.messageCount(), buffer.slice()); buffer.reset(); diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy index 5f01afeafa7..6d163d0ac79 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/core/datastreams/DataStreamsWritingTest.groovy @@ -96,7 +96,7 @@ class DataStreamsWritingTest extends DDCoreSpecification { BufferedSource bufferedSource = Okio.buffer(gzipSource) MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream()) - assert unpacker.unpackMapHeader() == 7 + assert unpacker.unpackMapHeader() == 8 assert unpacker.unpackString() == "Env" assert unpacker.unpackString() == "test" assert unpacker.unpackString() == "Service" @@ -161,7 +161,7 @@ class DataStreamsWritingTest extends DDCoreSpecification { BufferedSource bufferedSource = Okio.buffer(gzipSource) MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bufferedSource.inputStream()) - assert unpacker.unpackMapHeader() == 7 + assert unpacker.unpackMapHeader() == 8 assert unpacker.unpackString() == "Env" assert unpacker.unpackString() == "test" assert unpacker.unpackString() == "Service" @@ -262,6 +262,9 @@ class DataStreamsWritingTest extends DDCoreSpecification { assert unpacker.unpackString() == (hash == 1 ? "topic:testTopic" : "topic:testTopic2") } + assert unpacker.unpackString() == "ProductMask" + assert unpacker.unpackLong() == 1 + return true } } From 4df0a016680045ccc689ea09a5a858d360d616fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:02:29 +0100 Subject: [PATCH 106/106] Update Gradle dependencies (#8069) * chore: Update Gradle dependencies * chore: Update Gradle dependencies --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- components/json/gradle.lockfile | 118 +++ .../armeria-grpc/gradle.lockfile | 8 +- .../armeria-jetty/gradle.lockfile | 6 +- .../aws-java-eventbridge-2.0/gradle.lockfile | 52 +- .../aws-java-sdk-2.2/gradle.lockfile | 60 +- .../aws-java-sns-2.0/gradle.lockfile | 52 +- .../couchbase/couchbase-3.2/gradle.lockfile | 4 +- .../google-http-client/gradle.lockfile | 8 +- .../grizzly-client-1.9/gradle.lockfile | 7 +- .../instrumentation/grpc-1.5/gradle.lockfile | 11 +- .../junit-4.10/junit-4.13/gradle.lockfile | 16 +- .../junit-4.10/munit-junit-4/gradle.lockfile | 8 +- .../instrumentation/junit-5.3/gradle.lockfile | 6 +- .../junit-5.3/junit-5.8/gradle.lockfile | 6 +- .../instrumentation/lettuce-5/gradle.lockfile | 16 +- .../http-server-netty-4.0/gradle.lockfile | 39 +- .../instrumentation/mule-4/gradle.lockfile | 940 +++++++++++++----- .../opentelemetry-1.4/gradle.lockfile | 4 +- .../redisson/redisson-3.10.3/gradle.lockfile | 2 +- .../instrumentation/twilio/gradle.lockfile | 2 +- 20 files changed, 931 insertions(+), 434 deletions(-) create mode 100644 components/json/gradle.lockfile diff --git a/components/json/gradle.lockfile b/components/json/gradle.lockfile new file mode 100644 index 00000000000..867461db86a --- /dev/null +++ b/components/json/gradle.lockfile @@ -0,0 +1,118 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +ch.qos.logback:logback-classic:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs +com.github.spotbugs:spotbugs:4.7.3=spotbugs +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.9.1=spotbugs +com.thoughtworks.qdox:qdox:1.12.1=jmhRuntimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.15=spotbugs +de.thetaphi:forbiddenapis:3.1=compileClasspath,jmhCompileClasspath +info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath +jaxen:jaxen:1.2.0=spotbugs +jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath +junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath +net.sf.saxon:Saxon-HE:11.4=spotbugs +org.apache.ant:ant-antlr:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant-antlr:1.9.15=codenarc +org.apache.ant:ant-junit:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant-junit:1.9.15=codenarc +org.apache.ant:ant-launcher:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant:1.10.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.bcel:bcel:6.5.0=spotbugs +org.apache.commons:commons-lang3:3.12.0=pitest,spotbugs +org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.apache.commons:commons-text:1.10.0=pitest,spotbugs +org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs +org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.logging.log4j:log4j-api:2.19.0=spotbugs +org.apache.logging.log4j:log4j-core:2.19.0=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:2.5.14=codenarc +org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:2.5.14=codenarc +org.codehaus.groovy:groovy-json:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:2.5.14=codenarc +org.codehaus.groovy:groovy-templates:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:2.5.14=codenarc +org.codehaus.groovy:groovy-xml:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:2.5.14=codenarc +org.codehaus.groovy:groovy:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:2.2.0=codenarc +org.dom4j:dom4j:2.1.3=spotbugs +org.gmetrics:GMetrics:1.1=codenarc +org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.5=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.5=jacocoAnt +org.jacoco:org.jacoco.core:0.8.5=jacocoAnt +org.jacoco:org.jacoco.report:0.8.5=jacocoAnt +org.junit.jupiter:junit-jupiter-api:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=jmhRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=jmhRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.9.1=spotbugs +org.junit:junit-bom:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjdk.jmh:jmh-core:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-asm:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-bytecode:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-reflection:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:7.2=jacocoAnt +org.ow2.asm:asm-analysis:9.4=spotbugs +org.ow2.asm:asm-commons:7.2=jacocoAnt +org.ow2.asm:asm-commons:9.4=spotbugs +org.ow2.asm:asm-tree:7.2=jacocoAnt +org.ow2.asm:asm-tree:9.4=spotbugs +org.ow2.asm:asm-util:9.4=spotbugs +org.ow2.asm:asm:7.2=jacocoAnt +org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.ow2.asm:asm:9.4=spotbugs +org.pitest:pitest-command-line:1.9.11=pitest +org.pitest:pitest-entry:1.9.11=pitest +org.pitest:pitest:1.9.11=pitest +org.slf4j:jcl-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=testCompileClasspath +org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j +org.spockframework:spock-core:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath +org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:4.4.3=spotbugs +xml-apis:xml-apis:1.4.01=spotbugs +empty=annotationProcessor,jmhAnnotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile b/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile index ba24c103e77..05c45bb49b7 100644 --- a/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile @@ -79,15 +79,15 @@ com.google.re2j:re2j:1.2=compileClasspath com.google.re2j:re2j:1.7=compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.linecorp.armeria:armeria-grpc-protocol:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc-protocol:1.0.0=testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc-protocol:1.31.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc-protocol:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-grpc:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria-grpc:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-grpc:1.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria-junit4:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria-protobuf:1.31.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-protobuf:1.31.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.linecorp.armeria:armeria:0.84.0=compileClasspath,compileProtoPath com.linecorp.armeria:armeria:1.0.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.linecorp.armeria:armeria:1.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.31.2=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,compileProtoPath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile b/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile index d2a0ca141b1..2e6b08c00a9 100644 --- a/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile +++ b/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile @@ -54,11 +54,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=anno com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.re2j:re2j:1.7=instrumentPluginClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.linecorp.armeria:armeria-jetty11:1.24.0=jetty11TestCompileClasspath,jetty11TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty11:1.31.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty11:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty9:1.31.1=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty9:1.31.2=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria:1.31.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.31.2=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:logging-interceptor:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okhttp3:okhttp:3.12.12=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile index 1b0623b9f58..3376ad10ddc 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile @@ -186,83 +186,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.27.19=compileClasspath software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.29=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.27.19=compileClasspath software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.27.19=compileClasspath software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.27.19=compileClasspath software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:eventbridge:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.27.19=compileClasspath software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.27.19=compileClasspath software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.27.19=compileClasspath software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.29=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.27.19=compileClasspath software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.27.19=compileClasspath software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.27.19=compileClasspath software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.27.19=compileClasspath software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.27.19=compileClasspath software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.27.19=compileClasspath software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile index 5d8e756c2a6..d34c8e2c6a6 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/gradle.lockfile @@ -268,14 +268,14 @@ software.amazon.awssdk:annotations:2.2.0=compileClasspath,testCompileClasspath,t software.amazon.awssdk:annotations:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:annotations:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:annotations:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:annotations:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:apache-client:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath @@ -287,40 +287,40 @@ software.amazon.awssdk:auth:2.2.0=compileClasspath,testCompileClasspath,testRunt software.amazon.awssdk:auth:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:auth:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-cbor-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:aws-cbor-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-core:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:crt-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -331,68 +331,68 @@ software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClass software.amazon.awssdk:endpoints-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:http-client-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:json-utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:kinesis:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:kinesis:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:kinesis:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:kinesis:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:kinesis:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.18.40=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.19.0=payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.2.0=testRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.20.33=latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.23.8=latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.23=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.29=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:profiles:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:profiles:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:profiles:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.2.0=testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:protocol-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:rds:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath @@ -401,9 +401,9 @@ software.amazon.awssdk:regions:2.2.0=compileClasspath,testCompileClasspath,testR software.amazon.awssdk:regions:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:regions:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:s3:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -413,12 +413,12 @@ software.amazon.awssdk:sdk-core:2.2.0=compileClasspath,testCompileClasspath,test software.amazon.awssdk:sdk-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sns:2.2.0=kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:sns:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:sqs:2.18.40=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:sqs:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -428,18 +428,18 @@ software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestC software.amazon.awssdk:third-party-jackson-core:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:utils:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:utils:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.23.8=latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:utils:2.29.23=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.29=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,kinesisDsmForkedTestCompileClasspath,kinesisDsmForkedTestRuntimeClasspath,kinesisDsmTestCompileClasspath,kinesisDsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestKinesisDsmForkedTestCompileClasspath,latestKinesisDsmForkedTestRuntimeClasspath,latestKinesisDsmTestCompileClasspath,latestKinesisDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile index c5c9949aa4f..a0eeef602d9 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/gradle.lockfile @@ -186,56 +186,56 @@ org.testng:testng:7.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeCl org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs software.amazon.awssdk:annotations:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:annotations:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:apache-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.29.29=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.29.29=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:third-party-jackson-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.29.29=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath xml-apis:xml-apis:1.4.01=spotbugs empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile index 2c31ef6fa5b..bb18e5ef240 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -8,9 +8,9 @@ ch.qos.logback:logback-core:1.2.3=latestDepTestCompileClasspath,latestDepTestRun com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.couchbase.client:core-io:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.couchbase.client:core-io:3.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.couchbase.client:core-io:3.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.couchbase.client:java-client:3.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.couchbase.client:java-client:3.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.couchbase.client:java-client:3.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/google-http-client/gradle.lockfile b/dd-java-agent/instrumentation/google-http-client/gradle.lockfile index 50cfa977288..0a74240842f 100644 --- a/dd-java-agent/instrumentation/google-http-client/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-http-client/gradle.lockfile @@ -31,14 +31,14 @@ com.google.auto:auto-common:0.10=annotationProcessor,latestDepTestAnnotationProc com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.30.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.guava:guava:30.1.1-android=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor com.google.http-client:google-http-client:1.19.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.http-client:google-http-client:1.45.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.http-client:google-http-client:1.45.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.j2objc:j2objc-annotations:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath @@ -55,8 +55,8 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC commons-logging:commons-logging:1.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.66.0=latestDepTestRuntimeClasspath -io.grpc:grpc-context:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.68.2=latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.68.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-api:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile b/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile index 603ac621a97..0d7c78346dd 100644 --- a/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly-client-1.9/gradle.lockfile @@ -138,7 +138,7 @@ org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-026=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-008=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath -org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-027=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath +org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-028=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-008=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-026=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -156,8 +156,9 @@ org.ow2.asm:asm:9.4=spotbugs org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,muleLatestDepTestCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath -org.slf4j:slf4j-api:1.7.32=latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath +org.slf4j:slf4j-api:1.7.32=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j org.spockframework:spock-core:2.2-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index f38e07402f7..f83390f221b 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -185,23 +185,18 @@ org.junit.platform:junit-platform-suite-api:1.9.2=latestDepTestCompileProtoPath, org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs org.junit:junit-bom:5.9.2=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm-commons:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-commons:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm-tree:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-tree:9.4=spotbugs -org.ow2.asm:asm-tree:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-util:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=compileProtoPath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath +org.ow2.asm:asm:9.2=compileProtoPath,instrumentPluginClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath org.ow2.asm:asm:9.4=spotbugs -org.ow2.asm:asm:9.7=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile index 092cf2a268d..d8a190eb319 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile @@ -9,7 +9,7 @@ com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:0.9.1=zinc @@ -60,12 +60,13 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.12=zinc -io.sqreen:libsqreen:11.1.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -junit:junit:4.13.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13=compileClasspath +junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.13.0=zinc @@ -179,10 +180,7 @@ org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=zinc org.scala-lang.modules:scala-xml_2.13:2.1.0=zinc org.scala-lang:scala-compiler:2.13.11=zinc -org.scala-lang:scala-library:2.13.10=testCompileClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.11=zinc -org.scala-lang:scala-library:2.13.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.scala-lang:scala-library:2.13.6=compileClasspath org.scala-lang:scala-reflect:2.13.11=zinc org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc org.scala-sbt:collections_2.13:1.9.2=zinc @@ -192,7 +190,6 @@ org.scala-sbt:core-macros_2.13:1.9.2=zinc org.scala-sbt:io_2.13:1.9.1=zinc org.scala-sbt:launcher-interface:1.4.2=zinc org.scala-sbt:sbinary_2.13:0.5.1=zinc -org.scala-sbt:test-interface:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-sbt:util-control_2.13:1.9.2=zinc org.scala-sbt:util-interface:1.9.2=zinc org.scala-sbt:util-logging_2.13:1.9.2=zinc @@ -206,11 +203,6 @@ org.scala-sbt:zinc-core_2.13:1.9.3=zinc org.scala-sbt:zinc-persist-core-assembly:1.9.3=zinc org.scala-sbt:zinc-persist_2.13:1.9.3=zinc org.scala-sbt:zinc_2.13:1.9.3=zinc -org.scalameta:junit-interface:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:junit-interface:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.scalameta:munit-diff_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.scalameta:munit_2.13:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:munit_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile index f04012d82e0..2ecfb96eef7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile @@ -181,7 +181,7 @@ org.scala-lang.modules:scala-xml_2.13:2.1.0=zinc org.scala-lang:scala-compiler:2.13.11=zinc org.scala-lang:scala-library:2.13.10=testCompileClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.11=zinc -org.scala-lang:scala-library:2.13.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scala-lang:scala-library:2.13.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.scala-lang:scala-library:2.13.6=compileClasspath org.scala-lang:scala-reflect:2.13.11=zinc org.scala-sbt.jline:jline:2.14.7-sbt-a1b0ffbb8f64bb820f4f84a0c07a0c0964507493=zinc @@ -207,10 +207,10 @@ org.scala-sbt:zinc-persist-core-assembly:1.9.3=zinc org.scala-sbt:zinc-persist_2.13:1.9.3=zinc org.scala-sbt:zinc_2.13:1.9.3=zinc org.scalameta:junit-interface:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:junit-interface:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.scalameta:munit-diff_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:junit-interface:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit-diff_2.13:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.scalameta:munit_2.13:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:munit_2.13:1.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit_2.13:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile index 86ace0836c1..fc6b4b70276 100644 --- a/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile @@ -136,9 +136,9 @@ org.junit.jupiter:junit-jupiter-api:5.11.3=latestDepTestCompileClasspath,latestD org.junit.jupiter:junit-jupiter-api:5.3.0=compileClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.3.0=compileClasspath org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath @@ -147,7 +147,7 @@ org.junit.platform:junit-platform-engine:1.3.0=compileClasspath org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.3.0=compileClasspath -org.junit.platform:junit-platform-launcher:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-runner:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.11.3=latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile index 8a94125daa2..220fe3837d6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile @@ -136,9 +136,9 @@ org.junit.jupiter:junit-jupiter-api:5.8.0=compileClasspath org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.8.0=compileClasspath -org.junit.jupiter:junit-jupiter-engine:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-commons:1.8.0=compileClasspath org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath @@ -147,7 +147,7 @@ org.junit.platform:junit-platform-engine:1.8.0=compileClasspath org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.11.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit.platform:junit-platform-launcher:1.8.0=compileClasspath -org.junit.platform:junit-platform-launcher:1.8.2=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-runner:1.11.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.11.3=latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile b/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile index 708f1710512..dc70698cb6d 100644 --- a/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce-5/gradle.lockfile @@ -58,19 +58,19 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.lettuce:lettuce-core:5.0.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.lettuce:lettuce-core:6.5.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-buffer:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.lettuce:lettuce-core:6.5.1.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.113.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.1.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.6.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile index 695c6c6fd6d..d8c62459412 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/gradle.lockfile @@ -62,37 +62,37 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micronaut:micronaut-aop:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-aop:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-aop:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-buffer-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-buffer-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-buffer-netty:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context-propagation:4.0.0=testRuntimeClasspath -io.micronaut:micronaut-context-propagation:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context-propagation:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-context:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core-processor:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-core-reactive:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core-reactive:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core-reactive:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-netty:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server-netty:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server-netty:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-inject-java:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-inject:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-inject:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-inject:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-core:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-databind:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-databind:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-databind:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-json-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-json-core:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-json-core:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-router:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-router:4.7.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-router:4.7.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.115.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -197,17 +197,20 @@ org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeCl org.opentest4j:opentest4j:1.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm-commons:9.4=spotbugs org.ow2.asm:asm-commons:9.5=latestDepTestAnnotationProcessor,testAnnotationProcessor -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm-tree:9.4=spotbugs org.ow2.asm:asm-tree:9.5=latestDepTestAnnotationProcessor,testAnnotationProcessor +org.ow2.asm:asm-tree:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.2=instrumentPluginClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath org.ow2.asm:asm:9.4=spotbugs org.ow2.asm:asm:9.5=latestDepTestAnnotationProcessor,testAnnotationProcessor +org.ow2.asm:asm:9.7=latestDepTestRuntimeClasspath,testRuntimeClasspath org.reactivestreams:reactive-streams:1.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mule-4/gradle.lockfile b/dd-java-agent/instrumentation/mule-4/gradle.lockfile index da2508ae972..15c0784dc83 100644 --- a/dd-java-agent/instrumentation/mule-4/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4/gradle.lockfile @@ -1,443 +1,831 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.78=testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.chuusai:shapeless_2.12:2.3.3=muleServices -com.conversantmedia:disruptor:1.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.damnhandy:handy-uri-templates:2.1.8=muleServices -com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.randelshofer:fastdoubleparser:0.8.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.78=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.beust:jcommander:1.82=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.chuusai:shapeless_2.12:2.3.3=mule46Services,muleServices +com.conversantmedia:disruptor:1.2.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.damnhandy:handy-uri-templates:2.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46Services,muleServices +com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.10.0=compileClasspath -com.fasterxml.jackson.core:jackson-annotations:2.12.7=muleServices -com.fasterxml.jackson.core:jackson-annotations:2.15.0=testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.16.1=latestMuleServices +com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.10.0=compileClasspath -com.fasterxml.jackson.core:jackson-core:2.15.0=muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.16.1=latestMuleServices +com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.10.0=compileClasspath -com.fasterxml.jackson.core:jackson-databind:2.12.7=muleServices -com.fasterxml.jackson.core:jackson-databind:2.15.0=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-jsonSchema:2.10.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:6.4.0=muleServices -com.fasterxml:aalto-xml:1.3.2=muleServices -com.github.ben-manes.caffeine:caffeine:2.8.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ben-manes.caffeine:caffeine:2.9.0=muleServices -com.github.erosb:everit-json-schema:1.14.2=muleServices -com.github.fge:btf:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.fge:msg-simple:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.fge:uri-template:0.9=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:jackson-coreutils:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:json-schema-core:1.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.java-json-tools:json-schema-validator:2.2.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.3=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.16.1=latestMuleServices +com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-jsonSchema:2.10.0=compileClasspath +com.fasterxml.jackson.module:jackson-module-jsonSchema:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-jsonSchema:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.16.1=latestMuleServices +com.fasterxml.jackson:jackson-bom:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:6.4.0=mule46Services,muleServices +com.fasterxml.woodstox:woodstox-core:6.6.1=latestMuleServices +com.fasterxml:aalto-xml:1.3.2=latestMuleServices,mule46Services,muleServices +com.github.ben-manes.caffeine:caffeine:2.8.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:2.9.0=mule46Services,muleServices +com.github.ben-manes.caffeine:caffeine:2.9.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.github.erosb:everit-json-schema:1.14.2=mule46Services,muleServices +com.github.erosb:everit-json-schema:1.14.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.github.fge:btf:1.2=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.fge:msg-simple:1.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.fge:uri-template:0.9=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:jackson-coreutils:1.9=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:json-schema-core:1.2.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.java-json-tools:json-schema-validator:2.2.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.7.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.7.3=spotbugs -com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath -com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.github.stefanbirkner:system-rules:1.19.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:0.10=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath com.google.code.gson:gson:2.8.9=compileClasspath -com.google.code.gson:gson:2.9.0=testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.9.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.9.1=spotbugs com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.5.1=muleServices -com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.21.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.26.1=latestMuleServices +com.google.errorprone:error_prone_annotations:2.28.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.5.1=mule46Services,muleServices +com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.google.guava:guava-parent:32.1.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor com.google.guava:guava:32.1.1-jre=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.6=muleServices -com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.googlecode.libphonenumber:libphonenumber:8.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.ibm.icu:icu4j:67.1=muleServices -com.lmax:disruptor:3.4.3=testCompileClasspath,testRuntimeClasspath -com.mchange:c3p0:0.9.5.5=muleServices -com.mchange:mchange-commons-java:0.2.19=muleServices -com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath -com.squareup.okhttp3:okhttp:4.11.0=testRuntimeClasspath +com.google.guava:guava:32.1.3-jre=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +com.google.guava:guava:33.2.1-jre=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestAnnotationProcessor,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=latestDepForkedTestCompileClasspath +com.google.re2j:re2j:1.6=latestDepForkedTestCompileClasspath,latestMuleServices,mule46Services,muleServices +com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +com.googlecode.juniversalchardet:juniversalchardet:1.0.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.googlecode.libphonenumber:libphonenumber:8.0.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.ibm.icu:icu4j:67.1=mule46Services,muleServices +com.ibm.icu:icu4j:71.1=latestMuleServices +com.lmax:disruptor:3.4.3=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.lmax:disruptor:3.4.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.mchange:c3p0:0.10.1=latestMuleServices +com.mchange:c3p0:0.9.5.5=mule46Services,muleServices +com.mchange:mchange-commons-java:0.2.19=mule46Services,muleServices +com.mchange:mchange-commons-java:0.3.1=latestMuleServices +com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath +com.squareup.okhttp3:okhttp:4.11.0=mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:4.12.0=latestDepForkedTestRuntimeClasspath com.squareup.okio:okio-jvm:3.2.0=testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath -com.squareup.okio:okio:3.2.0=testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.1=muleServices -com.sun.activation:jakarta.activation:1.2.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.activation:javax.activation:1.2.0=muleServices -com.sun.mail:jakarta.mail:1.6.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.mail:jakarta.mail:1.6.7=muleServices -com.sun.mail:mailapi:1.6.4=muleServices -com.sun.xml.bind:jaxb-impl:2.3.8=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath -com.typesafe:config:1.3.1=testCompileClasspath,testRuntimeClasspath -com.vdurmont:semver4j:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.zaxxer:HikariCP-java7:2.4.13=muleServices -commons-beanutils:commons-beanutils:1.9.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -commons-cli:commons-cli:1.2=testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.11=testCompileClasspath +com.squareup.okio:okio-jvm:3.6.0=mule46ForkedTestRuntimeClasspath +com.squareup.okio:okio-jvm:3.9.0=latestDepForkedTestRuntimeClasspath +com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,mule46ForkedTestCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath +com.squareup.okio:okio:3.2.0=mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.squareup.okio:okio:3.6.0=latestDepForkedTestRuntimeClasspath +com.sun.activation:jakarta.activation:1.2.1=mule46Services,muleServices +com.sun.activation:jakarta.activation:1.2.2=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.activation:javax.activation:1.2.0=mule46Services,muleServices +com.sun.mail:jakarta.mail:1.6.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.mail:jakarta.mail:1.6.7=latestMuleServices,mule46Services,muleServices +com.sun.mail:mailapi:1.6.4=mule46Services,muleServices +com.sun.xml.bind:jaxb-core:2.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.sun.xml.bind:jaxb-impl:2.3.8=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.thoughtworks.qdox:qdox:1.12.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +com.typesafe:config:1.3.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.typesafe:config:1.4.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +com.vdurmont:semver4j:3.1.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.zaxxer:HikariCP-java7:2.4.13=latestMuleServices,mule46Services,muleServices +commons-beanutils:commons-beanutils:1.9.4=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-cli:commons-cli:1.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-cli:commons-cli:1.8.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +commons-codec:commons-codec:1.11=latestDepForkedTestCompileClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath commons-codec:commons-codec:1.15=spotbugs -commons-codec:commons-codec:1.16.0=testRuntimeClasspath -commons-collections:commons-collections:3.2.2=muleServices -commons-digester:commons-digester:2.1=muleServices -commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=muleServices -commons-io:commons-io:2.13.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -commons-lang:commons-lang:2.6=compileClasspath,testCompileClasspath,testRuntimeClasspath -commons-logging:commons-logging:1.2=muleServices -commons-validator:commons-validator:1.7=muleServices +commons-codec:commons-codec:1.16.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.1=latestMuleServices +commons-collections:commons-collections:3.2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46Services,muleServices +commons-digester:commons-digester:2.1=latestMuleServices,mule46Services,muleServices +commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=mule46Services,muleServices +commons-io:commons-io:2.13.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.16.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +commons-lang:commons-lang:2.6=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=mule46Services,muleServices +commons-validator:commons-validator:1.7=latestMuleServices,mule46Services,muleServices de.thetaphi:forbiddenapis:3.1=compileClasspath -info.picocli:picocli:4.6.3=testRuntimeClasspath -io.helidon.grpc:io.grpc:2.6.1=testCompileClasspath,testRuntimeClasspath +eu.agno3.jcifs:jcifs-ng:2.1.10=latestMuleServices +info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.66.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +io.grpc:grpc-context:1.66.0=latestDepForkedTestRuntimeClasspath +io.grpc:grpc-core:1.66.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +io.helidon.grpc:io.grpc:2.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.114.Final=latestMuleServices +io.netty:netty-codec-dns:4.1.112.Final=latestMuleServices +io.netty:netty-codec-http2:4.1.114.Final=latestMuleServices +io.netty:netty-codec-http:4.1.114.Final=latestMuleServices +io.netty:netty-codec-socks:4.1.114.Final=latestMuleServices +io.netty:netty-codec:4.1.114.Final=latestMuleServices +io.netty:netty-common:4.1.114.Final=latestMuleServices +io.netty:netty-handler-proxy:4.1.114.Final=latestMuleServices +io.netty:netty-handler:4.1.114.Final=latestMuleServices +io.netty:netty-resolver-dns:4.1.112.Final=latestMuleServices +io.netty:netty-resolver:4.1.114.Final=latestMuleServices +io.netty:netty-transport-classes-epoll:4.1.112.Final=latestMuleServices +io.netty:netty-transport-native-epoll:4.1.112.Final=latestMuleServices +io.netty:netty-transport-native-unix-common:4.1.114.Final=latestMuleServices +io.netty:netty-transport:4.1.114.Final=latestMuleServices io.opentelemetry:opentelemetry-api-events:1.27.0-alpha=testRuntimeClasspath +io.opentelemetry:opentelemetry-api-events:1.31.0-alpha=mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-api-incubator:1.40.0-alpha=latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-api:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-exporter-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-common:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-common:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-exporter-logging:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-exporter-otlp-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp-common:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-exporter-otlp:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-otlp:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.31.0=mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.40.0=latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-extension-incubator:1.27.0-alpha=testRuntimeClasspath +io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha=mule46ForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-common:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.27.0=testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.31.0=mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-logs:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-metrics:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-testing:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-testing:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-testing:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk-trace:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-sdk:1.27.0=testCompileClasspath,testRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.31.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +io.opentelemetry:opentelemetry-sdk:1.40.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath io.opentelemetry:opentelemetry-semconv:1.27.0-alpha=testRuntimeClasspath -io.perfmark:perfmark-api:0.25.0=testCompileClasspath,testRuntimeClasspath -io.projectreactor.addons:reactor-extra:3.4.8=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.projectreactor:reactor-core:3.4.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:11.1.0=testRuntimeClasspath -it.unimi.dsi:fastutil:8.5.11=testCompileClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:1.2.2=testCompileClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.jms:jakarta.jms-api:2.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.jws:jakarta.jws-api:1.1.1=testCompileClasspath -jakarta.jws:jakarta.jws-api:2.1.0=testRuntimeClasspath -jakarta.resource:jakarta.resource-api:1.7.4=testCompileClasspath,testRuntimeClasspath -jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=testCompileClasspath,testRuntimeClasspath -jakarta.xml.ws:jakarta.xml.ws-api:2.3.3=testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.25.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=latestDepForkedTestRuntimeClasspath +io.projectreactor.addons:reactor-extra:3.4.8=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor.addons:reactor-extra:3.5.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +io.projectreactor.netty:reactor-netty-core:1.1.22=latestMuleServices +io.projectreactor.netty:reactor-netty-http:1.1.22=latestMuleServices +io.projectreactor:reactor-core:3.4.22=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.projectreactor:reactor-core:3.5.20=latestMuleServices +io.projectreactor:reactor-core:3.6.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +io.sqreen:libsqreen:11.2.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +it.unimi.dsi:fastutil:8.5.11=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +it.unimi.dsi:fastutil:8.5.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +jakarta.activation:jakarta.activation-api:1.2.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:1.0.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +jakarta.jms:jakarta.jms-api:2.0.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.jws:jakarta.jws-api:1.1.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath +jakarta.jws:jakarta.jws-api:2.1.0=mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +jakarta.resource:jakarta.resource-api:1.7.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:1.3.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +jakarta.xml.ws:jakarta.xml.ws-api:2.3.3=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.ws:jakarta.xml.ws-api:4.0.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath javax.inject:javax.inject:1=compileClasspath,testCompileClasspath,testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath -javax.validation:validation-api:1.1.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.xml.bind:jaxb-api:2.2.12=mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +javax.xml.bind:jaxb-api:2.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +javax.xml.stream:stax-api:1.0-2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +jaxen:jaxen:1.1.6=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs -jline:jline:2.14.6=testRuntimeClasspath -joda-time:joda-time:2.10.2=muleServices +jline:jline:2.14.6=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +joda-time:joda-time:2.10.2=latestMuleServices,mule46Services,muleServices +joda-time:joda-time:2.12.5=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +joda-time:joda-time:2.12.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath joda-time:joda-time:2.9.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath -junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -net.jodah:failsafe:2.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -net.sf.jopt-simple:jopt-simple:5.0.3=compileClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit-dep:4.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.18=compileClasspath,instrumentPluginClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +net.java.dev.msv:xsdlib:2013.6.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +net.jodah:failsafe:2.1.1=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.jodah:failsafe:2.4.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +net.sf.jopt-simple:jopt-simple:5.0.3=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:11.4=spotbugs -org.antlr:antlr-runtime:3.5.2=testCompileClasspath,testRuntimeClasspath -org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath +org.antlr:antlr-runtime:3.5.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr-runtime:3.5.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.ant:ant-antlr:1.10.12=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.apache.ant:ant-antlr:1.9.15=codenarc -org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath +org.apache.ant:ant-junit:1.10.12=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.apache.ant:ant-junit:1.9.15=codenarc -org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath -org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath -org.apache.avro:avro:1.11.1=muleServices +org.apache.ant:ant-launcher:1.10.12=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.apache.ant:ant:1.10.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.avro:avro:1.11.1=mule46Services,muleServices +org.apache.avro:avro:1.11.4=latestMuleServices org.apache.bcel:bcel:6.5.0=spotbugs -org.apache.commons:commons-collections4:4.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-compress:1.21=muleServices -org.apache.commons:commons-lang3:3.12.0=compileClasspath,muleServices,spotbugs,testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-pool2:2.11.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-collections4:4.4=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-compress:1.21=mule46Services,muleServices +org.apache.commons:commons-compress:1.26.2=latestMuleServices +org.apache.commons:commons-lang3:3.12.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.16.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +org.apache.commons:commons-pool2:2.11.1=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-pool2:2.12.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.3=muleServices -org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=muleServices +org.apache.commons:commons-text:1.12.0=latestMuleServices +org.apache.commons:commons-text:1.3=mule46Services,muleServices +org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=mule46Services,muleServices org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.14=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.16=testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-1.2-api:2.20.0=testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.20.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-1.2-api:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-api:2.20.0=testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.20.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.20.0=testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.20.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-core:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-api:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-api:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-impl:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-impl:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-named-locks:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-named-locks:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-spi:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-spi:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-supplier:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-supplier:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-transport-file:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-file:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-transport-http:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-http:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.15=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-util:1.9.15=testCompileClasspath,testRuntimeClasspath -org.apache.maven.wagon:wagon-http-shared:3.4.2=testCompileClasspath,testRuntimeClasspath -org.apache.maven.wagon:wagon-http:3.4.2=testCompileClasspath,testRuntimeClasspath -org.apache.maven.wagon:wagon-provider-api:3.4.2=testCompileClasspath,testRuntimeClasspath +org.apache.maven.resolver:maven-resolver-util:1.9.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.apache.maven.wagon:wagon-http-shared:3.4.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-http-shared:3.5.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.maven.wagon:wagon-http:3.4.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-http:3.5.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.maven.wagon:wagon-provider-api:3.4.2=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-provider-api:3.5.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.maven:maven-builder-support:3.9.4=testCompileClasspath,testRuntimeClasspath -org.apache.maven:maven-resolver-provider:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-builder-support:3.9.6=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.apache.maven:maven-builder-support:3.9.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.maven:maven-resolver-provider:3.9.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.maven:maven-settings-builder:3.9.4=testCompileClasspath,testRuntimeClasspath +org.apache.maven:maven-settings-builder:3.9.6=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.apache.maven:maven-settings-builder:3.9.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.apache.maven:maven-settings:3.9.4=testCompileClasspath,testRuntimeClasspath -org.apache.ws.xmlschema:xmlschema-core:2.2.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.xmlbeans:xmlbeans:3.1.0=compileClasspath,muleServices,testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor -org.checkerframework:checker-qual:3.10.0=muleServices +org.apache.maven:maven-settings:3.9.6=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.apache.maven:maven-settings:3.9.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.apache.ws.xmlschema:xmlschema-core:2.2.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.xmlbeans:xmlbeans:3.1.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,mule46Services,muleServices,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,mule46ForkedTestCompileClasspath,testCompileClasspath +org.bouncycastle:bcprov-jdk18on:1.76=latestMuleServices +org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +org.checkerframework:checker-qual:3.10.0=mule46Services,muleServices org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.checkerframework:checker-qual:3.42.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices +org.codehaus.groovy:groovy-all:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:2.5.14=codenarc -org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-astbuilder:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-cli-picocli:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-console:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-datetime:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-docgenerator:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovydoc:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-groovysh:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jmx:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-json:2.5.14=codenarc -org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-jsr223:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-macro:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-nio:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-servlet:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-sql:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-swing:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-templates:2.5.14=codenarc -org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test-junit5:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-test:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-testng:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-xml:2.5.14=codenarc -org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-xml:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy:2.5.14=codenarc -org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath -org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor -org.codehaus.plexus:plexus-cipher:2.0=testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-component-annotations:1.5.5=testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-interpolation:1.26=testCompileClasspath,testRuntimeClasspath -org.codehaus.plexus:plexus-sec-dispatcher:2.0=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.17=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor +org.codehaus.plexus:plexus-cipher:2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-component-annotations:1.5.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-interpolation:1.26=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-interpolation:1.27=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.codehaus.plexus:plexus-sec-dispatcher:2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-utils:3.5.1=testCompileClasspath,testRuntimeClasspath -org.codehaus.woodstox:stax2-api:4.2.1=muleServices +org.codehaus.plexus:plexus-utils:4.0.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.codehaus.plexus:plexus-utils:4.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.codehaus.plexus:plexus-xml:3.0.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.codehaus.plexus:plexus-xml:3.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.2.1=mule46Services,muleServices +org.codehaus.woodstox:stax2-api:4.2.2=latestMuleServices org.codenarc:CodeNarc:2.2.0=codenarc -org.dom4j:dom4j:2.1.3=spotbugs,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=testCompileClasspath,testRuntimeClasspath -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5=testCompileClasspath,testRuntimeClasspath -org.everit.json:org.everit.json.schema:1.5.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish:jakarta.json:1.1.6=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.dom4j:dom4j:2.1.3=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.dom4j:dom4j:2.1.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.everit.json:org.everit.json.schema:1.5.1=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish:jakarta.json:1.1.6=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.gmetrics:GMetrics:1.1=codenarc -org.graalvm.js:js-scriptengine:21.0.0.2=muleServices -org.graalvm.js:js:21.0.0.2=muleServices -org.graalvm.regex:regex:21.0.0.2=muleServices -org.graalvm.sdk:graal-sdk:21.0.0.2=muleServices -org.graalvm.truffle:truffle-api:21.0.0.2=muleServices -org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.graalvm.js:js-scriptengine:21.0.0.2=mule46Services,muleServices +org.graalvm.js:js-scriptengine:22.3.5=latestMuleServices +org.graalvm.js:js:21.0.0.2=mule46Services,muleServices +org.graalvm.js:js:22.3.5=latestMuleServices +org.graalvm.regex:regex:21.0.0.2=mule46Services,muleServices +org.graalvm.regex:regex:22.3.5=latestMuleServices +org.graalvm.sdk:graal-sdk:21.0.0.2=mule46Services,muleServices +org.graalvm.sdk:graal-sdk:22.3.5=latestMuleServices +org.graalvm.truffle:truffle-api:21.0.0.2=mule46Services,muleServices +org.graalvm.truffle:truffle-api:22.3.5=latestMuleServices +org.hamcrest:hamcrest-core:1.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10=mule46ForkedTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=latestDepForkedTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=mule46ForkedTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20=testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=latestDepForkedTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=mule46ForkedTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.6.20=testRuntimeClasspath -org.jetbrains:annotations:13.0=testRuntimeClasspath -org.jgrapht:jgrapht-core:1.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.jheaps:jheaps:0.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.9.10=mule46ForkedTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.9.21=latestDepForkedTestRuntimeClasspath +org.jetbrains:annotations:13.0=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.jgrapht:jgrapht-core:1.3.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jheaps:jheaps:0.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.json:json:20160810=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.json:json:20230227=muleServices -org.jsoup:jsoup:1.15.3=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.0=testCompileClasspath -org.junit.platform:junit-platform-commons:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.0=testCompileClasspath -org.junit.platform:junit-platform-engine:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.9.0=testRuntimeClasspath -org.junit:junit-bom:5.9.0=testCompileClasspath,testRuntimeClasspath +org.json:json:20230227=mule46Services,muleServices +org.json:json:20231013=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.jsoup:jsoup:1.15.3=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jsoup:jsoup:1.18.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.9.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.9.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.9.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.9.2=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.9.1=spotbugs -org.mozilla:rhino:1.7.12=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.apache:xerces2-xsd11:2.11.3=muleServices +org.junit:junit-bom:5.9.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mozilla:rhino:1.7.12=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mozilla:rhino:1.7.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.apache:xerces2-xsd11:2.11.3=mule46Services,muleServices org.mule.apache:xerces2-xsd11:2.11.3-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.com.github.stephenc.eaio-uuid:uuid:3.4.2-MULE-001=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.common:scala-common_2.12:2.0.99=muleServices +org.mule.apache:xerces2-xsd11:2.11.3-MULE-002=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.com.github.stephenc.eaio-uuid:uuid:3.4.2-MULE-001=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.common:scala-common_2.12:2.0.99=latestMuleServices,mule46Services,muleServices org.mule.commons:mule-oauth-client-api:2.0.0=testCompileClasspath,testRuntimeClasspath -org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-025=muleServices -org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-008=muleServices -org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-021=muleServices -org.mule.glassfish.grizzly:grizzly-http-server:2.3.36-MULE-025=muleServices -org.mule.glassfish.grizzly:grizzly-http-servlet:2.3.36-MULE-025=muleServices -org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-008=muleServices -org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-025=muleServices -org.mule.mvel:mule-mvel2:2.1.9-MULE-020=testCompileClasspath,testRuntimeClasspath +org.mule.commons:mule-oauth-client-api:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.commons:mule-oauth-client-api:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-025=mule46Services,muleServices +org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-026=latestMuleServices +org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-008=latestMuleServices,mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-021=mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-http-client:1.14-MULE-025=latestMuleServices +org.mule.glassfish.grizzly:grizzly-http-server:2.3.36-MULE-025=mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-http-server:2.3.36-MULE-026=latestMuleServices +org.mule.glassfish.grizzly:grizzly-http-servlet:2.3.36-MULE-025=mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-http-servlet:2.3.36-MULE-026=latestMuleServices +org.mule.glassfish.grizzly:grizzly-http:2.3.36-MULE-008=latestMuleServices,mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-025=mule46Services,muleServices +org.mule.glassfish.grizzly:grizzly-websockets:2.3.36-MULE-026=latestMuleServices +org.mule.mvel:mule-mvel2:2.1.9-MULE-020=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime.boot:mule-module-boot-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime.boot:mule-module-jpms-utils:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime.boot:mule-module-log4j-boot-configurator:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime.boot:mule-module-logging:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:api-annotations:1.4.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:api-annotations:1.5.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:api-annotations:1.7.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-ast-dependency-graph:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-dependency-graph:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-ast-dependency-graph:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-ast-serialization:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-serialization:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-ast-serialization:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-ast-xml-parser:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast-xml-parser:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-ast-xml-parser:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-ast:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-ast:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-ast:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-declaration-persistence:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-declaration-persistence:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-declaration-persistence:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-artifact-declaration:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-artifact-declaration:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-artifact-declaration:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-core-components:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core-components:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-core-components:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-core-mvel:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core-mvel:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.mule.runtime:mule-core:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-dwb-api:2.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-core:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-core:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-dwb-api:2.5.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mule.runtime:mule-extensions-api-dsql:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api-dsql:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-api-dsql:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-extensions-api-persistence:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api-persistence:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-api-persistence:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-extensions-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-mime-types:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-mime-types:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-extensions-soap-api:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-extensions-soap-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-extensions-soap-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-jar-handling-utils:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-jar-handling-utils:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-jar-handling-utils:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-message-metadata-model:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-message-metadata-model:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-message-metadata-model:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-api:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-catalog:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-catalog:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-catalog:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-java:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-java:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-java:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-json:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-json:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-json:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-persistence:1.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-persistence:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-persistence:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-raml:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-raml:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-raml:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metadata-model-xml:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metadata-model-xml:1.6.1=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metadata-model-xml:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-exporter-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-exporter-configuration-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-exporter-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-configuration-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-exporter-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-exporter-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-metrics-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-metrics-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-metrics-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-artifact-activation:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-artifact-activation:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-artifact-activation:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-artifact:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-artifact:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-artifact:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-module-boot-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.mule.runtime:mule-module-container:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-container:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-container:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-deployment-model-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment-model-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-deployment-model-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-deployment-model:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment-model:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-deployment-model:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-deployment:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-deployment:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-deployment:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-dsl-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-dsl-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-dsl-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-extensions-soap-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-soap-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-extensions-soap-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-extensions-spring-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-spring-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-extensions-spring-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-extensions-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-extensions-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-extensions-xml-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-extensions-xml-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-extensions-xml-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-feature-management:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-feature-management:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-feature-management:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-global-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-global-config:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-global-config:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-http-policy-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-http-policy-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-http-policy-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-javaee:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-javaee:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-javaee:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-jpms-utils:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-jpms-utils:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.mule.runtime:mule-module-launcher:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-launcher:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-launcher:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-license-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-license-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-license-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-log4j-boot-configurator:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-log4j-boot-configurator:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.mule.runtime:mule-module-log4j-configurator:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-log4j-configurator:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-log4j-configurator:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-logging:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-logging:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath org.mule.runtime:mule-module-memory-management:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-memory-management:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-memory-management:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-metadata-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-metadata-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-metadata-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-module-observability:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-observability:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-policy-api:1.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-policy-api:1.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-policy-api:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-properties-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-properties-config:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-properties-config:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-reboot:4.5.0=testCompileClasspath,testRuntimeClasspath org.mule.runtime:mule-module-repository:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-repository:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-repository:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-service:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-service:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-service:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-spring-config:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-spring-config:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-spring-config:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-tls:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-tls:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-tls:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-tooling-support:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-tooling-support:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-tooling-support:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-module-troubleshooting:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-module-troubleshooting:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-module-troubleshooting:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-profiling-api:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-profiling-api:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-profiling-api:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-properties-api:1.1.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-properties-api:1.2.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-properties-api:1.4.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-runtime-errors:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-runtime-extension-model:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-runtime-extension-model:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-runtime-extension-model:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-service-http-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-http-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-service-http-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-service-oauth-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-oauth-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-service-oauth-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-service-soap-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-service-soap-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-service-soap-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-common:4.5.0=testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-tracer-configuration-api:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-common:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-common:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-configuration-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-customization-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.mule.runtime:mule-tracer-customization-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-customization-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-customization-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-customization-impl:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-customization-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-customization-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-exporter-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-exporter-configuration-api:4.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-api:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-api:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-exporter-configuration-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-configuration-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-exporter-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-exporter-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.runtime:mule-tracer-internal-impl:4.5.0=testCompileClasspath,testRuntimeClasspath +org.mule.runtime:mule-tracer-internal-impl:4.6.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.runtime:mule-tracer-internal-impl:4.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.sdk:mule-sdk-api:0.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.sdk:mule-sdk-api:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.sdk:mule-sdk-api:0.8.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.sdk:mule-sdk-compatibility-api:0.10.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule.sdk:mule-sdk-compatibility-api:0.7.0=testCompileClasspath,testRuntimeClasspath -org.mule.services:mule-service-http:1.5.21=muleServices -org.mule.services:mule-service-scheduler:1.5.0=muleServices -org.mule.services:mule-service-weave:2.5.0=muleServices -org.mule.syaml:syaml_2.12:2.0.334=muleServices -org.mule.tools.maven:mule-classloader-model:3.8.5=testCompileClasspath,testRuntimeClasspath -org.mule.weave:avro-module:2.5.0=muleServices -org.mule.weave:core-modules:2.5.0=muleServices -org.mule.weave:core:2.5.0=muleServices -org.mule.weave:debugger:2.5.0=muleServices -org.mule.weave:dwb-api:2.5.0=testCompileClasspath,testRuntimeClasspath -org.mule.weave:dwb-module:2.5.0=muleServices -org.mule.weave:java-module:2.5.0=muleServices -org.mule.weave:jsonschema-module:2.5.0=muleServices -org.mule.weave:ndjson-module:2.5.0=muleServices -org.mule.weave:parser:2.5.0=muleServices -org.mule.weave:runtime:2.5.0=muleServices -org.mule.weave:wlang:2.5.0=muleServices -org.mule.weave:xmlschema-module:2.5.0=muleServices -org.mule.weave:yaml-module:2.5.0=muleServices +org.mule.sdk:mule-sdk-compatibility-api:0.8.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule.services:mule-netty-http-service:0.1.1=latestMuleServices +org.mule.services:mule-service-http:1.10.1=latestMuleServices +org.mule.services:mule-service-http:1.5.21=mule46Services,muleServices +org.mule.services:mule-service-scheduler:1.5.0=mule46Services,muleServices +org.mule.services:mule-service-scheduler:1.8.1=latestMuleServices +org.mule.services:mule-service-weave:2.5.0=mule46Services,muleServices +org.mule.services:mule-service-weave:2.8.1=latestMuleServices +org.mule.syaml:syaml_2.12:2.0.334=latestMuleServices,mule46Services,muleServices +org.mule.tools.maven:mule-classloader-model:3.8.5=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.tools.maven:mule-classloader-model:4.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.mule.weave:avro-module:2.5.0=mule46Services,muleServices +org.mule.weave:avro-module:2.8.1-20241101=latestMuleServices +org.mule.weave:cache-service:2.8.1-20241101=latestMuleServices +org.mule.weave:caffeine-cache-service:2.8.1-20241101=latestMuleServices +org.mule.weave:core-modules:2.5.0=mule46Services,muleServices +org.mule.weave:core-modules:2.8.1-20241101=latestMuleServices +org.mule.weave:core:2.5.0=mule46Services,muleServices +org.mule.weave:core:2.8.1-20241101=latestMuleServices +org.mule.weave:debugger:2.5.0=mule46Services,muleServices +org.mule.weave:debugger:2.8.1-20241101=latestMuleServices +org.mule.weave:dwb-api:2.5.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mule.weave:dwb-module:2.5.0=mule46Services,muleServices +org.mule.weave:dwb-module:2.8.1-20241101=latestMuleServices +org.mule.weave:java-module:2.5.0=mule46Services,muleServices +org.mule.weave:java-module:2.8.1-20241101=latestMuleServices +org.mule.weave:jsonschema-module:2.5.0=mule46Services,muleServices +org.mule.weave:jsonschema-module:2.8.1-20241101=latestMuleServices +org.mule.weave:metadata-api:2.8.1-20241101=latestMuleServices +org.mule.weave:ndjson-module:2.5.0=mule46Services,muleServices +org.mule.weave:ndjson-module:2.8.1-20241101=latestMuleServices +org.mule.weave:parser:2.5.0=mule46Services,muleServices +org.mule.weave:parser:2.8.1-20241101=latestMuleServices +org.mule.weave:runtime:2.5.0=mule46Services,muleServices +org.mule.weave:runtime:2.8.1-20241101=latestMuleServices +org.mule.weave:wlang:2.5.0=mule46Services,muleServices +org.mule.weave:wlang:2.8.1-20241101=latestMuleServices +org.mule.weave:xmlschema-module:2.5.0=mule46Services,muleServices +org.mule.weave:xmlschema-module:2.8.1-20241101=latestMuleServices +org.mule.weave:yaml-module:2.5.0=mule46Services,muleServices +org.mule.weave:yaml-module:2.8.1-20241101=latestMuleServices org.mule:maven-model-shaded:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:maven-model-shaded:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule:maven-model-shaded:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule:mule-maven-client-api:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-client-api:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule:mule-maven-client-api:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule:mule-maven-client-impl:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-client-impl:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule:mule-maven-client-impl:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule:mule-maven-pom-parser-api:2.0.0=testCompileClasspath,testRuntimeClasspath +org.mule:mule-maven-pom-parser-api:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule:mule-maven-pom-parser-api:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.mule:mule-maven-pom-parser-impl:2.0.0=testCompileClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.mule:mule-maven-pom-parser-impl:2.1.0=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.mule:mule-maven-pom-parser-impl:2.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-tree:9.4=spotbugs -org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.2=instrumentPluginClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.4=spotbugs -org.parboiled:parboiled_2.12:2.1.8=muleServices -org.quartz-scheduler:quartz:2.3.2=muleServices +org.parboiled:parboiled_2.12:2.1.8=mule46Services,muleServices +org.parboiled:parboiled_2.12:2.5.1=latestMuleServices +org.quartz-scheduler:quartz:2.3.2=latestMuleServices,mule46Services,muleServices org.raml:raml-parser-2:1.0.44-10=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.raml:raml-parser-2:1.0.44-12=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.raml:raml-parser-2:1.0.44-15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath org.raml:yagi:1.0.44-10=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.reflections:reflections:0.9.10=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scala-lang:scala-library:2.12.15=muleServices -org.slf4j:jcl-over-slf4j:2.0.7=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:2.0.7=testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muleServices,muzzleBootstrap,muzzleTooling,runtimeClasspath,spotbugs,spotbugsSlf4j,testCompileClasspath,testRuntimeClasspath +org.raml:yagi:1.0.44-12=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath +org.raml:yagi:1.0.44-15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestMuleServices,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.reflections:reflections:0.9.10=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.scala-lang:scala-library:2.12.15=latestMuleServices,mule46Services,muleServices +org.slf4j:jcl-over-slf4j:2.0.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.7=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.7=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.30=instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=latestMuleServices,mule46Services,muleServices +org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-api:2.0.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:5.3.27=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:5.3.27=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:5.3.27=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:5.3.27=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:5.3.27=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:5.3.27=testCompileClasspath,testRuntimeClasspath -org.testng:testng:7.5=testRuntimeClasspath -org.togglz:togglz-core:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.typelevel:macro-compat_2.12:1.1.1=muleServices -org.vibur:vibur-object-pool:23.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.webjars:jquery:3.5.1=testRuntimeClasspath +org.spockframework:spock-core:2.2-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.2-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.springframework:spring-beans:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-beans:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.springframework:spring-context:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-context:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.springframework:spring-core:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-core:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.springframework:spring-expression:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-expression:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.springframework:spring-jcl:5.3.27=mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-jcl:5.3.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.testng:testng:7.5=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +org.togglz:togglz-core:3.0.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.togglz:togglz-core:3.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.typelevel:macro-compat_2.12:1.1.1=mule46Services,muleServices +org.vibur:vibur-object-pool:23.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.vibur:vibur-object-pool:25.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:4.4.3=spotbugs -org.yaml:snakeyaml:2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -xml-apis:xml-apis:1.4.01=spotbugs,testCompileClasspath,testRuntimeClasspath -empty=spotbugsPlugins +org.yaml:snakeyaml:2.0=compileClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath +relaxngDatatype:relaxngDatatype:20020414=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +xml-apis:xml-apis:1.4.01=spotbugs +xpp3:xpp3:1.1.4c=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath +empty=latestDepTestAnnotationProcessor,latestDepTestCompileOnly,latestDepTestImplementation,latestDepTestRuntimeOnly,mule46TestAnnotationProcessor,mule46TestCompileOnly,mule46TestImplementation,mule46TestRuntimeOnly,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile index 3cdda833eb5..f4abd4ac45b 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -50,9 +50,9 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC de.thetaphi:forbiddenapis:3.1=compileClasspath info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.44.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.45.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:11.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:1.2.0=spotbugs diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile index 882680b7092..84d0ce818d2 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/gradle.lockfile @@ -198,7 +198,7 @@ org.ow2.asm:asm:9.4=spotbugs org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.reactivestreams:reactive-streams:1.0.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.redisson:redisson:3.10.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.redisson:redisson:3.39.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.redisson:redisson:3.40.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.rnorth.duct-tape:duct-tape:1.0.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/twilio/gradle.lockfile b/dd-java-agent/instrumentation/twilio/gradle.lockfile index 3e92170cecb..ef7258cdf7f 100644 --- a/dd-java-agent/instrumentation/twilio/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio/gradle.lockfile @@ -55,7 +55,7 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=latestDepTestRuntimeClasspath,testRuntimeClasspath com.twilio.sdk:twilio:0.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.twilio.sdk:twilio:10.6.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.twilio.sdk:twilio:10.6.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-codec:commons-codec:1.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs commons-codec:commons-codec:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath