🐛 Source Google Analytics Data API: fix duplicated stream instance (#30424)

2025-12-25 02:09:19 -05:00 · 2023-09-15 11:59:17 +03:00
parent 886dc43606
commit 3f1f13c4d7
7 changed files with 10 additions and 26 deletions
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile
@@ -28,5 +28,5 @@ COPY source_google_analytics_data_api ./source_google_analytics_data_api
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

-LABEL io.airbyte.version=1.3.0
+LABEL io.airbyte.version=1.3.1
 LABEL io.airbyte.name=airbyte/source-google-analytics-data-api
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/acceptance-test-config.yml
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/acceptance-test-config.yml
@@ -7,7 +7,7 @@ acceptance_tests:
    tests:
      - spec_path: "source_google_analytics_data_api/spec.json"
        backward_compatibility_tests_config:
-          disable_for_version: 1.2.0
+          disable_for_version: 1.3.0
  connection:
    tests:
      - config_path: "secrets/config.json"
@@ -18,7 +18,7 @@ acceptance_tests:
    tests:
      - config_path: "secrets/config.json"
        backward_compatibility_tests_config:
-          disable_for_version: 1.2.0
+          disable_for_version: 1.3.0
  basic_read:
    tests:
      - config_path: "secrets/config.json"
@@ -99,7 +99,7 @@ acceptance_tests:
  incremental:
    tests:
      - config_path: "secrets/config.json"
-        timeout_seconds: 3600
+        timeout_seconds: 10800
        configured_catalog_path: "integration_tests/configured_catalog.json"
        future_state:
          future_state_path: "integration_tests/abnormal_state.json"
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/integration_tests/expected_records.jsonl
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/integration_tests/expected_records.jsonl
@@ -94,8 +94,8 @@
 {"stream": "tech_screen_resolution_report", "data": {"property_id": "314186564", "date": "20230907", "screenResolution": "1440x900", "totalUsers": 288, "newUsers": 135, "engagedSessions": 242, "engagementRate": 0.5342163355408388, "eventCount": 3689, "conversions": 50.0, "totalRevenue": 0.0}, "emitted_at": 1694472783852}
 {"stream": "tech_app_version_report", "data": {"property_id": "314186564", "date": "20230901", "appVersion": "(not set)", "totalUsers": 2568, "newUsers": 1242, "engagedSessions": 2423, "engagementRate": 0.6881567736438512, "eventCount": 31553, "conversions": 2315.0, "totalRevenue": 0.0}, "emitted_at": 1694472785234}
 {"stream": "tech_app_version_report", "data": {"property_id": "314186564", "date": "20230903", "appVersion": "(not set)", "totalUsers": 1594, "newUsers": 796, "engagedSessions": 973, "engagementRate": 0.5010298661174047, "eventCount": 12817, "conversions": 121.0, "totalRevenue": 0.0}, "emitted_at": 1694472785234}
-{"stream": "tech_platform_report", "data": {"property_id": "314186564", "date": "20230908", "operatingSystemVersion": "(not set)", "totalUsers": 315, "newUsers": 20, "engagedSessions": 39, "engagementRate": 0.65, "eventCount": 1258, "conversions": 40.0, "totalRevenue": 0.0}, "emitted_at": 1694472786511}
-{"stream": "tech_platform_report", "data": {"property_id": "314186564", "date": "20230903", "operatingSystemVersion": "10", "totalUsers": 296, "newUsers": 177, "engagedSessions": 204, "engagementRate": 0.5411140583554377, "eventCount": 2435, "conversions": 31.0, "totalRevenue": 0.0}, "emitted_at": 1694472786512}
+{"stream": "tech_platform_report", "data": {"property_id": "314186564", "date": "20230902", "platform": "web", "totalUsers": 1183, "newUsers": 658, "engagedSessions": 716, "engagementRate": 0.494475138121547, "eventCount": 10314, "conversions": 343.0, "totalRevenue": 0.0}, "emitted_at": 1694705714014}
+{"stream": "tech_platform_report", "data": {"property_id": "314186564", "date": "20230909", "platform": "web", "totalUsers": 1181, "newUsers": 641, "engagedSessions": 693, "engagementRate": 0.47892190739460955, "eventCount": 9878, "conversions": 105.0, "totalRevenue": 0.0}, "emitted_at": 1694705714014}
 {"stream": "tech_platform_device_category_report", "data": {"property_id": "314186564", "date": "20230905", "platform": "web", "deviceCategory": "mobile", "totalUsers": 412, "newUsers": 280, "engagedSessions": 202, "engagementRate": 0.41821946169772256, "eventCount": 2087, "conversions": 14.0, "totalRevenue": 0.0}, "emitted_at": 1694472787846}
 {"stream": "tech_platform_device_category_report", "data": {"property_id": "314186564", "date": "20230906", "platform": "web", "deviceCategory": "mobile", "totalUsers": 387, "newUsers": 271, "engagedSessions": 169, "engagementRate": 0.3730684326710817, "eventCount": 1841, "conversions": 18.0, "totalRevenue": 0.0}, "emitted_at": 1694472787847}
 {"stream": "tech_platform_device_category_report", "data": {"property_id": "314186564", "date": "20230908", "platform": "web", "deviceCategory": "mobile", "totalUsers": 374, "newUsers": 250, "engagedSessions": 198, "engagementRate": 0.4267241379310345, "eventCount": 2025, "conversions": 8.0, "totalRevenue": 0.0}, "emitted_at": 1694472787848}
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml
@@ -7,7 +7,7 @@ data:
  connectorSubtype: api
  connectorType: source
  definitionId: 3cc2eafd-84aa-4dca-93af-322d9dfeec1a
-  dockerImageTag: 1.3.0
+  dockerImageTag: 1.3.1
  dockerRepository: airbyte/source-google-analytics-data-api
  githubIssueLabel: source-google-analytics-data-api
  icon: google-analytics.svg
@@ -15,7 +15,6 @@ data:
  name: Google Analytics 4 (GA4)
  registries:
    cloud:
-      dockerImageTag: 1.1.3 # pinning back in cloud due to OC issue 2951
      enabled: true
    oss:
      enabled: true
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/defaults/default_reports.json
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/defaults/default_reports.json
@@ -734,21 +734,6 @@
      "date",
      "platform"
    ],
