Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: myrotvorets/opentelemetry-resource-detectors
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2ce151d2ec06631e46ac7a57d53f1c43e285b10
Choose a base ref
..
head repository: myrotvorets/opentelemetry-resource-detectors
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da752bf199dfd569776b7605bd14bb2a6a0c3d26
Choose a head ref
Showing with 511 additions and 1,854 deletions.
  1. +0 −4 .eslintignore
  2. +0 −16 .eslintrc.json
  3. +1 −1 .mocharc.cjs
  4. +19 −0 eslint.config.mjs
  5. +0 −1 lib/detectors/dockerdetector.mts
  6. +0 −1 lib/detectors/k8sdetector.mts
  7. +0 −1 lib/detectors/osdetector.mts
  8. +0 −1 lib/detectors/packagejsondetector.mts
  9. +491 −1,828 package-lock.json
  10. +0 −1 test/detectors/k8sdetector.test.mts
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

16 changes: 0 additions & 16 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .mocharc.cjs
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ module.exports = {
process.env.GITHUB_ACTIONS === 'true' ? 'mocha-reporter-gha=-' : null,
process.env.SONARSCANNER === 'true' ? 'mocha-reporter-sonarqube=test-report.xml' : null,
].filter(Boolean),
}
};
19 changes: 19 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import MyrotvoretsConfig from '@myrotvorets/eslint-config-myrotvorets-ts';
import MochaPlugin from 'eslint-plugin-mocha';
import globals from 'globals';

/** @type {import('eslint').Linter.Config[]} */
export default [
{
ignores: ['dist/**'],
},
...MyrotvoretsConfig,
MochaPlugin.configs.flat.recommended,
{
languageOptions: {
globals: {
...globals.node,
},
},
},
];
1 change: 0 additions & 1 deletion lib/detectors/dockerdetector.mts
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ import { ATTR_CONTAINER_ID } from '@opentelemetry/semantic-conventions/incubatin
import { getContainerIDFormCGroup, getContainerIDFormCGroup2 } from './utils.mjs';

export class DockerDetector implements DetectorSync {
// eslint-disable-next-line class-methods-use-this
public detect(_config: ResourceDetectionConfig): IResource {
return new Resource({}, DockerDetector.getAsyncAttributes());
}
1 change: 0 additions & 1 deletion lib/detectors/k8sdetector.mts
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ import {
import { getContainerIDFormCGroup } from './utils.mjs';

export class K8sDetector implements DetectorSync {
// eslint-disable-next-line class-methods-use-this
public detect(_config: ResourceDetectionConfig): IResource {
const matches = /^(.*)-([a-f0-9]+)-([a-z0-9]{5})$/u.exec(process.env['HOSTNAME'] ?? '');
if (!matches) {
1 change: 0 additions & 1 deletion lib/detectors/osdetector.mts
Original file line number Diff line number Diff line change
@@ -24,7 +24,6 @@ import {
} from '@opentelemetry/semantic-conventions/incubating';

export class OSDetector implements DetectorSync {
// eslint-disable-next-line class-methods-use-this
public detect(_config: ResourceDetectionConfig): IResource {
const attrs = {
[ATTR_HOST_NAME]: hostname(),
1 change: 0 additions & 1 deletion lib/detectors/packagejsondetector.mts
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ import {
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';

export class PackageJsonDetector implements DetectorSync {
// eslint-disable-next-line class-methods-use-this
public detect(_config: ResourceDetectionConfig): IResource {
return new Resource({}, PackageJsonDetector.getAsyncAttributes());
}
Loading