Merge branch 'main' into 542-manual-instrumentation-set-name

open-telemetry · Jan 14, 2024 · 8d3684d · 8d3684d
2 parents 895bd6c + 19b134f
commit 8d3684d
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: lycheeverse/[email protected].0
+    - uses: lycheeverse/[email protected].1
       with:
         args: >-
           -v -n "*.md" "**/*.md"
@@ -33,14 +33,14 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Module cache
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         env:
           cache-name: go-mod-cache
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }}
       - name: Tools cache
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         env:
           cache-name: go-tools-cache
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5-bullseye as builder
+FROM golang:1.21.6-bullseye as builder
 
 WORKDIR /app
 

diff --git a/examples/httpPlusdb/Dockerfile b/examples/httpPlusdb/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /app
 COPY ./*.go .
 RUN go mod init main

diff --git a/examples/rolldice/Dockerfile b/examples/rolldice/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /app
 COPY ./*.go .
 RUN go mod init main

diff --git a/internal/test/e2e/databasesql/Dockerfile b/internal/test/e2e/databasesql/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/databasesql && go mod tidy && go build -o main
diff --git a/internal/test/e2e/databasesql/traces.json b/internal/test/e2e/databasesql/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {

diff --git a/internal/test/e2e/gin/Dockerfile b/internal/test/e2e/gin/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/gin && go mod tidy && go build -o main
diff --git a/internal/test/e2e/gin/traces.json b/internal/test/e2e/gin/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {

diff --git a/internal/test/e2e/grpc/Dockerfile b/internal/test/e2e/grpc/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/grpc && go mod tidy && go build -o main
diff --git a/internal/test/e2e/grpc/traces.json b/internal/test/e2e/grpc/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {

diff --git a/internal/test/e2e/nethttp/Dockerfile b/internal/test/e2e/nethttp/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/nethttp && go mod tidy && go build -o main
diff --git a/internal/test/e2e/nethttp/traces.json b/internal/test/e2e/nethttp/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {

diff --git a/internal/test/e2e/nethttp_custom/Dockerfile b/internal/test/e2e/nethttp_custom/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/nethttp && go mod tidy && go build -o main
diff --git a/internal/test/e2e/nethttp_custom/traces.json b/internal/test/e2e/nethttp_custom/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {

diff --git a/internal/test/e2e/otelglobal/Dockerfile b/internal/test/e2e/otelglobal/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.21.6
 WORKDIR /sample-app
 COPY . .
 RUN go mod init go.opentelemetry.io/auto/internal/test/e2e/otelglobal && go mod tidy && go build -o main
diff --git a/internal/test/e2e/otelglobal/traces.json b/internal/test/e2e/otelglobal/traces.json
@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.21.5 linux/amd64"
+              "stringValue": "go version 1.21.6 linux/amd64"
             }
           },
           {
@@ -18,7 +18,7 @@
           {
             "key": "process.runtime.version",
             "value": {
-              "stringValue": "1.21.5"
+              "stringValue": "1.21.6"
             }
           },
           {