Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into semconv-stable-code

Author: SylvainJuge

conventions/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.5")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.6")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")

dependencyManagement/build.gradle.kts

@@ -39,7 +39,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
 val errorProneVersion = "2.38.0"
-val byteBuddyVersion = "1.17.5"
+val byteBuddyVersion = "1.17.6"
 val asmVersion = "9.8"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

docs/contributing/writing-instrumentation-module.md

@@ -394,7 +394,7 @@ Due to the changes needed on most of the instrumentation modules the migration c
 we thus have to implement it in two steps:
 
 - `InstrumentationModule#isIndyModule` implementation return `true` (and changes needed to make it indy compatible)
-- set `inlined = false` on advice methods annotated with `@Advice.OnMethodEnter` or `@Advice.OnMethodExit`
+- set `inline = false` on advice methods annotated with `@Advice.OnMethodEnter` or `@Advice.OnMethodExit`
 
 The `otel.javaagent.experimental.indy` (default `false`) configuration option allows to opt-in for
 using "indy". When set to `true`, the `io.opentelemetry.javaagent.tooling.instrumentation.indy.AdviceTransformer`
@@ -403,7 +403,7 @@ be removed once all the instrumentations are "indy native".
 
 This configuration is automatically enabled in CI with `testIndy*` checks or when the `-PtestIndy=true` parameter is added to gradle.
 
-In order to preserve compatibility with both instrumentation strategies, we have to omit the `inlined = false`
+In order to preserve compatibility with both instrumentation strategies, we have to omit the `inline = false`
 from the advice method annotations.
 
 We have three sets of instrumentation modules:
@@ -445,12 +445,12 @@ return a value from the enter advice and get the value in the exit advice with a
 with `@Advice.Enter`, for example:
 
 ```java
-@Advice.OnMethodEnter(suppress = Throwable.class, inlined = false)
+@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
 public static Object onEnter(@Advice.Argument(1) Object request) {
   return "enterValue";
 }
 
-@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inlined = false)
+@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class, inline = false)
 public static void onExit(@Advice.Argument(1) Object request,
                           @Advice.Enter Object enterValue) {
   // do something with enterValue
@@ -467,7 +467,7 @@ annotated parameters, however modifying the values is done through the advice me
 and `@Advice.AssignReturned.ToArguments` annotation:
 
 ```java
-@Advice.OnMethodEnter(suppress = Throwable.class, inlined = false)
+@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
 @Advice.AssignReturned.ToArguments(@ToArgument(1))
 public static Object onEnter(@Advice.Argument(1) Object request) {
   return "hello";
@@ -487,7 +487,7 @@ annotated parameter, however modifying the value is done through the advice meth
 and `@Advice.AssignReturned.ToReturned`.
 
 ```java
-@Advice.OnMethodExit(suppress = Throwable.class, inlined = false)
+@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
 @Advice.AssignReturned.ToReturned
 public static Object onExit(@Advice.Return Object returnValue) {
   return "hello";
@@ -504,7 +504,7 @@ annotated parameter, however modifying the value is done through the advice meth
 and `@Advice.AssignReturned.ToFields` annotation.
 
 ```java
-@Advice.OnMethodEnter(suppress = Throwable.class, inlined = false)
+@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
 @Advice.AssignReturned.ToFields(@ToField("fieldName"))
 public static Object onEnter(@Advice.FieldValue("fieldName") Object originalFieldValue) {
   return "newFieldValue";

gradle-plugins/build.gradle.kts

@@ -25,7 +25,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.17.5"
+val byteBuddyVersion = "1.17.6"
 val aetherVersion = "1.1.0"
 
 dependencies {

licenses/byte-buddy-dep-1.17.5.jar/META-INF/LICENSE renamed to licenses/byte-buddy-dep-1.17.6.jar/META-INF/LICENSE

@@ -11,7 +11,7 @@ dependencies {
   implementation(platform("io.grpc:grpc-bom:1.73.0"))
   implementation(platform("io.opentelemetry:opentelemetry-bom:1.0.0"))
   implementation(platform("io.opentelemetry:opentelemetry-bom-alpha:1.0.0-alpha"))
-  implementation(platform("org.apache.logging.log4j:log4j-bom:2.24.3"))
+  implementation(platform("org.apache.logging.log4j:log4j-bom:2.25.0"))
 
   implementation("io.grpc:grpc-netty-shaded")
   implementation("io.grpc:grpc-protobuf")