feat: support core experimental versions ^0.28.0

.github/workflows/daily-test.yml

@@ -31,14 +31,6 @@ jobs:
         env:
           NEO4J_AUTH: neo4j/test
 
-      rabbitmq:
-        image: rabbitmq:3
-        ports:
-          - 22221:5672
-        env:
-          RABBITMQ_DEFAULT_USER: username
-          RABBITMQ_DEFAULT_PASS: password
-
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -30,14 +30,6 @@ jobs:
         env:
           NEO4J_AUTH: neo4j/test
 
-      rabbitmq:
-        image: rabbitmq:3
-        ports:
-          - 22221:5672
-        env:
-          RABBITMQ_DEFAULT_USER: username
-          RABBITMQ_DEFAULT_PASS: password
-
     steps:
 
       - uses: actions/checkout@v2
@@ -47,8 +39,13 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch
 
+      - name: Use Node.js 14
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+
       - name: Install Dependencies
-        run: yarn
+        run: yarn install
 
       - name: Build
         run: yarn build:ci

README.md

@@ -29,7 +29,7 @@ The instrumentations in this repo are:
 - strictly complies with [open telemetry semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions)
 - up to date with latest SDK version
 
-**Compatible with [SDK stable v1.0.1](https://github.com/open-telemetry/opentelemetry-js/releases/tag/stable%2Fv1.0.1) and [SDK experimental v0.27.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.27.0)**
+**Compatible with [SDK stable ^1.0.0](https://github.com/open-telemetry/opentelemetry-js/tree/stable/v1.0.0) and [SDK experimental ^0.28.0](https://github.com/open-telemetry/opentelemetry-js/tree/v0.28.0/experimental/packages)**
 ## Instrumentations
 | Instrumentation Package | Instrumented Lib | NPM |
 | --- | --- | --- |
@@ -64,6 +64,7 @@ The instrumentations in this repo are:
 
 | Instrumentations Version | OpenTelemetry Core | OpenTelemetry Experimental | 
 | --- | --- | --- |
+| 0.28.x | ^1.0.0 | ^0.28.0 |
 | 0.27.x | ^1.0.1 | ^0.27.0 |
 | 0.26.x | ^1.0.0 | ^0.26.0 |
 | 0.25.x | 0.25.0 | --- |

detectors/node/resource-detector-deployment/package.json

@@ -21,7 +21,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha",
         "watch": "tsc -w",
@@ -33,15 +33,15 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/resources": "^1.0.0",
         "@opentelemetry/semantic-conventions": "^1.0.0",
         "opentelemetry-resource-detector-sync-api": "^0.26.0"
     },
     "devDependencies": {
-        "@opentelemetry/api": "^1.0.2",
+        "@opentelemetry/api": "^1.0.0",
         "@types/mocha": "^8.2.2",
         "expect": "^26.6.2",
         "mocha": "^8.4.0",

detectors/node/resource-detector-git/package.json

@@ -22,7 +22,7 @@
     "scripts": {
         "postinstall": "node dist/src/persist-on-post-install.js || exit 0",
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha",
         "watch": "tsc -w",
@@ -34,7 +34,7 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/resources": "^1.0.0",
@@ -43,7 +43,7 @@
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@opentelemetry/api": "^1.0.2",
+        "@opentelemetry/api": "^1.0.0",
         "@types/mocha": "^8.2.2",
         "@types/node": "^14.0.0",
         "expect": "^26.6.2",

detectors/node/resource-detector-service/package.json

@@ -21,7 +21,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha",
         "watch": "tsc -w",
@@ -33,7 +33,7 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/resources": "^1.0.0",
@@ -42,7 +42,7 @@
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@opentelemetry/api": "^1.0.2",
+        "@opentelemetry/api": "^1.0.0",
         "@types/mocha": "^8.2.2",
         "expect": "^26.6.2",
         "mocha": "^8.4.0",

detectors/resource-detector-sync-api/package.json

@@ -21,7 +21,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "watch": "tsc -w",
         "version:update": "node ../../scripts/version-update.js",
         "version": "yarn run version:update"
@@ -30,13 +30,14 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/resources": "^1.0.0"
     },
     "devDependencies": {
         "ts-node": "^9.1.1",
-        "typescript": "4.3.4"
+        "typescript": "4.3.4",
+        "@opentelemetry/api": "^1.0.0"
     }
 }

packages/instrumentation-elasticsearch/.tav.yml

@@ -1,4 +1,4 @@
 '@elastic/elasticsearch':
-  versions: "*"
+  versions: ">=5 <8"
   commands:
     - yarn test

packages/instrumentation-elasticsearch/package.json

@@ -29,7 +29,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "watch": "tsc -w",
         "version:update": "node ../../scripts/version-update.js",
         "version": "yarn run version:update",
@@ -42,17 +42,17 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/core": "^1.0.0",
-        "@opentelemetry/instrumentation": "^0.27.0",
+        "@opentelemetry/instrumentation": "^0.28.0",
         "@opentelemetry/semantic-conventions": "^1.0.0"
     },
     "devDependencies": {
         "@elastic/elasticsearch": "^7.8.0",
-        "@opentelemetry/api": "^1.0.2",
-        "@opentelemetry/contrib-test-utils": "^0.28.0",
+        "@opentelemetry/api": "^1.0.0",
+        "@opentelemetry/contrib-test-utils": "^0.30.0",
         "@types/chai": "^4.2.15",
         "@types/mocha": "^8.2.2",
         "chai": "^4.3.0",

packages/instrumentation-elasticsearch/src/elasticsearch.ts

@@ -41,7 +41,7 @@ export class ElasticsearchInstrumentation extends InstrumentationBase<typeof ela
             ({ path, operationClassName }) =>
                 new InstrumentationNodeModuleFile<any>(
                     `@elastic/elasticsearch/api/${path}`,
-                    ['*'],
+                    ['>=5 <8'],
                     this.patch.bind(this, operationClassName),
                     this.unpatch.bind(this)
                 )

packages/instrumentation-express/package.json

@@ -19,7 +19,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha --require @opentelemetry/contrib-test-utils",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha --require @opentelemetry/contrib-test-utils",
         "watch": "tsc -w",
@@ -32,20 +32,20 @@
         "access": "public"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/core": "^1.0.0",
-        "@opentelemetry/instrumentation": "^0.27.0",
+        "@opentelemetry/instrumentation": "^0.28.0",
         "@opentelemetry/semantic-conventions": "^1.0.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7"
     },
     "devDependencies": {
-        "@opentelemetry/api": "1.0.2",
-        "@opentelemetry/contrib-test-utils": "^0.28.0",
-        "@opentelemetry/instrumentation-http": "^0.27.0",
-        "@opentelemetry/sdk-trace-base": "1.0.1",
+        "@opentelemetry/api": "^1.0.0",
+        "@opentelemetry/contrib-test-utils": "^0.30.0",
+        "@opentelemetry/instrumentation-http": "^0.28.0",
+        "@opentelemetry/sdk-trace-base": "1.2.0",
         "@types/express": "4.17.8",
         "@types/mocha": "^8.2.2",
         "axios": "0.21.1",
@@ -54,6 +54,7 @@
         "express": "4.17.1",
         "mocha": "^8.4.0",
         "opentelemetry-instrumentation-mocha": "0.0.1-rc.7",
+        "ts-node": "^9.1.1",
         "test-all-versions": "^5.0.1",
         "typescript": "4.3.4"
     },

