From 3a56dda90fcc515aa0e9ef6cb887e4e6bd236967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 08:25:54 -0700 Subject: [PATCH 1/4] Bump the opentelemetry-deps-ruby group across 1 directory with 2 updates (#1489) Updates the requirements on [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-ruby) and [opentelemetry-exporter-otlp](https://github.com/open-telemetry/opentelemetry-ruby) to permit the latest version. Updates `opentelemetry-sdk` to 1.5.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/sdk/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-sdk/v1.4.1...opentelemetry-sdk/v1.5.0) Updates `opentelemetry-exporter-otlp` to 0.28.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/exporter/otlp/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-exporter-otlp/v0.27.0...opentelemetry-exporter-otlp/v0.28.1) --- updated-dependencies: - dependency-name: opentelemetry-sdk dependency-type: direct:production dependency-group: opentelemetry-deps-ruby - dependency-name: opentelemetry-exporter-otlp dependency-type: direct:production dependency-group: opentelemetry-deps-ruby ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ruby/src/otel/layer/Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/src/otel/layer/Gemfile b/ruby/src/otel/layer/Gemfile index 796e0db07a..6c1e97960a 100644 --- a/ruby/src/otel/layer/Gemfile +++ b/ruby/src/otel/layer/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'opentelemetry-sdk', '~> 1.4.1' -gem 'opentelemetry-exporter-otlp', '~> 0.27.0' +gem 'opentelemetry-sdk', '~> 1.5.0' +gem 'opentelemetry-exporter-otlp', '~> 0.28.1' gem 'opentelemetry-instrumentation-aws_lambda', '~> 0.1.0' From dc1440a934d75e0009598d50efeb41b1dab181a4 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 22 Aug 2024 08:46:12 -0700 Subject: [PATCH 2/4] Make the name of the java wrapper artifact consistent (#1486) This has to be done so that the release workflow works properly Signed-off-by: Raphael Silva --- .github/workflows/layer-publish.yml | 2 +- .github/workflows/release-layer-java.yml | 2 +- java/layer-wrapper/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/layer-publish.yml b/.github/workflows/layer-publish.yml index fc700a50fa..08730240cf 100644 --- a/.github/workflows/layer-publish.yml +++ b/.github/workflows/layer-publish.yml @@ -4,7 +4,7 @@ on: workflow_call: inputs: artifact-name: - description: 'This should correspond to a actions/upload-artifact name earlier in the build.' + description: 'This should correspond to a actions/upload-artifact name earlier in the build. The file name and the name of the artifact containing it must be equal.' required: true type: string layer-name: diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml index 73dc4f6031..65498c0aea 100644 --- a/.github/workflows/release-layer-java.yml +++ b/.github/workflows/release-layer-java.yml @@ -42,7 +42,7 @@ jobs: name: Save javawrapper layer to build with: name: opentelemetry-javawrapper-layer.zip - path: java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip + path: java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip - name: Save Javaagent Version id: save-javaagent-version diff --git a/java/layer-wrapper/build.gradle.kts b/java/layer-wrapper/build.gradle.kts index b0721ee896..232d096a99 100644 --- a/java/layer-wrapper/build.gradle.kts +++ b/java/layer-wrapper/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { tasks { val createLayer by registering(Zip::class) { - archiveFileName.set("opentelemetry-java-wrapper.zip") + archiveFileName.set("opentelemetry-javawrapper-layer.zip") destinationDirectory.set(file("$buildDir/distributions")) from(configurations["runtimeClasspath"]) { From b284186cf0f3eb0743764bc25da971ee673f3947 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 22 Aug 2024 08:54:19 -0700 Subject: [PATCH 3/4] Install all transitive dependencies for Python instrumentation (#1483) * Install all transitive dependencies for Python instrumentation Signed-off-by: Raphael Silva * Fix conflit with botocore instrumentation Signed-off-by: Raphael Silva --------- Signed-off-by: Raphael Silva --- .../src/otel/otel_sdk/nodeps-requirements.txt | 33 ++----------------- python/src/otel/otel_sdk/requirements.txt | 32 +++++++++++++++++- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/python/src/otel/otel_sdk/nodeps-requirements.txt b/python/src/otel/otel_sdk/nodeps-requirements.txt index fb4de05d42..998a2525d9 100644 --- a/python/src/otel/otel_sdk/nodeps-requirements.txt +++ b/python/src/otel/otel_sdk/nodeps-requirements.txt @@ -1,31 +1,4 @@ -opentelemetry-instrumentation-aiohttp-client==0.47b0 -opentelemetry-util-http==0.47b0 -asgiref~=3.8 -opentelemetry-instrumentation-asgi==0.47b0 -opentelemetry-instrumentation-asyncpg==0.47b0 -opentelemetry-instrumentation-boto==0.47b0 -opentelemetry-instrumentation-boto3sqs==0.47b0 -opentelemetry-instrumentation-botocore==0.47b0 -opentelemetry-instrumentation-celery==0.47b0 -opentelemetry-instrumentation-dbapi==0.47b0 -opentelemetry-instrumentation-django==0.47b0 -opentelemetry-instrumentation-elasticsearch==0.47b0 -opentelemetry-instrumentation-fastapi==0.47b0 -opentelemetry-instrumentation-falcon==0.47b0 -opentelemetry-instrumentation-flask==0.47b0 -opentelemetry-instrumentation-grpc==0.47b0 -opentelemetry-instrumentation-jinja2==0.47b0 -opentelemetry-instrumentation-mysql==0.47b0 -opentelemetry-instrumentation-psycopg2==0.47b0 -opentelemetry-instrumentation-pymemcache==0.47b0 -opentelemetry-instrumentation-pymongo==0.47b0 -opentelemetry-instrumentation-pymysql==0.47b0 -opentelemetry-instrumentation-pyramid==0.47b0 -opentelemetry-instrumentation-redis==0.47b0 -opentelemetry-instrumentation-requests==0.47b0 -opentelemetry-instrumentation-sqlalchemy==0.47b0 -opentelemetry-instrumentation-sqlite3==0.47b0 -opentelemetry-instrumentation-starlette==0.47b0 -opentelemetry-instrumentation-tornado==0.47b0 -opentelemetry-instrumentation-wsgi==0.47b0 +# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of +# opentelemetry-propagator-aws-xray opentelemetry-instrumentation-aws-lambda==0.47b0 +opentelemetry-instrumentation-botocore==0.47b0 diff --git a/python/src/otel/otel_sdk/requirements.txt b/python/src/otel/otel_sdk/requirements.txt index ea70aa2fc9..a0c781ad93 100644 --- a/python/src/otel/otel_sdk/requirements.txt +++ b/python/src/otel/otel_sdk/requirements.txt @@ -2,5 +2,35 @@ opentelemetry-sdk==1.26.0 opentelemetry-exporter-otlp-proto-http==1.26.0 opentelemetry-distro==0.47b0 opentelemetry-instrumentation==0.47b0 -opentelemetry-semantic-conventions == 0.47b0 +opentelemetry-semantic-conventions==0.47b0 opentelemetry-propagator-aws-xray==1.0.2 + +# Instrumentation dependencies +opentelemetry-instrumentation-aiohttp-client==0.47b0 +opentelemetry-util-http==0.47b0 +opentelemetry-instrumentation-asgi==0.47b0 +opentelemetry-instrumentation-asyncpg==0.47b0 +opentelemetry-instrumentation-boto==0.47b0 +opentelemetry-instrumentation-boto3sqs==0.47b0 +opentelemetry-instrumentation-celery==0.47b0 +opentelemetry-instrumentation-dbapi==0.47b0 +opentelemetry-instrumentation-django==0.47b0 +opentelemetry-instrumentation-elasticsearch==0.47b0 +opentelemetry-instrumentation-fastapi==0.47b0 +opentelemetry-instrumentation-falcon==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-grpc==0.47b0 +opentelemetry-instrumentation-jinja2==0.47b0 +opentelemetry-instrumentation-mysql==0.47b0 +opentelemetry-instrumentation-psycopg2==0.47b0 +opentelemetry-instrumentation-pymemcache==0.47b0 +opentelemetry-instrumentation-pymongo==0.47b0 +opentelemetry-instrumentation-pymysql==0.47b0 +opentelemetry-instrumentation-pyramid==0.47b0 +opentelemetry-instrumentation-redis==0.47b0 +opentelemetry-instrumentation-requests==0.47b0 +opentelemetry-instrumentation-sqlalchemy==0.47b0 +opentelemetry-instrumentation-sqlite3==0.47b0 +opentelemetry-instrumentation-starlette==0.47b0 +opentelemetry-instrumentation-tornado==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 From d1be0dcd4b855a0c0c718a5b586f7193b19de722 Mon Sep 17 00:00:00 2001 From: Ivan Santos <301291+pragmaticivan@users.noreply.github.com> Date: Thu, 22 Aug 2024 17:08:06 -0500 Subject: [PATCH 4/4] build: fix release layer nodejs (#1493) * build: fix release layer nodejs * build: rename build step * build: fix with prod only install * build: reduce layer by removing package json files --- .github/workflows/release-layer-nodejs.yml | 2 +- nodejs/package.json | 3 +-- nodejs/packages/layer/package.json | 4 ++-- nodejs/sample-apps/aws-sdk/package.json | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-layer-nodejs.yml b/.github/workflows/release-layer-nodejs.yml index a220dad93e..764511f5eb 100644 --- a/.github/workflows/release-layer-nodejs.yml +++ b/.github/workflows/release-layer-nodejs.yml @@ -25,7 +25,7 @@ jobs: - name: Build run: | npm install - npm run compile + npm run build working-directory: nodejs - name: Save Node SDK Version diff --git a/nodejs/package.json b/nodejs/package.json index 36e4a3c4e7..d5e38cc1fc 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -10,8 +10,7 @@ "main": "build/src/index.js", "types": "build/src/index.d.ts", "scripts": { - "precompile": "tsc --version", - "compile": "lerna run compile", + "build": "lerna run build", "test": "lerna run test", "lint": "lerna run lint", "lint:fix": "lerna run lint:fix" diff --git a/nodejs/packages/layer/package.json b/nodejs/packages/layer/package.json index f2aa3de049..8d2e7cae47 100644 --- a/nodejs/packages/layer/package.json +++ b/nodejs/packages/layer/package.json @@ -8,9 +8,9 @@ "clean": "rimraf build/*", "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts", "lint:fix": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --fix", - "prepare": "npm run compile", + "build": "npm run clean && npm run compile && npm run postcompile", "compile": "tsc -p .", - "postcompile": "copyfiles 'node_modules/**' build/workspace/nodejs && copyfiles -f 'scripts/*' build/workspace && copyfiles -f 'build/src/*' build/workspace && cd build/workspace && bestzip ../layer.zip *", + "postcompile": "copyfiles 'package*.json' build/workspace/nodejs && npm install --production --ignore-scripts --prefix build/workspace/nodejs && rm build/workspace/nodejs/package.json build/workspace/nodejs/package-lock.json && copyfiles -f 'scripts/*' build/workspace && copyfiles -f 'build/src/*' build/workspace && cd build/workspace && bestzip ../layer.zip *", "test": "mocha" }, "keywords": [ diff --git a/nodejs/sample-apps/aws-sdk/package.json b/nodejs/sample-apps/aws-sdk/package.json index d216788d20..091a0cbcbd 100644 --- a/nodejs/sample-apps/aws-sdk/package.json +++ b/nodejs/sample-apps/aws-sdk/package.json @@ -10,8 +10,7 @@ "clean": "rimraf build/*", "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts", "lint:fix": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --fix", - "precompile": "tsc --version", - "prepare": "npm run compile", + "build": "npm run clean && npm run compile && npm run postcompile", "compile": "tsc -p .", "postcompile": "copyfiles 'package*.json' build/src/ && npm install --production --ignore-scripts --prefix build/src/ && cd build/src && bestzip ../function.zip *" },