Skip to content

Commit 2bdddaf

Browse files
authored
Apply Prettier to markdown files (#8968)
1 parent c21ea0f commit 2bdddaf

File tree

75 files changed

+717
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+717
-719
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
4+
title: ""
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Describe the bug**

.github/ISSUE_TEMPLATE/feature_request.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
4+
title: ""
55
labels: enhancement
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Is your feature request related to a problem? Please describe.**

.github/repository-settings.md

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
66

77
## General > Pull Requests
88

9-
* Allow squash merging > Default to pull request title
9+
- Allow squash merging > Default to pull request title
1010

11-
* Allow auto-merge
11+
- Allow auto-merge
1212

1313
## Actions > General
1414

15-
* Fork pull request workflows from outside collaborators:
15+
- Fork pull request workflows from outside collaborators:
1616
"Require approval for first-time contributors who are new to GitHub"
1717

1818
(To reduce friction for new contributors,
@@ -22,14 +22,14 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
2222

2323
### `main`
2424

25-
* Require branches to be up to date before merging: UNCHECKED
25+
- Require branches to be up to date before merging: UNCHECKED
2626

2727
(PR jobs take too long, and leaving this unchecked has not been a significant problem)
2828

29-
* Status checks that are required:
29+
- Status checks that are required:
3030

31-
* EasyCLA
32-
* required-status-check
31+
- EasyCLA
32+
- required-status-check
3333

3434
### `release/*`
3535

@@ -42,28 +42,28 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
4242

4343
### `gh-pages`
4444

45-
* Everything UNCHECKED
45+
- Everything UNCHECKED
4646

4747
(This branch is currently only used for directly pushing benchmarking results from the
4848
[Nightly overhead benchmark](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/nightly-benchmark-overhead.yml)
4949
job)
5050

5151
## Code security and analysis
5252

53-
* Secret scanning: Enabled
53+
- Secret scanning: Enabled
5454

5555
## Secrets and variables > Actions
5656

57-
* `GE_CACHE_PASSWORD`
58-
* `GE_CACHE_USERNAME`
59-
* `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
60-
* `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
61-
* `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
62-
* Generated at https://ge.opentelemetry.io > My settings > Access keys
63-
* format of env var is `ge.opentelemetry.io=<access key>`,
57+
- `GE_CACHE_PASSWORD`
58+
- `GE_CACHE_USERNAME`
59+
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
60+
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
61+
- `GRADLE_ENTERPRISE_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
62+
- Generated at https://ge.opentelemetry.io > My settings > Access keys
63+
- format of env var is `ge.opentelemetry.io=<access key>`,
6464
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
65-
* `GRADLE_PUBLISH_KEY`
66-
* `GRADLE_PUBLISH_SECRET`
67-
* `OPENTELEMETRYBOT_GITHUB_TOKEN` - owned by [@trask](https://github.com/trask)
68-
* `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
69-
* `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
65+
- `GRADLE_PUBLISH_KEY`
66+
- `GRADLE_PUBLISH_SECRET`
67+
- `OPENTELEMETRYBOT_GITHUB_TOKEN` - owned by [@trask](https://github.com/trask)
68+
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
69+
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)

CHANGELOG.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
- The `opentelemetry-runtime-metrics` artifact has been renamed and split into
8080
`opentelemetry-runtime-telemetry-java8` and `opentelemetry-runtime-telemetry-java17`
8181
([#8165](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8165),
82-
[#8715](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8715))
82+
[#8715](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8715))
8383
- `InetSocketAddressNetServerAttributesGetter` and `InetSocketAddressNetClientAttributesGetter`
8484
have been deprecated
8585
([#8341](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8341),
86-
[#8591](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8591))
86+
[#8591](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8591))
8787
- The new HTTP and network semantic conventions can be opted into using either the system
8888
property `otel.semconv-stability.opt-in` or the environment variable
8989
`OTEL_SEMCONV_STABILITY_OPT_IN`, which support two values:
9090
- `http` - emit the new, stable HTTP and networking attributes, and stop emitting the old
91-
experimental HTTP and networking attributes that the instrumentation emitted previously.
91+
experimental HTTP and networking attributes that the instrumentation emitted previously.
9292
- `http/dup` - emit both the old and the stable HTTP and networking attributes, allowing
9393
for a more seamless transition.
9494
- The default behavior (in the absence of one of these values) is to continue emitting
@@ -104,7 +104,7 @@
104104
([#8487](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8487))
105105
- Reactor Kafka
106106
([#8439](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8439),
107-
[#8529](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8529))
107+
[#8529](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8529))
108108

109109
### 📈 Enhancements
110110

@@ -286,7 +286,7 @@
286286
([#8174](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8174))
287287
- Spring scheduling: run error handler with the same context as task
288288
([#8220](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8220))
289-
- Switch from http.flavor to net.protocol.*
289+
- Switch from http.flavor to net.protocol.\*
290290
([#8131](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8131),
291291
[#8244](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/8244))
292292
- Support latest Armeria release
@@ -598,7 +598,7 @@
598598

599599
### 🧰 Tooling
600600

601-
- Muzzle logs should be logged using the io.opentelemetry.* logger name
601+
- Muzzle logs should be logged using the io.opentelemetry.\* logger name
602602
([#7446](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7446))
603603

604604
## Version 1.21.0 (2022-12-13)
@@ -840,12 +840,12 @@ The `opentelemetry-instrumentation-api` artifact is declared stable in this rele
840840

841841
- There were a few late-breaking changes in `opentelemetry-instrumentation-api`, prior to it being
842842
declared stable:
843-
* `InstrumenterBuilder.addAttributesExtractors(AttributesExtractor...)` was removed, use instead
843+
- `InstrumenterBuilder.addAttributesExtractors(AttributesExtractor...)` was removed, use instead
844844
`addAttributesExtractors(AttributesExtractor)` or
845845
`addAttributesExtractors(Iterable<AttributesExtractor>)`
846-
* `SpanLinksExtractor.extractFromRequest()` was removed, use instead manual extraction
847-
* `ErrorCauseExtractor.jdk()` was renamed to `ErrorCauseExtractor.getDefault()`
848-
* `ClassNames` utility was removed with no direct replacement
846+
- `SpanLinksExtractor.extractFromRequest()` was removed, use instead manual extraction
847+
- `ErrorCauseExtractor.jdk()` was renamed to `ErrorCauseExtractor.getDefault()`
848+
- `ClassNames` utility was removed with no direct replacement
849849
- The deprecated `io.opentelemetry.instrumentation.api.config.Config` and related classes
850850
have been removed
851851
([#6501](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/6501))
@@ -1208,15 +1208,15 @@ The `opentelemetry-instrumentation-api` artifact is declared stable in this rele
12081208

12091209
- Micrometer instrumentation is now automatically applied to spring-boot-actuator apps
12101210
- Some configuration properties have been renamed:
1211-
* `otel.instrumentation.common.experimental.suppress-controller-spans`
1211+
- `otel.instrumentation.common.experimental.suppress-controller-spans`
12121212
`otel.instrumentation.common.experimental.controller-telemetry.enabled`
12131213
(important: note that the meaning is inverted)
1214-
* `otel.instrumentation.common.experimental.suppress-view-spans`
1214+
- `otel.instrumentation.common.experimental.suppress-view-spans`
12151215
`otel.instrumentation.common.experimental.view-telemetry.enabled`
12161216
(important: note that the meaning is inverted)
1217-
* `otel.instrumentation.netty.always-create-connect-span`
1217+
- `otel.instrumentation.netty.always-create-connect-span`
12181218
`otel.instrumentation.netty.connection-telemetry.enabled`
1219-
* `otel.instrumentation.reactor-netty.always-create-connect-span`
1219+
- `otel.instrumentation.reactor-netty.always-create-connect-span`
12201220
`otel.instrumentation.reactor-netty.connection-telemetry.enabled`
12211221
- Runtime memory metric names were updated to reflect
12221222
[semantic conventions](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/runtime-environment-metrics.md#jvm-metrics)
@@ -1519,7 +1519,7 @@ The `opentelemetry-instrumentation-api` artifact is declared stable in this rele
15191519
([#5112](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/5112))
15201520
- Parameterize VirtualField field type
15211521
([#5165](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/5165))
1522-
- Remove old TraceUtils and use InstrumentationTestRunner#run*Span() (almost) everywhere
1522+
- Remove old TraceUtils and use InstrumentationTestRunner#run\*Span() (almost) everywhere
15231523
([#5160](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/5160))
15241524
- Remove deprecated tracer API
15251525
([#5175](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/5175))

RELEASING.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ the second Monday of the month (roughly a few of days after the monthly minor re
1818

1919
## Preparing a new major or minor release
2020

21-
* Check that
21+
- Check that
2222
[dependabot has run](https://github.com/open-telemetry/opentelemetry-java-instrumentation/network/updates)
2323
sometime in the past day (this link is only accessible if you have write access to the
2424
repository), and check that all
2525
[dependabot PRs](https://github.com/open-telemetry/opentelemetry-java-contrib/pulls/app%2Fdependabot)
2626
have been merged.
27-
* Close the [release milestone](https://github.com/open-telemetry/opentelemetry-java-instrumentation/milestones)
27+
- Close the [release milestone](https://github.com/open-telemetry/opentelemetry-java-instrumentation/milestones)
2828
if there is one.
29-
* Merge a pull request to `main` updating the `CHANGELOG.md`.
30-
* The heading for the unreleased entries should be `## Unreleased`.
31-
* Use `.github/scripts/draft-change-log-entries.sh` as a starting point for writing the change log.
32-
* Run the [Prepare release branch workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/prepare-release-branch.yml).
33-
* Press the "Run workflow" button, and leave the default branch `main` selected.
34-
* Review and merge the two pull requests that it creates
29+
- Merge a pull request to `main` updating the `CHANGELOG.md`.
30+
- The heading for the unreleased entries should be `## Unreleased`.
31+
- Use `.github/scripts/draft-change-log-entries.sh` as a starting point for writing the change log.
32+
- Run the [Prepare release branch workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/prepare-release-branch.yml).
33+
- Press the "Run workflow" button, and leave the default branch `main` selected.
34+
- Review and merge the two pull requests that it creates
3535
(one is targeted to the release branch and one is targeted to `main`).
3636

3737
## Preparing a new patch release
@@ -41,31 +41,31 @@ All patch releases should include only bug-fixes, and must avoid adding/modifyin
4141
In general, patch releases are only made for regressions, security vulnerabilities, memory leaks
4242
and deadlocks.
4343

44-
* Backport pull request(s) to the release branch.
45-
* Run the [Backport workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/backport.yml).
46-
* Press the "Run workflow" button, then select the release branch from the dropdown list,
44+
- Backport pull request(s) to the release branch.
45+
- Run the [Backport workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/backport.yml).
46+
- Press the "Run workflow" button, then select the release branch from the dropdown list,
4747
e.g. `release/v1.9.x`, then enter the pull request number that you want to backport,
4848
then click the "Run workflow" button below that.
49-
* Review and merge the backport pull request that it generates.
50-
* Note: if the PR contains any changes to workflow files, it will have to be manually backported,
49+
- Review and merge the backport pull request that it generates.
50+
- Note: if the PR contains any changes to workflow files, it will have to be manually backported,
5151
because the default `GITHUB_TOKEN` does not have permission to update workflow files (and the
5252
`opentelemetrybot` token doesn't have write permission to this repository at all, so while it
5353
can be used to open a PR, it can't be used to push to a local branch).
54-
* Merge a pull request to the release branch updating the `CHANGELOG.md`.
55-
* The heading for the unreleased entries should be `## Unreleased`.
56-
* Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/prepare-patch-release.yml).
57-
* Press the "Run workflow" button, then select the release branch from the dropdown list,
54+
- Merge a pull request to the release branch updating the `CHANGELOG.md`.
55+
- The heading for the unreleased entries should be `## Unreleased`.
56+
- Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/prepare-patch-release.yml).
57+
- Press the "Run workflow" button, then select the release branch from the dropdown list,
5858
e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
59-
* Review and merge the pull request that it creates for updating the version.
59+
- Review and merge the pull request that it creates for updating the version.
6060

6161
## Making the release
6262

63-
* Run the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release.yml).
64-
* Press the "Run workflow" button, then select the release branch from the dropdown list,
63+
- Run the [Release workflow](https://github.com/open-telemetry/opentelemetry-java-instrumentation/actions/workflows/release.yml).
64+
- Press the "Run workflow" button, then select the release branch from the dropdown list,
6565
e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
66-
* This workflow will publish the artifacts to maven central and will publish a GitHub release
66+
- This workflow will publish the artifacts to maven central and will publish a GitHub release
6767
with release notes based on the change log and with the javaagent jar attached.
68-
* Review and merge the pull request that it creates for updating the change log in main
68+
- Review and merge the pull request that it creates for updating the change log in main
6969
(note that if this is not a patch release then the change log on main may already be up-to-date,
7070
in which case no pull request will be created).
7171

VERSIONING.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ Artifacts in this repository follow the same compatibility requirements describe
99
EXCEPT for the following incompatible changes which are allowed in stable artifacts in this
1010
repository:
1111

12-
* Changes to the telemetry produced by instrumentation
12+
- Changes to the telemetry produced by instrumentation
1313
(there will be some guarantees about telemetry stability in the future, see discussions
1414
in <https://github.com/open-telemetry/opentelemetry-specification/issues/1301>)
15-
* Changes to configuration properties that contain the word `experimental`
16-
* Changes to configuration properties under the namespace `otel.javaagent.testing`
15+
- Changes to configuration properties that contain the word `experimental`
16+
- Changes to configuration properties under the namespace `otel.javaagent.testing`
1717

1818
This means that:
1919

20-
* Changes to configuration properties (other than those that contain the word `experimental`
20+
- Changes to configuration properties (other than those that contain the word `experimental`
2121
or are under the namespace `otel.javaagent.testing`) will be considered breaking changes
2222
(unless they only affect telemetry produced by instrumentation)
2323

@@ -39,24 +39,24 @@ where versioning stability is important.
3939
Bumping the minimum supported library version for library instrumentation is generally acceptable
4040
if there's a good reason because:
4141

42-
* Users of library instrumentation have to integrate the library instrumentation during build-time
42+
- Users of library instrumentation have to integrate the library instrumentation during build-time
4343
of their application, and so have the option to bump the library version if they are using an
4444
unsupported library version.
45-
* Users have the option of staying with the old version of library instrumentation, without being
45+
- Users have the option of staying with the old version of library instrumentation, without being
4646
pinned on an old version of the OpenTelemetry API and SDK.
47-
* Bumping the minimum library version changes the artifact name, so it is not technically a breaking
47+
- Bumping the minimum library version changes the artifact name, so it is not technically a breaking
4848
change.
4949

5050
### Javaagent instrumentation
5151

5252
The situation is much trickier for javaagent instrumentation:
5353

54-
* A common use case of the javaagent is applying instrumentation at deployment-time (including
54+
- A common use case of the javaagent is applying instrumentation at deployment-time (including
5555
to third-party applications), where bumping the library version is frequently not an option.
56-
* While users have the option of staying with the old version of javaagent, that pins them on
56+
- While users have the option of staying with the old version of javaagent, that pins them on
5757
an old version of the OpenTelemetry API and SDK, which is problematic for the OpenTelemetry
5858
ecosystem.
59-
* While bumping the minimum library version changes the instrumentation module name, it does not
59+
- While bumping the minimum library version changes the instrumentation module name, it does not
6060
change the "aggregated" javaagent artifact name which most users depend on, so could be considered
6161
a breaking change for some users (though this is not a breaking change that we currently make any
6262
guarantees about).
@@ -68,8 +68,8 @@ When there is functionality in a new library version that requires changes to th
6868
instrumentation which are incompatible with the current javaagent base library version, some options
6969
that do not require bumping the minimum supported library version include:
7070

71-
* Access the new functionality via reflection. This is a good technique only for very small changes.
72-
* Create a new javaagent instrumentation module to support the new library version. This requires
71+
- Access the new functionality via reflection. This is a good technique only for very small changes.
72+
- Create a new javaagent instrumentation module to support the new library version. This requires
7373
configuring non-overlapping versions in the muzzle check and applying `assertInverse` to confirm
7474
that the two instrumentations are never be applied to the same library version (see
7575
[class loader matchers](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/writing-instrumentation-module.md#restrict-the-criteria-for-applying-the-instrumentation-by-extending-the-classloadermatcher-method)

0 commit comments

Comments
 (0)