Skip to content
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

Jump to bottom

style: use single quotes everywhere and add a rule to eslint #2351

Merged
merged 3 commits into from Jul 21, 2021
Merged

style: use single quotes everywhere and add a rule to eslint #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2364d9e
style: use single quotes and add a rule to eslint
blumamir Jul 14, 2021
8b869a7
Merge branch 'main' into eslint-quotes
blumamir Jul 14, 2021
146433f
Merge branch 'main' into eslint-quotes
blumamir Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions eslint.config.js
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ module.exports = {
"project": "./tsconfig.json"
},
rules: {
"quotes": [2, "single", { "avoidEscape": true }],
"@typescript-eslint/no-floating-promises": 2,
"@typescript-eslint/no-this-alias": "off",
"brace-style": ["error", "1tbs"],
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ import {
ServiceClientType,
} from './types';
import { ServiceClient } from './types';
import { getEnv, baggageUtils } from "@opentelemetry/core";
import { getEnv, baggageUtils } from '@opentelemetry/core';

/**
* Collector Metric Exporter abstract base class
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/CollectorMetricExporter.ts
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import { CollectorExporterConfigNode, ServiceClientType } from './types';
import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
import { baggageUtils, getEnv } from '@opentelemetry/core';
import { validateAndNormalizeUrl } from './util';
import { Metadata } from "@grpc/grpc-js";
import { Metadata } from '@grpc/grpc-js';

const DEFAULT_COLLECTOR_URL = 'localhost:4317';

Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/CollectorTraceExporter.ts
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import {
import { CollectorExporterConfigNode, ServiceClientType } from './types';
import { baggageUtils, getEnv } from '@opentelemetry/core';
import { validateAndNormalizeUrl } from './util';
import { Metadata } from "@grpc/grpc-js";
import { Metadata } from '@grpc/grpc-js';

const DEFAULT_COLLECTOR_URL = 'localhost:4317';

Expand Down
32 changes: 16 additions & 16 deletions packages/opentelemetry-exporter-collector-grpc/test/helper.ts
View file
Open in desktop
Expand Up @@ -410,31 +410,31 @@ export function ensureResourceIsCorrect(
assert.deepStrictEqual(resource, {
attributes: [
{
"key": "service.name",
"value": {
"stringValue": `unknown_service:${process.argv0}`,
"value": "stringValue"
'key': 'service.name',
'value': {
'stringValue': `unknown_service:${process.argv0}`,
'value': 'stringValue'
}
},
{
"key": "telemetry.sdk.language",
"value": {
"stringValue": "nodejs",
"value": "stringValue"
'key': 'telemetry.sdk.language',
'value': {
'stringValue': 'nodejs',
'value': 'stringValue'
}
},
{
"key": "telemetry.sdk.name",
"value": {
"stringValue": "opentelemetry",
"value": "stringValue"
'key': 'telemetry.sdk.name',
'value': {
'stringValue': 'opentelemetry',
'value': 'stringValue'
}
},
{
"key": "telemetry.sdk.version",
"value": {
"stringValue": VERSION,
"value": "stringValue"
'key': 'telemetry.sdk.version',
'value': {
'stringValue': VERSION,
'value': 'stringValue'
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/src/jaeger.ts
View file
Open in desktop
Expand Up @@ -156,7 +156,7 @@ export class JaegerExporter implements SpanExporter {
}

const serviceNameTag = span.tags.find(t => t.key === ResourceAttributes.SERVICE_NAME)
const serviceName = serviceNameTag?.vStr || "unknown_service";
const serviceName = serviceNameTag?.vStr || 'unknown_service';

sender.setProcess({
serviceName,
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts
View file
Open in desktop
Expand Up @@ -93,8 +93,8 @@ describe('JaegerExporter', () => {

const process: ThriftProcess = exporter['_getSender']({
tags: [{
key: "service.name",
vStr: "opentelemetry"
key: 'service.name',
vStr: 'opentelemetry'
}]
} as any)._process;
assert.strictEqual(exporter['_sender']._host, 'remotehost');
Expand All @@ -109,8 +109,8 @@ describe('JaegerExporter', () => {
const exporter = new JaegerExporter();
const sender = exporter['_getSender']({
tags: [{
key: "service.name",
vStr: "opentelemetry"
key: 'service.name',
vStr: 'opentelemetry'
}]
} as any);
assert.strictEqual(sender._host, 'localhost');
Expand All @@ -121,8 +121,8 @@ describe('JaegerExporter', () => {
const exporter = new JaegerExporter();
const sender = exporter['_getSender']({
tags: [{
key: "service.name",
vStr: "opentelemetry"
key: 'service.name',
vStr: 'opentelemetry'
}]
} as any);
assert.strictEqual(sender._host, 'env-set-host');
Expand All @@ -135,8 +135,8 @@ describe('JaegerExporter', () => {
});
const sender = exporter['_getSender']({
tags: [{
key: "service.name",
vStr: "opentelemetry"
key: 'service.name',
vStr: 'opentelemetry'
}]
} as any);
assert.strictEqual(sender._host, 'option-set-host');
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ import { InstrumentationBase, registerInstrumentations } from '../../src';

class DummyTracerProvider implements TracerProvider {
getTracer(name: string, version?: string): Tracer {
throw new Error("not implemented");
throw new Error('not implemented');
}
}
class FooInstrumentation extends InstrumentationBase {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-node/test/registration.test.ts
View file
Open in desktop
Expand Up @@ -78,7 +78,7 @@ describe('API registration', () => {
contextManager: null,
});

assert.strictEqual(context['_getContextManager'](), ctxManager, "context manager should not change");
assert.strictEqual(context['_getContextManager'](), ctxManager, 'context manager should not change');

assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
Expand Down
12 changes: 6 additions & 6 deletions packages/opentelemetry-sdk-node/test/sdk.test.ts
View file
Open in desktop
Expand Up @@ -113,9 +113,9 @@ describe('Node SDK', () => {

await sdk.start();

assert.strictEqual(context['_getContextManager'](), ctxManager, "context manager should not change");
assert.strictEqual(propagation['_getGlobalPropagator'](), propagator, "propagator should not change");
assert.strictEqual((trace.getTracerProvider() as ProxyTracerProvider).getDelegate(), delegate, "tracer provider should not have changed");
assert.strictEqual(context['_getContextManager'](), ctxManager, 'context manager should not change');
assert.strictEqual(propagation['_getGlobalPropagator'](), propagator, 'propagator should not change');
assert.strictEqual((trace.getTracerProvider() as ProxyTracerProvider).getDelegate(), delegate, 'tracer provider should not have changed');

assert.ok(metrics.getMeterProvider() instanceof NoopMeterProvider);
});
Expand Down Expand Up @@ -173,9 +173,9 @@ describe('Node SDK', () => {

await sdk.start();

assert.strictEqual(context['_getContextManager'](), ctxManager, "context manager should not change");
assert.strictEqual(propagation['_getGlobalPropagator'](), propagator, "propagator should not change");
assert.strictEqual((trace.getTracerProvider() as ProxyTracerProvider).getDelegate(), delegate, "tracer provider should not have changed");
assert.strictEqual(context['_getContextManager'](), ctxManager, 'context manager should not change');
assert.strictEqual(propagation['_getGlobalPropagator'](), propagator, 'propagator should not change');
assert.strictEqual((trace.getTracerProvider() as ProxyTracerProvider).getDelegate(), delegate, 'tracer provider should not have changed');

assert.ok(metrics.getMeterProvider() instanceof MeterProvider);
});
Expand Down
10 changes: 5 additions & 5 deletions packages/opentelemetry-shim-opentracing/src/shim.ts
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
import * as api from '@opentelemetry/api';
import { SpanAttributes, SpanAttributeValue, SpanStatusCode, TextMapPropagator } from '@opentelemetry/api';
import * as opentracing from 'opentracing';
import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';

function translateReferences(references: opentracing.Reference[]): api.Link[] {
const links: api.Link[] = [];
Expand Down Expand Up @@ -301,23 +301,23 @@ export class SpanShim extends opentracing.Span {
const entries = Object.entries(attributes);
const errorEntry = entries.find(([key]) => key === 'error.object');
const error = errorEntry?.[1];
if (typeof error === "string") {
if (typeof error === 'string') {
this._span.recordException(error, timestamp);
return;
}

const mappedAttributes: api.SpanAttributes = {};
for (const [k, v] of entries) {
switch (k) {
case "error.kind": {
case 'error.kind': {
mappedAttributes[SemanticAttributes.EXCEPTION_TYPE] = v;
break;
}
case "message": {
case 'message': {
mappedAttributes[SemanticAttributes.EXCEPTION_MESSAGE] = v;
break;
}
case "stack": {
case 'stack': {
mappedAttributes[SemanticAttributes.EXCEPTION_STACKTRACE] = v;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-shim-opentracing/test/Shim.test.ts
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ import {
import { performance } from 'perf_hooks';
import { B3Propagator } from '@opentelemetry/propagator-b3';
import { JaegerPropagator } from '@opentelemetry/propagator-jaeger';
import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';

describe('OpenTracing Shim', () => {
const compositePropagator = new CompositePropagator({
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-tracing/test/common/Tracer.test.ts
View file
Open in desktop
Expand Up @@ -238,7 +238,7 @@ describe('Tracer', () => {
tracerProvider
);

const spy = sinon.spy(tracer, "startSpan");
const spy = sinon.spy(tracer, 'startSpan');

assert.strictEqual(tracer.startActiveSpan('my-span', span => {
try {
Expand All @@ -259,7 +259,7 @@ describe('Tracer', () => {
tracerProvider
);

const spy = sinon.spy(tracer, "startSpan");
const spy = sinon.spy(tracer, 'startSpan');

assert.strictEqual(tracer.startActiveSpan('my-span', {attributes: {foo: 'bar'}}, span => {
try {
Expand All @@ -283,7 +283,7 @@ describe('Tracer', () => {

const ctx = context.active().setValue(ctxKey, 'bar')

const spy = sinon.spy(tracer, "startSpan");
const spy = sinon.spy(tracer, 'startSpan');

assert.strictEqual(tracer.startActiveSpan('my-span', {attributes: {foo: 'bar'}}, ctx, span => {
try {
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-web/test/registration.test.ts
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ describe('API registration', () => {
contextManager: null,
});

assert.strictEqual(context['_getContextManager'](), ctxManager, "context manager should not change");
assert.strictEqual(context['_getContextManager'](), ctxManager, 'context manager should not change');

assert.ok(
propagation['_getGlobalPropagator']() instanceof CompositePropagator
Expand All @@ -84,7 +84,7 @@ describe('API registration', () => {
propagator: null,
});

assert.strictEqual(propagation["_getGlobalPropagator"](), propagator, "propagator should not change")
assert.strictEqual(propagation['_getGlobalPropagator'](), propagator, 'propagator should not change')

assert.ok(context['_getContextManager']() instanceof StackContextManager);
const apiTracerProvider = trace.getTracerProvider() as ProxyTracerProvider;
Expand Down