DataDog
diff --git a/‎…ling/lock-support-profiling/build.gradle‎ ‎…adog/profiling/lock-support/build.gradle‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/build.gradle renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/build.gradle b/‎…ling/lock-support-profiling/build.gradle‎ ‎…adog/profiling/lock-support/build.gradle‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/build.gradle renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/build.gradle
diff --git a/‎…LockSupportProfilingInstrumentation.java‎ ‎…LockSupportProfilingInstrumentation.java‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/src/main/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentation.java renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/src/main/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentation.java
Lines changed: 1 addition & 1 deletion b/‎…LockSupportProfilingInstrumentation.java‎ ‎…LockSupportProfilingInstrumentation.java‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/src/main/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentation.java renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/src/main/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentation.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎…SupportProfilingInstrumentationTest.java‎ ‎…SupportProfilingInstrumentationTest.java‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/src/test/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentationTest.java renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/src/test/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentationTest.java b/‎…SupportProfilingInstrumentationTest.java‎ ‎…SupportProfilingInstrumentationTest.java‎dd-java-agent/instrumentation/datadog/profiling/lock-support-profiling/src/test/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentationTest.java renamed to dd-java-agent/instrumentation/datadog/profiling/lock-support/src/test/java/datadog/trace/instrumentation/locksupport/LockSupportProfilingInstrumentationTest.java
diff --git a/‎…iling/object-wait-profiling/build.gradle‎ ‎…tadog/profiling/object-wait/build.gradle‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/build.gradle renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/build.gradle b/‎…iling/object-wait-profiling/build.gradle‎ ‎…tadog/profiling/object-wait/build.gradle‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/build.gradle renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/build.gradle
diff --git a/‎…/ObjectWaitProfilingInstrumentation.java‎ ‎…/ObjectWaitProfilingInstrumentation.java‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/src/main/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentation.java renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/src/main/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentation.java
Lines changed: 1 addition & 1 deletion b/‎…/ObjectWaitProfilingInstrumentation.java‎ ‎…/ObjectWaitProfilingInstrumentation.java‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/src/main/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentation.java renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/src/main/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentation.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎…ectWaitProfilingInstrumentationTest.java‎ ‎…ectWaitProfilingInstrumentationTest.java‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/src/test/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentationTest.java renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/src/test/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentationTest.java b/‎…ectWaitProfilingInstrumentationTest.java‎ ‎…ectWaitProfilingInstrumentationTest.java‎dd-java-agent/instrumentation/datadog/profiling/object-wait-profiling/src/test/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentationTest.java renamed to dd-java-agent/instrumentation/datadog/profiling/object-wait/src/test/java/datadog/trace/instrumentation/objectwait/ObjectWaitProfilingInstrumentationTest.java
diff --git a/‎metadata/supported-configurations.json‎
Lines changed: 4 additions & 4 deletions b/‎metadata/supported-configurations.json‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎settings.gradle.kts‎
Lines changed: 2 additions & 2 deletions b/‎settings.gradle.kts‎
Lines changed: 2 additions & 2 deletions
@@ -34,7 +34,7 @@ public class LockSupportProfilingInstrumentation extends InstrumenterModule.Prof
     implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
   public LockSupportProfilingInstrumentation() {
-    super("lock-support-profiling");
+    super("lock-support");
   }
 
   @Override
 
@@ -35,7 +35,7 @@ public class ObjectWaitProfilingInstrumentation extends InstrumenterModule.Profi
     implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
   public ObjectWaitProfilingInstrumentation() {
-    super("object-wait-profiling");
+    super("object-wait");
   }
 
   @Override
 
@@ -7865,12 +7865,12 @@
         "aliases": ["DD_TRACE_INTEGRATION_LIBERTY_ENABLED", "DD_INTEGRATION_LIBERTY_ENABLED"]
       }
     ],
-    "DD_TRACE_LOCK_SUPPORT_PROFILING_ENABLED": [
+    "DD_TRACE_LOCK_SUPPORT_ENABLED_EXPERIMENTAL": [
       {
         "version": "A",
         "type": "boolean",
         "default": "true",
-        "aliases": ["DD_TRACE_INTEGRATION_LOCK_SUPPORT_PROFILING_ENABLED", "DD_INTEGRATION_LOCK_SUPPORT_PROFILING_ENABLED"]
+        "aliases": ["DD_TRACE_INTEGRATION_LOCK_SUPPORT_ENABLED_EXPERIMENTAL", "DD_INTEGRATION_LOCK_SUPPORT_ENABLED_EXPERIMENTAL"]
       }
     ],
     "DD_TRACE_LOG4J_1_ENABLED": [
@@ -8297,12 +8297,12 @@
         "aliases": ["DD_OBFUSCATION_QUERY_STRING_REGEXP"]
       }
     ],
