Skip to content

Commit a8531ac

Browse files
committed
Merge remote-tracking branch 'otel/HEAD' into openj9-indy-classloading-fix
# Conflicts: # .github/workflows/reusable-test-indy.yml
2 parents 54820ca + 0fd47e3 commit a8531ac

File tree

126 files changed

+2879
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2879
-527
lines changed

.fossa.yml

+9
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,12 @@ targets:
148148
- type: gradle
149149
path: ./
150150
target: ':instrumentation:java-http-client:library'
151+
- type: gradle
152+
path: ./
153+
target: ':instrumentation:java-http-server:javaagent'
154+
- type: gradle
155+
path: ./
156+
target: ':instrumentation:java-http-server:library'
151157
- type: gradle
152158
path: ./
153159
target: ':instrumentation:java-util-logging:javaagent'
@@ -751,6 +757,9 @@ targets:
751757
- type: gradle
752758
path: ./
753759
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent'
760+
- type: gradle
761+
path: ./
762+
target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
754763
- type: gradle
755764
path: ./
756765
target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'

0 commit comments

Comments
 (0)