Skip to content

Implement js-sdk-logging in optimizely-sdk #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Mar 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0a6af0b
Drop in core logger package
jordangarcia Feb 16, 2019
dc0cc6e
update package-lock
jordangarcia Feb 16, 2019
980aaff
Default to NOTSET for log level
jordangarcia Feb 16, 2019
a5346cf
Default logLevel to ERROR when given invalid value
jordangarcia Feb 16, 2019
3b6999b
Improve logger a lot
jordangarcia Feb 16, 2019
62aa40d
bump core to 0.3.0
jordangarcia Feb 16, 2019
161f428
Improve logger again
jordangarcia Feb 16, 2019
d995038
Update tests for new logger
jordangarcia Feb 16, 2019
6378899
Fix more tests
jordangarcia Feb 16, 2019
733e9ee
Replace existing logger plugin and reference core
jordangarcia Feb 16, 2019
0ae3532
Get working with 0.4.0 core-logger
jordangarcia Feb 16, 2019
93bd7e3
Expose `setLogger` and `setLogLevel` on top level API
jordangarcia Feb 16, 2019
1c93277
Implement core logger 0.6.0
jordangarcia Feb 20, 2019
9846003
Implement new logging package
jordangarcia Feb 21, 2019
cf9be1d
Remove old core/ folder
jordangarcia Feb 22, 2019
2a8af52
Import js-sdk-logging@0.1.2
jordangarcia Feb 22, 2019
b930dbc
Remove automatic log prefix
jordangarcia Feb 22, 2019
081650f
Remove webpack bundle analyzer
jordangarcia Feb 22, 2019
dbd9899
Fix broken reference
jordangarcia Feb 22, 2019
ddbd49f
Clean up logger plugin
jordangarcia Feb 22, 2019
cef8cd0
Fix umdtests
jordangarcia Feb 22, 2019
bedf9a2
Fix tsconfig.json from rebase
jordangarcia Mar 1, 2019
3b27029
Bump package versions back to 0.1.0
jordangarcia Mar 1, 2019
8697090
Require js-sdk-logging 0.1.0
jordangarcia Mar 1, 2019
0202be5
Add package.json to files
jordangarcia Mar 1, 2019
6bcfe0f
add package.json to `files` in js-sdk-logging
jordangarcia Mar 1, 2019
6bd5644
Use right padding in log level in console logger
jordangarcia Mar 1, 2019
1bef4e5
Fix logging tests
jordangarcia Mar 1, 2019
aaa8a7d
Add README to js-sdk-utils
jordangarcia Mar 1, 2019
893073c
Add changelog, license
jordangarcia Mar 1, 2019
2593a70
Add changelog, license to js-sdk-logging
jordangarcia Mar 1, 2019
a44ea80
update package-lock.json for install `@optimizely/js-sdk-logging`
jordangarcia Mar 1, 2019
c2b47ac
Fix test
jordangarcia Mar 1, 2019
a6594ac
Fix mocha test
jordangarcia Mar 1, 2019
fd305e9
Remove postinstall step
jordangarcia Mar 1, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "1.0.0",
"name": "optimizely-sdk-packages",
"scripts": {
"postinstall": "lerna bootstrap && lerna run build",
"build": "lerna run build",
"clean": "lerna run clean",
"publish": "npm run build && lerna publish",
Expand Down
12 changes: 12 additions & 0 deletions packages/logging/CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
Changes that have landed but are not yet released.

## [0.1.0] - March 1, 2019

Initial release
202 changes: 202 additions & 0 deletions packages/logging/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016-2017, Optimizely, Inc. and contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
6 changes: 3 additions & 3 deletions packages/logging/__tests__/logger.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ describe('logger', () => {
logger.log(LogLevel.INFO, 'hey')

expect(console.info).toBeCalledTimes(1)
expect(console.info).toBeCalledWith('[OPTIMIZELY] - INFO 12:00 hey')
expect(console.info).toBeCalledWith('[OPTIMIZELY] - INFO 12:00 hey')
})

it('should set logLevel to ERROR when setLogLevel is called with invalid value', () => {
Expand Down Expand Up @@ -331,7 +331,7 @@ describe('logger', () => {
logger.log(LogLevel.INFO, 'test')

expect(console.info).toBeCalledTimes(1)
expect(console.info).toBeCalledWith('[OPTIMIZELY] - INFO 12:00 test')
expect(console.info).toBeCalledWith('[OPTIMIZELY] - INFO 12:00 test')
})

it('should log to console.log for LogLevel.DEBUG', () => {
Expand All @@ -357,7 +357,7 @@ describe('logger', () => {
logger.log(LogLevel.WARNING, 'warning')

expect(console.warn).toBeCalledTimes(1)
expect(console.warn).toBeCalledWith('[OPTIMIZELY] - WARNING 12:00 warning')
expect(console.warn).toBeCalledWith('[OPTIMIZELY] - WARN 12:00 warning')
})

it('should log to console.error for LogLevel.ERROR', () => {
Expand Down
13 changes: 10 additions & 3 deletions packages/logging/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 21 additions & 4 deletions packages/logging/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@optimizely/js-sdk-logging",
"version": "0.1.2",
"version": "0.1.0",
"description": "Optimizely Full Stack Core Logging",
"author": "jordangarcia <jordan@optimizely.com>",
"homepage": "https://github.com/optimizely/javascript-sdk",
"homepage": "https://github.com/optimizely/javascript-sdk/tree/master/packages/logging",
"license": "MIT",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -12,15 +12,32 @@
"test": "test"
},
"files": [
"lib"
"lib",
"LICENSE",
"CHANGELOG",
"README.md",
"package.json"
],
"scripts": {
"tsc": "rm -rf lib && tsc",
"test": "jest",
"prepublishOnly": "jest && npm run tsc"
},
"repository": {
"type": "git",
"url": "git+https://github.com/optimizely/javascript-sdk.git"
},
"keywords": [
"optimizely"
],
"bugs": {
"url": "https://github.com/optimizely/javascript-sdk/issues"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@optimizely/js-sdk-utils": "^0.1.2"
"@optimizely/js-sdk-utils": "^0.1.0"
},
"devDependencies": {
"@types/jest": "^23.3.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/logging/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ export class ConsoleLogHandler implements LogHandler {
case LogLevel.DEBUG:
return 'DEBUG'
case LogLevel.INFO:
return 'INFO'
return 'INFO '
case LogLevel.WARNING:
return 'WARNING'
return 'WARN '
case LogLevel.ERROR:
return 'ERROR'
default:
Expand Down
Loading