Source google ads: add more logs

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -635,7 +635,7 @@
 - name: Google Ads
   sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
   dockerRepository: airbyte/source-google-ads
-  dockerImageTag: 0.2.6
+  dockerImageTag: 0.2.7
   documentationUrl: https://docs.airbyte.com/integrations/sources/google-ads
   icon: google-adwords.svg
   sourceType: api

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -5093,7 +5093,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-google-ads:0.2.6"
+- dockerImage: "airbyte/source-google-ads:0.2.7"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/google-ads"
     connectionSpecification:

airbyte-integrations/connectors/source-google-ads/Dockerfile

@@ -13,5 +13,5 @@ COPY main.py ./
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.2.6
+LABEL io.airbyte.version=0.2.7
 LABEL io.airbyte.name=airbyte/source-google-ads

airbyte-integrations/connectors/source-google-ads/acceptance-test-config.yml

@@ -19,27 +19,39 @@ acceptance_tests:
     tests:
       - config_path: "secrets/config.json"
         expect_records:
-          bypass_reason: "Bypassed because SAT run on active account. Dedicated Sandbox is needed."
+          path: "integration_tests/expected_records.txt"
+        timeout_seconds: 600
         empty_streams:
-          - name: "geographic_report"
-            bypass_reason: "The stream could not be fullfield with data manually."
-          - name: "keyword_report"
-            bypass_reason: "The stream could not be fullfield with data manually."
-          - name: "display_keyword_performance_report"
-            bypass_reason: "The stream could not be fullfield with data manually."
           - name: "display_topics_performance_report"
-            bypass_reason: "The stream could not be fullfield with data manually."
-          - name: "shopping_performance_report"
-            bypass_reason: "The stream could not be fullfield with data manually."
-          - name: "unhappytable"
-            bypass_reason: "The stream could not be fullfield with data manually."
+            bypass_reason: "Stream not filled yet."
           - name: "click_view"
-            bypass_reason: "The stream could not be fullfield with data manually."
-        timeout_seconds: 1200
+            bypass_reason: "Stream not filled yet."
+          - name: "unhappytable"
+            bypass_reason: "Stream not filled yet."
+          - name: "shopping_performance_report"
+            bypass_reason: "Stream not filled yet."
   full_refresh:
     tests:
       - config_path: "secrets/config.json"
         configured_catalog_path: "integration_tests/configured_catalog.json"
-        timeout_seconds: 1200
   incremental:
-    bypass_reason: "Incremental tests are implemented using custom test, available by integration_tests/test_incremental.py"
+    tests:
+      - config_path: "secrets/incremental_config.json"
+        configured_catalog_path: "integration_tests/incremental_catalog.json"
+        threshold_days: 14
+        future_state:
+          future_state_path: "integration_tests/abnormal_state.json"
+        cursor_paths:
+          account_performance_report: ["4651612872", "segments.date"]
+          click_view: ["4651612872", "segments.date"]
+          geographic_report: ["4651612872", "segments.date"]
+          keyword_report: ["4651612872", "segments.date"]
+          display_topics_performance_report: ["4651612872", "segments.date"]
+          shopping_performance_report: ["4651612872", "segments.date"]
+          ad_group_ads: ["4651612872", "segments.date"]
+          ad_groups: ["4651612872", "segments.date"]
+          accounts: ["4651612872", "segments.date"]
+          campaigns: ["4651612872", "segments.date"]
+          user_location_report: ["4651612872", "segments.date"]
+          ad_group_ad_report: ["4651612872", "segments.date"]
+          display_keyword_performance_report: ["4651612872", "segments.date"]

airbyte-integrations/connectors/source-google-ads/integration_tests/abnormal_state.json

@@ -0,0 +1,93 @@
+[
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "account_performance_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "click_view" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "geographic_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "keyword_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "display_topics_performance_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "shopping_performance_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "ad_group_ads" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "ad_groups" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "accounts" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "campaigns" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "user_location_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "ad_group_ad_report" }
+    }
+  },
+  {
+    "type": "STREAM",
+    "stream": {
+      "stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
+      "stream_descriptor": { "name": "display_keyword_performance_report" }
+    }
+  }
+]

airbyte-integrations/connectors/source-google-ads/integration_tests/configured_catalog.json

@@ -169,6 +169,39 @@
       "cursor_field": ["segments.date"],
       "primary_key": [["campaign.id"], ["segments.date"]]
     },
+    {
+      "stream": {
+        "name": "campaign_labels",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh"],
+        "source_defined_primary_key": [["campaign_label.resource_name"]]
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "overwrite",
+      "primary_key": [["campaign_label.resource_name"]]
+    },
+    {
+      "stream": {
+        "name": "ad_group_labels",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh"],
+        "source_defined_primary_key": [["ad_group_label.resource_name"]]
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "overwrite",
+      "primary_key": [["ad_group_label.resource_name"]]
+    },
+    {
+      "stream": {
+        "name": "ad_group_ad_labels",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh"],
+        "source_defined_primary_key": [["ad_group_ad_label.resource_name"]]
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "overwrite",
+      "primary_key": [["ad_group_ad_label.resource_name"]]
+    },
     {
       "stream": {
         "name": "user_location_report",
@@ -198,6 +231,15 @@
       },
       "sync_mode": "full_refresh",
       "destination_sync_mode": "overwrite"
+    },
+    {
+      "stream": {
+        "name": "ad_group_custom",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh"]
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "overwrite"
     }
   ]
 }