Skip to content

Commit bbcf759

Browse files
Merge pull request #235606 from KarlErickson/karler-fix-108632
fixes MicrosoftDocs/azure-docs#108632
2 parents bba8106 + 51c6f85 commit bbcf759

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

articles/spring-apps/quickstart-deploy-apps.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Use the following steps to create and deploys apps on Azure Spring Apps using th
224224
az configure --defaults group=<resource-group-name> spring=<service-name>
225225
```
226226

227-
1. Create the two core Spring applications for PetClinic: API gateway and customers-service.
227+
1. Create the two core Spring applications for PetClinic: `api-gateway` and `customers-service`.
228228

229229
```azurecli
230230
az spring app create \
@@ -270,12 +270,12 @@ Use the following steps to create and deploys apps on Azure Spring Apps using th
270270

271271
## Verify the services
272272

273-
Access the app gateway and customers service from browser with the **Public Url** shown previously, in the format of `https://<service name>-api-gateway.azuremicroservices.io`.
273+
Access `api-gateway` and `customers-service` from a browser with the **Public Url** shown previously, in the format of `https://<service name>-api-gateway.azuremicroservices.io`.
274274

275275
:::image type="content" source="media/quickstart-deploy-apps/access-customers-service.png" alt-text="Screenshot of the PetClinic customers service." lightbox="media/quickstart-deploy-apps/access-customers-service.png":::
276276

277277
> [!TIP]
278-
> To troubleshot deployments, you can use the following command to get logs streaming in real time whenever the app is running `az spring app logs --name <app name> -f`.
278+
> To troubleshot deployments, you can use the following command to get logs streaming in real time whenever the app is running `az spring app logs --name <app name> --follow`.
279279
280280
## Deploy extra apps
281281

@@ -431,7 +431,7 @@ To deploy to Azure, you must sign in with your Azure account with Azure Toolkit
431431
:::image type="content" source="media/quickstart-deploy-apps/memory-jvm-options.png" alt-text="Screenshot of memory and JVM options." lightbox="media/quickstart-deploy-apps/memory-jvm-options.png":::
432432

433433
1. In the **Before launch** section of the dialog, double-click **Run Maven Goal**.
434-
1. In the **Working directory** textbox, navigate to the *spring-petclinic-microservices/gateway* folder.
434+
1. In the **Working directory** textbox, navigate to the *spring-petclinic-microservices/spring-petclinic-api-gateway* folder.
435435
1. In the **Command line** textbox, enter *package -DskipTests*. Select **OK**.
436436

437437
:::image type="content" source="media/quickstart-deploy-apps/deploy-to-azure-spring-apps-2-pet-clinic.png" alt-text="Screenshot of the spring-petclinic-microservices/gateway page and command line textbox." lightbox="media/quickstart-deploy-apps/deploy-to-azure-spring-apps-2-pet-clinic.png":::

articles/spring-apps/quickstart-logs-metrics-tracing.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ zone_pivot_groups: programming-languages-spring-apps
1515
> [!NOTE]
1616
> Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
1717
18-
**This article applies to:** ✔️ Basic/Standard tier ❌ Enterprise tier
18+
**This article applies to:** ✔️ Basic/Standard ❌ Enterprise
1919

2020
::: zone pivot="programming-language-csharp"
2121

@@ -41,10 +41,10 @@ There are two ways to see logs on Azure Spring Apps: **Log Streaming** of real-t
4141
You can use log streaming in the Azure CLI with the following command.
4242

4343
```azurecli
44-
az spring app logs -n solar-system-weather -f
44+
az spring app logs --name solar-system-weather --follow
4545
```
4646

47-
You'll see output similar to the following example:
47+
You're shown output similar to the following example:
4848

