Changes for release 2.1.0. (#81)

googleads · May 23, 2019 · f29efa7 · f29efa7
1 parent 20e1d20
commit f29efa7
Show file tree

Hide file tree

Showing 78 changed files with 17,288 additions and 2,905 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2.1.0
+=====
+- Added support for Google Ads API v1.3. See release notes:
+ https://developers.google.com/google-ads/api/docs/release-notes#130_2019-05-22
+- Increased the default timeout for services to 120 seconds.
+- Made a change to generate logs only if appropriate logging levels are set.
+- Fixed https://github.com/googleads/google-ads-dotnet/issues/59.
+
 2.0.0
 =====
 - Added support for Google Ads API v1.2 See release notes:

diff --git a/examples/Authentication/AuthenticateInWebApplication/AuthenticateInWebApplication.csproj b/examples/Authentication/AuthenticateInWebApplication/AuthenticateInWebApplication.csproj
@@ -48,8 +48,8 @@
     <ProjectReference Condition="Exists('..\..\..\src\Google.Ads.GoogleAds.csproj')" Include="..\..\..\src\Google.Ads.GoogleAds.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Google.Ads.GoogleAds, Version=2.0.0.0, Culture=neutral, PublicKeyToken=52807268f2b614dc, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Google.Ads.GoogleAds.2.0.0\lib\net452\Google.Ads.GoogleAds.dll</HintPath>
+    <Reference Include="Google.Ads.GoogleAds, Version=2.1.0.0, Culture=neutral, PublicKeyToken=52807268f2b614dc, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Google.Ads.GoogleAds.2.1.0\lib\net452\Google.Ads.GoogleAds.dll</HintPath>
     </Reference>
     <Reference Include="Google.Api.CommonProtos, Version=1.6.0.0, Culture=neutral, PublicKeyToken=3ec5ea7f18953e47, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Google.Api.CommonProtos.1.6.0\lib\net45\Google.Api.CommonProtos.dll</HintPath>

diff --git a/examples/Authentication/AuthenticateInWebApplication/packages.config b/examples/Authentication/AuthenticateInWebApplication/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Google.Ads.GoogleAds" version="2.0.0" targetFramework="net452" />
+  <package id="Google.Ads.GoogleAds" version="2.1.0" targetFramework="net452" />
   <package id="Google.Api.CommonProtos" version="1.6.0" targetFramework="net452" />
   <package id="Google.Api.Gax" version="2.7.0" targetFramework="net452" />
   <package id="Google.Api.Gax.Grpc" version="2.7.0" targetFramework="net452" />

diff --git a/examples/Google.Ads.GoogleAds.Examples.csproj b/examples/Google.Ads.GoogleAds.Examples.csproj
@@ -20,7 +20,7 @@
     <None Remove="Migration\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Google.Ads.GoogleAds" Version="2.0.0" />
+    <PackageReference Include="Google.Ads.GoogleAds" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Web" />

diff --git a/src/App.config b/src/App.config
@@ -15,8 +15,9 @@
 
     <!-- Settings related to general library behaviour. -->
 
-    <!-- Set the service timeout in milliseconds. -->
-    <add key="Timeout" value="10000" />
+    <!-- Set the service timeout in milliseconds. Use this setting to increase the timeout if you
+         face DeadlineExceeded errors frequently. The default is currently set to 120000 ms. -->
+    <!-- <add key="Timeout" value="120000" /> -->
 
     <!-- Proxy settings for library. -->
     <!--

diff --git a/src/Config/GoogleAdsConfig.cs b/src/Config/GoogleAdsConfig.cs
@@ -36,7 +36,7 @@ public class GoogleAdsConfig : ConfigBase
         /// <summary>
         /// The default timeout for API calls in milliseconds.
         /// </summary>
-        private const int DEFAULT_TIMEOUT = 60000;
+        private const int DEFAULT_TIMEOUT = 120_000;
 
         /// <summary>
         /// The default value of OAuth2 server URL.

diff --git a/src/Google.Ads.GoogleAds.csproj b/src/Google.Ads.GoogleAds.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Title>Google Ads API Dotnet Client Library</Title>
     <PackageId>Google.Ads.GoogleAds</PackageId>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
     <Description>This library provides you with functionality to access the Google Ads API.</Description>
     <PackageReleaseNotes>https://github.com/googleads/google-ads-dotnet/blob/master/ChangeLog</PackageReleaseNotes>
     <PackageTags>GoogleAds Google</PackageTags>
@@ -30,8 +30,8 @@
     <IncludeSource>true</IncludeSource>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="app.config.transform" PackagePath="content" />

diff --git a/src/Lib/GoogleAdsServiceClientFactory.cs b/src/Lib/GoogleAdsServiceClientFactory.cs
@@ -167,6 +167,11 @@ private Channel CreateChannel(GoogleAdsConfig config)
                 Environment.SetEnvironmentVariable("http_proxy", config.Proxy.Address.ToString());
             }
 
