Skip to content

Commit 15a364a

Browse files
authored
update branch to main (elastic#36)
1 parent 89491f2 commit 15a364a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Once your changes are ready to submit for review:
7070
4. Rebase your changes
7171

7272
Update your local repository with the most recent code from the main repo,
73-
and rebase your branch on top of the latest master branch.
73+
and rebase your branch on top of the latest main branch.
7474
We prefer your initial changes to be squashed into a single commit.
7575
Later,
7676
if we ask you to make changes,
@@ -105,7 +105,7 @@ composer test
105105

106106
### Workflow
107107

108-
All feature development and most bug fixes hit the master branch first.
108+
All feature development and most bug fixes hit the main branch first.
109109
Pull requests should be reviewed by someone with commit access.
110110
Once approved, the author of the pull request,
111111
or reviewer if the author does not have commit access,
@@ -114,7 +114,7 @@ should "Squash and merge".
114114
### Design considerations
115115

116116
#### Compatibility
117-
117+
118118
Coming soon [TBD]
119119

120120
### Coding guidelines
@@ -123,4 +123,4 @@ Coming soon [TBD]
123123

124124
### Releasing
125125

126-
See [RELEASE.md](RELEASE.md) for details on releasing.
126+
See [RELEASE.md](RELEASE.md) for details on releasing.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-php%2Fecs-logging-php-mbp%2Fmaster)](https://apm-ci.elastic.co/job/apm-agent-php/job/ecs-logging-php-mbp/job/master/)
1+
[![Build Status](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-php%2Fecs-logging-php-mbp%2Fmain)](https://apm-ci.elastic.co/job/apm-agent-php/job/ecs-logging-php-mbp/job/main/)
22

33
# ECS Logging for PHP
44

@@ -16,7 +16,7 @@ composer require elastic/ecs-logging
1616
```
1717

1818
## Examples and Usage
19-
* [Monolog v2.0](https://github.com/elastic/ecs-logging-php/blob/master/docs/Monolog_v2.md)
19+
* [Monolog v2.0](https://github.com/elastic/ecs-logging-php/blob/main/docs/Monolog_v2.md)
2020

2121
## Library Support
2222
* Currently only [Monolog:2.*](https://github.com/Seldaek/monolog) is supported.
@@ -32,4 +32,4 @@ composer require elastic/ecs-logging
3232
See [contributing documentation](CONTRIBUTING.md).
3333

3434
## License
35-
This software is licensed under the [Apache 2 license](https://github.com/elastic/ecs-logging-php/blob/master/LICENSE).
35+
This software is licensed under the [Apache 2 license](https://github.com/elastic/ecs-logging-php/blob/main/LICENSE).

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## CI based
44

5-
The release process is also automated in the way any specific commit, from the master branch ideally, can be potentially released, for such it's required the below steps:
5+
The release process is also automated in the way any specific commit, from the main branch ideally, can be potentially released, for such it's required the below steps:
66

77
1. Checkout the commit to be released
88
1. Create a tag with the format `[0-9]+.[0-9]+.[0-9]+`, i.e.: `1.0.2`

docs/Monolog_v2.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ catch(\Exception $exception) {
3030
// log and do other things ..
3131
}
3232
```
33-
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-error.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/master/src/Elastic/Types/Error.php)
33+
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-error.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/main/src/Elastic/Types/Error.php)
3434

3535
### Service
3636
The service context enables you to provide more attributes describing your service. Setting a version can help you track system behaviour over time.
@@ -43,7 +43,7 @@ $serviceContext->setVersion('1.2.42');
4343

4444
$logger->notice('this message adds service context, nice :)', ['service' => $serviceContext]);
4545
```
46-
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-service.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/master/src/Elastic/Types/Service.php)
46+
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-service.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/main/src/Elastic/Types/Service.php)
4747

4848
### User
4949
The user context allows you to enrich your log entries with user specific attributes such as `user.id` or `user.name` to simplify the discovery of specific log events.
@@ -56,7 +56,7 @@ $userContext->setEmail('hello@example.com');
5656

5757
$logger->notice('heya, the context helps you to trace logs more effective', ['user' => $userContext]);
5858
```
59-
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-user.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/master/src/Elastic/Types/User.php)
59+
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-user.html) | Service [class](https://github.com/elastic/ecs-logging-php/blob/main/src/Elastic/Types/User.php)
6060

6161
Please be aware that a method `User::setHash` is available, if you want to obfuscate `user.id`, `user.name`, etc.
6262

@@ -69,4 +69,4 @@ $tracingContext = new Tracing('<trace-id>', '<transaction-id>');
6969

7070
$logger->notice('I am a log message with a trace id, so you can do awesome things in the Logs UI', ['tracing' => $tracingContext]);
7171
```
72-
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-tracing.html) | Tracing [class](https://github.com/elastic/ecs-logging-php/blob/master/src/Elastic/Types/Tracing.php)
72+
ECS [docs](https://www.elastic.co/guide/en/ecs/current/ecs-tracing.html) | Tracing [class](https://github.com/elastic/ecs-logging-php/blob/main/src/Elastic/Types/Tracing.php)

0 commit comments

Comments
 (0)