Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
SPAN_TYPE,
} from '../ext/tags'
import { HTTP, WEB } from '../ext/types'
import * as opentracing from '../vendor/dist/opentracing';
import * as opentracing from 'opentracing';
import { IncomingMessage, OutgoingMessage } from 'http';

opentracing.initGlobalTracer(tracer);
Expand Down
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ClientRequest, IncomingMessage, OutgoingMessage, ServerResponse } from "http";
import { LookupFunction } from 'net';
import * as opentracing from "./vendor/dist/opentracing";
import * as opentracing from "opentracing";
Comment thread
BridgeAR marked this conversation as resolved.
import * as otel from "@opentelemetry/api";

/**
Expand Down
2 changes: 1 addition & 1 deletion index.d.v5.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ClientRequest, IncomingMessage, OutgoingMessage, ServerResponse } from "http";
import { LookupFunction } from 'net';
import * as opentracing from "./vendor/dist/opentracing";
import * as opentracing from "opentracing";
import * as otel from "@opentelemetry/api";

/**
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@
],
"dependencies": {
"dc-polyfill": "^0.1.11",
"import-in-the-middle": "^3.0.1"
"import-in-the-middle": "^3.0.1",
"opentracing": ">=0.14.7"
},
"optionalDependencies": {
"@datadog/libdatadog": "0.9.3",
Expand Down Expand Up @@ -218,7 +219,6 @@
"node-preload": "^0.2.1",
"nyc": "^18.0.0",
"octokit": "^5.0.3",
"opentracing": ">=0.14.7",
"p-limit": "^7.2.0",
"proxyquire": "^2.1.3",
"retry": "^0.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/dd-trace/test/opentracing/tracer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { describe, it, beforeEach } = require('mocha')
const sinon = require('sinon')
const proxyquire = require('proxyquire')

const opentracing = require('../../../../vendor/dist/opentracing')
const opentracing = require('opentracing')
require('../setup/core')
const SpanContext = require('../../src/opentracing/span_context')
const formats = require('../../../../ext/formats')
Expand Down
2 changes: 1 addition & 1 deletion packages/dd-trace/test/scope.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const assert = require('node:assert/strict')
const { describe, it, beforeEach } = require('mocha')
const sinon = require('sinon')

const { Span } = require('../../../vendor/dist/opentracing')
const { Span } = require('opentracing')
require('./setup/core')
const Scope = require('../src/scope')

Expand Down
11 changes: 0 additions & 11 deletions vendor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"meriyah": "^6.1.4",
"module-details-from-path": "^1.0.4",
"mutexify": "^1.4.0",
"opentracing": ">=0.14.7",
"pprof-format": "^2.1.1",
"protobufjs": "^8.0.1",
"retry": "^0.13.1",
Expand Down
7 changes: 0 additions & 7 deletions vendor/rspack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,6 @@ module.exports = {
}),
new CopyRspackPlugin({
patterns: [
// The OpenTracing types are exposed in the public API of dd-trace so
// they need to be available in the package.
{
from: '**/*.d.ts',
context: join(__dirname, 'node_modules', 'opentracing', 'lib'),
to: 'opentracing'
},
// Binaries need to be copied manually.
{
from: 'source-map/lib/mappings.wasm',
Expand Down
Loading