nh-main

.github/README.md

@@ -17,7 +17,6 @@ This is a **Linux Only package** with no Mac or Windows support.
   * [Testing](#testing)
   * [Building](#building)
   * [Debugging](#debugging)
-  * [Dev Repo](#dev-repo)
 - [Development & Release with GitHub Actions](#development--release-with-github-actions)
   * [Overview](#overview)
   * [Usage](#usage)
@@ -53,7 +52,7 @@ Those are available in the Docker Dev Container.
 `git clone` to start.
 
 * `src` directory contains the C++ code to bind to liboboe. 
-* `oboe` directory contains `liboboe` and its required header files. `liboboe` is downloaded from: https://files.appoptics.com/c-lib. Pre-release versions are at: https://rc-files-t2.s3-us-west-2.amazonaws.com/c-lib/
+* `oboe` directory contains `liboboe` and its required header files. `liboboe` is downloaded from: https://agent-binaries.cloud.solarwinds.com/apm/c-lib. Pre-release versions are at: https://agent-binaries.global.st-ssp.solarwinds.com/apm/c-lib
 * `test` directory contains the test suite. 
 * `.github` contains the files for github actions.
 * `dev` directory contains anything related to dev environment
@@ -62,7 +61,9 @@ Those are available in the Docker Dev Container.
 ## Docker Dev Container
 
 1. Start the Docker daemon (on a Mac that would be simplest using Docker desktop).
-2. Create a `.env` file and set: `APPOPTICS_SERVICE_KEY={a valid service key}`, `APPOPTICS_COLLECTOR={a url of the collector}` and `AO_TEST_PROD_SERVICE_KEY={a valid **production** service key}`.
+2. Create a `.env` file and set two sets of keys for both backends:
+- `APPOPTICS_SERVICE_KEY={a valid service key}`, `APPOPTICS_COLLECTOR={a url of the collector}` and `AO_TEST_PROD_SERVICE_KEY={a valid **production** service key}`.
+- `SW_APM_SERVICE_KEY={a valid service key}`, `SW_APM_COLLECTOR={a url of the collector}` and `SW_TEST_PROD_SERVICE_KEY={a valid **production** service key}`.
 3. Run `npm run dev`. This will create a docker container, set it up, and open a shell. Docker container will have all required build tools as well as nano installed, and access to GitHub SSH keys as configured. Repo code is **mounted** to the container.
 4. To open another shell in same container use: `docker exec -it dev-bindings /bin/bash`
 
@@ -163,39 +164,6 @@ Dump a `.node` file as asm (build debug for better symbols):
 
 `objdump -CRrS build/Release/ao-metrics.node  > ao-metrics.s`
 
-## Dev Repo
-
-The dev repo setup allows to run end-to-end `node-pre-gyp` and npm release process in a development environment.
-It also greatly simplifies creating and testing CI integrations such as GitHub Actions.
-
-It contains:
-  - dev repo: https://github.com/appoptics/appoptics-bindings-node-dev (private, permissions via AppOptics Organization admin)
-  - staging S3 bucket: https://apm-appoptics-bindings-node-dev-staging.s3.us-east-1.amazonaws.com (public, write permissions via SolarWinds admin)
-  - production S3 bucket: https://apm-appoptics-bindings-node-dev-production.s3.amazonaws.com (public, write permissions via SolarWinds admin)
-
-The dev repo was cloned from the main repo and setup with the appropriate secrets.
-
-To set the main repo to work with the dev repo:
-
-1. `git remote -v`
-2. `git remote add dev git@github.com:appoptics/appoptics-bindings-node-dev.git`
-3. `npm run dev:repo:reset`
-
-The script will:
-  - Force push all branches and tags to dev repo.
-  - Remove the local dev repo and clone a fresh one into a sibling directory. 
-  - Modify package.json:
-  ```
-  "name": "@appoptics/apm-binding-dev",
-  "staging_host": "https://apm-appoptics-bindings-node-dev-staging.s3.us-east-1.amazonaws.com",
-  "production_host": "https://apm-appoptics-bindings-node-dev-production.s3.amazonaws.com",
-  ```
-  - Commit updated `package.json` to `master` all branches.
-
-To start fresh on the dev repo run `npm run dev:repo:reset` again.
-
-When running a [Release](#release---push-version-tag) process on the dev repo, the package will be published to https://www.npmjs.com/package/@appoptics/apm-bindings-dev. It should be [unpublished](https://docs.npmjs.com/unpublishing-packages-from-the-registry) as soon as possible. Note that because the package is scoped to the organization, the organization admin must temporarily reassign this package to just the dev-internal team; this team has a single member, which is one of the requirements for unpublishing per https://docs.npmjs.com/policies/unpublish#packages-published-more-than-72-hours-ago.
-
 # Development & Release with GitHub Actions 
 
 > **tl;dr** Push to feature branch. Create Pull Request. Merge Pull Request. Push version tag to release. 
@@ -365,6 +333,10 @@ Repo is defined with the following secrets:
 APPOPTICS_SERVICE_KEY
 APPOPTICS_COLLECTOR
 AO_TEST_PROD_SERVICE_KEY
+SW_APM_SERVICE_KEY
+SW_APM_COLLECTOR
+SW_TEST_PROD_SERVICE_KEY
+
 STAGING_AWS_ACCESS_KEY_ID
 STAGING_AWS_SECRET_ACCESS_KEY
 PROD_AWS_ACCESS_KEY_ID

.github/config/build-group.json

@@ -2,25 +2,13 @@
 {
   "include": [
     {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:10-alpine3.9-build"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:10-centos7-build"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:12-alpine3.9-build"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:12-centos7-build"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:14-alpine3.10-build"
+      "image": "ghcr.io/$GITHUB_REPOSITORY/node:14-alpine3.13-build"
     },
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:14-centos7-build"
     },
     {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:16-alpine3.11-build"
+      "image": "ghcr.io/$GITHUB_REPOSITORY/node:16-alpine3.13-build"
     },
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:16-centos7-build"

.github/config/docker-node.json

@@ -1,37 +1,7 @@
 {
   "include": [
     {
-      "tag": "10-alpine3.9-build"
-    },
-    {
-      "tag": "10-centos7-build"
-    },
-    {
-      "tag": "10-amazonlinux2"
-    },
-    {
-      "tag": "10-centos7"
-    },
-    {
-      "tag": "10-centos8"
-    },
-    {
-      "tag": "12-alpine3.9-build"
-    },
-    {
-      "tag": "12-centos7-build"
-    },
-    {
-      "tag": "12-amazonlinux2"
-    },
-    {
-      "tag": "12-centos7"
-    },
-    {
-      "tag": "12-centos8"
-    },
-    {
-      "tag": "14-alpine3.10-build"
+      "tag": "14-alpine3.13-build"
     },
     {
       "tag": "14-centos7-build"
@@ -46,11 +16,17 @@
       "tag": "14-centos8"
     },
     {
-      "tag": "16-alpine3.11-build"
+      "tag": "16-alpine3.13-build"
     },
     {
       "tag": "16-centos7-build"
     },
+    {
+      "tag": "16-centos7"
+    },
+    {
+      "tag": "16-centos8"
+    },
     {
       "tag": "16-amazonlinux2"
     },

.github/config/fallback-group.json

@@ -1,20 +1,5 @@
 {
   "include": [
-    {
-      "image": "node:10-buster"
-    },
-    {
-      "image": "node:10-stretch"
-    },
-    {
-      "image": "node:12-buster"
-    },
-    {
-      "image": "node:12-stretch"
-    },
-    {
-      "image": "node:12-bullseye"
-    },
     {
       "image": "node:14-buster"
     },

.github/config/prebuilt-group.json

@@ -1,86 +1,5 @@
 {
   "include": [
-    {
-      "image": "node:10-buster-slim"
-    },
-    {
-      "image": "node:10-stretch-slim"
-    },
-    {
-      "image": "node:10-alpine3.9"
-    },
-    {
-      "image": "node:10-alpine3.10"
-    },
-    {
-      "image": "node:10-alpine3.11"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:10-centos7"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:10-centos8"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:10-amazonlinux2"
-    },
-    {
-      "image": "node:12-buster-slim"
-    },
-    {
-      "image": "node:12-stretch-slim"
-    },
-    {
-      "image": "node:12-bullseye-slim"
-    },
-    {
-      "image": "node:12-alpine3.9"
-    },
-    {
-      "image": "node:12-alpine3.10"
-    },
-    {
-      "image": "node:12-alpine3.11"
-    },
-    {
-      "image": "node:12-alpine3.12"
-    },
-    {
-      "image": "node:12-alpine3.13"
-    },
-    {
-      "image": "node:12-alpine3.14"
-    },
-    {
-      "image": "node:12-alpine3.15"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:12-centos7"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:12-centos8"
-    },
-    {
-      "image": "ghcr.io/$GITHUB_REPOSITORY/node:12-amazonlinux2"
-    },
-    {
-      "image": "node:14-buster-slim"
-    },
-    {
-      "image": "node:14-stretch-slim"
-    },
-    {
-      "image": "node:14-bullseye-slim"
-    },
-    {
-      "image": "node:14-alpine3.10"
-    },
-    {
-      "image": "node:14-alpine3.11"
-    },
-    {
-      "image": "node:14-alpine3.12"
-    },
     {
       "image": "node:14-alpine3.13"
     },
@@ -90,6 +9,9 @@
     {
       "image": "node:14-alpine3.15"
     },
+    {
+      "image": "node:14-alpine3.16"
+    },
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:14-centos7"
     },
@@ -99,32 +21,20 @@
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:14-amazonlinux2"
     },
-    {
-      "image": "node:16-buster-slim"
-    },
-    {
-      "image": "node:16-stretch-slim"
-    },
     {
       "image": "node:16-stretch"
     },
-    {
-      "image": "node:16-bullseye-slim"
-    },
-    {
-      "image": "node:16-alpine3.11"
-    },
-    {
-      "image": "node:16-alpine3.12"
-    },
     {
       "image": "node:16-alpine3.13"
     },
     {
       "image": "node:16-alpine3.14"
     },
     {
-      "image": "node:14-alpine3.15"
+      "image": "node:16-alpine3.15"
+    },
+    {
+      "image": "node:16-alpine3.16"
     },
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:16-centos7"
@@ -135,18 +45,15 @@
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:16-amazonlinux2"
     },
-    {
-      "image": "node:18-buster-slim"
-    },
-    {
-      "image": "node:18-bullseye-slim"
-    },
     {
       "image": "node:18-alpine3.14"
     },
     {
       "image": "node:18-alpine3.15"
     },
+    {
+      "image": "node:18-alpine3.16"
+    },
     {
       "image": "ghcr.io/$GITHUB_REPOSITORY/node:18-rhel8"
     },