Skip to content

Commit f609a08

Browse files
authored
Merge branch 'main' into copilot/fix-7289f6ea-eccf-4b1f-8b72-9a0a0823fcd6
2 parents ca2de7a + bda633d commit f609a08

36 files changed

Lines changed: 59 additions & 61 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
{
22
"name": "Application Insights Java Development Environment",
3-
"image": "mcr.microsoft.com/vscode/devcontainers/base:bullseye",
3+
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
44
"features": {
55
"ghcr.io/devcontainers/features/java:1": {
6-
"version": "17"
6+
"version": "17",
7+
"jdkDistro": "ms"
78
},
8-
"ghcr.io/devcontainers/features/docker-in-docker:2": {
9-
"version": "latest"
10-
}
9+
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
1110
},
11+
"updateContentCommand": "./gradlew classes --no-daemon",
1212
"customizations": {
1313
"vscode": {
1414
"extensions": [
1515
"vscjava.vscode-java-pack",
16-
"vscjava.vscode-gradle",
17-
"ms-vscode.vscode-json"
16+
"ms-vscode.vscode-json",
17+
"GitHub.copilot",
18+
"GitHub.copilot-chat"
1819
]
20+
},
21+
"settings": {
22+
"java.server.launchMode": "LightWeight"
1923
}
20-
},
21-
"mounts": [
22-
"source=gradle-cache,target=/home/vscode/.gradle,type=volume"
23-
],
24-
"remoteUser": "vscode",
25-
"postCreateCommand": "sudo chown -R vscode:vscode /home/vscode/.gradle"
24+
}
2625
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.gradle/
33
/buildSrc/.gradle/
44
/perf-tests/.gradle/
5+
/buildSrc/.kotlin/
56
build/
67

78
# Intellij

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
[![Build Status](https://github-private.visualstudio.com/microsoft/_apis/build/status/CDPX/applicationinsights-java/applicationinsights-java-Windows-Buddy-master?branchName=refs%2Fpull%2F1583%2Fmerge)](https://github-private.visualstudio.com/microsoft/_build/latest?definitionId=224&branchName=refs%2Fpull%2F1583%2Fmerge)
2-
31
# Application Insights for Java
42

5-
See documentation at https://docs.microsoft.com/en-us/azure/azure-monitor/app/java-in-process-agent.
3+
See the [official documentation](https://learn.microsoft.com/en-us/azure/azure-monitor/app/opentelemetry-enable?tabs=java).
64

75
## If you need to build locally or want to contribute
86

agent/agent-bootstrap/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath

agent/agent-for-testing/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
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
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
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
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath

agent/agent-profiler/agent-alerting-api/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
66
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath

agent/agent-profiler/agent-alerting/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-json:1.5.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.2.36=runtimeClasspath
6-
com.fasterxml.jackson:jackson-bom:2.19.1=runtimeClasspath
6+
com.fasterxml.jackson:jackson-bom:2.19.2=runtimeClasspath
77
io.netty:netty-bom:4.2.3.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.17.1-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.17.1=runtimeClasspath

0 commit comments

Comments
 (0)