Skip to content

Commit 7072c9c

Browse files
authored
Merge branch 'main' into copilot/fix-78
2 parents 4f5dcf3 + 8a289f7 commit 7072c9c

File tree

14 files changed

+21
-22
lines changed

14 files changed

+21
-22
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- main
4+
# push:
5+
# branches:
6+
# - main
77
pull_request:
88
workflow_dispatch:
99

.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+
/buildSrc/.kotlin/
45
build/
56

67
# Intellij

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ from the OpenTelemetry Java Instrumentation project.
3636
See the [style guide](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/style-guideline.md).
3737
from the OpenTelemetry Java Instrumentation project.
3838

39-
## Running a smoke test in Intellij
39+
## Running a smoke test in IntelliJ
4040

4141
Pick the smoke test that you want to run, e.g. `MongoTest`.
4242
If the smoke test is abstract, then pick one of its subclasses, e.g. `MongoTest$Tomcat8Java8Test`.
4343
Right-click on it and select run.
4444

45-
## Debugging a smoke test in Intellij
45+
## Debugging a smoke test in IntelliJ
4646

4747
Add `-PsmokeTestRemoteDebug=true` to the gradle args, e.g.
4848

@@ -52,7 +52,7 @@ Then create a Remote JVM Debug configuration, e.g.
5252

5353
![Create a Remote JVM Debug configuration](docs/intellij-debug-smoke-test-part-2.png)
5454

55-
Then run (not debug) the smoke test as above in [Running the smoke tests from Intellij](#running-a-smoke-test-in-intellij).
55+
Then run (not debug) the smoke test as above in [Running the smoke tests from IntelliJ](#running-a-smoke-test-in-intellij).
5656

5757
The JVM inside the container will wait remote debugger to be attached before starting.
5858

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-profiler/request-triggers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Each individual configuration is formed of:
8181
supported type).
8282
- `profileDuration` - The duration in seconds of the profile to be collected when this SLA is
8383
breached.
84-
- `threshold` - The threshould applied to the output of the aggregation, if this value is breached a
84+
- `threshold` - The threshold applied to the output of the aggregation, if this value is breached a
8585
profile will be triggered, i.e the `breach-ratio` aggregation outputs the percentage of requests
8686
that breach the SLA, a threshold of 0.95 would trigger a profile if 95% of requests breach the
8787
SLA.

agent/runtime-attach/src/main/java/com/microsoft/applicationinsights/attach/ApplicationInsights.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
public final class ApplicationInsights {
2323

2424
/**
25-
* This property allows configuring an Application Insights json file. It can be helpful to get an
26-
* Application Insights json file by Spring profile.
25+
* This property allows configuring an Application Insights JSON file. It can be helpful to load
26+
* different Application Insights JSON files based on Spring profile.
2727
*/
2828
public static final String APPLICATIONINSIGHTS_RUNTIME_ATTACH_CONFIGURATION_FILE =
2929
"applicationinsights.runtime-attach.configuration.classpath.file";
@@ -42,7 +42,7 @@ private ApplicationInsights() {}
4242
* Attach the Application Insights agent for Java to the current JVM. The attachment must be
4343
* requested at the beginning of the main method.
4444
*
45-
* @throws ConfigurationException If the file given by the
45+
* @throws ConfigurationException if the file specified by the
4646
* applicationinsights.runtime-attach.configuration.classpath.file property was not found
4747
*/
4848
public static void attach() {

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/AvailabilityTelemetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void setMessage(String message) {
6363
data.setMessage(message);
6464
}
6565

66-
/** Gets a dictionary of custom defined metrics. */
66+
/** Gets a map of custom defined metrics. */
6767
public ConcurrentMap<String, Double> getMetrics() {
6868
return data.getMeasurements();
6969
}

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/BaseTelemetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public TelemetryContext getContext() {
3939
}
4040

4141
/**
42-
* Gets a dictionary of application-defined property names and values providing additional
42+
* Gets a map of application-defined property names and values providing additional
4343
* information about this event.
4444
*/
4545
@Override

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/EventTelemetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void setName(String name) {
4040
data.setName(name);
4141
}
4242

43-
/** Gets a dictionary of custom defined metrics. */
43+
/** Gets a map of custom defined metrics. */
4444
public ConcurrentMap<String, Double> getMetrics() {
4545
return data.getMeasurements();
4646
}

classic-sdk/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public SeverityLevel getSeverityLevel() {
7373
: SeverityLevel.values()[data.getSeverityLevel().getValue()];
7474
}
7575

76-
/** Gets a dictionary of custom defined metrics. */
76+
/** Gets a map of custom defined metrics. */
7777
public ConcurrentMap<String, Double> getMetrics() {
7878
return data.getMeasurements();
7979
}

0 commit comments

Comments
 (0)