Merge branch 'main' into add_jsonlogencoding

open-telemetry · Jun 4, 2024 · b480252 · b480252
2 parents eb38f1e + b8551a7
commit b480252
Show file tree

Hide file tree

Showing 5 changed files with 286 additions and 285 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 GO ?= go
 GORELEASER ?= goreleaser
 
-OTELCOL_BUILDER_VERSION ?= 0.101.0
+OTELCOL_BUILDER_VERSION ?= 0.102.0
 OTELCOL_BUILDER_DIR ?= ${HOME}/bin
 OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb