Skip to content

Commit 3f0d7ab

Browse files
huypubhuypub
authored
Merge pull request #241282 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents f33ba35 + e55b381 commit 3f0d7ab

File tree

6 files changed

+82
-47
lines changed

6 files changed

+82
-47
lines changed

‎articles/api-management/policy-fragments.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Limitations:
2828

2929
* A policy fragment can't include a policy section identifier (`<inbound>`, `<outbound>`, etc.) or the `<base/>` element.
3030
* Currently, a policy fragment can't nest another policy fragment.
31+
* The maximum size of a policy fragment is 32 KB.
3132

3233
## Prerequisites
3334

‎articles/cognitive-services/use-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ If you're using a multi-service resource or Language resource, you can update [y
595595
596596
## Next steps
597597
598-
* See [What are Cognitive Services](./what-are-cognitive-services.md) for available features you can develop along with [Azure key vault](../key-vault/general/index.yml).
598+
* See [What are Cognitive Services](./what-are-cognitive-services.md) for available features you can develop along with [Azure Key Vault](../key-vault/general/index.yml).
599599
* For additional information on secure application development, see:
600600
* [Best practices for using Azure Key Vault](../key-vault/general/best-practices.md)
601601
* [Cognitive Services security](cognitive-services-security.md)

‎articles/communication-services/quickstarts/voice-video-calling/includes/call-recording-samples/call-recording-csharp.md

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
author: dbasantes
33
ms.service: azure-communication-services
4-
ms.date: 10/14/2022
4+
ms.date: 06/11/2023
55
ms.topic: include
66
ms.custom: public_preview
77
---
88
## Sample Code
99

10-
You can download the sample app from [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/ServerRecording)
10+
You can download the sample app from [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/CallRecording)
1111

1212
## Prerequisites
1313

