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

fix: install_unix.sh breaks with status code 2 in non-interactive environments #1813

Open
wants to merge 4 commits into
base: release/v1.59.0
Choose a base branch
from
Open

fix: install_unix.sh breaks with status code 2 in non-interactive environments #1813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0280754
Update modules to v1.59.0
dpaasman00 Aug 20, 2024
7d12a58
chore(release): Use 8 core runner (#1810)
jsirianni Aug 20, 2024
2c98147
feat: Add routing connector (#1811)
BinaryFissionGames Aug 21, 2024
793a15a
Make install_unix.sh functional with non-interactive environments
dithmer Aug 24, 2024
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 .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

release:
needs: [build-64bit-msi]
runs-on: ubuntu-latest-4-cores
runs-on: ubuntu-latest-8-cores
steps:
- name: Checkout Repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion cmd/plugindocgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/plugindocgen
go 1.21.9

require (
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.59.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/chronicleexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.9
require (
github.com/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/chronicleforwarderexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter
go 1.21.9

require (
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
Expand Down
2 changes: 2 additions & 0 deletions factories/connectors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package factories

import (
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
"go.opentelemetry.io/collector/connector"
Expand All @@ -27,4 +28,5 @@ var defaultConnectors = []connector.Factory{
forwardconnector.NewFactory(),
servicegraphconnector.NewFactory(),
spanmetricsconnector.NewFactory(),
routingconnector.NewFactory(),
}
61 changes: 31 additions & 30 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,38 @@ go 1.21.9
require (
github.com/google/uuid v1.6.0
github.com/mholt/archiver/v3 v3.5.1
github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.58.0
github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.58.0
github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.58.0
github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.58.0
github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.58.0
github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.58.0
github.com/observiq/bindplane-agent/internal/report v1.58.0
github.com/observiq/bindplane-agent/packagestate v1.58.0
github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/logcountprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/lookupprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/maskprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/samplingprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/spancountprocessor v1.58.0
github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.58.0
github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/httpreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/m365receiver v1.58.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.58.0
github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.58.0
github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.59.0
github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.59.0
github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.59.0
github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.59.0
github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.59.0
github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.59.0
github.com/observiq/bindplane-agent/internal/report v1.59.0
github.com/observiq/bindplane-agent/packagestate v1.59.0
github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/logcountprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/logdeduplicationprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/lookupprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/maskprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/samplingprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/spancountprocessor v1.59.0
github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.59.0
github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/httpreceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/m365receiver v1.59.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.59.0
github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.59.0
github.com/oklog/ulid/v2 v2.1.0
github.com/open-telemetry/opamp-go v0.9.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.107.0
Expand Down Expand Up @@ -331,8 +332,8 @@ require (
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/observiq/bindplane-agent/counter v1.58.0 // indirect
github.com/observiq/bindplane-agent/expr v1.58.0 // indirect
github.com/observiq/bindplane-agent/counter v1.59.0 // indirect
github.com/observiq/bindplane-agent/expr v1.59.0 // indirect
github.com/observiq/bindplane-agent/internal/rehydration v1.54.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.107.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,6 +1908,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnect
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0/go.mod h1:Fz1oG0B2AVwSAG22GOZc9EGpOXqdHJtYU0F0+KjA6zs=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0 h1:5nCidAaa6vxj85UHOz7/kqtVsnbFMXyDDUV0Ima8FHk=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.107.0/go.mod h1:X+V2G++oM4NHchq7RR4kpL32zKzd6fH4QQzO7/F8i24=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0 h1:jS6ACtJreXaDLG/zp90goLERgsrj4vQrGKZNiFBKGho=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.107.0/go.mod h1:uZus6WqY8aYfns2J2fZrFyyyBNZX7Ghi7s7wSc/02Kw=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0 h1:llpmzV6B3ayRns2O2VUvnmQhBmFYea6B9G/j3TubjnM=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.107.0/go.mod h1:vG1hP4f3oLQI4qCm58GiCXm4X0QiKLojybCM9vqeFXc=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.107.0 h1:1S+oa3bMVrSi7PclgMvxtyPAi8mTdHsuDqAq8XA06qU=
Expand Down
2 changes: 1 addition & 1 deletion internal/rehydration/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/internal/rehydration
go 1.21.9

require (
github.com/observiq/bindplane-agent/internal/testutils v1.58.0
github.com/observiq/bindplane-agent/internal/testutils v1.59.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
go.opentelemetry.io/collector/consumer v0.107.0
Expand Down
6 changes: 3 additions & 3 deletions processor/datapointcountprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/datapointcountprocessor
go 1.21.9

require (
github.com/observiq/bindplane-agent/counter v1.58.0
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0
github.com/observiq/bindplane-agent/counter v1.59.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
Expand Down
6 changes: 3 additions & 3 deletions processor/logcountprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/logcountprocessor
go 1.21.9

require (
github.com/observiq/bindplane-agent/counter v1.58.0
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0
github.com/observiq/bindplane-agent/counter v1.59.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
Expand Down
4 changes: 2 additions & 2 deletions processor/metricextractprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/observiq/bindplane-agent/processor/metricextractprocessor
go 1.21.9

require (
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.107.0
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion processor/snapshotprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/processor/snapshotprocessor
go 1.21.9

require (
github.com/observiq/bindplane-agent/internal/report v1.58.0
github.com/observiq/bindplane-agent/internal/report v1.59.0
github.com/open-telemetry/opamp-go v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.107.0
Expand Down
6 changes: 3 additions & 3 deletions processor/spancountprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/spancountprocessor
go 1.21.9

require (
github.com/observiq/bindplane-agent/counter v1.58.0
github.com/observiq/bindplane-agent/expr v1.58.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.58.0
github.com/observiq/bindplane-agent/counter v1.59.0
github.com/observiq/bindplane-agent/expr v1.59.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/awss3rehydrationreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
github.com/observiq/bindplane-agent/internal/rehydration v1.54.0
github.com/observiq/bindplane-agent/internal/testutils v1.58.0
github.com/observiq/bindplane-agent/internal/testutils v1.59.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
go.opentelemetry.io/collector/confmap v0.107.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/azureblobrehydrationreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.9
require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
github.com/observiq/bindplane-agent/internal/rehydration v1.54.0
github.com/observiq/bindplane-agent/internal/testutils v1.58.0
github.com/observiq/bindplane-agent/internal/testutils v1.59.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.107.0
go.opentelemetry.io/collector/confmap v0.107.0
Expand Down
60 changes: 36 additions & 24 deletions scripts/install/install_unix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,40 @@ SCRIPT_NAME="$0"
INDENT_WIDTH=' '
indent=""

IS_INTERACTIVE="false"
case "$-" in
*i*) IS_INTERACTIVE="true" ;;
esac

Comment on lines +38 to +42
Copy link
Member

Choose a reason for hiding this comment

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

This seems to always be false in the environment I'm testing in 🤔

For reference, I'm testing in a fresh Ubuntu Server 24.04 install. The exiting with status code 2 issue is fixed, but we don't get the coloring like we should.

# out_file_path is the full path to the downloaded package (e.g. "/tmp/observiq-otel-collector_linux_amd64.deb")
out_file_path="unknown"

# Colors
num_colors=$(tput colors 2>/dev/null)
if test -n "$num_colors" && test "$num_colors" -ge 8; then
bold="$(tput bold)"
underline="$(tput smul)"
# standout can be bold or reversed colors dependent on terminal
standout="$(tput smso)"
reset="$(tput sgr0)"
bg_black="$(tput setab 0)"
bg_blue="$(tput setab 4)"
bg_cyan="$(tput setab 6)"
bg_green="$(tput setab 2)"
bg_magenta="$(tput setab 5)"
bg_red="$(tput setab 1)"
bg_white="$(tput setab 7)"
bg_yellow="$(tput setab 3)"
fg_black="$(tput setaf 0)"
fg_blue="$(tput setaf 4)"
fg_cyan="$(tput setaf 6)"
fg_green="$(tput setaf 2)"
fg_magenta="$(tput setaf 5)"
fg_red="$(tput setaf 1)"
fg_white="$(tput setaf 7)"
fg_yellow="$(tput setaf 3)"
if $IS_INTERACTIVE; then
# Colors
num_colors=$(tput colors 2>/dev/null)
if test -n "$num_colors" && test "$num_colors" -ge 8; then
bold="$(tput bold)"
underline="$(tput smul)"
# standout can be bold or reversed colors dependent on terminal
standout="$(tput smso)"
reset="$(tput sgr0)"
bg_black="$(tput setab 0)"
bg_blue="$(tput setab 4)"
bg_cyan="$(tput setab 6)"
bg_green="$(tput setab 2)"
bg_magenta="$(tput setab 5)"
bg_red="$(tput setab 1)"
bg_white="$(tput setab 7)"
bg_yellow="$(tput setab 3)"
fg_black="$(tput setaf 0)"
fg_blue="$(tput setaf 4)"
fg_cyan="$(tput setaf 6)"
fg_green="$(tput setaf 2)"
fg_magenta="$(tput setaf 5)"
fg_red="$(tput setaf 1)"
fg_white="$(tput setaf 7)"
fg_yellow="$(tput setaf 3)"
fi
fi

if [ -z "$reset" ]; then
Expand Down Expand Up @@ -328,6 +335,11 @@ set_proxy()
info "Using proxy from arguments: $proxy"
if [ -n "$proxy_user" ]; then
while [ -z "$proxy_password" ] ; do
if ! $IS_INTERACTIVE; then
error_exit "$LINENO" "The proxy password must be set via the command line argument -P, if called non-interactively!"
exit
fi

increase_indent
command printf "${indent}$(fg_blue "$proxy_user@$proxy")'s password: "
stty -echo
Expand Down
2 changes: 1 addition & 1 deletion updater/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.9

require (
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/observiq/bindplane-agent/packagestate v1.58.0
github.com/observiq/bindplane-agent/packagestate v1.59.0
github.com/open-telemetry/opamp-go v0.9.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand Down
Loading