Skip to content

Commit 2f5d1de

Browse files
authored
chore: replace deprecated substr() with substring() (#2553)
1 parent e7cc441 commit 2f5d1de

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

plugins/node/opentelemetry-instrumentation-cassandra/src/instrumentation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,5 +392,5 @@ function wrapPromise<T>(
392392
}
393393

394394
function truncateQuery(query: unknown, maxQueryLength: number) {
395-
return String(query).substr(0, maxQueryLength);
395+
return String(query).substring(0, maxQueryLength);
396396
}

plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ describe('CassandraDriverInstrumentation', () => {
244244
it('truncates long queries', async () => {
245245
const query = 'select userid, count from ot.test';
246246
await client.execute(query);
247-
assertSingleSpan('cassandra-driver.execute', query.substr(0, 25));
247+
assertSingleSpan('cassandra-driver.execute', query.substring(0, 25));
248248
});
249249
});
250250

plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export class FastifyInstrumentation extends InstrumentationBase<FastifyInstrumen
251251
anyRequest.routeOptions?.handler || anyRequest.context?.handler;
252252

253253
const handlerName = handler?.name.startsWith('bound ')
254-
? handler.name.substr(6)
254+
? handler.name.substring(6)
255255
: handler?.name;
256256
const spanName = `${FastifyNames.REQUEST_HANDLER} - ${
257257
handlerName || this.pluginName || ANONYMOUS_NAME

plugins/node/opentelemetry-instrumentation-knex/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const limitLength = (str: string, maxLength: number) => {
7979
0 < maxLength &&
8080
maxLength < str.length
8181
) {
82-
return str.substr(0, maxLength) + '..';
82+
return str.substring(0, maxLength) + '..';
8383
}
8484
return str;
8585
};

plugins/node/opentelemetry-instrumentation-knex/test/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ describe('Knex instrumentation', () => {
150150
const [span] = memoryExporter.getFinishedSpans();
151151
const limitedStatement = span?.attributes?.['db.statement'] as string;
152152
assert.strictEqual(limitedStatement.length, 52);
153-
assert.ok(statement.startsWith(limitedStatement.substr(0, 50)));
153+
assert.ok(statement.startsWith(limitedStatement.substring(0, 50)));
154154
});
155155

156156
it('should catch errors', async () => {

propagators/opentelemetry-propagator-ot-trace/src/OTTracePropagator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class OTTracePropagator implements TextMapPropagator {
6767
const spanContext = trace.getSpan(context)?.spanContext();
6868
if (!spanContext || !isSpanContextValid(spanContext)) return;
6969

70-
setter.set(carrier, OT_TRACE_ID_HEADER, spanContext.traceId.substr(16));
70+
setter.set(carrier, OT_TRACE_ID_HEADER, spanContext.traceId.substring(16));
7171
setter.set(carrier, OT_SPAN_ID_HEADER, spanContext.spanId);
7272
setter.set(
7373
carrier,
@@ -110,7 +110,7 @@ export class OTTracePropagator implements TextMapPropagator {
110110
getter.keys(carrier).forEach(k => {
111111
if (!k.startsWith(OT_BAGGAGE_PREFIX)) return;
112112
const value = readHeader(carrier, getter, k);
113-
baggage = baggage.setEntry(k.substr(OT_BAGGAGE_PREFIX.length), {
113+
baggage = baggage.setEntry(k.substring(OT_BAGGAGE_PREFIX.length), {
114114
value,
115115
});
116116
});

0 commit comments

Comments
 (0)