Skip to content

fix(exporter-prometheus): add appendTimestamp option to ExporterConfig #1697

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.

Sign up for GitHub

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
obecny merged 12 commits into from
Dec 14, 2020
Merged

fix(exporter-prometheus): add appendTimestamp option to ExporterConfig #1697

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
835cd73
fix(exporter-prometheus): add appendTimestamp option to ExporterConfig
antoniomrfranco Nov 24, 2020
7d7b80a
chore: lint
antoniomrfranco Nov 24, 2020
683dafc
chore: add test
antoniomrfranco Nov 24, 2020
ee5f96a
fix(exporter-prometheus): check if appendTimestamp is boolean
antoniomrfranco Nov 24, 2020
6656e04
chore: lint
antoniomrfranco Nov 24, 2020
581a989
fix(exporter-prometheus): change appendTimestamp property
antoniomrfranco Nov 24, 2020
db10eaf
chore: rollback unintentional package changes
antoniomrfranco Nov 24, 2020
c77c601
Merge branch 'master' into exporter-prometheus-fix-append-timestamp
antoniomrfranco Nov 25, 2020
d2123d0
Merge branch 'master' into exporter-prometheus-fix-append-timestamp
antoniomrfranco Nov 30, 2020
ee1a9a6
Merge branch 'master' into exporter-prometheus-fix-append-timestamp
obecny Dec 14, 2020
b9c860d
chore(exporter-prometheus): update test
antoniomrfranco Dec 14, 2020
0749345
Merge branch 'master' into exporter-prometheus-fix-append-timestamp
obecny Dec 14, 2020
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
Prev Previous commit
Next Next commit
chore: lint 
Signed-off-by: Antonio Franco <antoniomrfranco@gmail.com>
  • Loading branch information
@antoniomrfranco
antoniomrfranco committed Nov 24, 2020
commit 6656e0447d78865bccf14075a705b2cc23aed0d5
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@typescript-eslint/parser": "4.1.1",
"beautify-benchmark": "0.2.4",
"benchmark": "2.1.4",
"eslint": "7.6.0",
"eslint": "^7.6.0",
"eslint-config-airbnb-base": "14.2.0",
"eslint-plugin-header": "3.0.0",
"eslint-plugin-import": "2.22.0",
Expand All @@ -57,6 +57,7 @@
"lerna": "3.22.1",
"lerna-changelog": "1.0.1",
"markdownlint-cli": "0.23.2",
"prettier": "^2.2.0",
"typescript": "3.9.7"
},
"husky": {
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ export class PrometheusExporter implements MetricExporter {
this._port = config.port || PrometheusExporter.DEFAULT_OPTIONS.port;
this._prefix = config.prefix || PrometheusExporter.DEFAULT_OPTIONS.prefix;
this._appendTimestamp =
typeof config.appendTimestamp === 'boolean' ?
config.appendTimestamp :
PrometheusExporter.DEFAULT_OPTIONS.appendTimestamp;
typeof config.appendTimestamp === 'boolean'
? config.appendTimestamp
: PrometheusExporter.DEFAULT_OPTIONS.appendTimestamp;
this._server = createServer(this._requestHandler);
this._serializer = new PrometheusSerializer(
this._prefix,
Expand Down