Skip to content

Commit

Permalink
Release v1.44.0 (#1445)
Browse files Browse the repository at this point in the history
  • Loading branch information
Corbin Phelps authored Feb 5, 2024
2 parents 13be017 + 6496e98 commit 188e295
Show file tree
Hide file tree
Showing 82 changed files with 9,532 additions and 218 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/multi_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest-4-cores
steps:
- name: Checkout Sources
uses: actions/checkout@v4
Expand All @@ -23,7 +23,7 @@ jobs:
go install github.com/uw-labs/[email protected]
lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
build_darwin:
runs-on: macos-11
runs-on: macos-14
steps:
- name: Checkout Sources
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-11, windows-2022-8-cores]
os: [ubuntu-20.04, macos-14, windows-2022-8-cores]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Sources
Expand Down
24 changes: 24 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,25 @@ builds:
- arm64
- arm
- "386"
- ppc64
- ppc64le
ignore:
- goos: windows
goarch: arm
- goos: windows
goarch: arm64
- goos: windows
goarch: ppc64
- goos: windows
goarch: ppc64le
- goos: linux
goarch: "386"
- goos: darwin
goarch: "386"
- goos: darwin
goarch: ppc64
- goos: darwin
goarch: ppc64le
ldflags:
- -s -w
- -X github.com/observiq/bindplane-agent/internal/version.version=v{{ .Version }}
Expand All @@ -52,15 +62,25 @@ builds:
- arm64
- arm
- "386"
- ppc64
- ppc64le
ignore:
- goos: windows
goarch: arm
- goos: windows
goarch: arm64
- goos: windows
goarch: ppc64
- goos: windows
goarch: ppc64le
- goos: linux
goarch: "386"
- goos: darwin
goarch: "386"
- goos: darwin
goarch: ppc64
- goos: darwin
goarch: ppc64le
ldflags:
- -s -w
- -X github.com/observiq/bindplane-agent/updater/internal/version.version=v{{ .Version }}
Expand Down Expand Up @@ -236,6 +256,7 @@ dockers:
- config/example.yaml
- config/logging.stdout.yaml
- LICENSE
- release_deps/opentelemetry-java-contrib-jmx-metrics.jar
- id: ubuntu-arm64
goos: linux
goarch: arm64
Expand Down Expand Up @@ -280,6 +301,7 @@ dockers:
- config/example.yaml
- config/logging.stdout.yaml
- LICENSE
- release_deps/opentelemetry-java-contrib-jmx-metrics.jar

- id: ubi8-amd64
goos: linux
Expand Down Expand Up @@ -307,6 +329,7 @@ dockers:
- config/example.yaml
- config/logging.stdout.yaml
- LICENSE
- release_deps/opentelemetry-java-contrib-jmx-metrics.jar
- id: ubi8-arm64
goos: linux
goarch: arm64
Expand All @@ -333,6 +356,7 @@ dockers:
- config/example.yaml
- config/logging.stdout.yaml
- LICENSE
- release_deps/opentelemetry-java-contrib-jmx-metrics.jar

docker_manifests:
- name_template: "observiq/observiq-otel-collector:latest"
Expand Down
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,22 @@ build-binaries: agent updater
build-all: build-linux build-darwin build-windows

.PHONY: build-linux
build-linux: build-linux-amd64 build-linux-arm64 build-linux-arm
build-linux: build-linux-amd64 build-linux-arm64 build-linux-arm build-linux-ppc64 build-linux-ppc64le

.PHONY: build-darwin
build-darwin: build-darwin-amd64 build-darwin-arm64

.PHONY: build-windows
build-windows: build-windows-amd64 build-windows-x86

.PHONY: build-linux-ppc64
build-linux-ppc64:
GOOS=linux GOARCH=ppc64 $(MAKE) build-binaries -j2

.PHONY: build-linux-ppc64le
build-linux-ppc64le:
GOOS=linux GOARCH=ppc64le $(MAKE) build-binaries -j2

