-
Notifications
You must be signed in to change notification settings - Fork 750
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into deserializeSpanContext-performance
- Loading branch information
Showing
90 changed files
with
1,801 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
examples/opentelemetry-web/examples/fetch-proto/index.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
|
|
||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Fetch Plugin Example</title> | ||
| <base href="/"> | ||
|
|
||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| </head> | ||
|
|
||
| <body> | ||
| Example of using Web Tracer with Fetch plugin with console exporter and proto exporter | ||
| <script type="text/javascript" src="fetch-proto.js"></script> | ||
| <br/> | ||
| <button id="button1">Test</button> | ||
|
|
||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| const { context, trace } = require("@opentelemetry/api"); | ||
| const { ConsoleSpanExporter, SimpleSpanProcessor} = require("@opentelemetry/sdk-trace-base"); | ||
| const { WebTracerProvider } = require("@opentelemetry/sdk-trace-web"); | ||
| const { FetchInstrumentation } = require("@opentelemetry/instrumentation-fetch"); | ||
| const { ZoneContextManager } = require("@opentelemetry/context-zone"); | ||
| const { B3Propagator } = require("@opentelemetry/propagator-b3"); | ||
| const { registerInstrumentations } = require("@opentelemetry/instrumentation"); | ||
| const { OTLPTraceExporter: OTLPTraceExporterProto } = require("@opentelemetry/exporter-trace-otlp-proto"); | ||
|
|
||
| const provider = new WebTracerProvider(); | ||
|
|
||
| // Note: For production consider using the "BatchSpanProcessor" to reduce the number of requests | ||
| // to your exporter. Using the SimpleSpanProcessor here as it sends the spans immediately to the | ||
| // exporter without delay | ||
| provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); | ||
| provider.addSpanProcessor( | ||
| new SimpleSpanProcessor(new OTLPTraceExporterProto()) | ||
| ); | ||
|
|
||
| provider.register({ | ||
| contextManager: new ZoneContextManager(), | ||
| propagator: new B3Propagator(), | ||
| }); | ||
|
|
||
| registerInstrumentations({ | ||
| instrumentations: [ | ||
| new FetchInstrumentation({ | ||
| ignoreUrls: [/localhost:8090\/sockjs-node/], | ||
| propagateTraceHeaderCorsUrls: [ | ||
| "https://cors-test.appspot.com/test", | ||
| "https://httpbin.org/get", | ||
| ], | ||
| clearTimingResources: true, | ||
| }), | ||
| ], | ||
| }); | ||
|
|
||
| const webTracerWithZone = provider.getTracer("example-tracer-web"); | ||
|
|
||
| const getData = (url) => | ||
| fetch(url, { | ||
| method: "GET", | ||
| headers: { | ||
| Accept: "application/json", | ||
| "Content-Type": "application/json", | ||
| }, | ||
| }); | ||
|
|
||
| // example of keeping track of context between async operations | ||
| const prepareClickEvent = () => { | ||
| const url = "https://httpbin.org/get"; | ||
|
|
||
| const element = document.getElementById("button1"); | ||
|
|
||
| const onClick = () => { | ||
| const singleSpan = webTracerWithZone.startSpan("files-series-info"); | ||
| context.with(trace.setSpan(context.active(), singleSpan), () => { | ||
| getData(url).then((_data) => { | ||
| trace | ||
| .getSpan(context.active()) | ||
| .addEvent("fetching-single-span-completed"); | ||
| singleSpan.end(); | ||
| }); | ||
| }); | ||
| for (let i = 0, j = 5; i < j; i += 1) { | ||
| const span = webTracerWithZone.startSpan(`files-series-info-${i}`); | ||
| context.with(trace.setSpan(context.active(), span), () => { | ||
| getData(url).then((_data) => { | ||
| trace | ||
| .getSpan(context.active()) | ||
| .addEvent(`fetching-span-${i}-completed`); | ||
| span.end(); | ||
| }); | ||
| }); | ||
| } | ||
| }; | ||
| element.addEventListener("click", onClick); | ||
| }; | ||
|
|
||
| window.addEventListener("load", prepareClickEvent); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
experimental/packages/exporter-trace-otlp-proto/karma.conf.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /*! | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * 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. | ||
| */ | ||
|
|
||
| const karmaWebpackConfig = require('../../../karma.webpack'); | ||
| const karmaBaseConfig = require('../../../karma.base'); | ||
|
|
||
| module.exports = (config) => { | ||
| config.set(Object.assign({}, karmaBaseConfig, { | ||
| webpack: karmaWebpackConfig, | ||
| files: ['test/browser/index-webpack.ts'], | ||
| preprocessors: { 'test/browser/index-webpack.ts': ['webpack'] } | ||
| })) | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
experimental/packages/exporter-trace-otlp-proto/src/platform/browser/OTLPTraceExporter.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
|
|
||
| import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'; | ||
| import { getEnv, baggageUtils } from '@opentelemetry/core'; | ||
| import { | ||
| OTLPExporterConfigBase, | ||
| appendResourcePathToUrl, | ||
| appendRootPathToUrlIfNeeded, | ||
| } from '@opentelemetry/otlp-exporter-base'; | ||
| import { | ||
| OTLPProtoExporterBrowserBase, | ||
| ServiceClientType, | ||
| } from '@opentelemetry/otlp-proto-exporter-base'; | ||
| import { | ||
| createExportTraceServiceRequest, | ||
| IExportTraceServiceRequest, | ||
| } from '@opentelemetry/otlp-transformer'; | ||
|
|
||
| const DEFAULT_COLLECTOR_RESOURCE_PATH = 'v1/traces'; | ||
| const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURCE_PATH}`; | ||
|
|
||
| /** | ||
| * Collector Trace Exporter for Web | ||
| */ | ||
| export class OTLPTraceExporter | ||
| extends OTLPProtoExporterBrowserBase<ReadableSpan, IExportTraceServiceRequest> | ||
| implements SpanExporter | ||
| { | ||
| constructor(config: OTLPExporterConfigBase = {}) { | ||
| super(config); | ||
| this._headers = Object.assign( | ||
| this._headers, | ||
| baggageUtils.parseKeyPairsIntoRecord( | ||
| getEnv().OTEL_EXPORTER_OTLP_TRACES_HEADERS | ||
| ) | ||
| ); | ||
| } | ||
| convert(spans: ReadableSpan[]): IExportTraceServiceRequest { | ||
| return createExportTraceServiceRequest(spans); | ||
| } | ||
|
|
||
| getDefaultUrl(config: OTLPExporterConfigBase): string { | ||
| return typeof config.url === 'string' | ||
| ? config.url | ||
| : getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT.length > 0 | ||
| ? appendRootPathToUrlIfNeeded(getEnv().OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) | ||
| : getEnv().OTEL_EXPORTER_OTLP_ENDPOINT.length > 0 | ||
| ? appendResourcePathToUrl( | ||
| getEnv().OTEL_EXPORTER_OTLP_ENDPOINT, | ||
| DEFAULT_COLLECTOR_RESOURCE_PATH | ||
| ) | ||
| : DEFAULT_COLLECTOR_URL; | ||
| } | ||
|
|
||
| getServiceClientType() { | ||
| return ServiceClientType.SPANS; | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
experimental/packages/exporter-trace-otlp-proto/src/platform/browser/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| export { OTLPTraceExporter } from './OTLPTraceExporter'; |
16 changes: 16 additions & 0 deletions
16
experimental/packages/exporter-trace-otlp-proto/src/platform/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| export { OTLPTraceExporter } from './node'; |
File renamed without changes.
Oops, something went wrong.