+            // GRPC uses c-ares DNS resolver, which doesn't seem to work on some Windows machines.
+            // Turn it off for now.
+            // https://github.com/googleads/google-ads-dotnet/issues/59
+            Environment.SetEnvironmentVariable("GRPC_DNS_RESOLVER", "native");
+
             Uri uri = new Uri(config.ServerUrl);
             return new Channel(uri.Host, uri.Port, channelCredentials, null);
         }

diff --git a/src/Logging/LoggingInterceptor.cs b/src/Logging/LoggingInterceptor.cs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using Google.Ads.GoogleAds.Config;
+using Google.Ads.GoogleAds.Util;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
 using System;
@@ -106,19 +107,24 @@ public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(
             Task t = call.ResponseAsync.ContinueWith(
                 delegate (Task<TResponse> oldTask)
             {
-                LogEntry logEntry = new LogEntry()
+                // Generating log entry is expensive, so let's do that only if the log source
+                // has been configured to do so.
+                if (TraceUtilities.ShouldGenerateRequestLogs())
                 {
-                    Host = Config.ServerUrl,
-                    Method = context.Method.FullName,
-                    RequestHeaders = context.Options.Headers,
-                    Request = request,
-                    ResponseHeaders = GetResponseHeader(call),
-                    Response = (oldTask.IsFaulted) ? default(TResponse) : oldTask.Result,
-                    Exception = GetGoogleAdsException(oldTask.Exception),
-                    IsFailure = oldTask.IsFaulted,
-                    CustomerId = GetCustomerId(request)
-                };
-                OnLogEventAvailable?.Invoke(this, logEntry);
+                    LogEntry logEntry = new LogEntry()
+                    {
+                        Host = Config.ServerUrl,
+                        Method = context.Method.FullName,
+                        RequestHeaders = context.Options.Headers,
+                        Request = request,
+                        ResponseHeaders = GetResponseHeader(call),
+                        Response = (oldTask.IsFaulted) ? default(TResponse) : oldTask.Result,
+                        Exception = GetGoogleAdsException(oldTask.Exception),
+                        IsFailure = oldTask.IsFaulted,
+                        CustomerId = GetCustomerId(request)
+                    };
+                    OnLogEventAvailable?.Invoke(this, logEntry);
+                }
             });
             t.Wait();
             return call;

diff --git a/src/Util/TraceUtilities.cs b/src/Util/TraceUtilities.cs
@@ -120,6 +120,21 @@ public static void Configure(string source, string filePath, SourceLevels levels
             Configure(source, textWriter, levels);
         }
 
+        /// <summary>
+        /// Decide whether the library should attempt to generate logs.
+        /// </summary>
+        internal static bool ShouldGenerateRequestLogs()
+        {
+            TraceSource detailedSource = GetSource(DETAILED_REQUEST_LOGS_SOURCE);
+            TraceSource summarySource = GetSource(SUMMARY_REQUEST_LOGS_SOURCE);
+
+            return (
+                ((detailedSource.Switch.Level & SourceLevels.Information) ==
+                    SourceLevels.Information) ||
+                ((summarySource.Switch.Level & SourceLevels.Warning) == SourceLevels.Warning)
+            );
+        }
+
         /// <summary>
         /// Writes the deprecation warnings.
         /// </summary>
@@ -160,7 +175,7 @@ public static void WriteGeneralErrors(string message)
         /// <param name="isError">Indicates whether or not these are error logs.</param>
         /// <remarks>The trace levels may be controlled from App.config by setting
         /// the level for AdsClientLibs.DetailedRequestLogs trace switch.</remarks>
