Skip to content

Commit d691525

Browse files
dpaasman00dpaasman00
committed
Update OTel v0.113.0; resolve import issue; update builder & supervisor versions
1 parent 2860a59 commit d691525

File tree

7 files changed

+250
-247
lines changed

7 files changed

+250
-247
lines changed

‎exporter/googlecloudexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22.7
44

55
require (
66
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.49.0
7-
github.com/observiq/bindplane-agent/internal/version v0.0.0-20240717172323-a1d3e6ed4aab
7+
github.com/observiq/bindplane-agent/internal/version v1.64.0
88
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.113.0
99
github.com/stretchr/testify v1.9.0
1010
go.opentelemetry.io/collector/component v0.113.0

‎internal/tools/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/client9/misspell v0.3.4
99
github.com/google/addlicense v1.1.1
1010
github.com/mgechev/revive v1.5.0
11-
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.111.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.113.0
1212
github.com/securego/gosec/v2 v2.18.2
1313
github.com/uw-labs/lichen v0.1.7
1414
github.com/vektra/mockery/v2 v2.46.1
15-
go.opentelemetry.io/collector/cmd/builder v0.111.0
15+
go.opentelemetry.io/collector/cmd/builder v0.113.0
1616
go.opentelemetry.io/collector/cmd/mdatagen v0.113.0
1717
golang.org/x/tools v0.27.0
1818
)
@@ -50,7 +50,7 @@ require (
5050
github.com/knadh/koanf/parsers/yaml v0.1.0 // indirect
5151
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
5252
github.com/knadh/koanf/providers/env v1.0.0 // indirect
53-
github.com/knadh/koanf/providers/file v1.1.0 // indirect
53+
github.com/knadh/koanf/providers/file v1.1.2 // indirect
5454
github.com/knadh/koanf/providers/fs v0.1.0 // indirect
5555
github.com/knadh/koanf/providers/rawbytes v0.1.0 // indirect
5656
github.com/knadh/koanf/v2 v2.1.1 // indirect
@@ -116,5 +116,3 @@ require (
116116
gopkg.in/yaml.v2 v2.4.0 // indirect
117117
gopkg.in/yaml.v3 v3.0.1 // indirect
118118
)
119-
120-
replace go.opentelemetry.io/collector/cmd/builder => go.opentelemetry.io/collector/cmd/builder v0.111.1-0.20241004150551-9d6a84e0b86f

‎internal/tools/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPgh
8585
github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU=
8686
github.com/knadh/koanf/providers/env v1.0.0 h1:ufePaI9BnWH+ajuxGGiJ8pdTG0uLEUWC7/HDDPGLah0=
8787
github.com/knadh/koanf/providers/env v1.0.0/go.mod h1:mzFyRZueYhb37oPmC1HAv/oGEEuyvJDA98r3XAa8Gak=
88-
github.com/knadh/koanf/providers/file v1.1.0 h1:MTjA+gRrVl1zqgetEAIaXHqYje0XSosxSiMD4/7kz0o=
89-
github.com/knadh/koanf/providers/file v1.1.0/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI=
88+
github.com/knadh/koanf/providers/file v1.1.2 h1:aCC36YGOgV5lTtAFz2qkgtWdeQsgfxUkxDOe+2nQY3w=
89+
github.com/knadh/koanf/providers/file v1.1.2/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI=
9090
github.com/knadh/koanf/providers/fs v0.1.0 h1:9Hln9GS3bWTItAnGVFYyfkoAIxAFq7pvlF64pTNiDdQ=
9191
github.com/knadh/koanf/providers/fs v0.1.0/go.mod h1:Cva1yH8NBxkEeVZx8CUmF5TunbgO72E+GwqDbqpP2sE=
9292
github.com/knadh/koanf/providers/rawbytes v0.1.0 h1:dpzgu2KO6uf6oCb4aP05KDmKmAmI51k5pe8RYKQ0qME=
@@ -141,8 +141,8 @@ github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
141141
github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
142142
github.com/open-telemetry/opamp-go v0.15.0 h1:X2TWhEsGQ8GP7Uos3Ic9v/1aFUqoECZXKS7xAF5HqsA=
143143
github.com/open-telemetry/opamp-go v0.15.0/go.mod h1:QyPeN56JXlcZt5yG5RMdZ50Ju+zMFs1Ihy/hwHyF8Oo=
144-
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.111.0 h1:d0NHDrFLqujxU9+blD5aiiPP5r2Rj4Qkr156ZyjuOLU=
145-
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.111.0/go.mod h1:7O06mUnPz0XYE3bjWg1oFC6GL2yLciVLLddk8xc7x8U=
144+
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.113.0 h1:Ah4LOFMkwVLa6tbrEducJNqbJpV0oYyH5SQSsp9DC5s=
145+
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.113.0/go.mod h1:1zcjY4CLnuUmK+sRaazIRDlp0YZMBrXYBdZ6yUs594w=
146146
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
147147
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
148148
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -206,8 +206,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT
206206
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
207207
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
208208
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
209-
go.opentelemetry.io/collector/cmd/builder v0.111.1-0.20241004150551-9d6a84e0b86f h1:IVNvV5XbGUyuARrXlUeSic4zFgfljs1XX3btuwetRYk=
210-
go.opentelemetry.io/collector/cmd/builder v0.111.1-0.20241004150551-9d6a84e0b86f/go.mod h1:FRih5dexF7nTQNzOiRdtNOJykEqRE2CgKDLgskd4K9o=
209+
go.opentelemetry.io/collector/cmd/builder v0.113.0 h1:ZeUJOyTCHB+kCHonKFWyb9q/CEXxRuXs79nCBrNR6b4=
210+
go.opentelemetry.io/collector/cmd/builder v0.113.0/go.mod h1:SLfEUrCIKrcpEHBn1aL5THiSLYW1UMIDIA4erdSxF9Y=
211211
go.opentelemetry.io/collector/cmd/mdatagen v0.113.0 h1:CRN6TNjoftXm/iP4aazarRJQ07PQYOrwf8/NkhxqrV4=
212212
go.opentelemetry.io/collector/cmd/mdatagen v0.113.0/go.mod h1:+IChFa64tg7FzQ54n7sH/AE1K3Js+1jQKuzXZQAwh24=
213213
go.opentelemetry.io/collector/component v0.113.0 h1:/nx+RvZgxUEXP+YcTj69rEtuSEGkfaCyp/ad5zQGLjU=

‎manifests/minimal/manifest.yaml

+15-12
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,31 @@ dist:
44
description: ObservIQ's minimal distro for OpenTelemetry Collector
55
version: "v0.0.1"
66
output_path: ./dist
7-
otelcol_version: 0.111.0
87
conf_resolver:
98
default_uri_scheme: "env"
109
extensions:
11-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.111.0
12-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.111.0
13-
- gomod: github.com/observiq/bindplane-agent/extension/bindplaneextension v1.61.1
10+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.113.0
11+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.113.0
12+
- gomod: github.com/observiq/bindplane-agent/extension/bindplaneextension v1.64.0
1413
path: "./extension/bindplaneextension"
1514
exporters:
16-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.111.0
15+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.113.0
16+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.113.0
1717
processors:
18-
- gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.61.1
18+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.113.0
19+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.113.0
20+
- gomod: github.com/observiq/bindplane-agent/processor/snapshotprocessor v1.64.0
1921
path: "./processor/snapshotprocessor"
2022
receivers:
21-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.111.0
23+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.113.0
24+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.113.0
2225
connectors: []
2326
providers:
24-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.17.0
25-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.17.0
26-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.17.0
27-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0
28-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0
27+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.113.0
28+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.113.0
29+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.113.0
30+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.113.0
31+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.113.0
2932
# When adding a replace, add a comment before it to document why it's needed and when it can be removed
3033
replaces:
3134
# See https://github.com/google/gnostic/issues/262

0 commit comments

Comments
 (0)