Skip to content

Commit 62198ed

Browse files
committed
Merge branch 'master' of github.com:airbytehq/airbyte
2 parents 5a06aa3 + 8a03adc commit 62198ed

File tree

17 files changed

+157
-147
lines changed

17 files changed

+157
-147
lines changed

.github/workflows/connectors_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
default: "--modified"
1212
runner:
1313
description: "The runner to use for this job"
14-
default: "conn-prod-xlarge-runner"
14+
default: "dev-large-runner"
1515
pull_request:
1616
types:
1717
- opened
@@ -21,7 +21,7 @@ jobs:
2121
connectors_ci:
2222
name: Connectors CI
2323
timeout-minutes: 1440 # 24 hours
24-
runs-on: ${{ inputs.runner || 'conn-prod-xlarge-runner'}}
24+
runs-on: ${{ inputs.runner || 'dev-large-runner'}}
2525
steps:
2626
- name: Checkout Airbyte
2727
uses: actions/checkout@v3

.github/workflows/publish_connectors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
publish_connectors:
1919
name: Publish connectors
20-
runs-on: conn-prod-xlarge-runner
20+
runs-on: large-runner
2121
steps:
2222
- name: Checkout Airbyte
2323
uses: actions/checkout@v3

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.24
16+
LABEL io.airbyte.version=0.3.0
1717
LABEL io.airbyte.name=airbyte/source-google-ads

airbyte-integrations/connectors/source-google-ads/metadata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ data:
66
connectorSubtype: api
77
connectorType: source
88
definitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
9-
dockerImageTag: 0.2.24
9+
dockerImageTag: 0.3.0
1010
dockerRepository: airbyte/source-google-ads
1111
githubIssueLabel: source-google-ads
1212
icon: google-adwords.svg
13-
license: MIT
13+
license: Elv2
1414
name: Google Ads
1515
registries:
1616
cloud:

airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ COPY source_google_analytics_data_api ./source_google_analytics_data_api
2828
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
2929
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
3030

31-
LABEL io.airbyte.version=1.0.0
31+
LABEL io.airbyte.version=1.1.0
3232
LABEL io.airbyte.name=airbyte/source-google-analytics-data-api

airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ data:
77
connectorSubtype: api
88
connectorType: source
99
definitionId: 3cc2eafd-84aa-4dca-93af-322d9dfeec1a
10-
dockerImageTag: 1.0.0
10+
dockerImageTag: 1.1.0
1111
dockerRepository: airbyte/source-google-analytics-data-api
1212
githubIssueLabel: source-google-analytics-data-api
1313
icon: google-analytics.svg
14-
license: MIT
14+
license: Elv2
1515
name: Google Analytics 4 (GA4)
1616
registries:
1717
cloud:

airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ RUN pip install .
1212
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
1313
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
1414

15-
LABEL io.airbyte.version=0.1.36
15+
LABEL io.airbyte.version=0.2.0
1616
LABEL io.airbyte.name=airbyte/source-google-analytics-v4

airbyte-integrations/connectors/source-google-analytics-v4/metadata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ data:
88
connectorSubtype: api
99
connectorType: source
1010
definitionId: eff3616a-f9c3-11eb-9a03-0242ac130003
11-
dockerImageTag: 0.1.36
11+
dockerImageTag: 0.2.0
1212
dockerRepository: airbyte/source-google-analytics-v4
1313
githubIssueLabel: source-google-analytics-v4
1414
icon: google-analytics.svg
15-
license: MIT
15+
license: Elv2
1616
name: Google Analytics (Universal Analytics)
1717
registries:
1818
cloud:

airbyte-integrations/connectors/source-google-search-console/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ RUN pip install .
1212
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
1313
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
1414

15-
LABEL io.airbyte.version=1.0.2
15+
LABEL io.airbyte.version=1.1.0
1616
LABEL io.airbyte.name=airbyte/source-google-search-console

airbyte-integrations/connectors/source-google-search-console/metadata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ data:
55
connectorSubtype: api
66
connectorType: source
77
definitionId: eb4c9e00-db83-4d63-a386-39cfa91012a8
8-
dockerImageTag: 1.0.2
8+
dockerImageTag: 1.1.0
99
dockerRepository: airbyte/source-google-search-console
1010
githubIssueLabel: source-google-search-console
1111
icon: googlesearchconsole.svg
12-
license: MIT
12+
license: Elv2
1313
name: Google Search Console
1414
registries:
1515
cloud:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ COPY source_google_sheets ./source_google_sheets
3434
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
3535
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
3636

37-
LABEL io.airbyte.version=0.2.39
37+
LABEL io.airbyte.version=0.3.0
3838
LABEL io.airbyte.name=airbyte/source-google-sheets

