[RQ-610] Add Azure app services fields to usage v1 endpoints (#591)

* add apm aas host type tests

* fix test — json formatting

* Regenerate client from commit 2554c85 of spec repo

Co-authored-by: Rolf Bates <rolf.bates@datadoghq.com>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>
Co-authored-by: Rolf Bates <RolfBates@users.noreply.github.com>
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>

Author: 4 people

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2020-12-28 16:56:42.720322",
-            "spec_repo_commit": "4e7ddc2"
+            "regenerated": "2020-12-29 08:50:49.572551",
+            "spec_repo_commit": "2554c85"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev2",
-            "regenerated": "2020-12-28 16:56:51.497835",
-            "spec_repo_commit": "4e7ddc2"
+            "regenerated": "2020-12-29 08:51:00.069703",
+            "spec_repo_commit": "2554c85"
         }
     }
 }

api_docs/v1/UsageHostHour.md

@@ -9,13 +9,15 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **agentHostCount** | **Long** | Contains the total number of infrastructure hosts reporting during a given hour that were running the Datadog Agent. |  [optional]
 **alibabaHostCount** | **Long** | Contains the total number of hosts that reported via Alibaba integration (and were NOT running the Datadog Agent). |  [optional]
+**apmAzureAppServiceHostCount** | **Long** | Contains the total number of Azure App Services hosts using APM. |  [optional]
 **apmHostCount** | **Long** | Shows the total number of hosts using APM during the hour, these are counted as billable (except during trial periods). |  [optional]
 **awsHostCount** | **Long** | Contains the total number of hosts that reported via the AWS integration (and were NOT running the Datadog Agent). |  [optional]
 **azureHostCount** | **Long** | Contains the total number of hosts that reported via Azure integration (and were NOT running the Datadog Agent). |  [optional]
 **containerCount** | **Long** | Shows the total number of containers reported by the Docker integration during the hour. |  [optional]
 **gcpHostCount** | **Long** | Contains the total number of hosts that reported via the Google Cloud integration (and were NOT running the Datadog Agent). |  [optional]
 **hostCount** | **Long** | Contains the total number of billable infrastructure hosts reporting during a given hour. This is the sum of `agent_host_count`, `aws_host_count`, and `gcp_host_count`. |  [optional]
 **hour** | **OffsetDateTime** | The hour for the usage. |  [optional]
+**infraAzureAppService** | **Long** | Contains the total number of hosts that reported via the Azure App Services integration (and were NOT running the Datadog Agent). |  [optional]
 
 
 

api_docs/v1/UsageSummaryDate.md

@@ -8,6 +8,7 @@ Response with hourly report of all data billed by Datadog all organizations.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **agentHostTop99p** | **Long** | Shows the 99th percentile of all agent hosts over all hours in the current date for all organizations. |  [optional]
+**apmAzureAppServiceHostTop99p** | **Long** | Shows the 99th percentile of all Azure app services using APM over all hours in the current date all organizations. |  [optional]
 **apmHostTop99p** | **Long** | Shows the 99th percentile of all distinct APM hosts over all hours in the current date for all organizations. |  [optional]
 **awsHostTop99p** | **Long** | Shows the 99th percentile of all AWS hosts over all hours in the current date for all organizations. |  [optional]
 **awsLambdaFuncCount** | **Long** | Shows the average of the number of functions that executed 1 or more times each hour in the current date for all organizations. |  [optional]

api_docs/v1/UsageSummaryDateOrg.md

@@ -8,10 +8,12 @@ Global hourly report of all data billed by Datadog for a given organization.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **agentHostTop99p** | **Long** | Shows the 99th percentile of all agent hosts over all hours in the current date for the given org. |  [optional]
+**apmAzureAppServiceHostTop99p** | **Long** | Shows the 99th percentile of all Azure app services using APM over all hours in the current date for the given org. |  [optional]
 **apmHostTop99p** | **Long** | Shows the 99th percentile of all distinct APM hosts over all hours in the current date for the given org. |  [optional]
 **awsHostTop99p** | **Long** | Shows the 99th percentile of all AWS hosts over all hours in the current date for the given org. |  [optional]
 **awsLambdaFuncCount** | **Long** | Shows the sum of all AWS Lambda invocations over all hours in the current date for the given org. |  [optional]
 **awsLambdaInvocationsSum** | **Long** | Shows the sum of all AWS Lambda invocations over all hours in the current date for the given org. |  [optional]
