Skip to content

Commit b38ba5a

Browse files
trasktrask
authored
Merge branch 'main' into javadoc
2 parents b7f8ab8 + 3f5a008 commit b38ba5a

File tree

75 files changed

+527
-485
lines changed

Some content is hidden

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

75 files changed

+527
-485
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ The agent JAR is built in **3 critical steps** (see `agent/agent/build.gradle.kt
9090
abstract class HttpClientTest {
9191
@Environment(TOMCAT_8_JAVA_8)
9292
static class Tomcat8Java8Test extends HttpClientTest {}
93-
93+
9494
@Environment(TOMCAT_8_JAVA_11)
9595
static class Tomcat8Java11Test extends HttpClientTest {}
9696
}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Gradle
22
/.gradle/
33
/buildSrc/.gradle/
4+
/perf-tests/.gradle/
45
/buildSrc/.kotlin/
56
build/
67

‎.gitmodules‎

Whitespace-only changes.

‎.lgtm.yml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-for-testing/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tasks {
5050
dependsOn(relocateJavaagentLibs)
5151
isolateClasses(relocateJavaagentLibs.get().outputs.files)
5252

53-
into("$buildDir/isolated/javaagentLibs")
53+
into(layout.buildDirectory.dir("isolated/javaagentLibs"))
5454
}
5555

5656
// 3. the relocated and isolated javaagent libs are merged together with the bootstrap libs (which undergo relocation

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
1111
org.junit:junit-bom:5.13.3=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath
1313
empty=

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.40.0=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-api/src/main/java/com/microsoft/gcmonitor/MemoryManagers.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public static MemoryManagers of(MemoryManagement manager) {
4141
"Unable to find garbage collector group for the memory manager");
4242
}
4343

44+
@SafeVarargs
4445
MemoryManagers(Class<? extends GarbageCollector>... allCollectors) {
4546
this.managers = allCollectors;
4647
}

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.40.0=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.51.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.51.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.18.1-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.18.1=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.52.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.52.0=runtimeClasspath
1212
org.junit:junit-bom:5.13.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.21.3=runtimeClasspath

0 commit comments

Comments
 (0)