Merge branch 'main' into patch-3

open-telemetry · Aug 16, 2024 · 4a60816 · 4a60816
2 parents b26e891 + ca8dd14
commit 4a60816
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/examples/demo/client/Dockerfile b/examples/demo/client/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
-FROM golang:1.22 as build
+FROM golang:1.23 as build
 WORKDIR /app/
 COPY . .
 RUN go env -w GOPROXY=direct

diff --git a/examples/demo/server/Dockerfile b/examples/demo/server/Dockerfile
@@ -1,6 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
-FROM golang:1.22 as build
+FROM golang:1.23 as build
 WORKDIR /app/
 COPY . .
 RUN go env -w GOPROXY=direct

diff --git a/exporter/loadbalancingexporter/example/Dockerfile b/exporter/loadbalancingexporter/example/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 AS build
+FROM golang:1.23 AS build
 
 WORKDIR /src
 ADD . /src

diff --git a/exporter/splunkhecexporter/example/Dockerfile b/exporter/splunkhecexporter/example/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22 AS build
+FROM golang:1.23 AS build
 
 WORKDIR /src
 ADD . /src

diff --git a/testbed/go.mod b/testbed/go.mod
@@ -99,7 +99,7 @@ require (
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/digitalocean/godo v1.118.0 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
-	github.com/docker/docker v27.0.3+incompatible // indirect
+	github.com/docker/docker v27.1.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/elastic/go-grok v0.3.1 // indirect

diff --git a/testbed/go.sum b/testbed/go.sum