Skip to content

Commit

Permalink
Merge branch 'main' into lizf.update-grpc-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
lizthegrey authored May 3, 2021
2 parents 71db080 + e1e79ef commit e55404b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 3 additions & 0 deletions packages/opentelemetry-semantic-conventions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"node": ">=8.0.0"
},
"files": [
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
3 changes: 1 addition & 2 deletions packages/opentelemetry-tracing/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
import { ENVIRONMENT } from '@opentelemetry/core/src/utils/environment';

const env = getEnv();
const FALLBACK_OTEL_TRACES_SAMPLER = TracesSamplerValues.AlwaysOn;

/**
* Default configuration. For fields with primitive values, any user-provided
Expand All @@ -42,8 +43,6 @@ export const DEFAULT_CONFIG = {
},
};

const FALLBACK_OTEL_TRACES_SAMPLER = TracesSamplerValues.AlwaysOn;

/**
* Based on environment, builds a sampler, complies with specification.
* @param env optional, by default uses getEnv(), but allows passing a value to reuse parsed environment
Expand Down

0 comments on commit e55404b

Please sign in to comment.