Skip to content

Commit

Permalink
Rename the lib directory to src (#333)
Browse files Browse the repository at this point in the history
Renamed the `lib` directory to `src` to more closely align this module with the other Google Cloud API Client Libraries via the `google-cloud` modules in [1].

[1]: https://github.com/GoogleCloudPlatform/google-cloud-node

PR-URL: #333
  • Loading branch information
DominicKramer authored Dec 12, 2016
1 parent 04b3b31 commit 422c950
Show file tree
Hide file tree
Showing 51 changed files with 46 additions and 46 deletions.
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ var filesLoadedBeforeTrace = Object.keys(require.cache);
// patched before any user-land modules get loaded.
require('continuation-local-storage');

var SpanData = require('./lib/span-data.js');
var SpanData = require('./src/span-data.js');
var common = require('@google/cloud-diagnostics-common');
var semver = require('semver');
var constants = require('./lib/constants.js');
var constants = require('./src/constants.js');
var path = require('path');
var util = require('./lib/util.js');
var util = require('./src/util.js');

var modulesLoadedBeforeTrace = [];

Expand Down Expand Up @@ -183,7 +183,7 @@ var publicAgent = {
return this;
}

agent = require('./lib/trace-agent.js').get(config, logger);
agent = require('./src/trace-agent.js').get(config, logger);
return this; // for chaining
},

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

'use strict';

var cls = require('../../../lib/cls.js');
var cls = require('../../../src/cls.js');
var shimmer = require('shimmer');
var semver = require('semver');
var SpanData = require('../../../lib/span-data.js');
var SpanData = require('../../../src/span-data.js');
var agent;

var SUPPORTED_VERSIONS = '^2.9.x';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/hooks/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var agent = require('../..').start(config).private_();
// We want to disable publishing to avoid conflicts with production.
agent.traceWriter.publish_ = function() {};

var cls = require('../../lib/cls.js');
var cls = require('../../src/cls.js');

var assert = require('assert');
var http = require('http');
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-hooks-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
var assert = require('assert');
var Module = require('module');
var semver = require('semver');
var index = require('../../lib/hooks/index.js');
var index = require('../../src/hooks/index.js');
var findModulePath = index.findModulePath;
var findModuleVersion = index.findModuleVersion;

Expand Down
4 changes: 2 additions & 2 deletions test/hooks/test-trace-connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
'use strict';

var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
var http = require('http');
var assert = require('assert');
var constants = require('../../lib/constants.js');
var constants = require('../../src/constants.js');
var common = require('./common.js');
var connect = require('./fixtures/connect3');

Expand Down
4 changes: 2 additions & 2 deletions test/hooks/test-trace-express.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
'use strict';

var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
var http = require('http');
var assert = require('assert');
var constants = require('../../lib/constants.js');
var constants = require('../../src/constants.js');
var common = require('./common.js');
var express = require('./fixtures/express4');

Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-trace-grpc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
var common = require('./common.js');
require('../..').private_().config_.enhancedDatabaseReporting = true;
var assert = require('assert');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');

