Skip to content

Commit ea96260

Browse files
committed
Merge branch 'main' into release-postgres-flexible
2 parents dbb1eb9 + 5d9cb85 commit ea96260

File tree

220 files changed

+1487
-1173
lines changed

Some content is hidden

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

220 files changed

+1487
-1173
lines changed

articles/azure-monitor/app/availability-test-migration.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ We simplify this process by providing clear step-by-step instructions to ensure
1818
The following steps walk you through the process of creating [standard tests](availability-standard-tests.md) that replicate the functionality of your [URL ping tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability). It allows you to more easily start using the advanced features of [standard tests](availability-standard-tests.md) using your previously created [URL ping tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability).
1919

2020
> [!IMPORTANT]
21-
>
22-
> On September 30th, 2026, **[URL ping tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability) retire**. Transition to **[standard tests](/editor/availability-standard-tests.md)** before then.
23-
>
21+
> On September 30th, 2026, **[URL ping tests](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability) will be retired**. Transition to **[standard tests](/editor/availability-standard-tests.md)** before then.
2422
> - A cost is associated with running **[standard tests](/editor/availability-standard-tests.md)**. Once you create a **[standard test](/editor/availability-standard-tests.md)**, you will be charged for test executions.
23+
>
2524
> - Refer to **[Azure Monitor pricing](https://azure.microsoft.com/pricing/details/monitor/#pricing)** before starting this process.
26-
25+
>
2726
### Prerequisites
2827

2928
- Any [URL ping test](/previous-versions/azure/azure-monitor/app/monitor-web-app-availability) within Application Insights

articles/azure-monitor/app/convert-classic-resource.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Your classic resource data persists and is subject to the retention settings on
5353

5454
If you don't need to migrate an existing resource, and instead want to create a new workspace-based Application Insights resource, see the [Workspace-based resource creation guide](create-workspace-resource.md).
5555

56+
> [!NOTE]
57+
> The migration process shouldn't introduce any application downtime or restarts nor change your existing instrumentation key or connection string.
5658
## Prerequisites
5759

5860
- A Log Analytics workspace with the access control mode set to the **Use resource or workspace permissions** setting:
@@ -822,3 +824,4 @@ Legacy table: traces
822824

823825
* [Explore metrics](../essentials/metrics-charts.md)
824826
* [Write Log Analytics queries](../logs/log-query-overview.md)
827+

articles/azure-monitor/app/java-get-started-supplemental.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Application Insights with containers
33
description: This article shows you how to set-up Application Insights
44
ms.topic: conceptual
5-
ms.date: 10/30/2023
5+
ms.date: 12/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
@@ -28,16 +28,16 @@ For more information, see [Use Application Insights Java In-Process Agent in Azu
2828

2929
### Docker entry point
3030

31-
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.18.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
31+
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.19.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
3232

3333
```
34-
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.18.jar", "-jar", "<myapp.jar>"]
34+
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.19.jar", "-jar", "<myapp.jar>"]
3535
```
3636

37-
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.18.jar"` somewhere before `-jar`, for example:
37+
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.19.jar"` somewhere before `-jar`, for example:
3838

3939
```
40-
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.18.jar" -jar <myapp.jar>
40+
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.19.jar" -jar <myapp.jar>
4141
```
4242

4343

@@ -50,16 +50,16 @@ FROM ...
5050
5151
COPY target/*.jar app.jar
5252
53-
COPY agent/applicationinsights-agent-3.4.18.jar applicationinsights-agent-3.4.18.jar
53+
COPY agent/applicationinsights-agent-3.4.19.jar applicationinsights-agent-3.4.19.jar
5454
5555
COPY agent/applicationinsights.json applicationinsights.json
5656
5757
ENV APPLICATIONINSIGHTS_CONNECTION_STRING="CONNECTION-STRING"
5858
59-
ENTRYPOINT["java", "-javaagent:applicationinsights-agent-3.4.18.jar", "-jar", "app.jar"]
59+
ENTRYPOINT["java", "-javaagent:applicationinsights-agent-3.4.19.jar", "-jar", "app.jar"]
6060
```
6161

62-
In this example we have copied the `applicationinsights-agent-3.4.18.jar` and `applicationinsights.json` files from an `agent` folder (you can choose any folder of your machine). These two files have to be in the same folder in the Docker container.
62+
In this example we have copied the `applicationinsights-agent-3.4.19.jar` and `applicationinsights.json` files from an `agent` folder (you can choose any folder of your machine). These two files have to be in the same folder in the Docker container.
6363

6464
### Third-party container images
6565

@@ -81,18 +81,18 @@ For information on setting up the Application Insights Java agent, see [Enabling
8181
If you installed Tomcat via `apt-get` or `yum`, you should have a file `/etc/tomcat8/tomcat8.conf`. Add this line to the end of that file:
8282

8383
```
84-
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.18.jar"
84+
JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.19.jar"
8585
```
8686

8787
#### Tomcat installed via download and unzip
8888

8989
If you installed Tomcat via download and unzip from [https://tomcat.apache.org](https://tomcat.apache.org), you should have a file `<tomcat>/bin/catalina.sh`. Create a new file in the same directory named `<tomcat>/bin/setenv.sh` with the following content:
9090

9191
```
92-
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.18.jar"
92+
CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.4.19.jar"
9393
```
9494

95-
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to `CATALINA_OPTS`.
95+
If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to `CATALINA_OPTS`.
9696

9797
### Tomcat 8 (Windows)
9898

@@ -101,35 +101,35 @@ If the file `<tomcat>/bin/setenv.sh` already exists, modify that file and add `-
101101
Locate the file `<tomcat>/bin/catalina.bat`. Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
102102

103103
```
104-
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.18.jar
104+
set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.19.jar
105105
```
106106

107107
Quotes aren't necessary, but if you want to include them, the proper placement is:
108108

109109
```
110-
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.18.jar"
110+
set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.4.19.jar"
111111
```
112112

113-
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to `CATALINA_OPTS`.
113+
If the file `<tomcat>/bin/setenv.bat` already exists, modify that file and add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to `CATALINA_OPTS`.
114114

115115
#### Run Tomcat as a Windows service
116116

117-
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the `Java Options` under the `Java` tab.
117+
Locate the file `<tomcat>/bin/tomcat8w.exe`. Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to the `Java Options` under the `Java` tab.
118118

119119
### JBoss EAP 7
120120

121121
#### Standalone server
122122

123-
Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
123+
Add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
124124

125125
```java ...
126-
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.18.jar -Xms1303m -Xmx1303m ..."
126+
JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.4.19.jar -Xms1303m -Xmx1303m ..."
127127
...
128128
```
129129

130130
#### Domain server
131131

132-
Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
132+
Add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
133133

134134
```xml
135135
...
@@ -139,7 +139,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `j
139139
<jvm-options>
140140
<option value="-server"/>
141141
<!--Add Java agent jar file here-->
142-
<option value="-javaagent:path/to/applicationinsights-agent-3.4.18.jar"/>
142+
<option value="-javaagent:path/to/applicationinsights-agent-3.4.19.jar"/>
143143
<option value="-XX:MetaspaceSize=96m"/>
144144
<option value="-XX:MaxMetaspaceSize=256m"/>
145145
</jvm-options>
@@ -178,19 +178,19 @@ Add these lines to `start.ini`:
178178

179179
```
180180
--exec
181-
-javaagent:path/to/applicationinsights-agent-3.4.18.jar
181+
-javaagent:path/to/applicationinsights-agent-3.4.19.jar
182182
```
183183

184184
### Payara 5
185185

186-
Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
186+
Add `-javaagent:path/to/applicationinsights-agent-3.4.19.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
187187

188188
```xml
189189
...
190190
<java-config ...>
191191
<!--Edit the JVM options here-->
192192
<jvm-options>
193-
-javaagent:path/to/applicationinsights-agent-3.4.18.jar>
193+
-javaagent:path/to/applicationinsights-agent-3.4.19.jar>
194194
</jvm-options>
195195
...
196196
</java-config>
@@ -209,7 +209,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `j
209209
1. In `Generic JVM arguments`, add the following JVM argument:
210210
211211
```
212-
-javaagent:path/to/applicationinsights-agent-3.4.18.jar
212+
-javaagent:path/to/applicationinsights-agent-3.4.19.jar
213213
```
214214
215215
1. Save and restart the application server.
@@ -219,7 +219,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.4.18.jar` to the existing `j
219219
Create a new file `jvm.options` in the server directory (for example, `<openliberty>/usr/servers/defaultServer`), and add this line:
220220
221221
```
222-
-javaagent:path/to/applicationinsights-agent-3.4.18.jar
222+
-javaagent:path/to/applicationinsights-agent-3.4.19.jar
223223
```
224224
225225
### Others

articles/azure-monitor/app/java-spring-boot.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure Azure Monitor Application Insights for Spring Boot
33
description: How to configure Azure Monitor Application Insights for Spring Boot applications
44
ms.topic: conceptual
5-
ms.date: 10/30/2023
5+
ms.date: 12/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
---
@@ -16,24 +16,24 @@ There are two options for enabling Application Insights Java with Spring Boot: J
1616

1717
## Enabling with JVM argument
1818

19-
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.18.jar"` somewhere before `-jar`, for example:
19+
Add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.19.jar"` somewhere before `-jar`, for example:
2020

2121
```
22-
java -javaagent:"path/to/applicationinsights-agent-3.4.18.jar" -jar <myapp.jar>
22+
java -javaagent:"path/to/applicationinsights-agent-3.4.19.jar" -jar <myapp.jar>
2323
```
2424

2525
### Spring Boot via Docker entry point
2626

27-
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.18.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
27+
If you're using the *exec* form, add the parameter `-javaagent:"path/to/applicationinsights-agent-3.4.19.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
2828

2929
```
30-
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.18.jar", "-jar", "<myapp.jar>"]
30+
ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.4.19.jar", "-jar", "<myapp.jar>"]
3131
```
3232

33-
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.18.jar"` somewhere before `-jar`, for example:
33+
If you're using the *shell* form, add the JVM arg `-javaagent:"path/to/applicationinsights-agent-3.4.19.jar"` somewhere before `-jar`, for example:
3434

3535
```
36-
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.18.jar" -jar <myapp.jar>
36+
ENTRYPOINT java -javaagent:"path/to/applicationinsights-agent-3.4.19.jar" -jar <myapp.jar>
3737
```
3838

3939
### Configuration
@@ -48,7 +48,7 @@ To enable Application Insights Java programmatically, you must add the following
4848
<dependency>
4949
<groupId>com.microsoft.azure</groupId>
5050
<artifactId>applicationinsights-runtime-attach</artifactId>
51-
<version>3.4.18</version>
51+
<version>3.4.19</version>
5252
</dependency>
5353
```
5454

articles/azure-monitor/app/java-standalone-config.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configuration options - Azure Monitor Application Insights for Java
33
description: This article shows you how to configure Azure Monitor Application Insights for Java.
44
ms.topic: conceptual
5-
ms.date: 12/15/2023
5+
ms.date: 12/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
@@ -30,14 +30,14 @@ More information and configuration options are provided in the following section
3030

3131
## Configuration file path
3232

33-
By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.4.18.jar`.
33+
By default, Application Insights Java 3.x expects the configuration file to be named `applicationinsights.json`, and to be located in the same directory as `applicationinsights-agent-3.4.19.jar`.
3434

3535
You can specify your own configuration file path by using one of these two options:
3636

3737
* `APPLICATIONINSIGHTS_CONFIGURATION_FILE` environment variable
3838
* `applicationinsights.configuration.file` Java system property
3939

40-
If you specify a relative path, it resolves relative to the directory where `applicationinsights-agent-3.4.18.jar` is located.
40+
If you specify a relative path, it resolves relative to the directory where `applicationinsights-agent-3.4.19.jar` is located.
4141

4242
Alternatively, instead of using a configuration file, you can specify the entire _content_ of the JSON configuration via the environment variable `APPLICATIONINSIGHTS_CONFIGURATION_CONTENT`.
4343

@@ -60,7 +60,7 @@ Or you can set the connection string by using the Java system property `applicat
6060

6161
You can also set the connection string by specifying a file to load the connection string from.
6262

63-
If you specify a relative path, it resolves relative to the directory where `applicationinsights-agent-3.4.18.jar` is located.
63+
If you specify a relative path, it resolves relative to the directory where `applicationinsights-agent-3.4.19.jar` is located.
6464

6565
```json
6666
{
@@ -328,7 +328,7 @@ and add `applicationinsights-core` to your application:
328328
<dependency>
329329
<groupId>com.microsoft.azure</groupId>
330330
<artifactId>applicationinsights-core</artifactId>
331-
<version>3.4.18</version>
331+
<version>3.4.19</version>
332332
</dependency>
333333
```
334334

@@ -858,7 +858,7 @@ In the preceding configuration example:
858858

859859
* `level` can be one of `OFF`, `ERROR`, `WARN`, `INFO`, `DEBUG`, or `TRACE`.
860860
* `path` can be an absolute or relative path. Relative paths are resolved against the directory where
861-
`applicationinsights-agent-3.4.18.jar` is located.
861+
`applicationinsights-agent-3.4.19.jar` is located.
862862

863863
Starting from version 3.0.2, you can also set the self-diagnostics `level` by using the environment variable
864864
`APPLICATIONINSIGHTS_SELF_DIAGNOSTICS_LEVEL`. It then takes precedence over the self-diagnostics level specified in the JSON configuration.

articles/azure-monitor/app/java-standalone-upgrade-from-2x.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Upgrading from 2.x - Azure Monitor Application Insights Java
33
description: Upgrading from Azure Monitor Application Insights Java 2.x
44
ms.topic: conceptual
5-
ms.date: 10/30/2023
5+
ms.date: 12/20/2023
66
ms.devlang: java
77
ms.custom: devx-track-java, devx-track-extended-java
88
ms.reviewer: mmcc
@@ -29,7 +29,7 @@ There are typically no code changes when upgrading to 3.x. The 3.x SDK dependenc
2929
Add the 3.x Java agent to your JVM command-line args, for example
3030

3131
```
32-
-javaagent:path/to/applicationinsights-agent-3.4.18.jar
32+
-javaagent:path/to/applicationinsights-agent-3.4.19.jar
3333
```
3434

3535
If you're using the Application Insights 2.x Java agent, just replace your existing `-javaagent:...` with the aforementioned example.

articles/azure-monitor/app/javascript-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Two methods are available to add the code to enable Application Insights via the
4343
| Method | When would I use this method? |
4444
|:-------|:------------------------------|
4545
| JavaScript (Web) SDK Loader Script | For most customers, we recommend the JavaScript (Web) SDK Loader Script because you never have to update the SDK and you get the latest updates automatically. Also, you have control over which pages you add the Application Insights JavaScript SDK to. |
46-
| npm package | You want to bring the SDK into your code and enable IntelliSense. This option is only needed for developers who require more custom events and configuration. |
46+
| npm package | You want to bring the SDK into your code and enable IntelliSense. This option is only needed for developers who require more custom events and configuration. This method is required if you plan to use the React, React Native, or Angular Framework Extension. |
4747

4848
#### [JavaScript (Web) SDK Loader Script](#tab/javascriptwebsdkloaderscript)
4949

articles/azure-monitor/app/opentelemetry-add-modify.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,15 @@ You can collect more data automatically when you include instrumentation librari
230230

231231
### [ASP.NET Core](#tab/aspnetcore)
232232

233-
To add a community library, use the `ConfigureOpenTelemetryMeterProvider` or `ConfigureOpenTelemetryTracerProvider` methods.
233+
To add a community library, use the `ConfigureOpenTelemetryMeterProvider` or `ConfigureOpenTelemetryTracerProvider` methods,
234+
after adding the nuget package for the library.
234235

235236
The following example demonstrates how the [Runtime Instrumentation](https://www.nuget.org/packages/OpenTelemetry.Instrumentation.Runtime) can be added to collect extra metrics.
236237

238+
```dotnetcli
239+
dotnet add package OpenTelemetry.Instrumentation.Runtime
240+
```
241+
237242
```csharp
238243
// Create a new ASP.NET Core web application builder.
239244
var builder = WebApplication.CreateBuilder(args);

articles/azure-monitor/app/opentelemetry-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ You might want to enable the OpenTelemetry Protocol (OTLP) Exporter alongside th
702702
1. Install the [OpenTelemetry.Exporter.OpenTelemetryProtocol](https://www.nuget.org/packages/OpenTelemetry.Exporter.OpenTelemetryProtocol/) package in your project.
703703
704704
```dotnetcli
705-
dotnet add package --prerelease OpenTelemetry.Exporter.OpenTelemetryProtocol
705+
dotnet add package OpenTelemetry.Exporter.OpenTelemetryProtocol
706706
```
707707

708708
1. Add the following code snippet. This example assumes you have an OpenTelemetry Collector with an OTLP receiver running. For details, see the [example on GitHub](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/examples/Console/TestOtlpExporter.cs).

0 commit comments

Comments
 (0)