+**azureAppServiceTop99p** | **Long** | Shows the 99th percentile of all Azure app services over all hours in the current date for the given org. |  [optional]
 **billableIngestedBytesSum** | **Long** | Shows the sum of all log bytes ingested over all hours in the current date for the given org. |  [optional]
 **containerAvg** | **Long** | Shows the average of all distinct containers over all hours in the current date for the given org. |  [optional]
 **containerHwm** | **Long** | Shows the high-water mark of all distinct containers over all hours in the current date for the given org. |  [optional]

api_docs/v1/UsageSummaryResponse.md

@@ -8,6 +8,7 @@ Response with hourly report of all data billed by Datadog all organizations.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **agentHostTop99pSum** | **Long** | Shows the 99th percentile of all agent hosts over all hours in the current months for all organizations. |  [optional]
+**apmAzureAppServiceHostTop99pSum** | **Long** | Shows the 99th percentile of all Azure app services using APM over all hours in the current months all organizations. |  [optional]
 **apmHostTop99pSum** | **Long** | Shows the 99th percentile of all distinct APM hosts over all hours in the current months for all organizations. |  [optional]
 **awsHostTop99pSum** | **Long** | Shows the 99th percentile of all AWS hosts over all hours in the current months for all organizations. |  [optional]
 **awsLambdaFuncCount** | **Long** | Shows the average of the number of functions that executed 1 or more times each hour in the current months for all organizations. |  [optional]

src/main/java/com/datadog/api/v1/client/model/UsageHostHour.java

