Skip to content

Commit 58352c9

Browse files
davydov-doctavia-squidington-iii
davydov-d
and
octavia-squidington-iii
authored
Source google ads: add more logs (#20755)
* #1148 source google ads: add more logs * #1148 source google ads: upd changelog * #1148 source google ads: flake fix * #1148 source google ads - fix SATs * #1148 source Google Ads: bump version * #1148 source google ads: upd expected records * auto-bump connector version Co-authored-by: Octavia Squidington III <[email protected]>
1 parent 8ed66eb commit 58352c9

File tree

12 files changed

+465
-122
lines changed

12 files changed

+465
-122
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@
635635
- name: Google Ads
636636
sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
637637
dockerRepository: airbyte/source-google-ads
638-
dockerImageTag: 0.2.6
638+
dockerImageTag: 0.2.7
639639
documentationUrl: https://docs.airbyte.com/integrations/sources/google-ads
640640
icon: google-adwords.svg
641641
sourceType: api

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5093,7 +5093,7 @@
50935093
supportsNormalization: false
50945094
supportsDBT: false
50955095
supported_destination_sync_modes: []
5096-
- dockerImage: "airbyte/source-google-ads:0.2.6"
5096+
- dockerImage: "airbyte/source-google-ads:0.2.7"
50975097
spec:
50985098
documentationUrl: "https://docs.airbyte.com/integrations/sources/google-ads"
50995099
connectionSpecification:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ COPY main.py ./
1313

1414
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
1515

16-
LABEL io.airbyte.version=0.2.6
16+
LABEL io.airbyte.version=0.2.7
1717
LABEL io.airbyte.name=airbyte/source-google-ads

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

+28-16
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,39 @@ acceptance_tests:
1919
tests:
2020
- config_path: "secrets/config.json"
2121
expect_records:
22-
bypass_reason: "Bypassed because SAT run on active account. Dedicated Sandbox is needed."
22+
path: "integration_tests/expected_records.txt"
23+
timeout_seconds: 600
2324
empty_streams:
24-
- name: "geographic_report"
25-
bypass_reason: "The stream could not be fullfield with data manually."
26-
- name: "keyword_report"
27-
bypass_reason: "The stream could not be fullfield with data manually."
28-
- name: "display_keyword_performance_report"
29-
bypass_reason: "The stream could not be fullfield with data manually."
3025
- name: "display_topics_performance_report"
31-
bypass_reason: "The stream could not be fullfield with data manually."
32-
- name: "shopping_performance_report"
33-
bypass_reason: "The stream could not be fullfield with data manually."
34-
- name: "unhappytable"
35-
bypass_reason: "The stream could not be fullfield with data manually."
26+
bypass_reason: "Stream not filled yet."
3627
- name: "click_view"
37-
bypass_reason: "The stream could not be fullfield with data manually."
38-
timeout_seconds: 1200
28+
bypass_reason: "Stream not filled yet."
29+
- name: "unhappytable"
30+
bypass_reason: "Stream not filled yet."
31+
- name: "shopping_performance_report"
32+
bypass_reason: "Stream not filled yet."
3933
full_refresh:
4034
tests:
4135
- config_path: "secrets/config.json"
4236
configured_catalog_path: "integration_tests/configured_catalog.json"
43-
timeout_seconds: 1200
4437
incremental:
45-
bypass_reason: "Incremental tests are implemented using custom test, available by integration_tests/test_incremental.py"
38+
tests:
39+
- config_path: "secrets/incremental_config.json"
40+
configured_catalog_path: "integration_tests/incremental_catalog.json"
41+
threshold_days: 14
42+
future_state:
43+
future_state_path: "integration_tests/abnormal_state.json"
44+
cursor_paths:
45+
account_performance_report: ["4651612872", "segments.date"]
46+
click_view: ["4651612872", "segments.date"]
47+
geographic_report: ["4651612872", "segments.date"]
48+
keyword_report: ["4651612872", "segments.date"]
49+
display_topics_performance_report: ["4651612872", "segments.date"]
50+
shopping_performance_report: ["4651612872", "segments.date"]
51+
ad_group_ads: ["4651612872", "segments.date"]
52+
ad_groups: ["4651612872", "segments.date"]
53+
accounts: ["4651612872", "segments.date"]
54+
campaigns: ["4651612872", "segments.date"]
55+
user_location_report: ["4651612872", "segments.date"]
56+
ad_group_ad_report: ["4651612872", "segments.date"]
57+
display_keyword_performance_report: ["4651612872", "segments.date"]

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

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
[
2+
{
3+
"type": "STREAM",
4+
"stream": {
5+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
6+
"stream_descriptor": { "name": "account_performance_report" }
7+
}
8+
},
9+
{
10+
"type": "STREAM",
11+
"stream": {
12+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
13+
"stream_descriptor": { "name": "click_view" }
14+
}
15+
},
16+
{
17+
"type": "STREAM",
18+
"stream": {
19+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
20+
"stream_descriptor": { "name": "geographic_report" }
21+
}
22+
},
23+
{
24+
"type": "STREAM",
25+
"stream": {
26+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
27+
"stream_descriptor": { "name": "keyword_report" }
28+
}
29+
},
30+
{
31+
"type": "STREAM",
32+
"stream": {
33+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
34+
"stream_descriptor": { "name": "display_topics_performance_report" }
35+
}
36+
},
37+
{
38+
"type": "STREAM",
39+
"stream": {
40+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
41+
"stream_descriptor": { "name": "shopping_performance_report" }
42+
}
43+
},
44+
{
45+
"type": "STREAM",
46+
"stream": {
47+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
48+
"stream_descriptor": { "name": "ad_group_ads" }
49+
}
50+
},
51+
{
52+
"type": "STREAM",
53+
"stream": {
54+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
55+
"stream_descriptor": { "name": "ad_groups" }
56+
}
57+
},
58+
{
59+
"type": "STREAM",
60+
"stream": {
61+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
62+
"stream_descriptor": { "name": "accounts" }
63+
}
64+
},
65+
{
66+
"type": "STREAM",
67+
"stream": {
68+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
69+
"stream_descriptor": { "name": "campaigns" }
70+
}
71+
},
72+
{
73+
"type": "STREAM",
74+
"stream": {
75+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
76+
"stream_descriptor": { "name": "user_location_report" }
77+
}
78+
},
79+
{
80+
"type": "STREAM",
81+
"stream": {
82+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
83+
"stream_descriptor": { "name": "ad_group_ad_report" }
84+
}
85+
},
86+
{
87+
"type": "STREAM",
88+
"stream": {
89+
"stream_state": { "4651612872": { "segments.date": "2222-01-01" }},
90+
"stream_descriptor": { "name": "display_keyword_performance_report" }
91+
}
92+
}
93+
]

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

+42
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,39 @@
169169
"cursor_field": ["segments.date"],
170170
"primary_key": [["campaign.id"], ["segments.date"]]
171171
},
172+
{
173+
"stream": {
174+
"name": "campaign_labels",
175+
"json_schema": {},
176+
"supported_sync_modes": ["full_refresh"],
177+
"source_defined_primary_key": [["campaign_label.resource_name"]]
178+
},
179+
"sync_mode": "full_refresh",
180+
"destination_sync_mode": "overwrite",
181+
"primary_key": [["campaign_label.resource_name"]]
182+
},
183+
{
184+
"stream": {
185+
"name": "ad_group_labels",
186+
"json_schema": {},
187+
"supported_sync_modes": ["full_refresh"],
188+
"source_defined_primary_key": [["ad_group_label.resource_name"]]
189+
},
190+
"sync_mode": "full_refresh",
191+
"destination_sync_mode": "overwrite",
192+
"primary_key": [["ad_group_label.resource_name"]]
193+
},
194+
{
195+
"stream": {
196+
"name": "ad_group_ad_labels",
197+
"json_schema": {},
198+
"supported_sync_modes": ["full_refresh"],
199+
"source_defined_primary_key": [["ad_group_ad_label.resource_name"]]
200+
},
201+
"sync_mode": "full_refresh",
202+
"destination_sync_mode": "overwrite",
203+
"primary_key": [["ad_group_ad_label.resource_name"]]
204+
},
172205
{
173206
"stream": {
174207
"name": "user_location_report",
@@ -198,6 +231,15 @@
198231
},
199232
"sync_mode": "full_refresh",
200233
"destination_sync_mode": "overwrite"
234+
},
235+
{
236+
"stream": {
237+
"name": "ad_group_custom",
238+
"json_schema": {},
239+
"supported_sync_modes": ["full_refresh"]
240+
},
241+
"sync_mode": "full_refresh",
242+
"destination_sync_mode": "overwrite"
201243
}
202244
]
203245
}

‎airbyte-integrations/connectors/source-google-ads/integration_tests/configured_catalog_protobuf_msg.json

-16
This file was deleted.

‎airbyte-integrations/connectors/source-google-ads/integration_tests/expected_records.txt

+115
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)