Skip to content

Commit 494f924

Browse files
committed
chore: bump minimum node ver for gcp detector
1 parent 7608463 commit 494f924

File tree

3 files changed

+9
-27
lines changed

3 files changed

+9
-27
lines changed

packages/opentelemetry-resource-detector-gcp/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ The OpenTelemetry Resource is an immutable representation of the entity producin
1212

1313
## Installation
1414

15+
The GCP resource detector requires Node.JS 10+ due to a dependency on [`gcp-metadata`](https://www.npmjs.com/package/gcp-metadata) which uses features only available in Node.JS 10+.
16+
1517
```bash
1618
npm install --save @opentelemetry/resource-detector-gcp
1719
```

packages/opentelemetry-resource-detector-gcp/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"author": "OpenTelemetry Authors",
2828
"license": "Apache-2.0",
2929
"engines": {
30-
"node": ">=8.0.0"
30+
"node": ">=10.0.0"
3131
},
3232
"files": [
3333
"build/src/**/*.js",
@@ -41,23 +41,22 @@
4141
"access": "public"
4242
},
4343
"devDependencies": {
44+
"@opentelemetry/core": "^0.10.2",
4445
"@types/mocha": "8.0.1",
4546
"@types/node": "14.0.27",
46-
"@types/sinon": "9.0.4",
47+
"@types/semver": "7.3.3",
4748
"codecov": "3.7.2",
4849
"gts": "2.0.2",
4950
"mocha": "7.2.0",
5051
"nock": "12.0.3",
5152
"nyc": "15.1.0",
5253
"rimraf": "3.0.2",
53-
"sinon": "9.0.2",
54+
"semver": "7.3.2",
5455
"ts-mocha": "7.0.0",
5556
"ts-node": "8.10.2",
5657
"typescript": "3.9.7"
5758
},
5859
"dependencies": {
59-
"@opentelemetry/api": "^0.10.2",
60-
"@opentelemetry/core": "^0.10.2",
6160
"@opentelemetry/resources": "^0.10.2",
6261
"gcp-metadata": "^4.1.4"
6362
}

packages/opentelemetry-resource-detector-gcp/test/detectors/GcpDetector.test.ts

+3-22
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
resetIsAvailableCache,
2424
} from 'gcp-metadata';
2525
import * as nock from 'nock';
26+
import * as semver from 'semver';
2627
import { gcpDetector } from '../../src';
2728
import {
2829
assertCloudResource,
@@ -43,8 +44,8 @@ const PROJECT_ID_PATH = BASE_PATH + '/project/project-id';
4344
const ZONE_PATH = BASE_PATH + '/instance/zone';
4445
const CLUSTER_NAME_PATH = BASE_PATH + '/instance/attributes/cluster-name';
4546

46-
describe('gcpDetector', () => {
47-
describe('.detect', () => {
47+
(semver.satisfies(process.version, ">=10") ? describe : describe.skip)('gcpDetector', () => {
48+
describe('.detect', function() {
4849
before(() => {
4950
nock.disableNetConnect();
5051
});
@@ -55,16 +56,6 @@ describe('gcpDetector', () => {
5556
delete process.env.NAMESPACE;
5657
delete process.env.CONTAINER_NAME;
5758
delete process.env.HOSTNAME;
58-
delete process.env.ENTRY_POINT;
59-
delete process.env.GCP_PROJECT;
60-
delete process.env.GCLOUD_PROJECT;
61-
delete process.env.GOOGLE_CLOUD_PROJECT;
62-
delete process.env.FUNCTION_TRIGGER_TYPE;
63-
delete process.env.FUNCTION_NAME;
64-
delete process.env.FUNCTION_MEMORY_MB;
65-
delete process.env.FUNCTION_TIMEOUT_SEC;
66-
delete process.env.FUNCTION_IDENTITY;
67-
delete process.env.FUNCTION_REGION;
6859
});
6960

7061
beforeEach(() => {
@@ -74,16 +65,6 @@ describe('gcpDetector', () => {
7465
delete process.env.NAMESPACE;
7566
delete process.env.CONTAINER_NAME;
7667
delete process.env.HOSTNAME;
77-
delete process.env.ENTRY_POINT;
78-
delete process.env.GCP_PROJECT;
79-
delete process.env.GCLOUD_PROJECT;
80-
delete process.env.GOOGLE_CLOUD_PROJECT;
81-
delete process.env.FUNCTION_TRIGGER_TYPE;
82-
delete process.env.FUNCTION_NAME;
83-
delete process.env.FUNCTION_MEMORY_MB;
84-
delete process.env.FUNCTION_TIMEOUT_SEC;
85-
delete process.env.FUNCTION_IDENTITY;
86-
delete process.env.FUNCTION_REGION;
8768
});
8869

8970
it('should return resource with GCP metadata', async () => {

0 commit comments

Comments
 (0)