diff --git a/sdk/logz/azure-resourcemanager-logz/CHANGELOG.md b/sdk/logz/azure-resourcemanager-logz/CHANGELOG.md
index c5944e198387..de7c1d12e9c7 100644
--- a/sdk/logz/azure-resourcemanager-logz/CHANGELOG.md
+++ b/sdk/logz/azure-resourcemanager-logz/CHANGELOG.md
@@ -1,6 +1,8 @@
# Release History
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2021-12-16)
+
+- Azure Resource Manager logz client library for Java. This package contains Microsoft Azure SDK for logz Management SDK. Package tag package-2020-10-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
### Features Added
diff --git a/sdk/logz/azure-resourcemanager-logz/README.md b/sdk/logz/azure-resourcemanager-logz/README.md
index 05ba361c6da7..23e0865e5ebe 100644
--- a/sdk/logz/azure-resourcemanager-logz/README.md
+++ b/sdk/logz/azure-resourcemanager-logz/README.md
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
com.azure.resourcemanager
azure-resourcemanager-logz
- 1.0.0-beta.1
+ 1.0.0-beta.2
```
[//]: # ({x-version-update-end})
diff --git a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/LogzManager.java b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/LogzManager.java
index 65d474c54225..e21292a7642d 100644
--- a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/LogzManager.java
+++ b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/LogzManager.java
@@ -8,6 +8,7 @@
import com.azure.core.http.HttpClient;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
import com.azure.core.http.policy.AddDatePolicy;
import com.azure.core.http.policy.HttpLogOptions;
import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -41,6 +42,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/** Entry point to LogzManager. */
public final class LogzManager {
@@ -217,11 +219,24 @@ public LogzManager authenticate(TokenCredential credential, AzureProfile profile
List policies = new ArrayList<>();
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
policies.add(new RequestIdPolicy());
+ policies
+ .addAll(
+ this
+ .policies
+ .stream()
+ .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+ .collect(Collectors.toList()));
HttpPolicyProviders.addBeforeRetryPolicies(policies);
policies.add(retryPolicy);
policies.add(new AddDatePolicy());
policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
- policies.addAll(this.policies);
+ policies
+ .addAll(
+ this
+ .policies
+ .stream()
+ .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+ .collect(Collectors.toList()));
HttpPolicyProviders.addAfterRetryPolicies(policies);
policies.add(new HttpLoggingPolicy(httpLogOptions));
HttpPipeline httpPipeline =
diff --git a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/MonitorsClientImpl.java b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/MonitorsClientImpl.java
index 6323a75bc776..2fa72d2994be 100644
--- a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/MonitorsClientImpl.java
+++ b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/MonitorsClientImpl.java
@@ -991,7 +991,7 @@ private PollerFlux, LogzMonitorResourceInne
this.client.getHttpPipeline(),
LogzMonitorResourceInner.class,
LogzMonitorResourceInner.class,
- Context.NONE);
+ this.client.getContext());
}
/**
@@ -1459,7 +1459,8 @@ private PollerFlux, Void> beginDeleteAsync(String resourceGroup
Mono>> mono = deleteWithResponseAsync(resourceGroupName, monitorName);
return this
.client
- .getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+ .getLroResult(
+ mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
}
/**
diff --git a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SingleSignOnsClientImpl.java b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SingleSignOnsClientImpl.java
index 70cdfc0cbfcc..8dc2ca4012f7 100644
--- a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SingleSignOnsClientImpl.java
+++ b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SingleSignOnsClientImpl.java
@@ -452,7 +452,7 @@ private Mono>> createOrUpdateWithResponseAsync(
this.client.getHttpPipeline(),
LogzSingleSignOnResourceInner.class,
LogzSingleSignOnResourceInner.class,
- Context.NONE);
+ this.client.getContext());
}
/**
diff --git a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SubAccountsClientImpl.java b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SubAccountsClientImpl.java
index 8ff3e28a37c5..191779bebecf 100644
--- a/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SubAccountsClientImpl.java
+++ b/sdk/logz/azure-resourcemanager-logz/src/main/java/com/azure/resourcemanager/logz/implementation/SubAccountsClientImpl.java
@@ -583,7 +583,7 @@ private PollerFlux, LogzMonitorResourceInne
this.client.getHttpPipeline(),
LogzMonitorResourceInner.class,
LogzMonitorResourceInner.class,
- Context.NONE);
+ this.client.getContext());
}
/**
@@ -1067,7 +1067,8 @@ private PollerFlux, Void> beginDeleteAsync(
Mono>> mono = deleteWithResponseAsync(resourceGroupName, monitorName, subAccountName);
return this
.client
- .getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, Context.NONE);
+ .getLroResult(
+ mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
}
/**