Skip to content

Commit

Permalink
fix: get package name and version
Browse files Browse the repository at this point in the history
- remove start and end quotes from package name and version
- increase unit test coverage
  • Loading branch information
jharvey10 committed Aug 16, 2023
1 parent 49e8745 commit fcc2a2e
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { tmpName } from 'tmp-promise'

import { exec } from './main/core/exec.js'
import { initializeOpenTelemetry } from './main/core/initialize-open-telemetry.js'
import { Logger } from './main/core/logging/logger.js'
import { Logger } from './main/core/logger.js'
import * as ResourceAttributes from './main/core/resource-attributes.js'
import { tokenizeRepository } from './main/core/tokenize-repository.js'
import { getPackageName } from './main/scopes/npm/get-package-name.js'
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/scopes/npm/get-package-name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ import { exec } from '../../core/exec.js'
export function getPackageName() {
const cwd = path.dirname(import.meta.url.substring(7))

return exec('npm pkg get name', { cwd })
return exec('npm pkg get name', { cwd }).slice(1, -1)
}
2 changes: 1 addition & 1 deletion src/main/scopes/npm/get-package-version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ import { exec } from '../../core/exec.js'
export function getPackageVersion() {
const cwd = path.dirname(import.meta.url.substring(7))

return exec('npm pkg get version', { cwd })
return exec('npm pkg get version', { cwd }).slice(1, -1)
}
39 changes: 39 additions & 0 deletions src/test/core/manual-metric-reader.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright IBM Corp. 2023, 2023
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
import { describe, expect, it } from 'vitest'

import { ManualMetricReader } from '../../main/core/manual-metric-reader.js'

describe('manualMetricReader', () => {
it('throws an exception when onShutdown is called', async () => {
const metricReader = new ManualMetricReader()
let error

try {
await metricReader.shutdown()
} catch (err) {
error = err
}

expect(error).toBeInstanceOf(Error)
expect((error as Error).message).toBe('Method not implemented.')
})

it('throws an exception when onForceFlush is called', async () => {
const metricReader = new ManualMetricReader()
let error

try {
await metricReader.forceFlush()
} catch (err) {
error = err
}

expect(error).toBeInstanceOf(Error)
expect((error as Error).message).toBe('Method not implemented.')
})
})
15 changes: 15 additions & 0 deletions src/test/scopes/npm/get-package-name.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright IBM Corp. 2023, 2023
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
import { describe, expect, it } from 'vitest'

import { getPackageName } from '../../../main/scopes/npm/get-package-name.js'

describe('getPackageName', () => {
it('returns the correct package name for this file', () => {
expect(getPackageName()).toBe('@ibm/telemetrics-js')
})
})
15 changes: 15 additions & 0 deletions src/test/scopes/npm/get-package-version.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright IBM Corp. 2023, 2023
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/
import { describe, expect, it } from 'vitest'

import { getPackageVersion } from '../../../main/scopes/npm/get-package-version.js'

describe('getPackageName', () => {
it('returns a semantic-like version for this package', () => {
expect(getPackageVersion()).toMatch(/\d+.\d+.\d+/)
})
})
6 changes: 5 additions & 1 deletion vitest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ export default defineConfig({

all: true,
include: ['src/main'],
exclude: ['src/main/core/exec.ts']
exclude: [
'src/main/core/exec.ts',
'src/main/core/initialize-open-telemetry.ts',
'src/main/core/resource-attributes.ts'
]
}
}
})

0 comments on commit fcc2a2e

Please sign in to comment.