Skip to content

Commit

Permalink
internal: upgrade to go1.22.7 (#90)
Browse files Browse the repository at this point in the history
### Description

OB-36440 Upgrade golang to 1.22.7

### Checklist
- [ ] Created tests which fail without the change (if possible)
- [ ] Extended the README / documentation, if necessary
  • Loading branch information
obs-gh-alexlew authored Sep 9, 2024
1 parent e6c18fb commit 18bfb5c
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.5
go-version: 1.22.7
- name: Install msitools
run: sudo apt-get install -y wixl
# More assembly might be required: Docker logins, GPG, etc.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.5
go-version: 1.22.7
- name: Install msitools
run: sudo apt-get install -y wixl
# More assembly might be required: Docker logins, GPG, etc.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.5
go-version: 1.22.7
- name: Install msitools
run: sudo apt-get install -y wixl
# More assembly might be required: Docker logins, GPG, etc.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.5
go-version: 1.22.7
- name: Install msitools
run: sudo apt-get install -y wixl
- name: Install qemu
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module observe/otelcol

go 1.22.5
go 1.22.7

require (
github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000
Expand Down
2 changes: 1 addition & 1 deletion components/processors/observek8sattributesprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor

go 1.22.5
go 1.22.7

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module observe-agent

go 1.22.5
go 1.22.7

require (
github.com/prometheus/client_model v0.6.1
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.5
go 1.22.7

use (
.
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module observe-agent/internal/tools

go 1.22.5
go 1.22.7

require (
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
Expand Down
6 changes: 3 additions & 3 deletions packaging/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ RUN tar czhf observe-agent.tar.gz /observe-agent $(ldd /observe-agent | grep -oP
# however, we can copy full directory as root (/) to be base file structure for scratch image
RUN mkdir /output && tar xf /observe-agent.tar.gz --directory /output

FROM alpine:3.20.2 AS directories
FROM alpine:3.20.3 AS directories
RUN mkdir -p /var/lib/observe-agent/filestorage

FROM alpine:3.20.2 AS certs
FROM alpine:3.20.3 AS certs
RUN apk --update add ca-certificates

FROM debian:12.5 AS systemd
Expand All @@ -28,7 +28,7 @@ RUN tar czhf journalctl.tar.gz /bin/journalctl $(ldd /bin/journalctl | grep -oP
# however, we can copy full directory as root (/) to be base file structure for scratch image
RUN mkdir /output && tar xf /journalctl.tar.gz --directory /output

FROM alpine:3.20.2
FROM alpine:3.20.3
ADD packaging/docker/observe-agent /etc/observe-agent
COPY --from=systemd /output/ /
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ github.com/munnerz/goautoneg
## explicit
github.com/mwitkow/go-conntrack
# github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor
## explicit; go 1.22.5
## explicit; go 1.22.7
# github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.107.0
## explicit; go 1.21.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector
Expand Down

0 comments on commit 18bfb5c

Please sign in to comment.