Merge remote-tracking branch 'origin/feat/support-jfinal' into feat/support-jfinal

Change-Id: I89962394646e846de25e3a68dbc76e00f472e29a

Author: pepeshore

.fossa.yml

@@ -136,6 +136,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:gwt-2.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon-4.3:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon-4.3:library'
     - type: gradle
       path: ./
       target: ':instrumentation:hikaricp-3.0:javaagent'
@@ -385,6 +391,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:azure-core:azure-core-1.36:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:azure-core:azure-core-1.53:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:cassandra:cassandra-3.0:javaagent'
@@ -424,6 +433,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:couchbase:couchbase-3.2:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:couchbase:couchbase-3.4:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent'
@@ -616,6 +628,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-myfaces-3.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:kafka:kafka-connect-2.6:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:kafka:kafka-streams-0.11:javaagent'
@@ -754,6 +769,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:openai:openai-java-1.1:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opensearch:opensearch-java-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

.github/CODEOWNERS

@@ -1,10 +1,6 @@
 #
 # Learn about membership in OpenTelemetry community:
 #  https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
-# 
-#
-# Learn about CODEOWNERS file format: 
-#  https://help.github.com/en/articles/about-code-owners
 #
 
 * @open-telemetry/java-instrumentation-approvers

.github/config/lychee.toml

@@ -1,3 +1,6 @@
+# Lychee configuration file
+# See https://lychee.cli.rs/config/
+
 timeout = 30
 retry_wait_time = 5
 max_retries = 6
@@ -21,4 +24,6 @@ exclude = [
   '^http://code.google.com/p/concurrentlinkedhashmap$',
   '^https://softwareengineering.stackexchange.com/questions/29727.*',
   '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
+  # new artifact, remove after 2.21.0 release
+  '^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
 ]

.github/labeler.yml

@@ -2,7 +2,7 @@ test native:
 - all:
   - changed-files:
       - any-glob-to-any-file:
-          - instrumentation/logback/logback-appender-10/library/**
+          - instrumentation/logback/logback-appender-1.0/library/**
           - instrumentation/jdbc/library/**
           - instrumentation/spring/**
           - smoke-tests-otel-starter/**

.github/renovate.json5

@@ -46,56 +46,51 @@
     {
       groupName: 'quarkus packages',
       matchPackageNames: [
-        'io.quarkus{/,}**',
+        'io.quarkus:**',
       ],
     },
     {
       groupName: 'gradle develocity packages',
       matchPackageNames: [
-        'com.gradle.develocity{/,}**',
+        'com.gradle.develocity:**',
       ],
     },
     {
       groupName: 'armeria packages',
       matchPackageNames: [
-        'com.linecorp.armeria:{/,}**',
+        'com.linecorp.armeria:**',
       ],
     },
     {
       groupName: 'spotless packages',
       matchPackageNames: [
-        'com.diffplug.spotless{/,}**',
+        'com.diffplug.spotless',
+        'com.diffplug.spotless:**',
       ],
     },
     {
       groupName: 'byte buddy packages',
       matchPackageNames: [
-        'net.bytebuddy:{/,}**',
+        'net.bytebuddy:**',
       ],
     },
     {
       groupName: 'gradle shadow packages',
       matchPackageNames: [
-        'com.gradleup.shadow{/,}**',
+        'com.gradleup.shadow:**',
       ],
     },
     {
       groupName: 'guava packages',
       matchPackageNames: [
-        'com.google.guava{/,}**',
+        'com.google.guava:**',
       ],
     },
     {
       groupName: 'jackson packages',
       matchPackageNames: [
-        'com.fasterxml.jackson{/,}**',
-      ],
-    },
-    {
-      // prevent update to 2.4-groovy-4.0-SNAPSHOT
-      allowedVersions: '!/\\-SNAPSHOT$/',
-      matchPackageNames: [
-        'org.spockframework:{/,}**',
+        'com.fasterxml.jackson:**',
+        'com.fasterxml.jackson.core:**',
       ],
     },
     {
@@ -109,7 +104,7 @@
       // OpenTelemetry SDK updates are handled by auto-update-otel-sdk.yml
       enabled: false,
       matchPackageNames: [
-        'io.opentelemetry:{/,}**',
+        'io.opentelemetry:**',
       ],
     },
     {
@@ -140,7 +135,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.mockito:{/,}**',
+        'org.mockito:**',
       ],
     },
     {
@@ -164,6 +159,16 @@
         'com.github.tomakehurst:wiremock-jre8'
       ],
     },
+    {
+      // vaadin 14 tests require node 16
+      matchPackageNames: [
+        'actions/node-versions',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+    },
     {
       // intentionally using Spring Boot 2 in this smoke tests
       // new versions of Spring Boot 3 are tested with
@@ -212,7 +217,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -225,7 +230,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.slf4j:{/,}**',
+        'org.slf4j:**',
       ],
     },
     {
@@ -239,8 +244,8 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'com.google.inject:{/,}**',
-        'com.google.inject.extensions:{/,}**',
+        'com.google.inject:**',
+        'com.google.inject.extensions:**',
       ],
     },
     {
@@ -316,7 +321,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -329,7 +334,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.springframework.boot:spring-boot-dependencies{/,}**',
+        'org.springframework.boot:spring-boot-dependencies:**',
       ],
     },
     {
@@ -342,7 +347,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.eclipse.jetty:{/,}**',
+        'org.eclipse.jetty:**',
       ],
     },
   ],
@@ -351,10 +356,12 @@
       customType: 'regex',
       datasourceTemplate: 'java-version',
       managerFilePatterns: [
-        '.github/workflows/**'
+        '.github/workflows/**',
+        '**/*.gradle.kts'
       ],
       matchStrings: [
         '(?<currentValue>\\d+) # renovate: datasource=java-version',
+        '"(?<currentValue>\\d+)" // renovate: datasource=java-version',
       ],
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',

