Merge branch 'main' of github.com:open-telemetry/opentelemetry-go-ins…

…trumentation into mike/arm # Conflicts: # Dockerfile
open-telemetry · Apr 24, 2023 · eae59eb · eae59eb
2 parents e383822 + 89b95e2
commit eae59eb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/[email protected]
       with:
         fetch-depth: 0
-    - uses: lycheeverse/lychee-action@v1.6.1
+    - uses: lycheeverse/lychee-action@v1.7.0
       with:
         args: >-
           -v -n "*.md" "**/*.md"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:37 as builder
+FROM fedora:38 as builder
 ARG TARGETARCH
 RUN dnf install clang llvm make libbpf-devel -y
 RUN curl -LO https://go.dev/dl/go1.20.linux-$TARGETARCH.tar.gz && tar -C /usr/local -xzf go*.linux-$TARGETARCH.tar.gz
@@ -7,6 +7,6 @@ WORKDIR /app
 COPY . .
 RUN TARGET=$TARGETARCH make build
 
-FROM registry.fedoraproject.org/fedora-minimal:37
+FROM registry.fedoraproject.org/fedora-minimal:38
 COPY --from=builder /app/otel-go-instrumentation /
 CMD ["/otel-go-instrumentation"]
diff --git a/pkg/inject/offset_results.json b/pkg/inject/offset_results.json
@@ -3459,6 +3459,10 @@
             {
               "offset": 8,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 8,
+              "version": "v1.56.0-dev"
             }
           ]
         },
@@ -3997,6 +4001,10 @@
             {
               "offset": 8,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 8,
+              "version": "v1.56.0-dev"
             }
           ]
         },
@@ -4535,6 +4543,10 @@
             {
               "offset": 24,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 24,
+              "version": "v1.56.0-dev"
             }
           ]
         },
@@ -5073,6 +5085,10 @@
             {
               "offset": 32,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 32,
+              "version": "v1.56.0-dev"
             }
           ]
         },
@@ -5611,6 +5627,10 @@
             {
               "offset": 0,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 0,
+              "version": "v1.56.0-dev"
             }
           ]
         },
@@ -6149,6 +6169,10 @@
             {
               "offset": 80,
               "version": "v1.55.0-dev"
+            },
+            {
+              "offset": 80,
+              "version": "v1.56.0-dev"
             }
           ]
         }