Merge branch 'master' into joseph.bell/33271/t+d-incremental-optionality

airbytehq · Jan 3, 2024 · 7e896e5 · 7e896e5
2 parents 33464a4 + 8d54e94
commit 7e896e5
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 79 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.50.39
+current_version = 0.50.40
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?

diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -163,7 +163,8 @@ MavenLocal debugging steps:
 ### Java CDK
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
-|:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| :------ | :--------- | :--------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 0.10.1  | 2023-12-21 | [\#33723](https://github.com/airbytehq/airbyte/pull/33723) | Make memory-manager log message less scary                                                                                                                     |
 | 0.10.0  | 2023-12-20 | [\#33704](https://github.com/airbytehq/airbyte/pull/33704) | JdbcDestinationHandler now properly implements `getInitialRawTableState`; reenable SqlGenerator test                                                           |
 | 0.9.0   | 2023-12-18 | [\#33124](https://github.com/airbytehq/airbyte/pull/33124) | Make Schema Creation Separate from Table Creation, exclude the T&D module from the CDK                                                                         |
 | 0.8.0   | 2023-12-18 | [\#33506](https://github.com/airbytehq/airbyte/pull/33506) | Improve async destination shutdown logic; more JDBC async migration work; improve DAT test schema handling                                                     |

diff --git a/...core/src/main/java/io/airbyte/cdk/integrations/destination_async/GlobalMemoryManager.java b/...core/src/main/java/io/airbyte/cdk/integrations/destination_async/GlobalMemoryManager.java
@@ -88,8 +88,9 @@ public void free(final long bytes) {
     log.info("Freeing {} bytes..", bytes);
     currentMemoryBytes.addAndGet(-bytes);
 
-    if (currentMemoryBytes.get() < 0) {
-      log.warn("Freed more memory than allocated. This should never happen. Please report this bug.");
+    final long currentMemory = currentMemoryBytes.get();
+    if (currentMemory < 0) {
+      log.info("Freed more memory than allocated ({} of {})", bytes, currentMemory + bytes);
     }
   }
 

diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=0.10.0
+version=0.10.1
diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/validators/metadata_validator.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/validators/metadata_validator.py
@@ -26,15 +26,8 @@ class ValidatorOptions:
 # TODO: Remove these when each of these connectors ship any new version
 ALREADY_ON_MAJOR_VERSION_EXCEPTIONS = [
     ("airbyte/source-prestashop", "1.0.0"),
-    ("airbyte/source-onesignal", "1.0.0"),
     ("airbyte/source-yandex-metrica", "1.0.0"),
-    ("airbyte/destination-meilisearch", "1.0.0"),
     ("airbyte/destination-csv", "1.0.0"),
-    ("airbyte/source-metabase", "1.0.0"),
-    ("airbyte/source-typeform", "1.0.0"),
-    ("airbyte/source-recharge", "1.0.0"),
-    ("airbyte/source-pipedrive", "1.0.0"),
-    ("airbyte/source-paypal-transaction", "2.0.0"),
 ]
 
 

diff --git a/airbyte-integrations/connectors/destination-bigquery/build.gradle b/airbyte-integrations/connectors/destination-bigquery/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.10.0'
+    cdkVersionRequired = '0.10.1'
     features = ['db-destinations', 's3-destinations']
     useLocalCdk = false
 }

diff --git a/airbyte-integrations/connectors/destination-redshift/build.gradle b/airbyte-integrations/connectors/destination-redshift/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.10.0'
+    cdkVersionRequired = '0.10.1'
     features = ['db-destinations', 's3-destinations']
     useLocalCdk = false
 }

diff --git a/airbyte-integrations/connectors/destination-snowflake/build.gradle b/airbyte-integrations/connectors/destination-snowflake/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.10.0'
+    cdkVersionRequired = '0.10.1'
     features = ['db-destinations', 's3-destinations']
     useLocalCdk = false
 }

diff --git a/airbyte-integrations/connectors/source-microsoft-onedrive/metadata.yaml b/airbyte-integrations/connectors/source-microsoft-onedrive/metadata.yaml
@@ -7,7 +7,7 @@ data:
     oss:
       enabled: true
     cloud:
-      enabled: true
+      enabled: false # We need to either implement OAuth for cloud or remove OAuth from the config for cloud
   connectorBuildOptions:
     baseImage: docker.io/airbyte/python-connector-base:1.2.0@sha256:c22a9d97464b69d6ef01898edf3f8612dc11614f05a84984451dde195f337db9
   connectorSubtype: api

diff --git a/docs/cloud/managing-airbyte-cloud/understand-airbyte-cloud-limits.md b/docs/cloud/managing-airbyte-cloud/understand-airbyte-cloud-limits.md
@@ -12,16 +12,5 @@ Understanding the following limitations will help you more effectively manage Ai
 * Max number of streams that can be returned by a source in a discover call: 1K
 * Max number of streams that can be configured to sync in a single connection: 1K
 * Size of a single record: 20MB
-  * A flag can be set in order to log the PKs of the record that are skipped because of a size limit. In order to do that,
-the following entry need to be added to the file `flag.yml`: 
-```yaml
-  - name: platform.print-long-record-pks
-    serve: true
-```
-  * It is possible to not fail the syncs and instead skip the records by adding the following entry to the file `flag.yml`
-```yaml
-  - name: platform.fail-sync-if-too-big
-    serve: false
-```
 
 *Limits on workspaces, sources, and destinations do not apply to customers of [Powered by Airbyte](https://airbyte.com/solutions/powered-by-airbyte). To learn more [contact us](https://airbyte.com/talk-to-sales)!
diff --git a/docs/operating-airbyte/security.md b/docs/operating-airbyte/security.md
@@ -88,14 +88,6 @@ Note that this process is not reversible. Once you have converted to a secret st
 
 Most Airbyte Open Source connectors support encryption-in-transit (SSL or HTTPS). We recommend configuring your connectors to use the encryption option whenever available.
 
-### Telemetry
-
-Airbyte does send anonymized data to our services to improve the product (especially connector reliability and scale). To disable telemetry, modify the .env file and define the following environment variable:
-
-```
-TRACKING_STRATEGY=logging
-```
-
 ## Securing Airbyte Cloud
 
 Airbyte Cloud leverages the security features of leading Cloud providers and sets least-privilege access policies to ensure data security.

diff --git a/docs/operator-guides/telemetry.md b/docs/operator-guides/telemetry.md
@@ -0,0 +1,30 @@
+---
+products: all
+---
+
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+
+# Telemetry
+
+Airbyte collects telemetry data in the UI and the servers to help us understand users and their use-cases better to improve the product.
+
+Also check our [privacy policy](https://airbyte.com/privacy-policy) for more details.
+
+<Tabs groupId="cloud-hosted">
+  <TabItem value="self-managed" label="Self Managed">
+      To disable telemetry for your instance, modify the `.env` file and define the following environment variable:
+
+      ```
+      TRACKING_STRATEGY=logging
+      ```
+  </TabItem>
+  <TabItem value="cloud" label="Cloud">
+    When visiting the webapp or our homepage the first time, you'll be asked for your consent to
+    telemetry collection depending on the legal requirements of your location.
+
+    To change this later go to **Settings** > **User Settings** > **Cookie Preferences** or **Cookie Preferences** in the footer of our [homepage](https://airbyte.com).
+
+    Server side telemetry collection can't be changed using Airbyte Cloud.
+  </TabItem>
+</Tabs>
diff --git a/docs/operator-guides/upgrading-airbyte.md b/docs/operator-guides/upgrading-airbyte.md
@@ -128,7 +128,7 @@ If you are upgrading from (i.e. your current version of Airbyte is) Airbyte vers
    Here's an example of what it might look like with the values filled in. It assumes that the downloaded `airbyte_archive.tar.gz` is in `/tmp`.
 
    ```bash
-   docker run --rm -v /tmp:/config airbyte/migration:0.50.39 --\
+   docker run --rm -v /tmp:/config airbyte/migration:0.50.40 --\
    --input /config/airbyte_archive.tar.gz\
    --output /config/airbyte_archive_migrated.tar.gz
    ```