.github/repository-settings.md

@@ -8,6 +8,7 @@ private admin repo.
 
 ### Repository secrets
 
+- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
 - `GRADLE_PUBLISH_KEY`
@@ -17,13 +18,13 @@ private admin repo.
   - Key is associated with [@trask](https://github.com/trask)'s gmail address
 - `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
 - `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
-- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
 
 ### Organization secrets
 
+- `DEVELOCITY_ACCESS_KEY` (scoped only to Java repos)
 - `FOSSA_API_KEY`
+- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY` (scoped only to this repo)
 - `OTELBOT_PRIVATE_KEY`
-- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
 
 ### Organization variables
 

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

@@ -15,31 +15,29 @@ if [[ $minor == 0 ]]; then
   prior_minor=$(sed -n "s/^## Version $prior_major\.\([0-9]\+\)\..*/\1/p" CHANGELOG.md | head -1)
   if [[ -z $prior_minor ]]; then
     # assuming this is the first release
-    range=
+    range=HEAD
   else
     range="v$prior_major.$prior_minor.0..HEAD"
   fi
 else
   range="v$major.$((minor - 1)).0..HEAD"
 fi
 
-echo "## Unreleased"
-echo
-echo "### Migration notes"
+echo "# Changelog"
 echo
+echo "## Unreleased"
 echo
+
+"$(dirname "$0")/extract-labeled-prs.sh" "$range"
+
 echo "### 🌟 New javaagent instrumentation"
 echo
-echo
 echo "### 🌟 New library instrumentation"
 echo
-echo
 echo "### 📈 Enhancements"
 echo
-echo
 echo "### 🛠️ Bug fixes"
 echo
-echo
 echo "### 🧰 Tooling"
 echo
 
@@ -48,4 +46,5 @@ git log --reverse \
         --author='^(?!renovate\[bot\] )' \
         --pretty=format:"- %s" \
         "$range" \
-  | sed -E 's,\(#([0-9]+)\)$,\n  ([#\1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/\1)),'
+  | sed -E 's, *\(#([0-9]+)\)$,\n  ([#\1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/\1)),'
+echo