Skip to content

Commit fe39024

Browse files
authored
Merge pull request #225382 from v-jbasden/jbasden-rebase-java-otel-merge
Merging Java standalone OTel documentation
2 parents c2cf5f1 + 1bc1aa9 commit fe39024

Some content is hidden

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

42 files changed

+1352
-1785
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5703,13 +5703,18 @@
57035703
"redirect_document_id": false
57045704
},
57055705
{
5706+
"source_path_from_root": "/articles/azure-monitor/alerts/proactive-performance-diagnostics.md",
5707+
"redirect_url": "https://azure.microsoft.com/updates/public-preview-alerts-based-smart-detection-for-application-insights/",
5708+
"redirect_document_id": false
5709+
},
5710+
{
57065711
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-resource-log-schema.md",
57075712
"redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
57085713
"redirect_document_id": false
57095714
},
5710-
{
5711-
"source_path_from_root": "/articles/azure-monitor/alerts/proactive-performance-diagnostics.md",
5712-
"redirect_url": "https://azure.microsoft.com/updates/public-preview-alerts-based-smart-detection-for-application-insights/",
5715+
{
5716+
"source_path_from_root": "/articles/azure-monitor/app/java-in-process-agent.md",
5717+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
57135718
"redirect_document_id": false
57145719
}
57155720
]

