Merge branch 'main' into dependabot/npm_and_yarn/nodejs/nodejs-other-…

…bf50c26348

.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:

.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

.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

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"]) {

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"

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": [

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 *"
   },

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

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

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'