From 512f56af0fcedd54eb1f6e2b9f10d5d5a875d781 Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Mon, 20 May 2024 11:39:31 -0600 Subject: [PATCH] Bump otel to 0.100.0 (#75) Signed-off-by: Ruben Vargas --- Makefile | 4 ++-- _build/build.log | 15 ++++++++------- _build/go.mod | 4 ++-- _build/go.sum | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e07a7eb9..3e40b43d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GO ?= $(shell which go) -OTELCOL_VERSION ?= 0.99.0 +OTELCOL_VERSION ?= 0.100.0 # TODO: Align the ocb version with the collector version as soon as the ubi go 1.21 is supported. -OCB_VERSION ?= 0.99.0 +OCB_VERSION ?= 0.100.0 OTELCOL_BUILDER_DIR ?= ${PWD}/bin OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb PROJECT ?= opentelemetry-collector diff --git a/_build/build.log b/_build/build.log index f6f92ca0..cfb3fd03 100644 --- a/_build/build.log +++ b/_build/build.log @@ -1,8 +1,9 @@ Flag --go has been deprecated, use config distribution::go -2024-05-08T11:39:37.866-0600 INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "0.99.0", "date": "2024-04-22T20:31:41Z"} -2024-05-08T11:39:37.867-0600 INFO internal/command.go:161 Using config file {"path": "manifest.yaml"} -2024-05-08T11:39:37.872-0600 INFO builder/config.go:118 Using go {"go-executable": "/usr/local/go/bin/go"} -2024-05-08T11:39:37.875-0600 INFO builder/main.go:101 Sources created {"path": "./_build"} -2024-05-08T11:39:38.769-0600 INFO builder/main.go:197 Getting go modules -2024-05-08T11:39:38.825-0600 INFO builder/main.go:112 Compiling -2024-05-08T11:39:41.641-0600 INFO builder/main.go:131 Compiled {"binary": "./_build/otelcol"} +2024-05-20T11:00:52.337-0600 INFO internal/command.go:125 OpenTelemetry Collector Builder {"version": "0.100.0", "date": "2024-05-06T17:52:27Z"} +2024-05-20T11:00:52.338-0600 INFO internal/command.go:161 Using config file {"path": "manifest.yaml"} +2024-05-20T11:00:52.342-0600 INFO builder/config.go:132 Using go {"go-executable": "/usr/local/go/bin/go"} +2024-05-20T11:00:52.343-0600 INFO builder/main.go:77 You're building a distribution with non-aligned version of the builder. Compilation may fail due to API changes. Please upgrade your builder or API {"builder-version": "0.100.0"} +2024-05-20T11:00:52.345-0600 INFO builder/main.go:100 Sources created {"path": "./_build"} +2024-05-20T11:01:08.137-0600 INFO builder/main.go:191 Getting go modules +2024-05-20T11:01:08.236-0600 INFO builder/main.go:111 Compiling +2024-05-20T11:01:34.329-0600 INFO builder/main.go:130 Compiled {"binary": "./_build/otelcol"} diff --git a/_build/go.mod b/_build/go.mod index 7074f742..b860bf02 100644 --- a/_build/go.mod +++ b/_build/go.mod @@ -150,7 +150,7 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.3 // indirect + github.com/googleapis/gax-go/v2 v2.12.2 // indirect github.com/gophercloud/gophercloud v1.8.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -335,7 +335,7 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.19.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/api v0.170.0 // indirect + google.golang.org/api v0.168.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect google.golang.org/grpc v1.63.2 // indirect diff --git a/_build/go.sum b/_build/go.sum index 55fbe30f..d07e0e62 100644 --- a/_build/go.sum +++ b/_build/go.sum @@ -372,8 +372,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.12.3 h1:5/zPPDvw8Q1SuXjrqrZslrqT7dL/uJT2CQii/cLCKqA= -github.com/googleapis/gax-go/v2 v2.12.3/go.mod h1:AKloxT6GtNbaLm8QTNSidHUVsHYcBHwWRvkNFJUQcS4= +github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gophercloud/gophercloud v1.8.0 h1:TM3Jawprb2NrdOnvcHhWJalmKmAmOGgfZElM/3oBYCk= github.com/gophercloud/gophercloud v1.8.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= @@ -1354,8 +1354,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48= -google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8= +google.golang.org/api v0.168.0 h1:MBRe+Ki4mMN93jhDDbpuRLjRddooArz4FeSObvUMmjY= +google.golang.org/api v0.168.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=