1414
- You need an Azure account with an active subscription.
1515
- Deploy a Communication Service resource. Record your resource **connection string**.
1616
- Subscribe to events via [Azure Event Grid](../../../../../event-grid/event-schema-communication-services.md).
17-
- Download the [.NET SDK](https://www.nuget.org/packages/Azure.Communication.CallAutomation/1.0.0-beta.1)
17+
- Download the [.NET SDK](https://dotnet.microsoft.com/en-us/download/dotnet)
1818

1919
## Before you start
2020

@@ -44,7 +44,7 @@ To create a call automation client, you'll use your Communication Services conne
4444
CallAutomationClient callAutomationClient = new CallAutomationClient("<ACSConnectionString>");
4545
```
4646

47-
## 2. Start recording session with StartRecordingOptions using 'StartRecordingAsync' API
47+
## 2. Start recording session with StartRecordingOptions using 'StartAsync' API
4848

4949
Use the `serverCallId` received during initiation of the call.
5050
- RecordingContent is used to pass the recording content type. Use audio
@@ -57,10 +57,10 @@ StartRecordingOptions recordingOptions = new StartRecordingOptions(new ServerCal
5757
RecordingContent = RecordingContent.Audio,
5858
RecordingChannel = RecordingChannel.Unmixed,
5959
RecordingFormat = RecordingFormat.Wav,
60-
RecordingStateCallbackEndpoint = new Uri("<CallbackUri>");
60+
RecordingStateCallbackUri = new Uri("<CallbackUri>");
6161
};
62-
Response<RecordingStateResult> response = await callAutomationClient.getCallRecording()
63-
.StartRecordingAsync(recordingOptions);
62+
Response<RecordingStateResult> response = await callAutomationClient.GetCallRecording()
63+
.StartAsync(recordingOptions);
6464
```
6565

6666
### 2.1. Only for Unmixed - Specify a user on channel 0
@@ -72,36 +72,51 @@ StartRecordingOptions recordingOptions = new StartRecordingOptions(new ServerCal
7272
RecordingContent = RecordingContent.Audio,
7373
RecordingChannel = RecordingChannel.Unmixed,
7474
RecordingFormat = RecordingFormat.Wav,
75-
RecordingStateCallbackEndpoint = new Uri("<CallbackUri>"),
75+
RecordingStateCallbackUri = new Uri("<CallbackUri>"),
7676
AudioChannelParticipantOrdering = { new CommunicationUserIdentifier("<ACS_USER_MRI>") }
7777

7878
};
79-
Response<RecordingStateResult> response = await callAutomationClient.getCallRecording().StartRecordingAsync(recordingOptions);
79+
Response<RecordingStateResult> response = await callAutomationClient.GetCallRecording().StartAsync(recordingOptions);
8080
```
81-
The `StartRecordingAsync` API response contains the `recordingId` of the recording session.
8281

83-
## 3. Stop recording session using 'StopRecordingAsync' API
82+
### 2.2. Only for Unmixed - Specify channel affinity
8483

85-
Use the `recordingId` received in response of `startRecordingWithResponse`.
84+
```csharp
85+
var channelAffinity = new ChannelAffinity(new CommunicationUserIdentifier("<ACS_USER_MRI>")) { Channel = 0};
86+
StartRecordingOptions recordingOptions = new StartRecordingOptions(new ServerCallLocator("<ServerCallId>"))
87+
{
88+
RecordingContent = RecordingContent.Audio,
89+
RecordingChannel = RecordingChannel.Unmixed,
90+
RecordingFormat = RecordingFormat.Wav,
91+
RecordingStateCallbackUri = new Uri("<CallbackUri>"),
92+
ChannelAffinity = { channelAffinity }
93+
};
94+
Response<RecordingStateResult> response = await callAutomationClient.GetCallRecording().StartAsync(recordingOptions);
95+
```
96+
The `StartAsync` API response contains the `recordingId` of the recording session.
97+
98+
## 3. Stop recording session using 'StopAsync' API
99+
100+
Use the `recordingId` received in response of `StartAsync`.
86101

87102
```csharp
88-
var stopRecording = await callAutomationClient.GetCallRecording().StopRecordingAsync(recording.Value.RecordingId);
103+
var stopRecording = await callAutomationClient.GetCallRecording().StopAsync(recordingId);
89104
```
90105

91-
## 4. Pause recording session using 'PauseRecordingAsync' API
106+
## 4. Pause recording session using 'PauseAsync' API
92107

93-
Use the `recordingId` received in response of `startRecordingWithResponse`.
108+
Use the `recordingId` received in response of `StartAsync`.
94109

95110
```csharp
96-
var pauseRecording = await callAutomationClient.GetCallRecording ().PauseRecordingAsync(recording.Value.RecordingId);
111+
var pauseRecording = await callAutomationClient.GetCallRecording ().PauseAsync(recordingId);
97112
```
98113

99-
## 5. Resume recording session using 'ResumeRecordingAsync' API
114+
## 5. Resume recording session using 'ResumeAsync' API
100115

101-
Use the `recordingId` received in response of `startRecordingWithResponse`.
116+
Use the `recordingId` received in response of `StartAsync`.
102117

103118
```csharp
104-
var resumeRecording = await callAutomationClient.GetCallRecording().ResumeRecordingAsync(recording.Value.RecordingId);
119+
var resumeRecording = await callAutomationClient.GetCallRecording().ResumeAsync(recordingId);
105120
```
106121

107122
## 6. Download recording File using 'DownloadToAsync' API
@@ -141,19 +156,19 @@ Below is an example of the event schema.
141156
}
142157
```
143158

144-
Use `DownloadStreamingAsync` API for downloading the recorded media.
159+
Use `DownloadToAsync` API for downloading the recorded media.
145160

146161
```csharp
147162
var recordingDownloadUri = new Uri(contentLocation);
148-
var response = await callAutomationClient.GetCallRecording().DownloadStreamingAsync(recordingDownloadUri);
163+
var response = await callAutomationClient.GetCallRecording().DownloadToAsync(recordingDownloadUri, fileName);
149164
```
150-
The `downloadLocation` for the recording can be fetched from the `contentLocation` attribute of the `recordingChunk`. `DownloadStreamingAsync` method returns response of type `Response<Stream>`, which contains the downloaded content.
165+
The `downloadLocation` for the recording can be fetched from the `contentLocation` attribute of the `recordingChunk`. `DownloadToAsync` method download the content into provided filename.
151166

152-
## 7. Delete recording content using 'DeleteRecordingAsync' API
167+
## 7. Delete recording content using 'DeleteAsync' API
153168

154-
Use `DeleteRecordingAsync` API for deleting the recording content (for example, recorded media, metadata)
169+
Use `DeleteAsync` API for deleting the recording content (for example, recorded media, metadata)
155170

156171
```csharp
157172
var recordingDeleteUri = new Uri(deleteLocation);
158-
var response = await callAutomationClient.GetCallRecording().DeleteRecordingAsync(recordingDeleteUri);
173+
var response = await callAutomationClient.GetCallRecording().DeleteAsync(recordingDeleteUri);
159174
```

‎articles/communication-services/quickstarts/voice-video-calling/includes/call-recording-samples/call-recording-java.md

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
author: dbasantes
33
ms.service: azure-communication-services
4-
ms.date: 10/14/2022
4+
ms.date: 06/11/2023
55
ms.topic: include
66
ms.custom: public_preview
77
---
88

99
## Sample Code
1010

11-
You can download the sample app from [GitHub](https://github.com/Azure-Samples/communication-services-java-quickstarts/tree/main/ServerRecording)
11+
You can download the sample app from [GitHub](https://github.com/Azure-Samples/communication-services-java-quickstarts/tree/main/CallRecording)
1212

1313
## Prerequisites
1414

@@ -47,7 +47,7 @@ CallAutomationClient callAutomationClient = new CallAutomationClientBuilder()
4747
.buildClient();
4848
```
4949

50-
## 2. Start recording session with StartRecordingOptions using 'startRecordingWithResponse' API
50+
## 2. Start recording session with StartRecordingOptions using 'startWithResponse' API
5151

5252
Use the `serverCallId` received during initiation of the call.
5353
- RecordingContent is used to pass the recording content type. Use AUDIO
@@ -61,8 +61,8 @@ StartRecordingOptions recordingOptions = new StartRecordingOptions(new ServerCal
6161
.setRecordingContent(RecordingContent.AUDIO)
6262
.setRecordingStateCallbackUrl("<recordingStateCallbackUrl>");
6363

64-
Response<StartCallRecordingResult> response = callAutomationClient.getCallRecording()
65-
.startRecordingWithResponse(recordingOptions, null);
64+
Response<RecordingStateResult> response = callAutomationClient.getCallRecording()
65+
.startWithResponse(recordingOptions, null);
6666

6767
```
6868

@@ -78,35 +78,52 @@ StartRecordingOptions recordingOptions = new StartRecordingOptions(new ServerCal
7878
.setAudioChannelParticipantOrdering(List.of(new CommunicationUserIdentifier("<participantMri>")));
7979

8080
Response<RecordingStateResult> response = callAutomationClient.getCallRecording()
81-
.startRecordingWithResponse(recordingOptions, null);
81+
.startWithResponse(recordingOptions, null);
82+
83+
```
8284

85+
### 2.2. Only for Unmixed - Specify channel affinity
86+
```java
87+
ChannelAffinity channelAffinity = new ChannelAffinity()
88+
.setParticipant(new PhoneNumberIdentifier("RECORDING_ID"))
89+
.setChannel(0);
90+
List<ChannelAffinity> channelAffinities = Arrays.asList(channelAffinity);
91+
92+
StartRecordingOptions startRecordingOptions = new StartRecordingOptions(new ServerCallLocator(SERVER_CALL_ID))
93+
.setRecordingChannel(RecordingChannel.UNMIXED)
94+
.setRecordingFormat(RecordingFormat.WAV)
95+
.setRecordingContent(RecordingContent.AUDIO)
96+
.setRecordingStateCallbackUrl("<recordingStateCallbackUrl>")
97+
.setChannelAffinity(channelAffinities);
98+
Response<RecordingStateResult> response = callAutomationClient.getCallRecording()
99+
.startRecordingWithResponse(recordingOptions, null);
83100
```
84-
The `startRecordingWithResponse` API response contains the `recordingId` of the recording session.
101+
The `startWithResponse` API response contains the `recordingId` of the recording session.
85102

86-
## 3. Stop recording session using 'stopRecordingWithResponse' API
103+
## 3. Stop recording session using 'stopWithResponse' API
87104

88-
Use the `recordingId` received in response of `startRecordingWithResponse`.
105+
Use the `recordingId` received in response of `startWithResponse`.
89106

90107
```java
91108
Response<Void> response = callAutomationClient.getCallRecording()
92-
.stopRecordingWithResponse(response.getValue().getRecordingId(), null);
109+
.stopWithResponse(response.getValue().getRecordingId(), null);
93110
```
94111

95-
## 4. Pause recording session using 'pauseRecordingWithResponse' API
112+
## 4. Pause recording session using 'pauseWithResponse' API
96113

97-
Use the `recordingId` received in response of `startRecordingWithResponse`.
114+
Use the `recordingId` received in response of `startWithResponse`.
98115
```java
99116
Response<Void> response = callAutomationClient.getCallRecording()
100-
.pauseRecordingWithResponse(response.getValue().getRecordingId(), null);
117+
.pauseWithResponse(response.getValue().getRecordingId(), null);
101118
```
102119

103-
## 5. Resume recording session using 'resumeRecordingWithResponse' API
120+
## 5. Resume recording session using 'resumeWithResponse' API
104121

105-
Use the `recordingId` received in response of `startRecordingWithResponse`.
122+
Use the `recordingId` received in response of `startWithResponse`.
106123

107124
```java
108125
Response<Void> response = callAutomationClient.getCallRecording()
109-
.resumeRecordingWithResponse(response.getValue().getRecordingId(), null);
126+
.resumeWithResponse(response.getValue().getRecordingId(), null);
110127
```
111128

112129
## 6. Download recording File using 'downloadToWithResponse' API
@@ -166,13 +183,13 @@ Response<Void> downloadResponse = callAutomationClient.getCallRecording().downlo
166183
```
167184
The content location and document IDs for the recording files can be fetched from the `contentLocation` and `documentId` fields respectively, for each `recordingChunk`.
168185

169-
## 7. Delete recording content using ‘deleteRecordingWithResponse’ API.
186+
## 7. Delete recording content using ‘deleteWithResponse’ API.
170187

171-
Use `deleteRecordingWithResponse` method of `CallRecording` class for deleting the recorded media. Following are the supported parameters for `deleteRecordingWithResponse` method:
188+
Use `deleteWithResponse` method of `CallRecording` class for deleting the recorded media. Following are the supported parameters for `deleteWithResponse` method:
172189
- `deleteLocation`: Azure Communication Services URL where the content to delete is located.
173190
- `context`: A Context representing the request context.
174191

175192
```
176-
Response<Void> deleteResponse = callAutomationClient.getCallRecording().deleteRecordingWithResponse(deleteLocation, context);
193+
Response<Void> deleteResponse = callAutomationClient.getCallRecording().deleteWithResponse(deleteLocation, context);
177194
```
178195
The delete location for the recording can be fetched from the `deleteLocation` field of the Event Grid event.

‎articles/machine-learning/how-to-monitor-model-performance.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ create_monitor:
234234
path: azureml:my_model_training_data:1 # use training data as comparison baseline
235235
type: mltable
236236
dataset_context: training
237+
target_column_name: fraud_detected
237238
features:
238239
top_n_feature_importance: 20 # monitor drift for top 20 features
239240
metric_thresholds:
@@ -556,6 +557,7 @@ create_monitor:
556557
path: azureml:my_model_training_data:1 # use training data as comparison baseline
557558
type: mltable
558559
dataset_context: training
560+
target_column_name: fraud_detected
559561
features:
560562
top_n_feature_importance: 20 # monitor drift for top 20 features
561563
metric_thresholds:

‎articles/reliability/availability-zones-service-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Azure offerings are grouped into three categories that reflect their _regional_
7474
| [Azure Storage: Azure Data Lake Storage](migrate-storage.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
7575
| [Azure Storage: Disk Storage](migrate-storage.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
7676
| [Azure Storage: Blob Storage](migrate-storage.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
77-
| [Azure Storage: Managed Disks](https://learn.microsoft.com/azure/virtual-machines/disks-redundancy?source=recommendations) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
77+
| [Azure Storage: Managed Disks](/azure/virtual-machines/disks-redundancy) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
7878
| [Azure Virtual Machine Scale Sets](../virtual-machines/availability.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
7979
| [Azure Virtual Machines](../virtual-machines/availability.md) | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
8080
| Virtual Machines: [Av2-Series](../virtual-machines/availability.md) | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
@@ -116,7 +116,7 @@ Azure offerings are grouped into three categories that reflect their _regional_
116116
| [Azure DDoS Protection](../ddos-protection/ddos-faq.yml) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
117117
| [Azure Disk Encryption](../virtual-machines/disks-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
118118
| [Azure Event Grid](../event-grid/overview.md) | ![An icon that signifies this service is zone-redundant](media/icon-zone-redundant.svg) |
119-
| [Azure Firewall](../firewall/deploy-availability-zone-powershell.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
119+
| [Azure Firewall](../firewall/deploy-availability-zone-powershell.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
120120
| [Azure Firewall Manager](../firewall-manager/quick-firewall-policy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
121121
| [Azure Functions](./reliability-functions.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
122122
| [Azure HDInsight](../hdinsight/hdinsight-use-availability-zones.md) | ![An icon that signifies this service is zonal](media/icon-zonal.svg) |

0 commit comments

Comments
 (0)