Merge branch 'master' into release/1.1

.github/workflows/build.yml

@@ -182,7 +182,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: scopeci
           password: ${{ secrets.SCOPECI_TOKEN }}
@@ -192,12 +192,12 @@ jobs:
       # needed here since we're only building natively but we're leaving it in
       # since it'll be done by our build system anyway.
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       # Start a BuildX builder. We'll use the outputs later so give it an ID.
       - name: Setup Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       # We'll tell BuildX to `--cache-from` this folder to speed up the build
       # of our `appscope-builder` image. 
@@ -276,7 +276,7 @@ jobs:
           upload-chunk-size: 1000000
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: scopeci
           password: ${{ secrets.SCOPECI_TOKEN }}
@@ -449,14 +449,14 @@ jobs:
       # We skip this step if we're not going to push the resulting container image
       - name: Login to Container Registry
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: scopeci
           password: ${{ secrets.SCOPECI_TOKEN }}
@@ -496,14 +496,14 @@ jobs:
 
       - name: Login to Container Registry
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: scopeci
           password: ${{ secrets.SCOPECI_TOKEN }}
@@ -529,17 +529,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Setup Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       # We skip this step if we're not going to push the resulting container image
       - name: Login to Container Registry
         # TODO only if needs.test-*.results == 'success'
         if: ${{ needs.info.outputs.push == 'true' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: scopeci
           password: ${{ secrets.SCOPECI_TOKEN }}

src/evtformat.c

@@ -562,7 +562,7 @@ fmtMetricJson(event_t *metric, regex_t *fieldFilter, watch_t src, custom_tag_t *
     // Add fields
 
     // addedFields lets us avoid duplicate field names.  If we go to
-    // add one that's already in the set, skip it.  In this way precidence
+    // add one that's already in the set, skip it.  In this way precedence
     // is given to capturedFields then custom fields then remaining fields.
     addedFields = strSetCreate(DEFAULT_SET_SIZE);
     if (!addJsonFields(metric->capturedFields, fieldFilter, json, addedFields)) goto err;

src/mtcformat.c

@@ -243,7 +243,7 @@ mtcFormatStatsDString(mtc_fmt_t* fmt, event_t* e, regex_t* fieldFilter)
     scope_strcpy(end, "\n");
 
     // addedFields lets us avoid duplicate field names.  If we go to
-    // add one that's already in the set, skip it.  In this way precidence
+    // add one that's already in the set, skip it.  In this way precedence
     // is given to capturedFields then custom fields then remaining fields.
     strset_t *addedFields = strSetCreate(DEFAULT_SET_SIZE);
     addStatsdFields(fmt, e->capturedFields, &end, &bytes, addedFields, NULL);

src/scope.c

@@ -92,7 +92,7 @@ showUsage(char *prog)
       "\n"
       "Cribl AppScope Dynamic Loader %s\n"
       "\n"
-      "AppScope is a general-purpose observable applciation telemetry system.\n"
+      "AppScope is a general-purpose observable application telemetry system.\n"
       "\n"
       "usage: %s [OPTIONS] --lib LIBRARY [--] EXECUTABLE [ARGS...]\n"
       "       %s [OPTIONS] --attach PID\n"

src/transport.c

@@ -706,11 +706,6 @@ checkPendingSocketStatus(transport_t *trans)
     // If the placeDescriptor call failed, we're done
     if (trans->net.sock == -1) return 0;
 
-    // Set the TCP socket to blocking
-    if ((trans->type == CFG_TCP) && !setSocketBlocking(trans, trans->net.sock, TRUE)) {
-        DBG("%d %s %s", trans->net.sock, trans->net.host, trans->net.port);
-    }
-
     // Set TCP_QUICKACK
 #if defined(TCP_QUICKACK) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
     if (trans->type == CFG_TCP) {
@@ -739,6 +734,9 @@ checkPendingSocketStatus(transport_t *trans)
         // when successful, we'll have a connected tls socket.
         // when not, this will cleanup, disconnecting the socket.
         establishTlsSession(trans);
+
+        // If the establishTlsSession call failed, we're done
+        if (trans->net.sock == -1) return 0;
     }
 
     // Set the TCP socket to blocking

src/wrap.c

@@ -1261,7 +1261,7 @@ findLibscopePath(struct dl_phdr_info *info, size_t size, void *data)
 
 /*
  * Iterate all shared objects and GOT hook as necessary.
- * Return FALSE in all cases in order to interate all objects.
+ * Return FALSE in all cases in order to iterate all objects.
  * Ignore a set of objects we know we don't want to hook.
  */
 static int

website/src/data/corpSiteNav.yaml

@@ -1,13 +1,13 @@
 - navigationLeft:
   - parent: Products
     child: 
-      - link: LogStream
-        url: https://cribl.io/product/
-      - link: LogStream Cloud
-        url: https://cribl.io/logstream-cloud/
-      - link: Pricing
-        url: https://cribl.io/cribl-logstream-pricing/
-      - link: Download Logstream
-        url: https://cribl.io/download/
+      - link: Cribl Stream
+        url: https://cribl.io/stream/
+      - link: Cribl Edge
+        url: https://cribl.io/edge/
+      - link: Cribl.Cloud
+        url: https://cribl.io/cribl-cloud/
+      - link: AppScope
+        url: https://cribl.io/appscope/
   - parent: About Cribl
     link: https://cribl.io/about-us

website/src/data/documentationNav.yaml

@@ -63,7 +63,7 @@
     - name: Known Issues
       path: /docs/known-issues
 
-- name: Community
+- name: Join
   child: 
     - name: Community
       path: /docs/community      

website/src/data/header.yaml

@@ -1,6 +1,3 @@
-- name: Overview
-  path: /
-
 - name: Docs
   path: /docs/overview
 
@@ -13,4 +10,5 @@
   #     path: /resources/level2
 
 - name: Community
-  path: https://cribl.io/community?utm_source=appscope&utm_medium=footer&utm_campaign=appscope
+  path: /docs/community
+

website/src/data/readyGetStarted.yaml

@@ -1,9 +1,9 @@
 - title: Want to Contribute?
-  description: We’re proud to make AppScope available as open source under the Apache Software License v2.0. You can join the AppScope development by contributing code and documentation on Github, and by joining our Slack community.
+  description: We’re proud to make AppScope available as open source under the Apache Software License v2.0. You can join the AppScope development effort by contributing code and documentation on Github, and by joining our Slack community.
   items:
     - icon: github
       url: https://github.com/criblio/appscope
       buttonText: Fork On Github
     - icon:
-      url: https://cribl.io/community?utm_source=appscope&utm_medium=footer&utm_campaign=appscope
+      url: https://cribl.io/community/#form?utm_source=appscope&utm_medium=footer&utm_campaign=appscope
       buttonText: Join Our Community

website/src/pages/docs/changelog.md

@@ -6,6 +6,24 @@ title: Changelog
 
 See the AppScope repo to view [all issues](https://github.com/criblio/appscope/issues).
 
+## AppScope 1.0.4
+
+2022-05-10 - Maintenance Release
+
+Assets are available via Docker and the Cribl CDN at the links below.
+
+- `Docker`: `cribl/scope:1.0.4`
+- `x86`: [https://cdn.cribl.io/dl/scope/1.0.4/linux/x86_64/scope](https://cdn.cribl.io/dl/scope/1.0.4/linux/x86_64/scope)
+- `ARM`: [https://cdn.cribl.io/dl/scope/1.0.4/linux/aarch64/scope](https://cdn.cribl.io/dl/scope/1.0.4/linux/aarch64/scope)
+
+### Fixes
+
+AppScope 1.0.4 aims to resolve reported connectivity issues.
+
+- [#896](https://github.com/criblio/appscope/issues/896) AppScope now creates a connection dedicated to transmitting payload data only if payloads are enabled.
+- [#665](https://github.com/criblio/appscope/issues/665) AppScope now has safeguards to ensure that AppScope does not interfere with scoped processes exiting.
+- [#869](https://github.com/criblio/appscope/issues/869) AppScope now uses an improved algorithm for omitting raw binary data from console events. The improved algorithm is better able to handle commands that switch back and forth between outputting text and outputting raw binary data to the console.
+
 ## AppScope 1.0.3
 
 2022-04-12 - Maintenance Release

website/src/pages/docs/cli-reference.md

@@ -483,7 +483,7 @@ scope run -c tcp://127.0.0.1:10091 -- curl https://wttr.in/94105
 ### service
 ---
 
-Configures the specificied `systemd` service to be scoped upon starting.
+Configures the specified `systemd` service to be scoped upon starting.
 
 #### Usage
 

website/src/pages/docs/community.md

@@ -4,12 +4,10 @@ title: Community
 
 # Community
 
-## Join Our Community
-
 To connect with other AppScope users and developers:
 
 - Visit Cribl's [Q&A site](https://curious.cribl.io/).
-- Visit our [Community Slack](https://cribl-community.slack.com/).
+- Join Cribl's [Community Slack](https://cribl.io/community/#form) and check out the `#appscope` channel.
 - Check out learning and other resources in [Cribl Community](https://cribl.io/community?utm_source=appscope&utm_medium=footer&utm_campaign=appscope).
 
 ## How to Contribute

website/src/pages/docs/cribl-integration.md

@@ -10,7 +10,7 @@ AppScope can also easily connect to Cribl LogStream ([overview](https://cribl.io
 
 ## Integrating with Cribl Edge
 
-AppScope will connect with Cribl Edge when the `cribl` backend is enabled with the `edge` transport type. These are default settings for the AppScope libary, which is [best suited](/docs/working-with) for the kinds of longer-running, planned monitoring procedures that tend to scale, and where the AppScope-Cribl Edge combination excels. 
+AppScope will connect with Cribl Edge when the `cribl` backend is enabled with the `edge` transport type. These are default settings for the AppScope library, which is [best suited](/docs/working-with) for the kinds of longer-running, planned monitoring procedures that tend to scale, and where the AppScope-Cribl Edge combination excels. 
 
 The CLI, by contrast, writes to the local filesystem by default; and the CLI is best suited for ad hoc exploration that's less likely to scale to large numbers of scoped processes.
 

website/src/pages/docs/known-issues.md

@@ -10,7 +10,9 @@ title: Known Issues
 
 As of this AppScope release, known issues include:
 
-- [#869](https://github.com/criblio/appscope/issues/869) AppScope's ability to avoid outputting binary data in console messages does not work perfectly in all situations. When data is first sent to the console by a scoped app, AppScope can detect whether it is binary, and if so, redact it while emitting an informative message. But when apps switch back and forth between textual and binary data, AppScope does not detect the change, and binary data can appear in console output.  
+- [#869](https://github.com/criblio/appscope/issues/869) AppScope's ability to avoid outputting binary data in console messages does not work perfectly in all situations. When data is first sent to the console by a scoped app, AppScope can detect whether it is binary, and if so, redact it while emitting an informative message. But when apps switch back and forth between textual and binary data, AppScope does not detect the change, and binary data can appear in console output.
+  - **Fix:** 1.0.4
+
 - [#831](https://github.com/criblio/appscope/issues/831) When you scope the Microsoft Edge browser, AppScope fails to collect some HTTP events in these situations: (1) When Edge requests the use of HTTP/3; (2) When Edge uses HTTP/1.1 over UDP to request a list of plug-and-play devices from a Microsoft service; and, (3) when Edge uses SSL.  
 
 ## AppScope 1.0.0