chore: Merge release/v1.57.0 to main in prep for release (#1784)

observIQ · Aug 6, 2024 · cda1941 · cda1941
2 parents 7100932 + 4040ae4
commit cda1941
Show file tree

Hide file tree

Showing 163 changed files with 3,013 additions and 2,644 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -222,6 +222,52 @@ nfpms:
 
 # Build container images with docker buildx (mutli arch builds).
 dockers:
+  - id: scratch-amd64
+    goos: linux
+    goarch: amd64
+    ids:
+      - collector
+    image_templates:
+      - "observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "ghcr.io/observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "us-central1-docker.pkg.dev/observiq-containers/agent/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    dockerfile: ./docker/Dockerfile.scratch
+    use: buildx
+    build_flag_templates:
+      - "--label=created={{.Date}}"
+      - "--label=title={{.ProjectName}}"
+      - "--label=revision={{.FullCommit}}"
+      - "--label=version={{.Version}}"
+      - "--platform=linux/amd64"
+    extra_files:
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
+      - config/logging.stdout.yaml
+      - LICENSE
+  - id: scratch-arm64
+    goos: linux
+    goarch: arm64
+    ids:
+      - collector
+    image_templates:
+      - "observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "ghcr.io/observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "us-central1-docker.pkg.dev/observiq-containers/agent/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    dockerfile: ./docker/Dockerfile.scratch
+    use: buildx
+    build_flag_templates:
+      - "--label=created={{.Date}}"
+      - "--label=title={{.ProjectName}}"
+      - "--label=revision={{.FullCommit}}"
+      - "--label=version={{.Version}}"
+      - "--platform=linux/arm64"
+    extra_files:
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
+      - config/logging.stdout.yaml
+      - LICENSE
   - id: ubuntu-amd64
     goos: linux
     goarch: amd64
@@ -262,8 +308,9 @@ dockers:
       - "--label=version={{.Version}}"
       - "--platform=linux/amd64"
     extra_files:
-      - plugins
-      - config/example.yaml
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
       - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
@@ -307,8 +354,9 @@ dockers:
       - "--label=version={{.Version}}"
       - "--platform=linux/arm64"
     extra_files:
-      - plugins
-      - config/example.yaml
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
       - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
@@ -335,8 +383,9 @@ dockers:
       - "--label=version={{.Version}}"
       - "--platform=linux/amd64"
     extra_files:
-      - plugins
-      - config/example.yaml
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
       - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
@@ -362,13 +411,29 @@ dockers:
       - "--label=version={{.Version}}"
       - "--platform=linux/arm64"
     extra_files:
-      - plugins
-      - config/example.yaml
+      - release_deps/VERSION.txt
+      - release_deps/plugins
+      - release_deps/config.yaml
       - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
 
 docker_manifests:
+  - name_template: "observiq/bindplane-agent:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    image_templates:
+      - "observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    skip_push: false
+  - name_template: "ghcr.io/observiq/bindplane-agent:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    image_templates:
+      - "ghcr.io/observiq/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "ghcr.io/observiq/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    skip_push: false
+  - name_template: "us-central1-docker.pkg.dev/observiq-containers/agent/bindplane-agent:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    image_templates:
+      - "us-central1-docker.pkg.dev/observiq-containers/agent/bindplane-agent-amd64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+      - "us-central1-docker.pkg.dev/observiq-containers/agent/bindplane-agent-arm64:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-minimal"
+    skip_push: false
   - name_template: "observiq/observiq-otel-collector:latest"
     image_templates:
       - "observiq/observiq-otel-collector-amd64:latest"
@@ -536,6 +601,22 @@ signs:
       ["sign-blob", "--key=cosign.key", "--output=${signature}", "${artifact}"]
     artifacts: all
 
+# https://goreleaser.com/customization/docker_sign/
+# Uses Cosign by default, signs images and manifests.
+docker_signs:
+  - artifacts: all
+    stdin: "{{ .Env.COSIGN_PWD }}"
+    args: [
+      # Default options
+      "sign",
+      "--key=cosign.key",
+      "${artifact}",
+      "--yes",
+      # Additional options
+      "--recursive"
+    ]
+    output: true
+
 # https://goreleaser.com/customization/release/
 release:
   draft: false

diff --git a/cmd/plugindocgen/go.mod b/cmd/plugindocgen/go.mod
@@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/plugindocgen
 go 1.21.9
 
 require (
-	github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.56.0
+	github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.57.0
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -17,7 +17,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -34,7 +34,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.105.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.106.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
@@ -48,27 +48,27 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.etcd.io/bbolt v1.3.10 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.105.0 // indirect
-	go.opentelemetry.io/collector/component v0.105.0 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap/converter/expandconverter v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap/provider/envprovider v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.105.0 // indirect
-	go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.105.0 // indirect
-	go.opentelemetry.io/collector/connector v0.105.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.105.0 // indirect
-	go.opentelemetry.io/collector/exporter v0.105.0 // indirect
-	go.opentelemetry.io/collector/extension v0.105.0 // indirect
+	go.opentelemetry.io/collector v0.106.1 // indirect
+	go.opentelemetry.io/collector/component v0.106.1 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.1 // indirect
+	go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1 // indirect
+	go.opentelemetry.io/collector/connector v0.106.1 // indirect
+	go.opentelemetry.io/collector/consumer v0.106.1 // indirect
+	go.opentelemetry.io/collector/exporter v0.106.1 // indirect
+	go.opentelemetry.io/collector/extension v0.106.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
-	go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect
-	go.opentelemetry.io/collector/otelcol v0.105.0 // indirect
+	go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect
+	go.opentelemetry.io/collector/otelcol v0.106.1 // indirect
 	go.opentelemetry.io/collector/pdata v1.12.0 // indirect
-	go.opentelemetry.io/collector/processor v0.105.0 // indirect
-	go.opentelemetry.io/collector/receiver v0.105.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.105.0 // indirect
-	go.opentelemetry.io/collector/service v0.105.0 // indirect
+	go.opentelemetry.io/collector/processor v0.106.1 // indirect
+	go.opentelemetry.io/collector/receiver v0.106.1 // indirect
+	go.opentelemetry.io/collector/semconv v0.106.1 // indirect
+	go.opentelemetry.io/collector/service v0.106.1 // indirect
 	go.opentelemetry.io/contrib/config v0.8.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
 	go.opentelemetry.io/otel v1.28.0 // indirect