packages/instrumentation-express/test/utils.ts

@@ -74,5 +74,5 @@ export const errorMiddleware = (_req: express.Request, res: express.Response, ne
 };
 
 export const getExpressSpans = (): ReadableSpan[] => {
-    return getTestSpans().filter((s) => s.instrumentationLibrary.name?.endsWith('express'));
+    return getTestSpans().filter((s) => s.instrumentationLibrary.name?.endsWith('express')) as ReadableSpan[];
 };

packages/instrumentation-kafkajs/package.json

@@ -23,7 +23,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha --require @opentelemetry/contrib-test-utils",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha --require @opentelemetry/contrib-test-utils",
         "test:ci": "yarn test",
@@ -35,16 +35,16 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
-        "@opentelemetry/instrumentation": "^0.27.0",
+        "@opentelemetry/instrumentation": "^0.28.0",
         "@opentelemetry/semantic-conventions": "^1.0.0"
     },
     "devDependencies": {
-        "@opentelemetry/api": "1.0.2",
-        "@opentelemetry/contrib-test-utils": "^0.28.0",
-        "@opentelemetry/sdk-trace-base": "1.0.1",
+        "@opentelemetry/api": "^1.0.0",
+        "@opentelemetry/contrib-test-utils": "^0.30.0",
+        "@opentelemetry/sdk-trace-base": "1.2.0",
         "@types/mocha": "^8.2.2",
         "expect": "^26.6.2",
         "kafkajs": "^1.12.0",

packages/instrumentation-kafkajs/test/kafkajs.spec.ts

@@ -126,7 +126,7 @@ describe('instrumentation-kafkajs', () => {
                 expect(span.attributes[SemanticAttributes.MESSAGING_DESTINATION]).toStrictEqual('topic-name-1');
 
                 expect(messagesSent.length).toBe(1);
-                expectKafkaHeadersToMatchSpanContext(messagesSent[0], span);
+                expectKafkaHeadersToMatchSpanContext(messagesSent[0], span as ReadableSpan);
             });
 
             it('send two messages', async () => {
@@ -148,8 +148,8 @@ describe('instrumentation-kafkajs', () => {
                 expect(spans[1].name).toStrictEqual('topic-name-1');
 
                 expect(messagesSent.length).toBe(2);
-                expectKafkaHeadersToMatchSpanContext(messagesSent[0], spans[0]);
-                expectKafkaHeadersToMatchSpanContext(messagesSent[1], spans[1]);
+                expectKafkaHeadersToMatchSpanContext(messagesSent[0], spans[0] as ReadableSpan);
+                expectKafkaHeadersToMatchSpanContext(messagesSent[1], spans[1] as ReadableSpan);
             });
 
             it('send batch', async () => {
@@ -185,7 +185,7 @@ describe('instrumentation-kafkajs', () => {
 
                 expect(messagesSent.length).toBe(3);
                 for (let i = 0; i < 3; i++) {
-                    expectKafkaHeadersToMatchSpanContext(messagesSent[i], spans[i]);
+                    expectKafkaHeadersToMatchSpanContext(messagesSent[i], spans[i] as ReadableSpan);
                 }
             });
         });

packages/instrumentation-mongoose/package.json

@@ -28,7 +28,7 @@
     },
     "scripts": {
         "build": "tsc",
-        "prepare": "yarn run build",
+        "prepare": "yarn build",
         "test": "mocha --require @opentelemetry/contrib-test-utils",
         "test:jaeger": "OTEL_EXPORTER_JAEGER_AGENT_HOST=localhost mocha --require @opentelemetry/contrib-test-utils",
         "test:ci": "yarn test",
@@ -41,17 +41,17 @@
         "url": "https://github.com/aspecto-io/opentelemetry-ext-js/issues"
     },
     "peerDependencies": {
-        "@opentelemetry/api": "^1.0.1"
+        "@opentelemetry/api": "^1.0.0"
     },
     "dependencies": {
         "@opentelemetry/core": "^1.0.0",
-        "@opentelemetry/instrumentation": "^0.27.0",
+        "@opentelemetry/instrumentation": "^0.28.0",
         "@opentelemetry/semantic-conventions": "^1.0.0"
     },
     "devDependencies": {
-        "@opentelemetry/api": "1.0.2",
-        "@opentelemetry/contrib-test-utils": "^0.28.0",
-        "@opentelemetry/sdk-trace-base": "1.0.1",
+        "@opentelemetry/api": "^1.0.0",
+        "@opentelemetry/contrib-test-utils": "^0.30.0",
+        "@opentelemetry/sdk-trace-base": "1.2.0",
         "@types/mocha": "^8.2.2",
         "@types/node": "^14.0.0",
         "expect": "^26.6.2",