Skip to content

Commit f0b3197

Browse files
feat: upgrade go version to 1.22.8 (#160)
### Description Upgrade go version to 1.22.8 This also includes removing the go module replacements. I verified the high/critical CVEs are still fixed: ``` $ docker scout cves sha256:07a15d55106aded0734018ebd61141bfe3fa9b9aa99ae6dfe0261951540cceb3 ✓ Image stored for indexing ✓ Indexed 405 packages ✓ Provenance obtained from attestation ✗ Detected 3 vulnerable packages with a total of 5 vulnerabilities ## Overview │ Analyzed Image ────────────────────┼──────────────────────────────────────────────────────────────────────────── Target │ sha256:07a15d55106aded0734018ebd61141bfe3fa9b9aa99ae6dfe0261951540cceb3 digest │ 07a15d55106a platform │ linux/arm64 vulnerabilities │ 0C 0H 4M 1L size │ 49 MB packages │ 405 ## Packages and Vulnerabilities 0C 0H 2M 0L stdlib 1.22.8 pkg:golang/[email protected] ✗ MEDIUM CVE-2024-45341 https://scout.docker.com/v/CVE-2024-45341 Affected range : <1.22.11 Fixed version : 1.22.11 ✗ MEDIUM CVE-2024-45336 https://scout.docker.com/v/CVE-2024-45336 Affected range : <1.22.11 Fixed version : 1.22.11 0C 0H 1M 1L github.com/aws/aws-sdk-go 1.55.6 pkg:golang/github.com/aws/[email protected] ✗ MEDIUM CVE-2020-8911 https://scout.docker.com/v/CVE-2020-8911 Affected range : >=0 Fixed version : not fixed ✗ LOW CVE-2020-8912 https://scout.docker.com/v/CVE-2020-8912 Affected range : >=0 Fixed version : not fixed 0C 0H 1M 0L openssl 3.3.2-r0 pkg:apk/alpine/[email protected]?os_name=alpine&os_version=3.20 ✗ MEDIUM CVE-2024-9143 https://scout.docker.com/v/CVE-2024-9143 Affected range : <3.3.2-r1 Fixed version : 3.3.2-r1 5 vulnerabilities found in 3 packages CRITICAL 0 HIGH 0 MEDIUM 4 LOW 1 ``` ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
1 parent a4989fe commit f0b3197

File tree

7 files changed

+17
-20
lines changed

7 files changed

+17
-20
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Code for the Observe agent and CLI. The agent code is based on the OpenTelemetry
44

55
# Build
66

7-
To run the code you need to have `golang v1.22.7` installed. Then you can run the following command to compile the binary.
7+
To run the code you need to have `golang v1.22.8` installed. Then you can run the following command to compile the binary.
88

99
```sh
1010
go build -o observe-agent
@@ -62,7 +62,7 @@ To start the observe agent after building the binary run the following command.
6262

6363
## Components
6464

65-
Current OTEL Collector Version: `v0.110.0`
65+
Current OTEL Collector Version: `v0.118.0`
6666

6767
This section lists the components that are included in the Observe Distribution of the OpenTelemetry Collector.
6868

go.mod

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/observeinc/observe-agent
22

3-
go 1.22.7
3+
go 1.22.8
44

55
require (
66
github.com/jarcoal/httpmock v1.3.1
@@ -409,10 +409,6 @@ require (
409409
)
410410

411411
replace (
412-
// TODO remove these overrides when we upgrade to otelcol v0.117.0
413-
github.com/docker/docker => github.com/docker/docker v27.4.1+incompatible
414412
github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor
415413
github.com/observeinc/observe-agent/observecol => ./observecol
416-
golang.org/x/crypto => golang.org/x/crypto v0.32.0
417-
golang.org/x/net => golang.org/x/net v0.34.0
418414
)

go.work

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
go 1.22.7
1+
go 1.22.8
22

33
use (
44
.
5-
./observecol
65
./components/processors/observek8sattributesprocessor
6+
./observecol
77
)

observecol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module github.com/observeinc/observe-agent/observecol
44

5-
go 1.22.7
5+
go 1.22.8
66

77
require (
88
github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000

vendor/github.com/docker/docker/api/swagger.yaml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/docker/api/types/container/hostconfig.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ github.com/digitalocean/godo/metrics
316316
# github.com/distribution/reference v0.6.0
317317
## explicit; go 1.20
318318
github.com/distribution/reference
319-
# github.com/docker/docker v27.5.0+incompatible => github.com/docker/docker v27.4.1+incompatible
319+
# github.com/docker/docker v27.5.0+incompatible
320320
## explicit
321321
github.com/docker/docker/api
322322
github.com/docker/docker/api/types
@@ -835,11 +835,11 @@ github.com/munnerz/goautoneg
835835
## explicit
836836
github.com/mwitkow/go-conntrack
837837
# github.com/observeinc/observe-agent v0.0.0-00010101000000-000000000000 => .
838-
## explicit; go 1.22.7
838+
## explicit; go 1.22.8
839839
# github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => ./components/processors/observek8sattributesprocessor
840840
## explicit; go 1.22.7
841841
# github.com/observeinc/observe-agent/observecol v0.0.0-00010101000000-000000000000 => ./observecol
842-
## explicit; go 1.22.7
842+
## explicit; go 1.22.8
843843
# github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.118.0
844844
## explicit; go 1.22.0
845845
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector
@@ -2124,7 +2124,7 @@ go.uber.org/zap/internal/pool
21242124
go.uber.org/zap/internal/stacktrace
21252125
go.uber.org/zap/zapcore
21262126
go.uber.org/zap/zapgrpc
2127-
# golang.org/x/crypto v0.32.0 => golang.org/x/crypto v0.32.0
2127+
# golang.org/x/crypto v0.32.0
21282128
## explicit; go 1.20
21292129
golang.org/x/crypto/chacha20
21302130
golang.org/x/crypto/chacha20poly1305
@@ -2148,9 +2148,9 @@ golang.org/x/exp/slices
21482148
# golang.org/x/mod v0.22.0
21492149
## explicit; go 1.22.0
21502150
golang.org/x/mod/semver
2151-
# golang.org/x/net v0.29.0 => golang.org/x/net v0.34.0
2151+
# golang.org/x/net v0.29.0
21522152
## explicit; go 1.18
2153-
# golang.org/x/net v0.34.0 => golang.org/x/net v0.34.0
2153+
# golang.org/x/net v0.34.0
21542154
## explicit; go 1.18
21552155
golang.org/x/net/bpf
21562156
golang.org/x/net/context
@@ -2858,6 +2858,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
28582858
## explicit; go 1.12
28592859
sigs.k8s.io/yaml
28602860
sigs.k8s.io/yaml/goyaml.v2
2861-
# github.com/docker/docker => github.com/docker/docker v27.4.1+incompatible
2862-
# golang.org/x/crypto => golang.org/x/crypto v0.32.0
2863-
# golang.org/x/net => golang.org/x/net v0.34.0

0 commit comments

Comments
 (0)