Merge branch 'main' into dependabot/npm_and_yarn/packages/instrumenta…

…tion-openai/instrumentation-openai-754dd3b4c3
elastic · Jan 16, 2025 · bdbb02b · bdbb02b
2 parents 310e4e7 + 060821f
commit bdbb02b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/release-mockotlpserver.yml b/.github/workflows/release-mockotlpserver.yml
@@ -54,7 +54,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push Docker image
         id: docker-push
-        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc  # v6.11.0
+        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d  # v6.12.0
         with:
           context: ${{ env.PKGDIR }}
           platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
 
       - name: Build and Push Docker Image
         id: docker-push
-        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc  # v6.11.0
+        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d  # v6.12.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

diff --git a/packages/instrumentation-openai/.npmrc b/packages/instrumentation-openai/.npmrc
@@ -0,0 +1 @@
+lockfile-version=3
diff --git a/packages/opentelemetry-node/package-lock.json b/packages/opentelemetry-node/package-lock.json