articles/aks/monitor-aks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Application Insights provides complete monitoring of applications running on AKS
177177
- [ASP.NET Applications](../azure-monitor/app/asp-net.md)
178178
- [ASP.NET Core Applications](../azure-monitor/app/asp-net-core.md)
179179
- [.NET Console Applications](../azure-monitor/app/console.md)
180-
- [Java](../azure-monitor/app/java-in-process-agent.md)
180+
- [Java](../azure-monitor/app/opentelemetry-enable.md?tabs=java)
181181
- [Node.js](../azure-monitor/app/nodejs.md)
182182
- [Python](../azure-monitor/app/opencensus-python.md)
183183
- [Other platforms](../azure-monitor/app/app-insights-overview.md#supported-languages)

articles/azure-monitor/alerts/proactive-trace-severity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Traces are widely used in applications, and they help tell the story of what hap
1717

1818
It's normal to expect some level of “Bad” traces because of any number of reasons, such as transient network issues. But when a real problem begins growing, it usually manifests as an increase in the relative proportion of “bad” traces vs “good” traces. Smart detection automatically analyzes the trace telemetry that your application logs, and can warn you about unusual patterns in their severity.
1919

20-
This feature requires no special setup, other than configuring trace logging for your app. See how to configure a trace log listener for [.NET](../app/asp-net-trace-logs.md) or [Java](../app/java-in-process-agent.md). It's active when your app generates enough trace telemetry.
20+
This feature requires no special setup, other than configuring trace logging for your app. See how to configure a trace log listener for [.NET](../app/asp-net-trace-logs.md) or [Java](../app/opentelemetry-enable.md?tabs=java). It's active when your app generates enough trace telemetry.
2121

2222
## When would I get this type of smart detection notification?
2323
You get this type of notification if the ratio between “good” traces (traces logged with a level of *Info* or *Verbose*) and “bad” traces (traces logged with a level of *Warning*, *Error*, or *Fatal*) is degrading in a specific day, compared to a baseline calculated over the previous seven days.

articles/azure-monitor/app/api-custom-events-metrics.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you don't have a reference on Application Insights SDK yet:
3939

4040
* [ASP.NET project](./asp-net.md)
4141
* [ASP.NET Core project](./asp-net-core.md)
42-
* [Java project](./java-in-process-agent.md)
42+
* [Java project](./opentelemetry-enable.md?tabs=java)
4343
* [Node.js project](./nodejs.md)
4444
* [JavaScript in each webpage](./javascript.md)
4545
* In your device or web server code, include:
@@ -427,7 +427,7 @@ catch (ex)
427427
The SDKs catch many exceptions automatically, so you don't always have to call `TrackException` explicitly:
428428

429429
* **ASP.NET**: [Write code to catch exceptions](./asp-net-exceptions.md).
430-
* **Java EE**: [Exceptions are caught automatically](./java-in-process-agent.md).
430+
* **Java EE**: [Exceptions are caught automatically](./opentelemetry-enable.md?tabs=java).
431431
* **JavaScript**: Exceptions are caught automatically. If you want to disable automatic collection, add a line to the code snippet that you insert in your webpages:
432432

433433
```javascript
@@ -468,7 +468,7 @@ Use `TrackTrace` to help diagnose problems by sending a "breadcrumb trail" to Ap
468468

469469
In .NET [Log adapters](./asp-net-trace-logs.md), use this API to send third-party logs to the portal.
470470

471-
In Java, the [Application Insights Java agent](java-in-process-agent.md) autocollects and sends logs to the portal.
471+
In Java, the [Application Insights Java agent](opentelemetry-enable.md?tabs=java) autocollects and sends logs to the portal.
472472

473473
*C#*
474474

@@ -612,7 +612,7 @@ finally
612612
Remember that the server SDKs include a [dependency module](./asp-net-dependencies.md) that discovers and tracks certain dependency calls automatically, for example, to databases and REST APIs. You have to install an agent on your server to make the module work.
613613

614614
In Java, many dependency calls can be automatically tracked by using the
615-
[Application Insights Java agent](java-in-process-agent.md).
615+
[Application Insights Java agent](opentelemetry-enable.md?tabs=java).
616616

617617
You use this call if you want to track calls that the automated tracking doesn't catch.
618618

articles/azure-monitor/app/app-insights-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ A preview [Open Telemetry](opentelemetry-enable.md?tabs=net) offering is also av
7474

7575
Integrated Auto-Instrumentation is available for Java Apps hosted on [Azure App Service](azure-web-apps-java.md) and [Azure Functions](monitor-functions.md).
7676

77-
Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](java-in-process-agent.md).
77+
Auto-instrumentation is available for any environment using [Azure Monitor OpenTelemetry-based auto-instrumentation for Java applications](opentelemetry-enable.md?tabs=java).
7878

7979
### [Node.js](#tab/nodejs)
8080

@@ -102,7 +102,7 @@ A preview [Open Telemetry](opentelemetry-enable.md?tabs=python) offering is also
102102
This section outlines supported scenarios.
103103

104104
* [C#|VB (.NET)](./asp-net.md)
105-
* [Java](./java-in-process-agent.md)
105+
* [Java](./opentelemetry-enable.md?tabs=java)
106106
* [JavaScript](./javascript.md)
107107
* [Node.js](./nodejs.md)
108108
* [Python](./opencensus-python.md)
@@ -121,7 +121,7 @@ Supported platforms and frameworks are listed here.
121121
#### Auto-instrumentation (enable without code changes)
122122
* [ASP.NET - for web apps hosted with IIS](./status-monitor-v2-overview.md)
123123
* [ASP.NET Core - for web apps hosted with IIS](./status-monitor-v2-overview.md)
124-
* [Java](./java-in-process-agent.md)
124+
* [Java](./opentelemetry-enable.md?tabs=java)
125125

126126
#### Manual instrumentation / SDK (some code changes required)
127127
* [ASP.NET](./asp-net.md)
@@ -143,7 +143,7 @@ Supported platforms and frameworks are listed here.
143143
### Logging frameworks
144144
* [ILogger](./ilogger.md)
145145
* [Log4Net, NLog, or System.Diagnostics.Trace](./asp-net-trace-logs.md)
146-
* [Log4J, Logback, or java.util.logging](./java-in-process-agent.md#autocollected-logs)
146+
* [Log4J, Logback, or java.util.logging](./opentelemetry-enable.md?tabs=java#logs)
147147
* [LogStash plug-in](https://github.com/Azure/azure-diagnostics-tools/tree/master/Logstash/logstash-output-applicationinsights)
148148
* [Azure Monitor](/archive/blogs/msoms/application-insights-connector-in-oms)
149149

articles/azure-monitor/app/asp-net-dependencies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Below is the currently supported list of dependency calls that are automatically
252252
### Java
253253

254254
See the list of Application Insights Java's
255-
[autocollected dependencies](java-in-process-agent.md#autocollected-dependencies).
255+
[autocollected dependencies](opentelemetry-enable.md?tabs=java#distributed-tracing).
256256

257257
### Node.js
258258

@@ -269,7 +269,7 @@ A list of the latest [currently supported modules](https://github.com/microsoft/
269269
* [Exceptions](./asp-net-exceptions.md)
270270
* [User and page data](./javascript.md)
271271
* [Availability](./monitor-web-app-availability.md)
272-
* Set up custom dependency tracking for [Java](java-in-process-agent.md#add-spans-by-using-the-opentelemetry-annotation).
272+
* Set up custom dependency tracking for [Java](opentelemetry-enable.md?tabs=java#add-custom-spans).
273273
* Set up custom dependency tracking for [OpenCensus Python](./opencensus-python-dependency.md).
274274
* [Write custom dependency telemetry](./api-custom-events-metrics.md#trackdependency)
275275
* See [data model](./data-model.md) for Application Insights types and data model.

articles/azure-monitor/app/asp-net-exceptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To have exceptions reported from your server-side application, consider the foll
2323

2424
* Add the [Application Insights Extension](./azure-web-apps.md) for Azure web apps.
2525
* Add the [Application Monitoring Extension](./azure-vm-vmss-apps.md) for Azure Virtual Machines and Azure Virtual Machine Scale Sets IIS-hosted apps.
26-
* Install [Application Insights SDK](./asp-net.md) in your app code, run [Application Insights Agent](./status-monitor-v2-overview.md) for IIS web servers, or enable the [Java agent](./java-in-process-agent.md) for Java web apps.
26+
* Install [Application Insights SDK](./asp-net.md) in your app code, run [Application Insights Agent](./status-monitor-v2-overview.md) for IIS web servers, or enable the [Java agent](./opentelemetry-enable.md?tabs=java) for Java web apps.
2727

2828
### Client side
2929

articles/azure-monitor/app/asp-net-trace-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ System.Diagnostics.Tracing has an [Autoflush feature](/dotnet/api/system.diagnos
214214

215215
### How do I do this for Java?
216216

217-
In Java codeless instrumentation, which is recommended, the logs are collected out of the box. Use [Java 3.0 agent](./java-in-process-agent.md).
217+
In Java codeless instrumentation, which is recommended, the logs are collected out of the box. Use [Java 3.0 agent](./opentelemetry-enable.md?tabs=java).
218218

219219
The Application Insights Java agent collects logs from Log4j, Logback, and java.util.logging out of the box.
220220

articles/azure-monitor/app/azure-ad-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ appInsights.defaultClient.config.aadTokenCredential = credential;
139139
> [!NOTE]
140140
> Support for Azure AD in the Application Insights Java agent is included starting with [Java 3.2.0-BETA](https://github.com/microsoft/ApplicationInsights-Java/releases/tag/3.2.0-BETA).
141141
142-
1. [Configure your application with the Java agent](java-in-process-agent.md#get-started).
142+
1. [Configure your application with the Java agent.](opentelemetry-enable.md?tabs=java#get-started)
143143

144144
> [!IMPORTANT]
145145
> Use the full connection string, which includes `IngestionEndpoint`, when you configure your app with the Java agent. For example, use `InstrumentationKey=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX;IngestionEndpoint=https://XXXX.applicationinsights.azure.com/`.

articles/azure-monitor/app/azure-vm-vmss-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The Application Insights Agent autocollects the same dependency signals out of t
3333

3434
### [Java](#tab/Java)
3535

36-
We recommend the [Application Insights Java 3.0 agent](./java-in-process-agent.md) for Java. The most popular libraries, frameworks, logs, and dependencies are [autocollected](./java-in-process-agent.md#autocollected-requests), along with many [other configurations](./java-standalone-config.md).
36+
We recommend the [Application Insights Java 3.0 agent](./opentelemetry-enable.md?tabs=java) for Java. The most popular libraries, frameworks, logs, and dependencies are [autocollected](./java-in-process-agent.md#autocollected-requests), along with many [other configurations](./java-standalone-config.md).
3737

3838
### [Node.js](#tab/nodejs)
3939

0 commit comments

Comments
 (0)