Merge remote-tracking branch 'upstream/main' into javahttpclient

Author: trask

.fossa.yml

@@ -148,6 +148,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:java-http-client:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:java-http-server:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:java-http-server:library'
     - type: gradle
       path: ./
       target: ':instrumentation:java-util-logging:javaagent'