@@ -34,13 +34,15 @@
 @JsonPropertyOrder({
   UsageHostHour.JSON_PROPERTY_AGENT_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_ALIBABA_HOST_COUNT,
+  UsageHostHour.JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_APM_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_AWS_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_AZURE_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_CONTAINER_COUNT,
   UsageHostHour.JSON_PROPERTY_GCP_HOST_COUNT,
   UsageHostHour.JSON_PROPERTY_HOST_COUNT,
-  UsageHostHour.JSON_PROPERTY_HOUR
+  UsageHostHour.JSON_PROPERTY_HOUR,
+  UsageHostHour.JSON_PROPERTY_INFRA_AZURE_APP_SERVICE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class UsageHostHour {
@@ -50,6 +52,9 @@ public class UsageHostHour {
   public static final String JSON_PROPERTY_ALIBABA_HOST_COUNT = "alibaba_host_count";
   private Long alibabaHostCount;
 
+  public static final String JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_COUNT = "apm_azure_app_service_host_count";
+  private Long apmAzureAppServiceHostCount;
+
   public static final String JSON_PROPERTY_APM_HOST_COUNT = "apm_host_count";
   private Long apmHostCount;
 
@@ -71,6 +76,9 @@ public class UsageHostHour {
   public static final String JSON_PROPERTY_HOUR = "hour";
   private OffsetDateTime hour;
 
+  public static final String JSON_PROPERTY_INFRA_AZURE_APP_SERVICE = "infra_azure_app_service";
+  private Long infraAzureAppService;
+
 
   public UsageHostHour agentHostCount(Long agentHostCount) {
     this.agentHostCount = agentHostCount;
@@ -120,6 +128,30 @@ public void setAlibabaHostCount(Long alibabaHostCount) {
   }
 
 
+  public UsageHostHour apmAzureAppServiceHostCount(Long apmAzureAppServiceHostCount) {
+    this.apmAzureAppServiceHostCount = apmAzureAppServiceHostCount;
+    return this;
+  }
+
+   /**
+   * Contains the total number of Azure App Services hosts using APM.
+   * @return apmAzureAppServiceHostCount
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Contains the total number of Azure App Services hosts using APM.")
+  @JsonProperty(JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_COUNT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getApmAzureAppServiceHostCount() {
+    return apmAzureAppServiceHostCount;
+  }
+
+
+  public void setApmAzureAppServiceHostCount(Long apmAzureAppServiceHostCount) {
+    this.apmAzureAppServiceHostCount = apmAzureAppServiceHostCount;
+  }
+
+
   public UsageHostHour apmHostCount(Long apmHostCount) {
     this.apmHostCount = apmHostCount;
     return this;
@@ -288,6 +320,30 @@ public void setHour(OffsetDateTime hour) {
   }
 
 
+  public UsageHostHour infraAzureAppService(Long infraAzureAppService) {
+    this.infraAzureAppService = infraAzureAppService;
+    return this;
+  }
+
+   /**
+   * Contains the total number of hosts that reported via the Azure App Services integration (and were NOT running the Datadog Agent).
+   * @return infraAzureAppService
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Contains the total number of hosts that reported via the Azure App Services integration (and were NOT running the Datadog Agent).")
+  @JsonProperty(JSON_PROPERTY_INFRA_AZURE_APP_SERVICE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getInfraAzureAppService() {
+    return infraAzureAppService;
+  }
+
+
+  public void setInfraAzureAppService(Long infraAzureAppService) {
+    this.infraAzureAppService = infraAzureAppService;
+  }
+
+
   /**
    * Return true if this UsageHostHour object is equal to o.
    */
@@ -302,18 +358,20 @@ public boolean equals(Object o) {
     UsageHostHour usageHostHour = (UsageHostHour) o;
     return Objects.equals(this.agentHostCount, usageHostHour.agentHostCount) &&
         Objects.equals(this.alibabaHostCount, usageHostHour.alibabaHostCount) &&
+        Objects.equals(this.apmAzureAppServiceHostCount, usageHostHour.apmAzureAppServiceHostCount) &&
         Objects.equals(this.apmHostCount, usageHostHour.apmHostCount) &&
         Objects.equals(this.awsHostCount, usageHostHour.awsHostCount) &&
         Objects.equals(this.azureHostCount, usageHostHour.azureHostCount) &&
         Objects.equals(this.containerCount, usageHostHour.containerCount) &&
         Objects.equals(this.gcpHostCount, usageHostHour.gcpHostCount) &&
         Objects.equals(this.hostCount, usageHostHour.hostCount) &&
-        Objects.equals(this.hour, usageHostHour.hour);
+        Objects.equals(this.hour, usageHostHour.hour) &&
+        Objects.equals(this.infraAzureAppService, usageHostHour.infraAzureAppService);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(agentHostCount, alibabaHostCount, apmHostCount, awsHostCount, azureHostCount, containerCount, gcpHostCount, hostCount, hour);
+    return Objects.hash(agentHostCount, alibabaHostCount, apmAzureAppServiceHostCount, apmHostCount, awsHostCount, azureHostCount, containerCount, gcpHostCount, hostCount, hour, infraAzureAppService);
   }
 
 
@@ -323,13 +381,15 @@ public String toString() {
     sb.append("class UsageHostHour {\n");
     sb.append("    agentHostCount: ").append(toIndentedString(agentHostCount)).append("\n");
     sb.append("    alibabaHostCount: ").append(toIndentedString(alibabaHostCount)).append("\n");
+    sb.append("    apmAzureAppServiceHostCount: ").append(toIndentedString(apmAzureAppServiceHostCount)).append("\n");
     sb.append("    apmHostCount: ").append(toIndentedString(apmHostCount)).append("\n");
     sb.append("    awsHostCount: ").append(toIndentedString(awsHostCount)).append("\n");
     sb.append("    azureHostCount: ").append(toIndentedString(azureHostCount)).append("\n");
     sb.append("    containerCount: ").append(toIndentedString(containerCount)).append("\n");
     sb.append("    gcpHostCount: ").append(toIndentedString(gcpHostCount)).append("\n");
     sb.append("    hostCount: ").append(toIndentedString(hostCount)).append("\n");
     sb.append("    hour: ").append(toIndentedString(hour)).append("\n");
+    sb.append("    infraAzureAppService: ").append(toIndentedString(infraAzureAppService)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/datadog/api/v1/client/model/UsageSummaryDate.java

@@ -36,6 +36,7 @@
 @ApiModel(description = "Response with hourly report of all data billed by Datadog all organizations.")
 @JsonPropertyOrder({
   UsageSummaryDate.JSON_PROPERTY_AGENT_HOST_TOP99P,
+  UsageSummaryDate.JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_TOP99P,
   UsageSummaryDate.JSON_PROPERTY_APM_HOST_TOP99P,
   UsageSummaryDate.JSON_PROPERTY_AWS_HOST_TOP99P,
   UsageSummaryDate.JSON_PROPERTY_AWS_LAMBDA_FUNC_COUNT,
@@ -72,6 +73,9 @@ public class UsageSummaryDate {
   public static final String JSON_PROPERTY_AGENT_HOST_TOP99P = "agent_host_top99p";
   private Long agentHostTop99p;
 
+  public static final String JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_TOP99P = "apm_azure_app_service_host_top99p";
+  private Long apmAzureAppServiceHostTop99p;
+
   public static final String JSON_PROPERTY_APM_HOST_TOP99P = "apm_host_top99p";
   private Long apmHostTop99p;
 
@@ -187,6 +191,30 @@ public void setAgentHostTop99p(Long agentHostTop99p) {
   }
 
 
+  public UsageSummaryDate apmAzureAppServiceHostTop99p(Long apmAzureAppServiceHostTop99p) {
+    this.apmAzureAppServiceHostTop99p = apmAzureAppServiceHostTop99p;
+    return this;
+  }
+
+   /**
+   * Shows the 99th percentile of all Azure app services using APM over all hours in the current date all organizations.
+   * @return apmAzureAppServiceHostTop99p
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "Shows the 99th percentile of all Azure app services using APM over all hours in the current date all organizations.")
+  @JsonProperty(JSON_PROPERTY_APM_AZURE_APP_SERVICE_HOST_TOP99P)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public Long getApmAzureAppServiceHostTop99p() {
+    return apmAzureAppServiceHostTop99p;
+  }
+
+
+  public void setApmAzureAppServiceHostTop99p(Long apmAzureAppServiceHostTop99p) {
+    this.apmAzureAppServiceHostTop99p = apmAzureAppServiceHostTop99p;
+  }
+
+
   public UsageSummaryDate apmHostTop99p(Long apmHostTop99p) {
     this.apmHostTop99p = apmHostTop99p;
     return this;
@@ -928,6 +956,7 @@ public boolean equals(Object o) {
     }
     UsageSummaryDate usageSummaryDate = (UsageSummaryDate) o;
     return Objects.equals(this.agentHostTop99p, usageSummaryDate.agentHostTop99p) &&
+        Objects.equals(this.apmAzureAppServiceHostTop99p, usageSummaryDate.apmAzureAppServiceHostTop99p) &&
         Objects.equals(this.apmHostTop99p, usageSummaryDate.apmHostTop99p) &&
         Objects.equals(this.awsHostTop99p, usageSummaryDate.awsHostTop99p) &&
         Objects.equals(this.awsLambdaFuncCount, usageSummaryDate.awsLambdaFuncCount) &&
@@ -962,7 +991,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(agentHostTop99p, apmHostTop99p, awsHostTop99p, awsLambdaFuncCount, awsLambdaInvocationsSum, azureAppServiceTop99p, billableIngestedBytesSum, containerAvg, containerHwm, customTsAvg, date, fargateTasksCountAvg, fargateTasksCountHwm, gcpHostTop99p, incidentManagementMonthlyActiveUsersHwm, indexedEventsCountSum, infraHostTop99p, ingestedEventsBytesSum, mobileRumSessionCountAndroidSum, mobileRumSessionCountIosSum, mobileRumSessionCountSum, netflowIndexedEventsCountSum, npmHostTop99p, orgs, profilingHostTop99p, rumSessionCountSum, rumTotalSessionCountSum, syntheticsBrowserCheckCallsCountSum, syntheticsCheckCallsCountSum, traceSearchIndexedEventsCountSum, twolIngestedEventsBytesSum);
+    return Objects.hash(agentHostTop99p, apmAzureAppServiceHostTop99p, apmHostTop99p, awsHostTop99p, awsLambdaFuncCount, awsLambdaInvocationsSum, azureAppServiceTop99p, billableIngestedBytesSum, containerAvg, containerHwm, customTsAvg, date, fargateTasksCountAvg, fargateTasksCountHwm, gcpHostTop99p, incidentManagementMonthlyActiveUsersHwm, indexedEventsCountSum, infraHostTop99p, ingestedEventsBytesSum, mobileRumSessionCountAndroidSum, mobileRumSessionCountIosSum, mobileRumSessionCountSum, netflowIndexedEventsCountSum, npmHostTop99p, orgs, profilingHostTop99p, rumSessionCountSum, rumTotalSessionCountSum, syntheticsBrowserCheckCallsCountSum, syntheticsCheckCallsCountSum, traceSearchIndexedEventsCountSum, twolIngestedEventsBytesSum);
   }
 
 
@@ -971,6 +1000,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class UsageSummaryDate {\n");
     sb.append("    agentHostTop99p: ").append(toIndentedString(agentHostTop99p)).append("\n");
+    sb.append("    apmAzureAppServiceHostTop99p: ").append(toIndentedString(apmAzureAppServiceHostTop99p)).append("\n");
     sb.append("    apmHostTop99p: ").append(toIndentedString(apmHostTop99p)).append("\n");
     sb.append("    awsHostTop99p: ").append(toIndentedString(awsHostTop99p)).append("\n");
     sb.append("    awsLambdaFuncCount: ").append(toIndentedString(awsLambdaFuncCount)).append("\n");