var versions = {
grpc1: require('./fixtures/grpc1')
Expand Down
4 changes: 2 additions & 2 deletions test/hooks/test-trace-hapi.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

var common = require('./common.js');

var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
var http = require('http');
var assert = require('assert');
var constants = require('../../lib/constants.js');
var constants = require('../../src/constants.js');
var semver = require('semver');

var server;
Expand Down
6 changes: 3 additions & 3 deletions test/hooks/test-trace-http.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
'use strict';

var common = require('./common.js');
var constants = require('../../lib/constants.js');
var TraceLabels = require('../../lib/trace-labels.js');
var constants = require('../../src/constants.js');
var TraceLabels = require('../../src/trace-labels.js');

var assert = require('assert');
var http = require('http');
Expand Down Expand Up @@ -218,7 +218,7 @@ describe('test-trace-http', function() {
assert.equal(spans.length, 5);
// We need to check a property attached at the end of a span
var statusCodes = [];
var labels = require('../../lib/trace-labels.js');
var labels = require('../../src/trace-labels.js');
for (var j = 0; j < spans.length; j++) {
var code = Number(spans[j].labels[
labels.HTTP_RESPONSE_CODE_LABEL_KEY]);
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-trace-mongodb.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Run a mongo image binding the mongo port
// ex) docker run -p 27017:27017 -d mongo
var common = require('./common.js');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
var assert = require('assert');

var versions = {
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-trace-mongoose.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Run a mongo image binding the mongo port
// ex) docker run -p 27017:27017 -d mongo
var common = require('./common.js');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');

var assert = require('assert');
var mongoose = require('./fixtures/mongoose4');
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-trace-mysql.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'use strict';

var common = require('./common.js');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
require('../..').private_().config_.enhancedDatabaseReporting = true;
var assert = require('assert');
var mysql = require('./fixtures/mysql2');
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/test-trace-redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Run a redis image binding the redis port
// ex) docker run -p 6379:6379 -d redis
var common = require('./common.js');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');

var assert = require('assert');
var versions = {
Expand Down
4 changes: 2 additions & 2 deletions test/hooks/test-trace-restify.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
'use strict';

var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');
var http = require('http');
var assert = require('assert');
var constants = require('../../lib/constants.js');
var constants = require('../../src/constants.js');
var common = require('./common.js');
var semver = require('semver');
var versions = {
Expand Down
2 changes: 1 addition & 1 deletion test/performance/http/http-performance-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var smileyServer = http.createServer(function(req, res) {
});

var runInTransaction = function(fn) {
var cls = require('../../../lib/cls.js');
var cls = require('../../../src/cls.js');
cls.getNamespace().run(function() {
var span = traceAgent.createRootSpanData('outer');
fn(function() {
Expand Down
2 changes: 1 addition & 1 deletion test/performance/mongo/mongo-performance-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var sim = new Simple({
});

var runInTransaction = function(fn) {
var cls = require('../../../lib/cls.js');
var cls = require('../../../src/cls.js');
cls.getNamespace().run(function() {
var span = traceAgent.createRootSpanData('outer');
fn(function() {
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-agent-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
var assert = require('assert');
var nock = require('nock');
var agent = require('../..');
var traceLabels = require('../../lib/trace-labels.js');
var traceLabels = require('../../src/trace-labels.js');

nock.disableNetConnect();

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-config-credentials.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
var path = require('path');
var assert = require('assert');
var nock = require('nock');
var cls = require('../../lib/cls.js');
var cls = require('../../src/cls.js');

var queueSpans = function(n, privateAgent) {
for (var i = 0; i < n; i++) {
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (!process.env.GCLOUD_PROJECT) {

var assert = require('assert');
var agent = require('../..');
var cls = require('../../lib/cls.js');
var cls = require('../../src/cls.js');

describe('index.js', function() {

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-trace-header-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var common = require('../hooks/common.js');
var http = require('http');
var assert = require('assert');
var express = require('../hooks/fixtures/express4');
var constants = require('../../lib/constants.js');
var constants = require('../../src/constants.js');

describe('test-trace-header-context', function() {
beforeEach(function() {
Expand Down
4 changes: 2 additions & 2 deletions test/standalone/test-trace-koa.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ var common = require('../hooks/common.js');
var koa = require('../hooks/fixtures/koa1');
var http = require('http');
var assert = require('assert');
var constants = require('../../lib/constants.js');
var TraceLabels = require('../../lib/trace-labels.js');
var constants = require('../../src/constants.js');
var TraceLabels = require('../../src/trace-labels.js');

var server;

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-trace-uncaught-exception.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

var assert = require('assert');
var nock = require('nock');
var cls = require('../../lib/cls.js');
var cls = require('../../src/cls.js');
var agent = require('../..');
var request = require('request');

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/test-trace-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

var assert = require('assert');
var nock = require('nock');
var cls = require('../../lib/cls.js');
var cls = require('../../src/cls.js');
var agent = require('../..');
var request = require('request');

Expand Down
2 changes: 1 addition & 1 deletion test/test-constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

var assert = require('assert');
var constants = require('../lib/constants.js');
var constants = require('../src/constants.js');

describe('constants', function() {
it('has correct values', function() {
Expand Down
4 changes: 2 additions & 2 deletions test/test-span-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ if (!process.env.GCLOUD_PROJECT) {
}

var agent = require('..').start({ samplingRate: 0 }).private_();
var TraceLabels = require('../lib/trace-labels.js');
var TraceLabels = require('../src/trace-labels.js');
var assert = require('assert');
var cls = require('../lib/cls.js');
var cls = require('../src/cls.js');

describe('SpanData', function() {

Expand Down
10 changes: 5 additions & 5 deletions test/test-trace-agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

'use strict';

var constants = require('../lib/constants.js');
var constants = require('../src/constants.js');

if (!process.env.GCLOUD_PROJECT) {
console.log('The GCLOUD_PROJECT environment variable must be set.');
Expand All @@ -25,11 +25,11 @@ if (!process.env.GCLOUD_PROJECT) {

var assert = require('assert');
var config = require('../config.js');
var file = require('../lib/trace-agent.js');
var SpanData = require('../lib/span-data.js');
var file = require('../src/trace-agent.js');
var SpanData = require('../src/span-data.js');
var agent = file.get(config);
var constants = require('../lib/constants.js');
var cls = require('../lib/cls.js');
var constants = require('../src/constants.js');
var cls = require('../src/cls.js');

describe('Trace Agent', function() {

Expand Down
2 changes: 1 addition & 1 deletion test/test-trace-policy.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

var assert = require('assert');
var tracingPolicy = require('../lib/tracing-policy.js');
var tracingPolicy = require('../src/tracing-policy.js');

describe('FilterPolicy', function() {
it('should not allow filtered urls', function() {
Expand Down
2 changes: 1 addition & 1 deletion test/test-trace-span.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

var assert = require('assert');
var tk = require('timekeeper');
var TraceSpan = require('../lib/trace-span.js');
var TraceSpan = require('../src/trace-span.js');


describe('TraceSpan', function() {
Expand Down
2 changes: 1 addition & 1 deletion test/test-trace.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

var assert = require('assert');
var Trace = require('../lib/trace.js');
var Trace = require('../src/trace.js');


describe('Trace', function() {
Expand Down
2 changes: 1 addition & 1 deletion test/test-util.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'use strict';

var assert = require('assert');
var util = require('../lib/util.js');
var util = require('../src/util.js');
var path = require('path');

var o = {
Expand Down

0 comments on commit 422c950

Please sign in to comment.