.PHONY: build-linux-amd64
build-linux-amd64:
GOOS=linux GOARCH=amd64 $(MAKE) build-binaries -j2
Expand Down
4 changes: 2 additions & 2 deletions cmd/plugindocgen/go.mod
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.20

require (
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.43.1
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.44.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -21,7 +21,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/plugindocgen/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@ github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3
github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
Expand Down
12 changes: 1 addition & 11 deletions docker/Dockerfile.ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@
# limitations under the License.


# JMX stage downloads the opentelemetry-jmx-metrics.jar used by JMX receivers
#
FROM curlimages/curl:7.82.0 as jmxjar
ARG JMX_JAR_VERSION=v1.15.0
USER root
RUN curl -L \
--output /opentelemetry-java-contrib-jmx-metrics.jar \
"https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${JMX_JAR_VERSION}/opentelemetry-jmx-metrics.jar"


# eclipse-temurn stage provides the Java runtime used by JMX receivers.
# It is a replacement for the openjdk image, which is considered deprecated.
#
Expand Down Expand Up @@ -65,7 +55,7 @@ RUN mkdir /licenses
COPY LICENSE /licenses/observiq-otel-collector.license

COPY observiq-otel-collector /collector/observiq-otel-collector
COPY --from=jmxjar /opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
COPY plugins /etc/otel/plugins

COPY config/logging.stdout.yaml /etc/otel/logging.yaml
Expand Down
12 changes: 1 addition & 11 deletions docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@
# limitations under the License.


# JMX stage downloads the opentelemetry-jmx-metrics.jar used by JMX receivers
#
FROM curlimages/curl:7.82.0 as jmxjar
ARG JMX_JAR_VERSION=v1.15.0
USER root
RUN curl -L \
--output /opentelemetry-java-contrib-jmx-metrics.jar \
"https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/${JMX_JAR_VERSION}/opentelemetry-jmx-metrics.jar"


# eclipse-temurn stage provides the Java runtime used by JMX receivers.
# It is a replacement for the openjdk image, which is considered deprecated.
#
Expand Down Expand Up @@ -66,7 +56,7 @@ RUN mkdir /licenses
COPY LICENSE /licenses/observiq-otel-collector.license

COPY observiq-otel-collector /collector/observiq-otel-collector
COPY --from=jmxjar /opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
COPY plugins /etc/otel/plugins

COPY config/logging.stdout.yaml /etc/otel/logging.yaml
Expand Down
4 changes: 2 additions & 2 deletions exporter/chronicleexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/jarcoal/httpmock v1.3.1
github.com/observiq/bindplane-agent/expr v1.43.1
github.com/observiq/bindplane-agent/expr v1.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.92.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.92.0
Expand All @@ -26,7 +26,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/chronicleexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
Expand Down
4 changes: 2 additions & 2 deletions exporter/chronicleforwarderexporter/go.mod
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.20

require (
github.com/observiq/bindplane-agent/expr v1.43.1
github.com/observiq/bindplane-agent/expr v1.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.92.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.92.0
Expand All @@ -29,7 +29,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/chronicleforwarderexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
Expand Down
24 changes: 12 additions & 12 deletions exporter/googlecloudexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ require (
go.opentelemetry.io/collector/processor v0.92.0
go.opentelemetry.io/collector/processor/batchprocessor v0.92.0
go.uber.org/multierr v1.11.0
google.golang.org/api v0.156.0
google.golang.org/api v0.160.0
)

require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/logging v1.8.1 // indirect
cloud.google.com/go/monitoring v1.16.3 // indirect
cloud.google.com/go/logging v1.9.0 // indirect
cloud.google.com/go/monitoring v1.17.0 // indirect
cloud.google.com/go/trace v1.10.4 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -39,18 +39,18 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel v1.22.0
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/zap v1.26.0
golang.org/x/net v0.20.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/grpc v1.60.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down Expand Up @@ -81,11 +81,11 @@ require (
go.opentelemetry.io/collector/featuregate v1.0.1 // indirect
go.opentelemetry.io/collector/receiver v0.92.0 // indirect
go.opentelemetry.io/collector/semconv v0.92.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
)
Loading

0 comments on commit 188e295

Please sign in to comment.