-    "DD_TRACE_OBJECT_WAIT_PROFILING_ENABLED": [
+    "DD_TRACE_OBJECT_WAIT_ENABLED_EXPERIMENTAL": [
       {
         "version": "A",
         "type": "boolean",
         "default": "true",
-        "aliases": ["DD_TRACE_INTEGRATION_OBJECT_WAIT_PROFILING_ENABLED", "DD_INTEGRATION_OBJECT_WAIT_PROFILING_ENABLED"]
+        "aliases": ["DD_TRACE_INTEGRATION_OBJECT_WAIT_ENABLED_EXPERIMENTAL", "DD_INTEGRATION_OBJECT_WAIT_ENABLED_EXPERIMENTAL"]
       }
     ],
     "DD_TRACE_OGNL_ENABLED": [
 
@@ -328,8 +328,8 @@ include(
   ":dd-java-agent:instrumentation:datadog:dynamic-instrumentation:span-origin",
   ":dd-java-agent:instrumentation:datadog:profiling:enable-wallclock-profiling",
   ":dd-java-agent:instrumentation:datadog:profiling:exception-profiling",
-  ":dd-java-agent:instrumentation:datadog:profiling:lock-support-profiling",
-  ":dd-java-agent:instrumentation:datadog:profiling:object-wait-profiling",
+  ":dd-java-agent:instrumentation:datadog:profiling:lock-support",
+  ":dd-java-agent:instrumentation:datadog:profiling:object-wait",
   ":dd-java-agent:instrumentation:datadog:tracing:trace-annotation",
   ":dd-java-agent:instrumentation:datanucleus-4.0.5",
   ":dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0",
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class LockSupportProfilingInstrumentation extends InstrumenterModule.Prof`
`34`	`34`	`implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {`
`35`	`35`
`36`	`36`	`public LockSupportProfilingInstrumentation() {`
`37`		`- super("lock-support-profiling");`
	`37`	`+ super("lock-support");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class ObjectWaitProfilingInstrumentation extends InstrumenterModule.Profi`
`35`	`35`	`implements Instrumenter.ForBootstrap, Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {`
`36`	`36`
`37`	`37`	`public ObjectWaitProfilingInstrumentation() {`
`38`		`- super("object-wait-profiling");`
	`38`	`+ super("object-wait");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7865,12 +7865,12 @@`
`7865`	`7865`	`"aliases": ["DD_TRACE_INTEGRATION_LIBERTY_ENABLED", "DD_INTEGRATION_LIBERTY_ENABLED"]`
`7866`	`7866`	`}`
`7867`	`7867`	`],`
`7868`		`- "DD_TRACE_LOCK_SUPPORT_PROFILING_ENABLED": [`
	`7868`	`+ "DD_TRACE_LOCK_SUPPORT_ENABLED_EXPERIMENTAL": [`
`7869`	`7869`	`{`
`7870`	`7870`	`"version": "A",`
`7871`	`7871`	`"type": "boolean",`
`7872`	`7872`	`"default": "true",`
`7873`		`- "aliases": ["DD_TRACE_INTEGRATION_LOCK_SUPPORT_PROFILING_ENABLED", "DD_INTEGRATION_LOCK_SUPPORT_PROFILING_ENABLED"]`
	`7873`	`+ "aliases": ["DD_TRACE_INTEGRATION_LOCK_SUPPORT_ENABLED_EXPERIMENTAL", "DD_INTEGRATION_LOCK_SUPPORT_ENABLED_EXPERIMENTAL"]`
`7874`	`7874`	`}`
`7875`	`7875`	`],`
`7876`	`7876`	`"DD_TRACE_LOG4J_1_ENABLED": [`
`@@ -8297,12 +8297,12 @@`
`8297`	`8297`	`"aliases": ["DD_OBFUSCATION_QUERY_STRING_REGEXP"]`
`8298`	`8298`	`}`
`8299`	`8299`	`],`
`8300`		`- "DD_TRACE_OBJECT_WAIT_PROFILING_ENABLED": [`
	`8300`	`+ "DD_TRACE_OBJECT_WAIT_ENABLED_EXPERIMENTAL": [`
`8301`	`8301`	`{`
`8302`	`8302`	`"version": "A",`
`8303`	`8303`	`"type": "boolean",`
`8304`	`8304`	`"default": "true",`
`8305`		`- "aliases": ["DD_TRACE_INTEGRATION_OBJECT_WAIT_PROFILING_ENABLED", "DD_INTEGRATION_OBJECT_WAIT_PROFILING_ENABLED"]`
	`8305`	`+ "aliases": ["DD_TRACE_INTEGRATION_OBJECT_WAIT_ENABLED_EXPERIMENTAL", "DD_INTEGRATION_OBJECT_WAIT_ENABLED_EXPERIMENTAL"]`
`8306`	`8306`	`}`
`8307`	`8307`	`],`
`8308`	`8308`	`"DD_TRACE_OGNL_ENABLED": [`