airbyte-integrations/connectors/source-google-sheets/metadata.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ data:
55
connectorSubtype: file
66
connectorType: source
77
definitionId: 71607ba1-c0ac-4799-8049-7f4b90dd50f7
8-
dockerImageTag: 0.2.39
8+
dockerImageTag: 0.3.0
99
dockerRepository: airbyte/source-google-sheets
1010
githubIssueLabel: source-google-sheets
1111
icon: google-sheets.svg
12-
license: MIT
12+
license: Elv2
1313
name: Google Sheets
1414
registries:
1515
cloud:

docs/integrations/sources/google-ads.md

+16-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ This page contains the setup guide and reference information for the Google Ads
1010
<!-- /env:oss -->
1111

1212
## Setup guide
13+
1314
<!-- env:oss -->
15+
1416
### Step 1: (For Airbyte Open Source) Apply for a developer token
1517

1618
:::note
@@ -29,6 +31,7 @@ When you apply for a token, make sure to mention:
2931
- That you have full access to the server running the code (because you're self-hosting Airbyte)
3032

3133
### Step 2: Set up the Google Ads connector in Airbyte
34+
3235
<!-- /env:oss -->
3336
<!-- env:cloud -->
3437

@@ -51,6 +54,7 @@ To set up Google Ads as a source in Airbyte Cloud:
5154
<!-- /env:cloud -->
5255

5356
<!-- env:oss -->
57+
5458
**For Airbyte Open Source:**
5559

5660
To set up Google Ads as a source in Airbyte Open Source:
@@ -116,21 +120,25 @@ Due to Google Ads API constraints, the `click_view` stream retrieves data one da
116120
:::
117121

118122
For incremental streams, data is synced up to the previous day using your Google Ads account time zone since Google Ads can filter data only by [date](https://developers.google.com/google-ads/api/fields/v11/ad_group_ad#segments.date) without time. Also, some reports cannot load data real-time due to Google Ads [limitations](https://support.google.com/google-ads/answer/2544985?hl=en).
123+
119124
<!-- /env:oss -->
120125

121126
## Custom Query: Understanding Google Ads Query Language
122-
Additional streams for Google Ads can be dynamically created using custom queries.
127+
128+
Additional streams for Google Ads can be dynamically created using custom queries.
123129

124130
The Google Ads Query Language queries the Google Ads API. Review the [Google Ads Query Language](https://developers.google.com/google-ads/api/docs/query/overview) and the [query builder](https://developers.google.com/google-ads/api/fields/v13/query_validator) to validate your query. You can then add these as custom queries when configuring the Google Ads source.
125131

126132
Example GAQL Custom Query:
133+
127134
```
128-
SELECT
129-
campaign.name,
130-
metrics.conversions,
131-
metrics.conversions_by_conversion_date
135+
SELECT
136+
campaign.name,
137+
metrics.conversions,
138+
metrics.conversions_by_conversion_date
132139
FROM ad_group
133140
```
141+
134142
Note the segments.date is automatically added to the output, and does not need to be specified in the custom query. All custom reports will by synced by day.
135143

136144
Each custom query in the input configuration must work for all the customer account IDs. Otherwise, the customer ID will be skipped for every query that fails the validation test. For example, if your query contains metrics fields in the select clause, it will not be executed against manager accounts.
@@ -142,6 +150,7 @@ For an existing Google Ads source, when you are updating or removing Custom GAQL
142150
:::
143151

144152
<!-- env:oss -->
153+
145154
## Performance considerations
146155

147156
This source is constrained by the [Google Ads API limits](https://developers.google.com/google-ads/api/docs/best-practices/quotas)
@@ -151,7 +160,8 @@ Due to a limitation in the Google Ads API which does not allow getting performan
151160
## Changelog
152161

153162
| Version | Date | Pull Request | Subject |
154-
|:---------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------|
163+
| :------- | :--------- | :------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------- |
164+
| `0.3.0` | 2023-06-26 | [27738](https://github.com/airbytehq/airbyte/pull/27738) | License Update: Elv2 |
155165
| `0.2.24` | 2023-06-06 | [27608](https://github.com/airbytehq/airbyte/pull/27608) | Improve Google Ads exception handling |
156166
| `0.2.23` | 2023-06-06 | [26905](https://github.com/airbytehq/airbyte/pull/26905) | Replace deprecated `authSpecification` in the connector specification with `advancedAuth` |
157167
| `0.2.22` | 2023-06-02 | [26948](https://github.com/airbytehq/airbyte/pull/26948) | Refactor error messages; add `pattern_descriptor` for fields in spec |

docs/integrations/sources/google-analytics-data-api.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ This page contains the setup guide and reference information for the Google Anal
44

55
:::note
66

7-
[Google Analytics Universal Analytics (UA) connector](https://docs.airbyte.com/integrations/sources/google-analytics-v4), uses the older version of Google Analytics, which has been the standard for tracking website and app user behavior since 2012.
7+
[Google Analytics Universal Analytics (UA) connector](https://docs.airbyte.com/integrations/sources/google-analytics-v4), uses the older version of Google Analytics, which has been the standard for tracking website and app user behavior since 2012.
88

99
Google Analytics 4 (GA4) connector is the latest version of Google Analytics, which was introduced in 2020. It offers a new data model that emphasizes events and user properties, rather than pageviews and sessions. This new model allows for more flexible and customizable reporting, as well as more accurate measurement of user behavior across devices and platforms.
1010

1111
:::
1212

1313
## Prerequisites
1414

15-
* JSON credentials for the service account that has access to Google Analytics. For more details check [instructions](https://support.google.com/analytics/answer/1009702)
16-
* OAuth 2.0 credentials for the service account that has access to Google Analytics
17-
* Property ID
15+
- JSON credentials for the service account that has access to Google Analytics. For more details check [instructions](https://support.google.com/analytics/answer/1009702)
16+
- OAuth 2.0 credentials for the service account that has access to Google Analytics
17+
- Property ID
1818

1919
## Step 1: Set up Source
2020

@@ -61,7 +61,6 @@ Use the service account email address to [add a user](https://support.google.com
6161
7. Enter the **Custom Reports (Optional)** a JSON array describing the custom reports you want to sync from Google Analytics.
6262
8. Enter the **Data request time increment in days (Optional)**. The bigger this value is, the faster the sync will be, but the more likely that sampling will be applied to your data, potentially causing inaccuracies in the returned results. We recommend setting this to 1 unless you have a hard requirement to make the sync faster at the expense of accuracy. The minimum allowed value for this field is 1, and the maximum is 364. (Not applied to custom Cohort reports).
6363

64-
6564
## Supported sync modes
6665

6766
The Google Analytics source connector supports the following [sync modes](https://docs.airbyte.com/cloud/core-concepts#connection-sync-modes):
@@ -75,25 +74,25 @@ The Google Analytics source connector supports the following [sync modes](https:
7574

7675
This connector outputs the following incremental streams:
7776

78-
* Preconfigured streams:
79-
* [daily_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
80-
* [devices](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
81-
* [four_weekly_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
82-
* [locations](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
83-
* [pages](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
84-
* [traffic_sources](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
85-
* [website_overview](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
86-
* [weekly_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
87-
* [Custom stream\(s\)](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
77+
- Preconfigured streams:
78+
- [daily_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
79+
- [devices](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
80+
- [four_weekly_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
81+
- [locations](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
82+
- [pages](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
83+
- [traffic_sources](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
84+
- [website_overview](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
85+
- [weekly_active_users](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
86+
- [Custom stream\(s\)](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
8887

8988
## Connector-specific features
9089

9190
:::note
9291

93-
* Custom reports should be provided in format `[{"name": "<report-name>", "dimensions": ["<dimension-name>", ...], "metrics": ["<metric-name>", ...], "cohortSpec": "<cohortSpec>", "pivots": "<pivots>"}]`
94-
* Both `pivots` and `cohortSpec` are optional. Detailed description of the `cohortSpec` and the `pivots` objects you can find [here](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/CohortSpec) and [here](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/Pivot).
95-
* To enable Incremental sync for Custom reports, you need to include the `date` dimension (except for custom Cohort reports).
96-
:::
92+
- Custom reports should be provided in format `[{"name": "<report-name>", "dimensions": ["<dimension-name>", ...], "metrics": ["<metric-name>", ...], "cohortSpec": "<cohortSpec>", "pivots": "<pivots>"}]`
93+
- Both `pivots` and `cohortSpec` are optional. Detailed description of the `cohortSpec` and the `pivots` objects you can find [here](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/CohortSpec) and [here](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/Pivot).
94+
- To enable Incremental sync for Custom reports, you need to include the `date` dimension (except for custom Cohort reports).
95+
:::
9796

9897
## Performance Considerations
9998

@@ -102,7 +101,7 @@ This connector outputs the following incremental streams:
102101
## Data type map
103102

104103
| Integration Type | Airbyte Type | Notes |
105-
|:-----------------|:-------------|:------|
104+
| :--------------- | :----------- | :---- |
106105
| `string` | `string` | |
107106
| `number` | `number` | |
108107
| `array` | `array` | |
@@ -111,7 +110,8 @@ This connector outputs the following incremental streams:
111110
## Changelog
112111

113112
| Version | Date | Pull Request | Subject |
114-
|:--------|:-----------|:---------------------------------------------------------|:------------------------------------------------------------------------------|
113+
| :------ | :--------- | :------------------------------------------------------- | :---------------------------------------------------------------------------- |
114+
| 1.1.0 | 2023-06-26 | [27738](https://github.com/airbytehq/airbyte/pull/27738) | License Update: Elv2 |
115115
| 1.0.0 | 2023-06-22 | [26283](https://github.com/airbytehq/airbyte/pull/26283) | Added primary_key and lookback window |
116116
| 0.2.7 | 2023-06-21 | [27531](https://github.com/airbytehq/airbyte/pull/27531) | Fix formatting |
117117
| 0.2.6 | 2023-06-09 | [27207](https://github.com/airbytehq/airbyte/pull/27207) | Improve api rate limit messages |

0 commit comments

Comments
 (0)