Merge remote-tracking branch 'upstream/main' into fix/sampler-packages

Author: trask

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -16,6 +16,7 @@ body:
         - disk-buffering
         - gcp-auth-extension
         - gcp-resources
+        - ibm-mq-metrics
         - jfr-connection
         - jfr-events
         - jmx-metrics
@@ -57,3 +58,10 @@ body:
     attributes:
       label: Additional context
       description: Any additional information you think may be relevant to this issue.
+  - type: dropdown
+    attributes:
+      label: Tip
+      description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
+      options:
+        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+      default: 0

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -16,6 +16,7 @@ body:
         - disk-buffering
         - gcp-auth-extension
         - gcp-resources
+        - ibm-mq-metrics
         - jfr-connection
         - jfr-events
         - jmx-metrics
@@ -48,3 +49,10 @@ body:
     attributes:
       label: Additional context
       description: Add any other context or screenshots about the feature request here.
+  - type: dropdown
+    attributes:
+      label: Tip
+      description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
+      options:
+        - <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+      default: 0

.github/component_owners.yml

@@ -1,14 +1,14 @@
-# this file is used by .github/workflows/assign-reviewers.yml
+# this file is used by .github/workflows/assign-reviewers.yml and .github/workflows/assign-issue-owners.yml
 #
 # NOTE component owners must be members of the GitHub OpenTelemetry organization
 # so that they can be added to @open-telemetry/java-contrib-triagers
-# which in turn is required for them to be auto-assigned as reviewers by the automation
+# which in turn is required for them to be auto-assigned as reviewers and issue assignees by the automation
 #
 # NOTE when updating this file, don't forget to update the README.md files in the associated
 # components also
 #
 # NOTE when adding/updating one of the component names, don't forget to update the associated
-# `comp:*` labels
+# `component:*` labels (used for both PR reviews and issue assignment)
 components:
   aws-resources:
     - wangzlei
@@ -65,7 +65,7 @@ components:
     - LikeTheSalad
     - breedx-splk
     - jack-berg
-  prometheus-collector:
+  prometheus-client-bridge:
     - jkwatson
   resource-providers:
     - breedx-splk
@@ -90,3 +90,6 @@ components:
   opamp-client:
     - LikeTheSalad
     - jackshirazi
+  ibm-mq-metrics:
+    - breedx-splk
+    - atoulme

.github/config/lychee.toml

@@ -0,0 +1,17 @@
+timeout = 30
+retry_wait_time = 5
+max_retries = 6
+max_concurrency = 4
+
+# Check link anchors
+include_fragments = true
+
+remap = [
+  # workaround for https://github.com/lycheeverse/lychee/issues/1729
+  "https://github.com/(.*?)/(.*?)/blob/(.*?)/(.*#.*)$ https://raw.githubusercontent.com/$1/$2/$3/$4"
+]
+
+exclude = [
+  # excluding links to pull requests and issues is done for performance
+  "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\\d+$",
+]

.github/copilot-instructions.md

@@ -0,0 +1,66 @@
+# Copilot Instructions for OpenTelemetry Java Contrib
+
+This repository provides observability instrumentation for Java applications.
+
+## Code Review Priorities
+
+### Style Guide Compliance
+
+**PRIORITY**: Verify that all code changes follow the [Style Guide](../docs/style-guide.md). Check:
+
+- Code formatting (auto-formatting, static imports, class organization)
+- Java language conventions (`final` usage, `@Nullable` annotations, `Optional` usage)
+- Performance constraints (hot path allocations)
+- Implementation patterns (SPI registration, configuration conventions)
+- Gradle conventions (Kotlin DSL, plugin usage, module naming)
+- Documentation standards (README files, deprecation processes)
+
+### Critical Areas
+
+- **Public APIs**: Changes affect downstream users and require careful review
+- **Performance**: Instrumentation must have minimal overhead
+- **Thread Safety**: Ensure safe concurrent access patterns
+- **Memory Management**: Prevent leaks and excessive allocations
+
+### Quality Standards
+
+- Proper error handling with appropriate logging levels
+- OpenTelemetry specification and semantic convention compliance
+- Resource cleanup and lifecycle management
+- Comprehensive unit tests for new functionality
+
+### Test suites
+
+This project uses gradle 9 which requires specifying test classes and paths explicitly.
+
+For example, this will NOT work because it registers a `Test` without specifying the test classes or paths:
+
+```kotlin
+tasks.register<Test>("IntegrationTestUserCreds") {
+  dependsOn(tasks.shadowJar)
+  dependsOn(tasks.named("copyAgent"))
+  ...
+}
+```
+
+This is fixed by specifying the test classes and classpath explicitly:
+
+```kotlin
+tasks.register<Test>("IntegrationTestUserCreds") {
+  testClassesDirs = sourceSets.test.get().output.classesDirs
+  classpath = sourceSets.test.get().runtimeClasspath
+
+  dependsOn(tasks.shadowJar)
+  dependsOn(tasks.named("copyAgent"))
+  ...
+}
+```
+
+## Coding Agent Instructions
+
+When implementing changes or new features:
+
+1. Follow all [Style Guide](../docs/style-guide.md) conventions and the Code Review Priorities above
+2. Run tests to ensure they still pass (use `./gradlew test` and `./gradlew integrationTest` as needed)
+3. **Always run `./gradlew spotlessApply`** after making code changes to ensure proper formatting
+4. Run markdown lint to ensure it still passes: `npx [email protected] -c .github/config/markdownlint.yml **/*.md`

