diff --git a/assets/js/registrySearch.js b/assets/js/registrySearch.js index 8e3476329958..1aac4716f391 100644 --- a/assets/js/registrySearch.js +++ b/assets/js/registrySearch.js @@ -41,13 +41,13 @@ if (pathName.includes('registry')) { if (selectedLanguage !== 'all') { document.getElementById('languageDropdown').textContent = document.getElementById( - `language-item-${selectedLanguage}`, + `language-item-${selectedLanguage}` ).textContent; } if (selectedComponent !== 'all') { document.getElementById('componentDropdown').textContent = document.getElementById( - `component-item-${selectedComponent}`, + `component-item-${selectedComponent}` ).textContent; } updateFilters(); @@ -97,8 +97,8 @@ function populateResults(results) { snippetHighlights.push( match.value.substring( match.indices[0][0], - match.indices[0][1] - mvalue.indices[0][0] + 1, - ), + match.indices[0][1] - mvalue.indices[0][0] + 1 + ) ); } }); @@ -110,7 +110,7 @@ function populateResults(results) { // Pull template from hugo template definition let templateDefinition = document.querySelector( - '#search-result-template', + '#search-result-template' ).innerHTML; // Replace values from template with search results @@ -176,7 +176,7 @@ if (pathName.includes('registry')) { evt.target.textContent; setInput('language', val); updateFilters(); - }), + }) ); typeList.forEach((element) => element.addEventListener('click', function (evt) { @@ -186,7 +186,7 @@ if (pathName.includes('registry')) { evt.target.textContent; setInput('component', val); updateFilters(); - }), + }) ); }); } diff --git a/content/en/blog/2022/instrument-apache-httpd-server/index.md b/content/en/blog/2022/instrument-apache-httpd-server/index.md index 2dffb1d2b64d..f346fbd42787 100644 --- a/content/en/blog/2022/instrument-apache-httpd-server/index.md +++ b/content/en/blog/2022/instrument-apache-httpd-server/index.md @@ -103,7 +103,7 @@ Zipkin backend. The following steps are required to be done. add the following text ```html - + PHP Test Page diff --git a/content/en/docs/instrumentation/js/getting-started/browser.md b/content/en/docs/instrumentation/js/getting-started/browser.md index 94b41b3c4cdc..109c836ae88d 100644 --- a/content/en/docs/instrumentation/js/getting-started/browser.md +++ b/content/en/docs/instrumentation/js/getting-started/browser.md @@ -27,7 +27,7 @@ This is a very simple guide, if you'd like to see more complex examples go to Copy the following file into an empty directory and call it `index.html`. ```html - + diff --git a/content/en/docs/instrumentation/js/manual.md b/content/en/docs/instrumentation/js/manual.md index 07ecb768a9d4..6c8ab8221479 100644 --- a/content/en/docs/instrumentation/js/manual.md +++ b/content/en/docs/instrumentation/js/manual.md @@ -359,7 +359,7 @@ const resource = Resource.default().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'service-name-here', [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0', - }), + }) ); const provider = new WebTracerProvider({ @@ -390,7 +390,7 @@ const resource = Resource.default().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'service-name-here', [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0', - }), + }) ); const provider = new WebTracerProvider({ @@ -442,7 +442,7 @@ import opentelemetry from '@opentelemetry/api'; const tracer = opentelemetry.trace.getTracer( 'instrumentation-scope-name', - 'instrumentation-scope-version', + 'instrumentation-scope-version' ); // You can now use a 'tracer' to do tracing! @@ -456,7 +456,7 @@ const opentelemetry = require('@opentelemetry/api'); const tracer = opentelemetry.trace.getTracer( 'instrumentation-scope-name', - 'instrumentation-scope-version', + 'instrumentation-scope-version' ); // You can now use a 'tracer' to do tracing! @@ -881,7 +881,7 @@ tracer.startActiveSpan( // do some work... span.end(); - }, + } ); ``` @@ -894,7 +894,7 @@ function rollTheDice(rolls: number, min: number, max: number) { { attributes: { 'dicelib.rolls': rolls.toString() } }, (span: Span) => { /* ... */ - }, + } ); } ``` @@ -908,7 +908,7 @@ function rollTheDice(rolls, min, max) { { attributes: { 'dicelib.rolls': rolls.toString() } }, (span) => { /* ... */ - }, + } ); } ``` @@ -1182,7 +1182,7 @@ const doWork = (parent, i) => { // in the context, then use the resulting context to create a child span. const ctx = opentelemetry.trace.setSpan( opentelemetry.context.active(), - parent, + parent ); const span = tracer.startSpan(`doWork:${i}`, undefined, ctx); @@ -1280,7 +1280,7 @@ const resource = Resource.default().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'dice-server', [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0', - }), + }) ); const metricReader = new PeriodicExportingMetricReader({ @@ -1318,7 +1318,7 @@ const resource = Resource.default().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'service-name-here', [SemanticResourceAttributes.SERVICE_VERSION]: '0.1.0', - }), + }) ); const metricReader = new PeriodicExportingMetricReader({ @@ -1573,7 +1573,7 @@ const httpServerResponseDuration = myMeter.createHistogram( description: 'A distribution of the HTTP server response times', unit: 'milliseconds', valueType: ValueType.INT, - }, + } ); ``` diff --git a/content/en/docs/instrumentation/js/propagation.md b/content/en/docs/instrumentation/js/propagation.md index c05705ebb3fc..aa5e127e543b 100644 --- a/content/en/docs/instrumentation/js/propagation.md +++ b/content/en/docs/instrumentation/js/propagation.md @@ -87,7 +87,7 @@ let span = tracer.startSpan( { attributes: {}, }, - activeContext, + activeContext ); // Set the created span as active in the deserialized context. diff --git a/content/en/docs/instrumentation/js/serverless.md b/content/en/docs/instrumentation/js/serverless.md index fdb83abc2fe5..e28094338c0c 100644 --- a/content/en/docs/instrumentation/js/serverless.md +++ b/content/en/docs/instrumentation/js/serverless.md @@ -70,7 +70,7 @@ const collectorOptions = { }; const spanProcessor = new BatchSpanProcessor( - new OTLPTraceExporter(collectorOptions), + new OTLPTraceExporter(collectorOptions) ); provider.addSpanProcessor(spanProcessor); @@ -255,7 +255,7 @@ const collectorOptions = { }; const spanProcessor = new BatchSpanProcessor( - new OTLPTraceExporter(collectorOptions), + new OTLPTraceExporter(collectorOptions) ); provider.addSpanProcessor(spanProcessor); diff --git a/content/en/docs/security/security-response.md b/content/en/docs/security/security-response.md index 00b3472e5fa3..63f40a058252 100644 --- a/content/en/docs/security/security-response.md +++ b/content/en/docs/security/security-response.md @@ -24,7 +24,7 @@ branch at the moment of the release. For instance, if the latest version is Security fixes are given priority and might be enough to cause a new version to be released. Each repository is entitled to establish their own complementary processes. SIG-Security in conjunction with the TC can advise in case -clarifications are required. +clarifications are required. ## Disclosures @@ -49,9 +49,9 @@ If you know of a publicly disclosed security vulnerability please IMMEDIATELY email [cncf-opentelemetry-tc@lists.cncf.io](mailto:cncf-opentelemetry-tc@lists.cncf.io) to inform the Security Response Committee (SRC) about the vulnerability so they -may start the patch, release, and communication process. Please include any relevant -information about current public exploitations of this vulnerability if known to -help with scoring and priortization. +may start the patch, release, and communication process. Please include any +relevant information about current public exploitations of this vulnerability if +known to help with scoring and prioritization. The TC should receive the message and re-direct it to the relevant repo maintainers for ownership. If possible the repo maintainers will engage and ask @@ -69,7 +69,8 @@ The Fix Team is made up of the relevant repo maintainers. ### TC Role -- A member of the TC will need to review the proposed CVSS score and severity from the Fix Team +- A member of the TC will need to review the proposed CVSS score and severity + from the Fix Team - Acknowledge when a proposed fix is completed ### Fix Development Process @@ -112,8 +113,7 @@ OTel relies on GitHub tooling to notify the affected repositories and publish a security advisory. GitHub will publish the CVE to the CVE List, broadcast the Security Advisory via the GitHub Advisory Database, and send security alerts to all repositories that use the package and have alerts on. The CVE will also be -added to the [OTel website's CVE -feed](security/cve/). +added to the [OTel website's CVE feed](security/cve/). #### Fix Release Day @@ -122,8 +122,8 @@ notify their communities via Slack. ## Severity -The Fix Team evaluates vulnerability severity on a case-by-case -basis, guided by CVSS 3.1 and is subject to TC review. +The Fix Team evaluates vulnerability severity on a case-by-case basis, guided by +CVSS 3.1 and is subject to TC review. ## Retrospective diff --git a/gulp-src/_md-rules/trim-code-block-and-unindent.js b/gulp-src/_md-rules/trim-code-block-and-unindent.js index df0d061265ed..202f4b1a69a9 100644 --- a/gulp-src/_md-rules/trim-code-block-and-unindent.js +++ b/gulp-src/_md-rules/trim-code-block-and-unindent.js @@ -32,7 +32,7 @@ function processToken(token) { (line) => line.trim().length === 0 ? '' // Blank-only lines - : line.substring(minIndent), // Unindent + : line.substring(minIndent) // Unindent ); fixedLines = trimBlankLinesFromArray(fixedLines); const fixedContent = fixedLines.join('\n'); diff --git a/gulp-src/prune.js b/gulp-src/prune.js index d94270d112a9..69a783bf6dc6 100644 --- a/gulp-src/prune.js +++ b/gulp-src/prune.js @@ -68,7 +68,7 @@ async function pruneTask() { const entriesWith4xxStatus = Object.keys(entries) .map((url) => [url, entries[url].LastSeen, entries[url].StatusCode]) .filter( - ([url, date, statusCode]) => 400 <= statusCode && statusCode <= 499, + ([url, date, statusCode]) => 400 <= statusCode && statusCode <= 499 ); var msg = `INFO: ${entriesWith4xxStatus.length} entries with 4XX status.`; @@ -106,14 +106,14 @@ async function pruneTask() { `INFO: ${ pruneCandidatesByDate__sorted.length } entries as prune candidates for before-date ${formattedDate( - beforeDate, - )}.`, + beforeDate + )}.` ); } if (n == 0) { console.log( - `WARN: num is ${n} so no entries will be pruned by date. Specify number of entries to prune as --num .`, + `WARN: num is ${n} so no entries will be pruned by date. Specify number of entries to prune as --num .` ); if (numEntriesWith4xxStatus == 0) return; } diff --git a/scripts/registry-scanner/index.mjs b/scripts/registry-scanner/index.mjs index aaa41db24311..11f1957652f3 100644 --- a/scripts/registry-scanner/index.mjs +++ b/scripts/registry-scanner/index.mjs @@ -50,7 +50,7 @@ const ignoreList = [ if (process.argv.length < 3) { console.log( `USAGE: ${path.basename(process.argv[0])} ${path.basename( - process.argv[1], + process.argv[1] )} is a comma separated list of the following options: - collector @@ -65,8 +65,8 @@ if (process.argv.length < 3) { Use 'all' if you want to run all of them (except go). Example: ${path.basename(process.argv[0])} ${path.basename( - process.argv[1], - )} python,ruby,erlang`, + process.argv[1] + )} python,ruby,erlang` ); process.exit(); } @@ -76,7 +76,7 @@ const selection = process.argv[2].split(',').map((x) => x.trim()); const scanners = { collector: () => { ['receiver', 'exporter', 'processor', 'extension'].forEach( - async (component) => scanCollectorComponent(component), + async (component) => scanCollectorComponent(component) ); }, js: () => { @@ -85,7 +85,7 @@ const scanners = { 'resource-detector', 'js', 'detectors/node', - 'resource-detector', + 'resource-detector' ); }, java: () => { @@ -94,7 +94,7 @@ const scanners = { 'java', 'instrumentation', 'md', - 'opentelemetry-java-instrumentation', + 'opentelemetry-java-instrumentation' ); }, ruby: () => { @@ -111,7 +111,7 @@ const scanners = { 'python', 'exporter', 'rst', - 'opentelemetry-python', + 'opentelemetry-python' ); }, dotnet: () => { @@ -128,7 +128,7 @@ const scanners = { 'md', repo, (item) => item.name.toLowerCase().includes(registryType), - (name) => name.split('.').splice(2, 3).join('').toLowerCase(), + (name) => name.split('.').splice(2, 3).join('').toLowerCase() ); }); }, @@ -143,7 +143,7 @@ const scanners = { 'md', 'opentelemetry-php-contrib', () => true, - (name) => name.toLowerCase(), + (name) => name.toLowerCase() ); }, all: () => { @@ -167,7 +167,7 @@ async function scanForNew( repo, filter = () => true, keyMapper = (x) => x, - owner = 'open-telemetry', + owner = 'open-telemetry' ) { const result = await octokit.request( 'GET /repos/{owner}/{repo}/contents/{path}', @@ -175,7 +175,7 @@ async function scanForNew( owner, repo, path, - }, + } ); return result.data.reduce((carry, current) => { if (filter(current) && current.type === 'dir') { @@ -188,7 +188,7 @@ async function scanForNew( async function scanForExisting(type, noDash = false) { const result = await octokit.request( - 'GET /repos/open-telemetry/opentelemetry.io/contents/data/registry', + 'GET /repos/open-telemetry/opentelemetry.io/contents/data/registry' ); return result.data.reduce((carry, current) => { if (current.name.startsWith(type)) { @@ -207,7 +207,7 @@ function createYaml( language, registryType, repo, - description, + description ) { return `title: ${title} registryType: ${registryType} @@ -261,15 +261,15 @@ async function createFilesFromScanResult(existing, found, settings) { }; try { const result = await octokit.request( - `GET ${new URL(current.url).pathname}/README.${readmeFormat}`, + `GET ${new URL(current.url).pathname}/README.${readmeFormat}` ); parsedReadme = parseReadme( Buffer.from(result.data.content, 'base64').toString(), - readmeFormat, + readmeFormat ); } catch (e) { console.warn( - `Request error while fetching README.md for ${currentKey}: ${e.message}`, + `Request error while fetching README.md for ${currentKey}: ${e.message}` ); } const yaml = createYaml( @@ -278,7 +278,7 @@ async function createFilesFromScanResult(existing, found, settings) { language, registryType, current.html_url, - parsedReadme.description, + parsedReadme.description ); // collector entries are named reverse (collector-{registryTpe}) compared to languages ({registryTpe}-{language}), we fix this here. const fileName = ( @@ -306,9 +306,9 @@ async function scanByLanguage( .filter( (y) => !['opentelemetry', registryType].includes(y) && - !y.match(/^[0-9]+.[0-9]+$/), + !y.match(/^[0-9]+.[0-9]+$/) ) - .join(''), + .join('') ) { // https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/ const found = await scanForNew(path, repo, filter, keyMapper); @@ -329,8 +329,8 @@ async function scanCollectorComponent(component) { component, 'opentelemetry-collector-contrib', filter, - keyMapper, - ), + keyMapper + ) ); const existing = await scanForExisting(`collector-${component}`, true); createFilesFromScanResult(existing, found, { @@ -343,7 +343,7 @@ async function scanCollectorComponent(component) { async function scanForGo() { const response = await ( await fetch( - 'https://pkg.go.dev/search?limit=100&m=package&q=go.opentelemetry.io%2Fcontrib%2Finstrumentation', + 'https://pkg.go.dev/search?limit=100&m=package&q=go.opentelemetry.io%2Fcontrib%2Finstrumentation' ) ).text(); const $ = cheerioLoad(response); @@ -387,7 +387,7 @@ async function scanForGo() { language, registryType, current.url, - current.description, + current.description ); const fileName = `${registryType}-${language}-${current.title}.yml`; if (!ignoreList.includes(fileName)) {