Skip to content

Commit

Permalink
Merge branch 'main' into correct-tsconfigs
Browse files Browse the repository at this point in the history
  • Loading branch information
vmarchaud authored Aug 7, 2021
2 parents 2ad8340 + 365d502 commit ff07058
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions packages/opentelemetry-resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ const resource = new Resource({
[SemanticResourceAttributes.SERVICE_NAME]: 'api-service',
});

const another_resource = new Resource({
'service.version': 2.0.0,
const anotherResource = new Resource({
'service.version': '2.0.0',
'service.group': 'instrumentation-group'
});
const merged_resource = resource.merge(another_resource);
const mergedResource = resource.merge(anotherResource);
```

## Useful links
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-semantic-conventions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ npm install --save @opentelemetry/semantic-conventions
## Usage

```ts
import { GeneralAttribute } from '@opentelemetry/semantic-conventions';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';

const span = tracer.startSpan().startSpan(spanName, spanOptions)
.setAttributes({
[GeneralAttribute.NET_PEER_HOSTNAME]: 'localhost',
[SemanticAttributes.NET_PEER_NAME]: 'localhost',
});
```

Expand Down

0 comments on commit ff07058

Please sign in to comment.