.github/renovate.json5

@@ -6,24 +6,38 @@
   ],
   ignorePresets: [
     ':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
+    'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
   ],
   prHourlyLimit: 5, // we have a large number of parallel runners
   labels: [
-    'dependencies'
+    'dependencies',
   ],
   packageRules: [
     {
       // reduces the number of Renovate PRs
       // (patch updates are typically non-breaking)
-      "groupName": "all patch versions",
-      "matchUpdateTypes": ["patch"],
-      "schedule": ["before 8am every weekday"]
+      groupName: 'all patch versions',
+      matchUpdateTypes: [
+        'patch',
+      ],
+      schedule: [
+        'before 8am every weekday',
+      ],
     },
     {
       // avoids these Renovate PRs from trickling in throughout the week
       // (consolidating the review process)
-      "matchUpdateTypes": ["minor", "major"],
-      "schedule": ["before 8am on Monday"]
+      matchUpdateTypes: [
+        'minor',
+        'major',
+      ],
+      schedule: [
+        'before 8am on Monday',
+      ],
+      matchPackageNames: [
+        '!io.opentelemetry:**',
+        '!io.opentelemetry.*:**',
+      ],
     },
     {
       matchPackageNames: [
@@ -54,6 +68,17 @@
       ],
       enabled: false,
     },
+    {
+      // junit 6+ requires Java 17+
+      matchPackageNames: [
+        'org.junit:**',
+        'org.junit.jupiter:**',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+    },
     {
       // junit-pioneer 2+ requires Java 11+
       matchPackageNames: [
@@ -71,7 +96,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.mockito:{/,}**',
+        'org.mockito:**',
       ],
     },
     {
@@ -109,25 +134,45 @@
       matchCurrentVersion: '3.5.0',
       enabled: false,
       matchPackageNames: [
-        'org.apache.maven:{/,}**',
+        'org.apache.maven:**',
       ],
     },
     {
       groupName: 'spotless packages',
       matchPackageNames: [
-        'com.diffplug.spotless{/,}**',
+        'com.diffplug.spotless',
+        'com.diffplug.spotless:**',
       ],
     },
     {
       groupName: 'hipparchus packages',
       matchPackageNames: [
-        'org.hipparchus{/,}**',
+        'org.hipparchus:**',
       ],
     },
     {
       groupName: 'errorprone packages',
       matchPackageNames: [
-        'com.google.errorprone{/,}**',
+        'com.google.errorprone:**',
+      ],
+    },
+    {
+      groupName: 'jackson packages',
+      matchPackageNames: [
+        'com.fasterxml.jackson:**',
+        'com.fasterxml.jackson.core:**',
+      ],
+    },
+    {
+      groupName: 'develocity packages',
+      matchPackageNames: [
+        'com.gradle.develocity:**',
+      ],
+    },
+    {
+      groupName: 'bouncycastle packages',
+      matchPackageNames: [
+        'org.bouncycastle:**',
       ],
     },
     {
@@ -137,7 +182,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.openjdk.jmc{/,}**',
+        'org.openjdk.jmc:**',
       ],
     },
     {
@@ -148,7 +193,7 @@
       matchCurrentVersion: '5.0.0',
       enabled: false,
       matchPackageNames: [
-        'jakarta.servlet:{/,}**',
+        'jakarta.servlet:**',
       ],
     },
     {
@@ -161,7 +206,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.springframework.boot{/,}**',
+        'org.springframework.boot:**',
       ],
     },
   ],
@@ -170,11 +215,33 @@
       customType: 'regex',
       datasourceTemplate: 'npm',
       managerFilePatterns: [
-        '/^.github/workflows//',
+        '.github/workflows/**',
       ],
       matchStrings: [
         'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
       ],
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'java-version',
+      managerFilePatterns: [
+        '.github/workflows/**',
+      ],
+      matchStrings: [
+        '(?<currentValue>\\d+) # renovate: datasource=java-version',
+      ],
+      depNameTemplate: 'java',
+      extractVersionTemplate: '^(?<version>\\d+)',
+    },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'github-releases',
+      managerFilePatterns: [
+        '**/build.gradle.kts',
+      ],
+      matchStrings: [
+        '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
+      ],
+    },
   ],
 }

.github/scripts/draft-change-log-entries.sh

@@ -35,6 +35,7 @@ component_names["consistent-sampling/"]="Consistent sampling"
 component_names["disk-buffering/"]="Disk buffering"
 component_names["gcp-resources/"]="GCP resources"
 component_names["gcp-auth-extension/"]="GCP authentication extension"
+component_names["ibm-mq-metrics/"]="IBM MQ metrics"
 component_names["inferred-spans/"]="Inferred spans"
 component_names["jfr-connection/"]="JFR connection"
 component_names["jfr-events/"]="JFR events"
@@ -44,6 +45,7 @@ component_names["kafka-exporter/"]="Kafka exporter"
 component_names["maven-extension/"]="Maven extension"
 component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"
 component_names["noop-api/"]="No-op API"
+component_names["opamp-client/"]="OpAMP client"
 component_names["processors/"]="Telemetry processors"
 component_names["prometheus-client-bridge/"]="Prometheus client bridge"
 component_names["runtime-attach/"]="Runtime attach"

.github/scripts/package-lock.json

@@ -0,0 +1,9 @@
+{
+  "//": "Dependencies for GitHub Actions workflows that use actions/github-script",
+  "name": "github-scripts",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "yaml": "2.8.1"
+  }
+}