Skip to content

Commit

Permalink
Merge branch 'main' into logs/internal-state
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Jul 5, 2023
2 parents b46fef9 + dccd906 commit 57dd641
Show file tree
Hide file tree
Showing 227 changed files with 3,663 additions and 4,774 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
path: |
package-lock.json
packages/*/package-lock.json
backwards-compatability/*/package-lock.json
backwards-compatibility/*/package-lock.json
metapackages/*/package-lock.json
packages/*/package-lock.json
integration-tests/*/package-lock.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '16'

- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
NPM_CONFIG_UNSAFE_PERM: true
steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v3.5.3
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,29 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :rocket: (Enhancement)

* feat(SpanExpoter): Add optional forceFlush to SpanExporter interface [#3753](https://github.com/open-telemetry/opentelemetry-js/pull/3753/) @sgracias1 @JacksonWeber
* feat(exporter-metrics-otlp-*)!: add LowMemory metrics temporality preference [#3915](https://github.com/open-telemetry/opentelemetry-js/pull/3915)
* Breaking: From now on `AggregationTemporalityPreference` has to be used instead of `AggregationTemporality` when configuring the exporter.
* Adds support for [LowMemory temporality preference](https://github.com/open-telemetry/opentelemetry-specification/blob/f09624bb97e9be3be259733b93be507df18927bd/specification/metrics/sdk_exporters/otlp.md#additional-configuration)
* Adds support for `lowmemory` in `OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE`

### :bug: (Bug Fix)

* fix(opentelemetry-exporter-prometheus): Update default PrometheusExporter to not append a timestamp to match the text based exposition format [#3961](https://github.com/open-telemetry/opentelemetry-js/pull/3961) @JacksonWeber
* fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#3893](https://github.com/open-telemetry/opentelemetry-js/pull/3893/) @chigia001
* fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#3934](https://github.com/open-telemetry/opentelemetry-js/pull/3934/) @aabmass

### :books: (Refine Doc)

### :house: (Internal)

* feat(minification): [Minification] Add noEmitHelpers, importHelpers and tslib as a dependency [#3913](https://github.com/open-telemetry/opentelemetry-js/issues/3913)

## 1.14.0

### :rocket: (Enhancement)

* feat(SpanExporter): Add optional forceFlush to SpanExporter interface [#3753](https://github.com/open-telemetry/opentelemetry-js/pull/3753/) @sgracias1 @JacksonWeber

## 1.13.0

### :rocket: (Enhancement)
Expand Down
27 changes: 16 additions & 11 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
"codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"docs": "typedoc",
"docs:deploy": "gh-pages --dist docs/out",
Expand Down Expand Up @@ -60,31 +60,36 @@
"access": "public"
},
"devDependencies": {
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
"@types/webpack": "4.41.26",
"@types/sinon": "10.0.15",
"@types/webpack": "4.41.33",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
"dpdm": "3.10.0",
"cross-var": "1.1.0",
"dpdm": "3.13.1",
"istanbul-instrumenter-loader": "3.0.1",
"karma": "6.3.16",
"karma": "6.4.2",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-mocha": "2.0.1",
"karma-mocha-webworker": "1.3.0",
"karma-spec-reporter": "0.0.32",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "4.0.2",
"memfs": "3.4.9",
"mocha": "10.0.0",
"lerna": "7.1.1",
"memfs": "3.5.3",
"mocha": "10.2.0",
"nyc": "15.1.0",
"sinon": "15.0.0",
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"unionfs": "4.4.0",
"unionfs": "4.5.1",
"webpack": "4.46.0"
},
"dependencies": {
"tslib": "^2.3.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
"sideEffects": false
}
18 changes: 9 additions & 9 deletions examples/esm-http-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esm-http-ts",
"private": true,
"version": "0.38.0",
"version": "0.40.0",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -30,13 +30,13 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.4.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
"@opentelemetry/instrumentation": "0.38.0",
"@opentelemetry/instrumentation-http": "0.38.0",
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1",
"@opentelemetry/sdk-trace-node": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
"@opentelemetry/api": "1.4.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.40.0",
"@opentelemetry/instrumentation": "0.40.0",
"@opentelemetry/instrumentation-http": "0.40.0",
"@opentelemetry/resources": "1.14.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@opentelemetry/sdk-trace-node": "1.14.0",
"@opentelemetry/semantic-conventions": "1.14.0"
}
}
3 changes: 2 additions & 1 deletion examples/esm-http-ts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Completeness */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */,
"importHelpers": true
},
"include": ["**/*.ts", "**/*.js", "*.config.js"],
"exclude": ["node_modules"]
Expand Down
71 changes: 0 additions & 71 deletions examples/grpc/README.md

This file was deleted.

46 changes: 0 additions & 46 deletions examples/grpc/client.js

This file was deleted.

64 changes: 0 additions & 64 deletions examples/grpc/helloworld_grpc_pb.js

This file was deleted.

Loading

0 comments on commit 57dd641

Please sign in to comment.