Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Source Amplitude: Correct output schemas on cohorts, events, active_users, and average_session_lengths streams #6353

Merged
merged 2 commits into from
Sep 21, 2021
Merged

🐛 Source Amplitude: Correct output schemas on cohorts, events, active_users, and average_session_lengths streams #6353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2483e90
fix Amplitude build
yevhenii-ldv Sep 21, 2021
bc8fe1e
update changelog, bump version
yevhenii-ldv Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ain/resources/config/STANDARD_SOURCE_DEFINITION/fa9f58c6-2d03-4237-aaa4-07d75e0c1396.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "fa9f58c6-2d03-4237-aaa4-07d75e0c1396",
"name": "Amplitude",
"dockerRepository": "airbyte/source-amplitude",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/amplitude"
}
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
- sourceDefinitionId: fa9f58c6-2d03-4237-aaa4-07d75e0c1396
name: Amplitude
dockerRepository: airbyte/source-amplitude
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/amplitude
sourceType: api
- sourceDefinitionId: e2d65910-8c8b-40a1-ae7d-ee2416b2bfa2
Expand Down
4 changes: 0 additions & 4 deletions airbyte-integrations/connectors/source-amplitude/CHANGELOG.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-amplitude/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ RUN pip install .
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.1
LABEL io.airbyte.version=0.1.2
LABEL io.airbyte.name=airbyte/source-amplitude
4 changes: 1 addition & 3 deletions airbyte-integrations/connectors/source-amplitude/acceptance-test-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ tests:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog_without_events.json"
# Unable to use 'state_path' because Amplitude returns an error when specifying a date in the future.
# state_path: "integration_tests/abnormal_state.json"
cursor_paths:
active_users: [ "date" ]
# future_state_path: "integration_tests/abnormal_state.json"
full_refresh:
- config_path: "secrets/config.json"
configured_catalog_path: "integration_tests/configured_catalog_without_events.json"
264 changes: 5 additions & 259 deletions airbyte-integrations/connectors/source-amplitude/integration_tests/configured_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,7 @@
{
"stream": {
"name": "cohorts",
"json_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"appId": {
"type": ["null", "integer"]
},
"archived": {
"type": ["null", "boolean"]
},
"definition": {
"type": ["null", "object"]
},
"description": {
"type": ["null", "string"]
},
"finished": {
"type": ["null", "boolean"]
},
"id": {
"type": ["null", "string"]
},
"name": {
"type": ["null", "string"]
},
"owners": {
"type": ["null", "object"]
},
"published": {
"type": ["null", "boolean"]
},
"size": {
"type": ["null", "integer"]
},
"type": {
"type": ["null", "string"]
},
"lastMod": {
"type": ["null", "integer"]
},
"lastComputed": {
"type": ["null", "integer"]
},
"hidden": {
"type": ["null", "boolean"]
},
"is_predictive": {
"type": ["null", "boolean"]
},
"is_official_content": {
"type": ["null", "boolean"]
}
}
},
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["id"]]
},
Expand All @@ -66,25 +13,7 @@
{
"stream": {
"name": "annotations",
"json_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"date": {
"type": ["null", "string"],
"format": "date-time"
},
"details": {
"type": ["null", "string"]
},
"id": {
"type": ["null", "integer"]
},
"label": {
"type": ["null", "string"]
}
}
},
"json_schema": {},
"supported_sync_modes": ["full_refresh"],
"source_defined_primary_key": [["id"]]
},
Expand All @@ -94,166 +23,7 @@
{
"stream": {
"name": "events",
"json_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"server_received_time": {
"type": ["null", "string"],
"format": "date-time"
},
"app": {
"type": ["null", "integer"]
},
"device_carrier": {
"type": ["null", "string"]
},
"$schema": {
"type": ["null", "integer"]
},
"city": {
"type": ["null", "string"]
},
"user_id": {
"type": ["null", "string"]
},
"uuid": {
"type": ["null", "string"]
},
"event_time": {
"type": ["null", "string"],
"format": "date-time"
},
"platform": {
"type": ["null", "string"]
},
"os_version": {
"type": ["null", "string"]
},
"amplitude_id": {
"type": ["null", "integer"]
},
"processed_time": {
"type": ["null", "string"],
"format": "date-time"
},
"user_creation_time": {
"type": ["null", "string"],
"format": "date-time"
},
"version_name": {
"type": ["null", "string"]
},
"ip_address": {
"type": ["null", "string"]
},
"paying": {
"type": ["null", "boolean"]
},
"dma": {
"type": ["null", "string"]
},
"group_properties": {
"type": ["null", "object"]
},
"user_properties": {
"type": ["null", "object"]
},
"client_upload_time": {
"type": ["null", "string"],
"format": "date-time"
},
"$insert_id": {
"type": ["null", "string"]
},
"event_type": {
"type": ["null", "string"]
},
"library": {
"type": ["null", "string"]
},
"amplitude_attribution_ids": {
"type": ["null", "string"]
},
"device_type": {
"type": ["null", "string"]
},
"device_manufacturer": {
"type": ["null", "string"]
},
"start_version": {
"type": ["null", "string"]
},
"location_lng": {
"type": ["null", "number"]
},
"server_upload_time": {
"type": ["null", "string"],
"format": "date-time"
},
"event_id": {
"type": ["null", "integer"]
},
"location_lat": {
"type": ["null", "number"]
},
"os_name": {
"type": ["null", "string"]
},
"amplitude_event_type": {
"type": ["null", "string"]
},
"device_brand": {
"type": ["null", "string"]
},
"groups": {
"type": ["null", "object"]
},
"event_properties": {
"type": ["null", "object"]
},
"data": {
"type": ["null", "object"]
},
"device_id": {
"type": ["null", "string"]
},
"language": {
"type": ["null", "string"]
},
"device_model": {
"type": ["null", "string"]
},
"country": {
"type": ["null", "string"]
},
"region": {
"type": ["null", "string"]
},
"is_attribution_event": {
"type": ["null", "boolean"]
},
"adid": {
"type": ["null", "string"]
},
"session_id": {
"type": ["null", "number"]
},
"device_family": {
"type": ["null", "string"]
},
"sample_rate": {
"type": ["null"]
},
"idfa": {
"type": ["null", "string"]
},
"client_event_time": {
"type": ["null", "string"],
"format": "date-time"
}
}
},
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
"default_cursor_field": ["event_time"],
Expand All @@ -266,19 +36,7 @@
{
"stream": {
"name": "active_users",
"json_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"date": {
"type": ["null", "string"],
"format": "date-time"
},
"statistics": {
"type": ["null", "object"]
}
}
},
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
"default_cursor_field": ["date"],
Expand All @@ -291,19 +49,7 @@
{
"stream": {
"name": "average_session_length",
"json_schema": {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"properties": {
"date": {
"type": ["null", "string"],
"format": "date-time"
},
"length": {
"type": ["null", "number"]
}
}
},
"json_schema": {},
"supported_sync_modes": ["full_refresh", "incremental"],
"source_defined_cursor": true,
"default_cursor_field": ["date"],
Expand Down
2 changes: 2 additions & 0 deletions airbyte-integrations/connectors/source-amplitude/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-e ../../bases/source-acceptance-test
-e .
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-amplitude/source_amplitude/schemas/active_users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"date": {
"type": ["null", "string"],
"format": "date-time"
"format": "date"
},
"statistics": {
"type": ["null", "object"]
Expand Down
2 changes: 1 addition & 1 deletion ...grations/connectors/source-amplitude/source_amplitude/schemas/average_session_length.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"properties": {
"date": {
"type": ["null", "string"],
"format": "date-time"
"format": "date"
},
"length": {
"type": ["null", "number"]
Expand Down
5 changes: 4 additions & 1 deletion airbyte-integrations/connectors/source-amplitude/source_amplitude/schemas/cohorts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
"type": ["null", "string"]
},
"owners": {
"type": ["null", "object"]
"type": ["null", "array"],
"items": {
"type": "string"
}
},
"published": {
"type": ["null", "boolean"]
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-amplitude/source_amplitude/schemas/events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"type": ["null", "string"]
},
"sample_rate": {
"type": ["null"]
"type": ["null", "string", "number"]
},
"idfa": {
"type": ["null", "string"]
Expand Down
7 changes: 7 additions & 0 deletions docs/integrations/sources/amplitude.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,10 @@ The Amplitude connector should gracefully handle Amplitude API limitations under

Please read [How to get your API key and Secret key](https://help.amplitude.com/hc/en-us/articles/360058073772-Create-and-manage-organizations-and-projects#view-and-edit-your-project-information).

## Changelog

| Version | Date | Pull Request | Subject |
| :------ | :-------- | :----- | :------ |
| 0.1.2 | 2021-09-21 | [6353](https://github.com/airbytehq/airbyte/pull/6353) | Correct output schemas on cohorts, events, active_users, and average_session_lengths streams |
| 0.1.1 | 2021-06-09 | [3973](https://github.com/airbytehq/airbyte/pull/3973) | Add AIRBYTE_ENTRYPOINT for kubernetes support |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for backfilling!

| 0.1.0 | 2021-06-08 | [3664](https://github.com/airbytehq/airbyte/pull/3664) | New Source: Amplitude |