Merge remote-tracking branch 'origin/main' into feature/camunda_instrumentation

# Conflicts:
#	.fossa.yml

Author: cb645j

.fossa.yml

@@ -100,6 +100,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:external-annotations:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:failsafe-3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:finagle-http-23.11:javaagent'
@@ -133,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'
@@ -178,6 +187,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:jdbc:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:jfinal-3.2:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jmx-metrics:javaagent'
@@ -328,6 +340,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:armeria:armeria-grpc-1.14:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:async-http-client:async-http-client-1-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:async-http-client:async-http-client-1.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:async-http-client:async-http-client-1.9:javaagent'
@@ -379,6 +397,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:camunda:camunda-7.0:javaagent'
@@ -424,6 +445,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 +640,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'
@@ -712,6 +739,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:library'
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-3.8:javaagent'
@@ -748,6 +781,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

.lychee.toml .github/config/lychee.toml.lychee.toml renamed to .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
@@ -6,11 +9,21 @@ 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",
+  "https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1"
+]
+
 # excluding links to pull requests and issues is done for performance
 # stackexchange link fails with 403 when accessed by lychee
 exclude = [
+  # workaround for https://github.com/lycheeverse/lychee/issues/1729
+  '^https://github.com/.*#issuecomment-.*$',
   '^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issues|pull)/\d+$',
   '^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/**