Merge branch 'main' into nats-instrumentation

Author: AlixBa

.fossa.yml

@@ -4,6 +4,9 @@ targets:
   only:
     # only scanning the modules which are published
     # (as opposed to internal testing modules
+    - type: gradle
+      path: ./
+      target: ':declarative-config-bridge'
     - type: gradle
       path: ./
       target: ':instrumentation-annotations'

.github/workflows/survey-on-merged-pr.yml

@@ -0,0 +1,48 @@
+name: Survey on Merged PR by Non-Member
+
+on:
+  pull_request_target:
+    types: [closed]
+
+permissions:
+  contents: read
+
+env:
+  PR_NUM: ${{ github.event.pull_request.number }}
+  SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry-java-instrumentation
+
+jobs:
+  comment-on-pr:
+    name: Add survey to PR if author is not a member
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    steps:
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PRIVATE_KEY }}
+
+      - name: Add survey comment if author is not a member or bot
+        run: |
+          USERNAME="${{ github.event.pull_request.user.login }}"
+          USER_TYPE="${{ github.event.pull_request.user.type }}"
+          ORG="${{ github.repository_owner }}"
+          
+          # Skip if user is a bot
+          if [[ "$USER_TYPE" == "Bot" ]]; then
+            echo "Skipping survey for bot user: $USERNAME"
+            exit 0
+          fi
+          
+          # Skip if user is an org member
+          if gh api "orgs/$ORG/members/$USERNAME" --silent; then
+            echo "Skipping survey for org member: $USERNAME"
+            exit 0
+          fi
+          
+          # Add survey comment for external contributor
+          echo "Adding survey comment for external contributor: $USERNAME"
+          gh pr comment ${PR_NUM} --repo ${{ github.repository }} --body "Thank you for your contribution @${USERNAME}! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})."
+        env:
+          GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}

benchmark-overhead/README.md

@@ -50,7 +50,7 @@ relative overhead.
 | Thread switch rate       | # / s  | Max observed thread context switch rate                                      |
 | GC time                  | ms     | Total amount of time spent paused for garbage collection                     |
 | Request mean             | ms     | Average time to handle a single web request (measured at the caller)         |
-| Request p95              | ms     | 95th percentile time to handle a single web requ4st (measured at the caller) |
+| Request p95              | ms     | 95th percentile time to handle a single web request (measured at the caller) |
 | Iteration mean           | ms     | average time to do a single pass through the k6 test script                  |
 | Iteration p95            | ms     | 95th percentile time to do a single pass through the k6 test script          |
 | Peak threads             | #      | Highest number of running threads in the VM, including agent threads         |

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)
         }
@@ -439,7 +439,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "11.0.0"
+  toolVersion = "11.0.1"
   maxWarnings = 0
 }
 

instrumentation-api-incubator/README.md renamed to declarative-config-bridge/README.md

@@ -1,19 +1,12 @@
-# OpenTelemetry Instrumentation API Incubator
-
-Instrumentation API Incubator is a collection of libraries that provide additional functionality
-for OpenTelemetry instrumentation and auto-configuration. It is intended to be used by
-instrumentation authors and auto-configuration providers to enhance their capabilities and provide a
-more consistent experience when working with OpenTelemetry.
-
-## Declarative Config Bridge
+# Declarative Config Bridge
 
 Declarative Config Bridge allows instrumentation authors to access configuration in a uniform way,
 regardless of the configuration source.
 
 The bridge allows you to read configuration using the system property style when dealing with
 declarative configuration.
 
-### Example
+## Example
 
 As an example, let's look at the inferred spans configuration.
 First, there is a configuration method that reads the properties and is unaware of the source of the

declarative-config-bridge/build.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+  id("otel.java-conventions")
+  id("otel.publish-conventions")
+  id("otel.nullaway-conventions")
+}
+
+group = "io.opentelemetry.instrumentation"
+
+dependencies {
+  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
+  implementation("io.opentelemetry:opentelemetry-api-incubator")
+
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+
+  compileOnly("com.google.code.findbugs:annotations")
+  testCompileOnly("com.google.code.findbugs:annotations")
+}

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/sdk/config/bridge/ConfigPropertiesUtil.java renamed to declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesUtil.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.sdk.config.bridge;
+package io.opentelemetry.instrumentation.config.bridge;
 
 public final class ConfigPropertiesUtil {
   private ConfigPropertiesUtil() {}

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/sdk/config/bridge/DeclarativeConfigPropertiesBridge.java renamed to declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.sdk.config.bridge;
+package io.opentelemetry.instrumentation.config.bridge;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/sdk/config/bridge/DeclarativeConfigPropertiesBridgeBuilder.java renamed to declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.sdk.config.bridge;
+package io.opentelemetry.instrumentation.config.bridge;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/sdk/config/bridge/ConfigPropertiesUtilTest.java renamed to declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesUtilTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.sdk.config.bridge;
+package io.opentelemetry.instrumentation.config.bridge;
 
 import static org.assertj.core.api.Assertions.assertThat;