Merge pull request #209273 from trask/remove-more-2x-links

Replace more 2.x links with 3.x links

Author: 19BMG00

articles/azure-monitor/app/auto-collect-dependencies.md

@@ -34,31 +34,9 @@ Below is the currently supported list of dependency calls that are automatically
 
 
 ## Java
-| App servers | Versions |
-|-------------|----------|
-| [Tomcat](https://tomcat.apache.org/) | 7, 8 | 
-| [JBoss EAP](https://developers.redhat.com/products/eap/download/) | 6, 7 |
-| [Jetty](https://www.eclipse.org/jetty/) | 9 |
-| <b>App frameworks </b> |  |
-| [Spring](https://spring.io/) | 3.0 |
-| [Spring Boot](https://spring.io/projects/spring-boot) | 1.5.9+<sup>*</sup> |
-| Java Servlet | 3.1+ |
-| <b>Communication libraries</b> |  |
-| [Apache Http Client](https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient) | 4.3+<sup>†</sup> |
-| <b>Storage clients</b> | |
-| [SQL Server]( https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc) | 1+<sup>†</sup> |
-| [PostgreSQL (Beta Support)](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md#version-240-beta) | |
-| [Oracle]( https://www.oracle.com/technetwork/database/application-development/jdbc/downloads/index.html) | 1+<sup>†</sup> |
-| [MySql]( https://mvnrepository.com/artifact/mysql/mysql-connector-java) | 1+<sup>†</sup> |
-| <b>Logging libraries</b> | |
-| [Logback](https://logback.qos.ch/) | 1+ |
-| [Log4j](https://logging.apache.org/log4j/) | 1.2+ |
-| <b>Metrics libraries</b> |  |
-| JMX | 1.0+ |
 
-> [!NOTE]
-> *Except reactive programing support.
-> <br>†Requires installation of [JVM Agent](java-2x-agent.md#install-the-application-insights-agent-for-java).
+See the list of Application Insights Java's
+[autocollected dependencies](java-in-process-agent.md#autocollected-dependencies).
 
 ## Node.js
 
@@ -73,7 +51,7 @@ A list of the latest [currently-supported modules](https://github.com/microsoft/
 ## Next steps
 
 - Set up custom dependency tracking for [.NET](./asp-net-dependencies.md).
-- Set up custom dependency tracking for [Java](java-2x-agent.md).
+- Set up custom dependency tracking for [Java](java-in-process-agent.md#add-spans).
 - Set up custom dependency tracking for [OpenCensus Python](./opencensus-python-dependency.md).
 - [Write custom dependency telemetry](./api-custom-events-metrics.md#trackdependency)
 - See [data model](./data-model.md) for Application Insights types and data model.

articles/azure-monitor/app/correlation.md

@@ -304,19 +304,19 @@ The Application Insights .NET SDK uses `DiagnosticSource` and `Activity` to coll
 <a name="java-correlation"></a>
 ## Telemetry correlation in Java
 
-[Java agent](./java-in-process-agent.md) supports automatic correlation of telemetry. It automatically populates `operation_id` for all telemetry (like traces, exceptions, and custom events) issued within the scope of a request. It also propagates the correlation headers (described earlier) for service-to-service calls via HTTP, if the [Java SDK agent](java-2x-agent.md) is configured.
+[Application Insights Java](./java-in-process-agent.md) supports automatic correlation of telemetry.
+It automatically populates `operation_id` for all telemetry (like traces, exceptions, and custom events) issued within the scope of a request. It also propagates the correlation headers (described earlier) for service-to-service calls via HTTP, RPC, and messaging. See the list of Application Insights Java's
+[autocollected dependencies which support distributed trace propagation](java-in-process-agent.md#autocollected-dependencies).
 
 > [!NOTE]
-> Application Insights Java agent auto-collects requests and dependencies for JMS, Kafka, Netty/Webflux, and more. For Java SDK only calls made via Apache HttpClient are supported for the correlation feature. Automatic context propagation across messaging technologies (like Kafka, RabbitMQ, and Azure Service Bus) isn't supported in the SDK.
-
-> [!NOTE]
-> To collect custom telemetry you need to instrument the application with Java 2.6 SDK.
+> See [custom telemetry](./java-in-process-agent.md#custom-telemetry) if the auto-instrumentation does not cover all
+> of your needs.
 
 ### Role names
 
 You might want to customize the way component names are displayed in the [Application Map](../../azure-monitor/app/app-map.md). To do so, you can manually set the `cloud_RoleName` by taking one of the following actions:
 
-- For Application Insights Java agent 3.0, set the cloud role name as follows:
+- For Application Insights Java, set the cloud role name as follows:
 
     ```json
     {
@@ -325,27 +325,9 @@ You might want to customize the way component names are displayed in the [Applic
       }
     }
     ```
-    You can also set the cloud role name using the environment variable `APPLICATIONINSIGHTS_ROLE_NAME`.
-
-- With Application Insights Java SDK 2.5.0 and later, you can specify the `cloud_RoleName`
-  by adding `<RoleName>` to your ApplicationInsights.xml file:
-
-:::image type="content" source="media/migrate-from-instrumentation-keys-to-connection-strings/migrate-from-instrumentation-keys-to-connection-strings.png" alt-text="Screenshot displaying Application Insights overview and connection string." lightbox="media/migrate-from-instrumentation-keys-to-connection-strings/migrate-from-instrumentation-keys-to-connection-strings.png":::
-
-  ```xml
-  <?xml version="1.0" encoding="utf-8"?>
-  <ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
-     <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-000000000000</ConnectionString>
-     <RoleName>** Your role name **</RoleName>
-     ...
-  </ApplicationInsights>
-  ```
-
-- If you use Spring Boot with the Application Insights Spring Boot Starter, you just need to set your custom name for the application in the application.properties file:
-
-  `spring.application.name=<name-of-app>`
 
-  The Spring Boot Starter automatically assigns `cloudRoleName` to the value you enter for the `spring.application.name` property.
+    You can also set the cloud role name using via environment variable or system property,
+    see [configuring cloud role name](./java-standalone-config.md#cloud-role-name) for details.
 
 ## Next steps
 

articles/azure-monitor/app/data-model-dependency-telemetry.md

@@ -53,7 +53,7 @@ Indication of successful or unsuccessful call.
 ## Next steps
 
 - Set up dependency tracking for [.NET](./asp-net-dependencies.md).
-- Set up dependency tracking for [Java](java-2x-agent.md).
+- Set up dependency tracking for [Java](./java-in-process-agent.md).
 - [Write custom dependency telemetry](./api-custom-events-metrics.md#trackdependency)
 - See [data model](data-model.md) for Application Insights types and data model.
 - Check out [platforms](./platforms.md) supported by Application Insights.

articles/azure-monitor/app/data-model-trace-telemetry.md

@@ -26,7 +26,7 @@ Trace severity level. Value can be `Verbose`, `Information`, `Warning`, `Error`,
 ## Next steps
 
 - [Explore .NET trace logs in Application Insights](./asp-net-trace-logs.md).
-- [Explore Java trace logs in Application Insights](java-2x-trace-logs.md).
+- [Explore Java trace logs in Application Insights](./java-in-process-agent.md#autocollected-logs).
 - See [data model](data-model.md) for Application Insights types and data model.
 - [Write custom trace telemetry](./api-custom-events-metrics.md#tracktrace)
 - Check out [platforms](./platforms.md) supported by Application Insights.

articles/azure-monitor/app/data-retention-privacy.md

@@ -40,7 +40,7 @@ There are three sources of data:
 
   * Each SDK has many [modules](./configuration-with-applicationinsights-config.md), which use different techniques to collect different types of telemetry.
   * If you install the SDK in development, you can use its API to send your own telemetry, in addition to the standard modules. This custom telemetry can include any data you want to send.
-* In some web servers, there are also agents that run alongside the app and send telemetry about CPU, memory, and network occupancy. For example, Azure VMs, Docker hosts, and [Java EE servers](java-2x-agent.md) can have such agents.
+* In some web servers, there are also agents that run alongside the app and send telemetry about CPU, memory, and network occupancy. For example, Azure VMs, Docker hosts, and [Java application servers](./java-in-process-agent.md) can have such agents.
 * [Availability tests](./monitor-web-app-availability.md) are processes run by Microsoft that send requests to your web app at regular intervals. The results are sent to the Application Insights service.
 
 ### What kinds of data are collected?

articles/azure-monitor/app/diagnostic-search.md

@@ -125,7 +125,7 @@ The first time you do this, you are asked to configure a link to your Azure DevO
 
 In addition to the out-of-the-box telemetry sent by Application Insights SDK, you can:
 
-* Capture log traces from your favorite logging framework in [.NET](./asp-net-trace-logs.md) or [Java](java-2x-trace-logs.md). This means you can search through your log traces and correlate them with page views, exceptions, and other events.
+* Capture log traces from your favorite logging framework in [.NET](./asp-net-trace-logs.md) or [Java](./java-in-process-agent.md#autocollected-logs). This means you can search through your log traces and correlate them with page views, exceptions, and other events.
 * [Write code](./api-custom-events-metrics.md) to send custom events, page views, and exceptions.
 
 [Learn how to send logs and custom telemetry to Application Insights](./asp-net-trace-logs.md).

articles/azure-monitor/app/platforms.md

@@ -47,7 +47,7 @@ ms.reviewer: mmcc
 ## Logging frameworks
 * [ILogger](./ilogger.md)
 * [Log4Net, NLog, or System.Diagnostics.Trace](./asp-net-trace-logs.md)
-* [Java, Log4J, or Logback](java-2x-trace-logs.md)
+* [Log4J, Logback, or java.util.logging](./java-in-process-agent.md#autocollected-logs)
 * [LogStash plugin](https://github.com/Azure/azure-diagnostics-tools/tree/master/Logstash/logstash-output-applicationinsights)
 * [Azure Monitor](/archive/blogs/msoms/application-insights-connector-in-oms)
 

articles/azure-monitor/app/sampling.md

@@ -314,38 +314,6 @@ By default no sampling is enabled in the Java auto-instrumentation and SDK. Curr
 * To configure sampling overrides that override the default sampling rate and apply different sampling rates to selected requests and dependencies, use the [sampling override guide](./java-standalone-sampling-overrides.md#getting-started).
 * To configure fixed-rate sampling that applies to all of your telemetry, use the [fixed rate sampling guide](./java-standalone-config.md#sampling).
 
-#### Configuring Java 2.x SDK
-
-1. Download and configure your web application with the latest [Application Insights Java SDK](./java-2x-get-started.md).
-
-2. **Enable the fixed-rate sampling module** by adding the following snippet to `ApplicationInsights.xml` file:
-
-    ```xml
-    <TelemetryProcessors>
-        <BuiltInProcessors>
-            <Processor type="FixedRateSamplingTelemetryProcessor">
-                <!-- Set a percentage close to 100/N where N is an integer. -->
-                <!-- E.g. 50 (=100/2), 33.33 (=100/3), 25 (=100/4), 20, 1 (=100/100), 0.1 (=100/1000) -->
-                <Add name="SamplingPercentage" value="50" />
-            </Processor>
-        </BuiltInProcessors>
-    </TelemetryProcessors>
-    ```
-
-3. You can include or exclude specific types of telemetry from sampling using the following tags inside the `Processor` tag's `FixedRateSamplingTelemetryProcessor`:
-   
-    ```xml
-    <ExcludedTypes>
-        <ExcludedType>Request</ExcludedType>
-    </ExcludedTypes>
-
-    <IncludedTypes>
-        <IncludedType>Exception</IncludedType>
-    </IncludedTypes>
-    ```
-
-The telemetry types that can be included or excluded from sampling are: `Dependency`, `Event`, `Exception`, `PageView`, `Request`, and `Trace`.
-
 > [!NOTE]
 > For the sampling percentage, choose a percentage that is close to 100/N where N is an integer.  Currently sampling doesn't support other values.
 

articles/azure-monitor/app/sdk-connection-string.md

@@ -217,15 +217,6 @@ You can set the connection string in the `applicationinsights.json` configuratio
 
 For more information, [connection string configuration](./java-standalone-config.md#connection-string).
 
-For Application Insights Java 2.x, you can set the connection string in the `ApplicationInsights.xml` configuration file:
-
-```xml
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-000000000000</ConnectionString>
-</ApplicationInsights>
-```
-
 # [JavaScript](#tab/js)
 
 Important: JavaScript doesn't support the use of Environment Variables.