merge main

Author: jaydeluca

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
     with(ctx.details) {
       if (id.group == "io.netty" && id.name != "netty") {
         if (id.version.startsWith("4.1.")) {
-          belongsTo("io.netty:netty-bom:4.1.124.Final", false)
+          belongsTo("io.netty:netty-bom:4.1.126.Final", false)
         } else if (id.version.startsWith("4.0.")) {
           belongsTo("io.netty:netty-bom:4.0.56.Final", false)
         }

dependencyManagement/build.gradle.kts

@@ -107,7 +107,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
-  "io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
   "org.assertj:assertj-core:3.27.4",
   "org.awaitility:awaitility:4.3.0",

docs/instrumentation-list.yaml

@@ -3236,6 +3236,8 @@ libraries:
           type: STRING
   grpc:
   - name: grpc-1.6
+    description: This instrumentation enables RPC CLIENT and SERVER spans and metrics
+      for gRPC version 1.6 and above.
     source_path: instrumentation/grpc-1.6
     scope:
       name: io.opentelemetry.grpc-1.6
@@ -3244,6 +3246,27 @@ libraries:
       - io.grpc:grpc-core:[1.6.0,)
       library:
       - io.grpc:grpc-core:1.6.0
+    configurations:
+    - name: otel.instrumentation.grpc.emit-message-events
+      description: Determines whether to emit a span event for each individual message
+        received and sent.
+      type: boolean
+      default: true
+    - name: otel.instrumentation.grpc.experimental-span-attributes
+      description: |
+        Enable the capture of experimental span attributes `grpc.received.message_count`, `grpc.sent.message_count` and `grpc.canceled`.
+      type: boolean
+      default: false
+    - name: otel.instrumentation.grpc.capture-metadata.client.request
+      description: |
+        A comma-separated list of request metadata keys. gRPC client instrumentation will capture metadata values corresponding to configured keys as span attributes.
+      type: list
+      default: ''
+    - name: otel.instrumentation.grpc.capture-metadata.server.request
+      description: |
+        A comma-separated list of request metadata keys. gRPC server instrumentation will capture metadata values corresponding to configured keys as span attributes.
+      type: list
+      default: ''
     telemetry:
     - when: default
       metrics:
@@ -3286,8 +3309,6 @@ libraries:
       spans:
       - span_kind: CLIENT
         attributes:
-        - name: rpc.grpc.request.metadata.some-client-key
-          type: STRING_ARRAY
         - name: rpc.grpc.status_code
           type: LONG
         - name: rpc.method
@@ -3308,8 +3329,6 @@ libraries:
           type: LONG
         - name: network.type
           type: STRING
-        - name: rpc.grpc.request.metadata.some-server-key
-          type: STRING_ARRAY
         - name: rpc.grpc.status_code
           type: LONG
         - name: rpc.method
@@ -3367,8 +3386,6 @@ libraries:
           type: LONG
         - name: grpc.sent.message_count
           type: LONG
-        - name: rpc.grpc.request.metadata.some-client-key
-          type: STRING_ARRAY
         - name: rpc.grpc.status_code
           type: LONG
         - name: rpc.method
@@ -3393,8 +3410,6 @@ libraries:
           type: LONG
         - name: network.type
           type: STRING
-        - name: rpc.grpc.request.metadata.some-server-key
-          type: STRING_ARRAY
         - name: rpc.grpc.status_code
           type: LONG
         - name: rpc.method

examples/distro/smoke-tests/build.gradle

@@ -7,7 +7,7 @@ dependencies {
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
-  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
+  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 
   testImplementation("ch.qos.logback:logback-classic:1.5.18")

examples/extension/build.gradle

@@ -103,7 +103,7 @@ dependencies {
   testImplementation("com.google.protobuf:protobuf-java-util:4.32.0")
   testImplementation("com.squareup.okhttp3:okhttp:5.1.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
-  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
+  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")

gradle-plugins/settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
   plugins {
-    id("com.gradle.plugin-publish") version "1.3.1"
+    id("com.gradle.plugin-publish") version "2.0.0"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
   }
 }

instrumentation-docs/build.gradle.kts

@@ -8,7 +8,7 @@ otelJava {
 }
 
 dependencies {
-  implementation("org.yaml:snakeyaml:2.4")
+  implementation("org.yaml:snakeyaml:2.5")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
   implementation("io.opentelemetry:opentelemetry-sdk-common")