-    "metrics" : [
-      "totalUsers",
-      "newUsers",
-      "engagedSessions",
-      "engagementRate",
-      "conversions",
-      "totalRevenue"
-    ]
-  },
-  {
-    "name" : "tech_platform_report",
-    "dimensions" : [
-      "date",
-      "operatingSystemVersion"
-    ],
    "metrics" : [
      "totalUsers",
      "newUsers",
--- a/airbyte-integrations/connectors/source-google-analytics-data-api/unit_tests/test_source.py
+++ b/airbyte-integrations/connectors/source-google-analytics-data-api/unit_tests/test_source.py
@@ -128,5 +128,5 @@ def test_streams(mocker, patch_base_class):
    config_mock.__getitem__.side_effect = patch_base_class["config"].__getitem__

    streams = source.streams(patch_base_class["config"])
-    expected_streams_number = 57
-    assert len(streams) == expected_streams_number
+    expected_streams_number = 56
+    assert len(set(streams)) == expected_streams_number
--- a/docs/integrations/sources/google-analytics-data-api.md
+++ b/docs/integrations/sources/google-analytics-data-api.md
@@ -162,7 +162,6 @@ This connector outputs the following incremental streams:
  - [tech_screen_resolution_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
  - [tech_app_version_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
  - [tech_platform_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
-  - [tech_platform_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
  - [tech_platform_device_category_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
  - [tech_operating_system_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
  - [tech_os_with_version_report](https://developers.google.com/analytics/devguides/reporting/data/v1/rest/v1beta/properties/runReport)
@@ -266,6 +265,7 @@ The Google Analytics connector is subject to Google Analytics Data API quotas. P

 | Version | Date       | Pull Request                                             | Subject                                                                       |
 |:--------|:-----------|:---------------------------------------------------------|:------------------------------------------------------------------------------|
+| 1.3.1   | 2023-09-14 | [30424](https://github.com/airbytehq/airbyte/pull/30424) | Fixed duplicated stream issue                                                 |
 | 1.3.0   | 2023-09-13 | [30152](https://github.com/airbytehq/airbyte/pull/30152) | Ability to add multiple property ids                                          |
 | 1.2.0   | 2023-09-11 | [30290](https://github.com/airbytehq/airbyte/pull/30290) | Add new preconfigured reports                                                 |
 | 1.1.3   | 2023-08-04 | [29103](https://github.com/airbytehq/airbyte/pull/29103) | Update input field descriptions                                               |