-        public static void WriteDetailedRequestLogs(string message, Boolean isError)
+        public static void WriteDetailedRequestLogs(string message, bool isError)
         {
             TraceEventType type = isError ? TraceEventType.Information : TraceEventType.Verbose;
             Write(DETAILED_REQUEST_LOGS_SOURCE, type, message);
@@ -173,7 +188,7 @@ public static void WriteDetailedRequestLogs(string message, Boolean isError)
         /// <param name="isError">Indicates whether or not these are error logs.</param>
         /// <remarks>The trace levels may be controlled from App.config by setting
         /// the level for AdsClientLibs.SummaryRequestLogs trace switch.</remarks>
-        public static void WriteSummaryRequestLogs(string message, Boolean isError)
+        public static void WriteSummaryRequestLogs(string message, bool isError)
         {
             TraceEventType type = isError ? TraceEventType.Warning : TraceEventType.Information;
             Write(SUMMARY_REQUEST_LOGS_SOURCE, type, message);

diff --git a/src/V1/ResourceNames.cs b/src/V1/ResourceNames.cs
@@ -134,6 +134,16 @@ public static string CampaignBudget(long customerId, long budgetId)
             return $"customers/{customerId}/campaignBudgets/{budgetId}";
         }
 
+        public static string CampaignDraft(long customerId, long baseCampaignId, long draftId)
+        {
+            return $"customers/{customerId}/campaignDrafts/{baseCampaignId}~{draftId}";
+        }
+
+        public static string CampaignExperiments(long customerId, long campaignExperimentId)
+        {
+            return $"customers/{customerId}/campaignExperiments/{campaignExperimentId}";
+        }
+
         public static string CampaignCriteria(long customerId, long campaignId, long criterionId)
         {
             return $"customers/{customerId}/campaignCriteria/{campaignId}~{criterionId}";

diff --git a/src/V1/ServiceExtensions.cs b/src/V1/ServiceExtensions.cs
@@ -43,6 +43,8 @@ public abstract partial class CampaignBidModifierServiceClient : GoogleAdsServic
     public abstract partial class CampaignBudgetServiceClient : GoogleAdsServiceClientBase {}
     public abstract partial class CampaignCriterionServiceClient : GoogleAdsServiceClientBase {}
     public abstract partial class CampaignCriterionSimulationServiceClient : GoogleAdsServiceClientBase {}
+    public abstract partial class CampaignDraftServiceClient : GoogleAdsServiceClientBase {}
+    public abstract partial class CampaignExperimentServiceClient : GoogleAdsServiceClientBase {}
     public abstract partial class CampaignExtensionSettingServiceClient : GoogleAdsServiceClientBase {}
     public abstract partial class CampaignFeedServiceClient : GoogleAdsServiceClientBase {}
     public abstract partial class CampaignLabelServiceClient : GoogleAdsServiceClientBase {}

diff --git a/src/V1/Services.V1.cs b/src/V1/Services.V1.cs
@@ -203,6 +203,20 @@ public class V1
             public static readonly ServiceTemplate<CampaignCriterionSimulationServiceClient, CampaignCriterionSimulationServiceSettings> CampaignCriterionSimulationService;
 
 
+            /// <summary>
+            /// See https://developers.google.com/google-ads/api/reference/rpc/google.ads.googleads.v1.services#google.ads.googleads.v1.services.CampaignDraftService
+            /// for details.
+            /// </summary>
+            public static readonly ServiceTemplate<CampaignDraftServiceClient, CampaignDraftServiceSettings> CampaignDraftService;
+
+
+            /// <summary>
+            /// See https://developers.google.com/google-ads/api/reference/rpc/google.ads.googleads.v1.services#google.ads.googleads.v1.services.CampaignExperimentService
+            /// for details.
+            /// </summary>
+            public static readonly ServiceTemplate<CampaignExperimentServiceClient, CampaignExperimentServiceSettings> CampaignExperimentService;
+
+
             /// <summary>
             /// See https://developers.google.com/google-ads/api/reference/rpc/google.ads.googleads.v1.services#google.ads.googleads.v1.services.CampaignExtensionSettingService
             /// for details.