Merge branch 'master' into regal-voice-source

Author: markzegarelli

.buildkite/pipeline.yml

@@ -1,4 +1,23 @@
 steps:
+  - label: ":hammer: Install Dependencies"
+    command:
+      - make deps
+    env:
+      SEGMENT_CONTEXTS: "snyk, aws-credentials"
+    plugins:
+      - docker#v3.3.0:
+          image: jekyll/jekyll:4.2.0
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
+          paths: [ "vendor/" ]
+          save: true
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
+          paths: [ "node_modules/" ]
+          save: true
+
+  - wait: ~
+
   - label: ":hammer: Build Dependencies and Docs"
     command:
       - make test
@@ -10,18 +29,17 @@ steps:
         - build_package.tar.gz
     plugins:
       - docker#v3.3.0:
-          image: jekyll/jekyll
+          image: jekyll/jekyll:4.2.0
           environment:
             - BUILDKITE_BRANCH
-
-      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
-          key: "v1-cache-gem-{{ checksum 'Gemfile.lock' }}"
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
           paths: [ "vendor/" ]
-      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
-          key: "v1-cache-npm-{{ checksum 'yarn.lock' }}"
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
           paths: [ "node_modules/" ]
-     
-  - wait
+
+  - wait: ~
 
   - label: ":shipit: Deploy Docs to S3"
     env:
@@ -30,4 +48,4 @@ steps:
     command:
       - buildkite-agent artifact download build_package.tar.gz .
       - make unzip-artifacts
-      - make upload-docs
+      - make upload-docs

Gemfile.lock

@@ -97,6 +97,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
   dotenv
@@ -115,4 +116,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.2

Makefile

@@ -101,8 +101,9 @@ node_modules: package.json yarn.lock
 vendor/bundle:
 	@export BUNDLE_PATH="vendor/bundle"
 	@mkdir -p vendor && mkdir -p vendor/bundle
-	@chmod -R 777 vendor/
-	@bundle install --path=vendor/bundle
+	@chmod -R 777 vendor/ Gemfile.lock
+	@bundle config set --local path 'vendor/bundle'
+	@bundle install
 
 
 .PHONY: lint

src/connections/destinations/catalog/hubspot/index.md

@@ -259,16 +259,16 @@ Personas sends **Account-Level data** to HubSpot using **Identify** calls to add
 
 
 4. Go to your HubSpot Settings.
-5. Create a new `contact property` in HubSpot for each audience you want HubSpot to receive from Personas.
+5. Create a new `property` in HubSpot for each audience you want HubSpot to receive from Personas.
    This is required because HubSpot’s schema is explicitly defined.
    You must do this *before* you send any Personas data from Segment to HubSpot.
 
    ![](images/hubspot-personas04.png)
 
 
 6. Set the object type.
-   - For Personas Audiences that are only individual users, set the **Object Type** as `Contact`.
-   - For Audiences that use *Groups*, set the **Object type** to `Contact information`.
+   - For user-level Audiences, set the **Object Type** to `Contact` and the **Group** to `Contact information`.
+   - For account-level Audiences, set the **Object type** to `Company` and the **Group** to `Company information`.
 
 7. Enter the label for the custom property, and make sure it matches the Audience Key you wrote down from the Personas audience builder (see the tip below). Click **Next**.
 

src/personas/rate-limits.md

@@ -12,6 +12,8 @@ These rate limits were added to our product documentation on December 9, 2020.
 | Inbound Historical Replay Throughput        | 1000 events per second                                      |
 | Outbound Downstream Destination Rate Limits | Reduced retries when failures exceed 1000 events per second |
 | Profile API throughput                      | 100 requests per second                                     |
+| Identity Merges                             | 100 merges                                                  |
+| Identity Mappings                           | 1000 mappings                                               |
 
 ## Inbound Data Throughput
 
@@ -28,3 +30,11 @@ Most destinations have their own rate limits that Segment cannot control. In som
 ## Profile API throughput
 
 If a Customer sends more than 100 requests a second per space to the Profile API, Segment will return a 429 rate-limiting error. Any requests to raise that limit must be made in writing with Segment. Please reach out to [email protected] with details on your use case and estimated throughput.
+
+## Identity Merges
+
+Personas supports up to 100 merges per profile in its identity graph. A merge occurs when two existing profile are joined together by a common external_id. For example, if a user starts their journey on mobile, and then signs in via a web application, those two user profiles are joined together by a common identifier like a user_id. Messages that attempt additional merges are usually a sign of a corrupt profile and are dropped.
+
+## Identity Mappings
+
+Personas supports up to 1000 mappings per profile in its identity graph. Mappings are external id values like a user_id, email, mobile advertising id, or any custom id's. Messages that attempt to add additional mappings are usually a sign of a corrupt profile and are dropped. Note that this limit counts mappings across all merged profiles.

src/segment-app/iam/index.md

@@ -27,7 +27,7 @@ Users access their Segment account with either email/password credentials, or by
 `Owners` manage all aspects of the workspace, and `members` can have access to specific products and resource types.
 
 > info ""
-> **Note**: If you are on a Free or Team plan, only the `workspace owner` and `source admin` roles are available._
+> **Note**: If you are on a Free or Team plan, only the `workspace owner` and `source admin` roles are available.
 
 Check out the [Roles documentation](/docs/segment-app/iam/roles/) for more details.