Merge branch 'main' into trentm/gcp-metadata-cloud-project-id

CHANGELOG.asciidoc

@@ -31,20 +31,21 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 
 === Unreleased
 
-[float]
-===== Bug fixes
-* Prevent bad serialization in edge cases for span compression - {pull}3293[#3293]
-* Allow overriding of transaction type for Servlet-API transactions - {pull}3226[#3226]
-* Fix micrometer histogram serialization - {pull}3290[#3290], {pull}3304[#3304]
-* Fix transactions not being correctly handled in certain edge cases - {pull}3294[#3294]
-
 [float]
 ===== Features
 * Add support for Elasticsearch client 8.9 - {pull}3283[#3283]
 * Added `baggage_to_attach` config option to allow automatic lifting of baggage into transaction, span and error attributes - {pull}3288[#3288], {pull}3289[#3289]
 * Exclude elasticsearch 8.10 and newer clients from instrumentation because they natively support OpenTelemetry  - {pull}3303[#3303]
 * Switched to OpenTelemetry compatible context propagation for Kafka - {pull}3300[#3300]
 * Changed `cloud.project.id` collected in Google Cloud (GCP) to be the `project-id` - {issues}3311[#3311]
+* Allow running the IntelliJ debug agent in parallel - {pull}3315[#3315]
+
+[float]
+===== Bug fixes
+* Prevent bad serialization in edge cases for span compression - {pull}3293[#3293]
+* Allow overriding of transaction type for Servlet-API transactions - {pull}3226[#3226]
+* Fix micrometer histogram serialization - {pull}3290[#3290], {pull}3304[#3304]
+* Fix transactions not being correctly handled in certain edge cases - {pull}3294[#3294]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x

apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>3.11.4</version>
+            <version>3.11.5</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

apm-agent-plugins/apm-java-concurrent-plugin/src/main/java/co/elastic/apm/agent/concurrent/ForkJoinTaskInstrumentation.java

@@ -42,17 +42,6 @@ public class ForkJoinTaskInstrumentation extends ElasticApmInstrumentation {
 
     private static final Tracer tracer = GlobalTracer.get();
 
-    static {
-        if (Boolean.parseBoolean(System.getProperty("intellij.debug.agent"))) {
-            // IntelliJ debugger also instrument some java.util.concurrent classes and changes the class structure.
-            // However, the changes are not re-applied when re-transforming already loaded classes, which makes our
-            // agent unable to see those structural changes and try to load classes with their original bytecode
-            //
-            // Go to the following to enable/disable: File | Settings | Build, Execution, Deployment | Debugger | Async Stack Traces
-            throw new IllegalStateException("IntelliJ debug agent detected, disable it to prevent unexpected instrumentation errors. See https://github.com/elastic/apm-agent-java/issues/1673");
-        }
-    }
-
     @Override
     public ElementMatcher<? super TypeDescription> getTypeMatcher() {
         return is(ForkJoinTask.class);