4949
```output
5050
=> ConnectionId:0HM2HOMHT82UK => RequestPath:/weatherforecast RequestId:0HM2HOMHT82UK:00000003, SpanId:|e8c1682e-46518cc0202c5fd9., TraceId:e8c1682e-46518cc0202c5fd9, ParentId: => Microsoft.Azure.SpringCloud.Sample.SolarSystemWeather.Controllers.WeatherForecastController.Get (Microsoft.Azure.SpringCloud.Sample.SolarSystemWeather)
@@ -71,7 +71,7 @@ Executing ObjectResult, writing value of type 'System.Collections.Generic.KeyVal
7171

7272
1. Edit the query to remove the Where clauses that limit the display to warning and error logs.
7373

74-
1. Then select **Run**, and you'll see logs. For more information, see [Get started with log queries in Azure Monitor](../azure-monitor/logs/get-started-queries.md).
74+
1. Select **Run**. You're shown logs. For more information, see [Get started with log queries in Azure Monitor](../azure-monitor/logs/get-started-queries.md).
7575

7676
:::image type="content" source="media/quickstart-logs-metrics-tracing/logs-query-steeltoe.png" alt-text="Screenshot of a Logs Analytics query." lightbox="media/quickstart-logs-metrics-tracing/logs-query-steeltoe.png":::
7777

@@ -135,10 +135,14 @@ There are two ways to see logs on Azure Spring Apps: **Log Streaming** of real-t
135135
You can use log streaming in the Azure CLI with the following command.
136136

137137
```azurecli
138-
az spring app logs -s <service instance name> -g <resource group name> -n gateway -f
138+
az spring app logs \
139+
--resource-group <resource-group-name> \
140+
--service <service-instance-name> \
141+
--name api-gateway \
142+
--follow
139143
```
140144

141-
You'll see logs like this:
145+
You're shown logs like this:
142146

143147
:::image type="content" source="media/quickstart-logs-metrics-tracing/logs-streaming-cli.png" alt-text="Screenshot of CLI log output." lightbox="media/quickstart-logs-metrics-tracing/logs-streaming-cli.png":::
144148

@@ -163,7 +167,7 @@ To get the logs using Azure Toolkit for IntelliJ:
163167

164168
![Select instance](media/quickstart-logs-metrics-tracing/select-instance.png)
165169

166-
1. The streaming log will be visible in the output window.
170+
1. The streaming log is visible in the output window.
167171

168172
![Streaming log output](media/quickstart-logs-metrics-tracing/streaming-log-output.png)
169173

@@ -177,7 +181,7 @@ To get the logs using Azure Toolkit for IntelliJ:
177181

178182
:::image type="content" source="media/quickstart-logs-metrics-tracing/logs-entry.png" alt-text="Screenshot of the Logs opening page." lightbox="media/quickstart-logs-metrics-tracing/logs-entry.png":::
179183

180-
1. Then you'll see filtered logs. For more information, see [Get started with log queries in Azure Monitor](../azure-monitor/logs/get-started-queries.md).
184+
1. Then you're shown filtered logs. For more information, see [Get started with log queries in Azure Monitor](../azure-monitor/logs/get-started-queries.md).
181185

182186
:::image type="content" source="media/quickstart-logs-metrics-tracing/logs-query.png" alt-text="Screenshot of filtered logs." lightbox="media/quickstart-logs-metrics-tracing/logs-query.png":::
183187

@@ -189,16 +193,16 @@ The following chart shows `gateway-requests` (Spring Cloud Gateway), `hikaricp_c
189193

190194
:::image type="content" source="media/quickstart-logs-metrics-tracing/petclinic-microservices-metrics.jpg" alt-text="Screenshot of gateway requests." lightbox="media/quickstart-logs-metrics-tracing/petclinic-microservices-metrics.jpg":::
191195

192-
Spring Boot registers several core metrics, including JVM, CPU, Tomcat, and Logback. The Spring Boot auto-configuration enables the instrumentation of requests handled by Spring MVC. All three REST controllers (`OwnerResource`, `PetResource`, and `VisitResource`) have been instrumented by the `@Timed` Micrometer annotation at the class level.
196+
Spring Boot registers several core metrics, including JVM, CPU, Tomcat, and Logback. The Spring Boot autoconfiguration enables the instrumentation of requests handled by Spring MVC. All three REST controllers (`OwnerResource`, `PetResource`, and `VisitResource`) are instrumented by the `@Timed` Micrometer annotation at the class level.
193197

194198
The `customers-service` application has the following custom metrics enabled:
195199

196-
- @Timed: `petclinic.owner`
197-
- @Timed: `petclinic.pet`
200+
- @Timed: `petclinic.owner`
201+
- @Timed: `petclinic.pet`
198202

199203
The `visits-service` application has the following custom metrics enabled:
200204

201-
- @Timed: `petclinic.visit`
205+
- @Timed: `petclinic.visit`
202206

203207
You can see these custom metrics in the `Metrics` blade:
204208

0 commit comments

Comments
 (0)