Merge branch 'main' into default-sampler

.github/workflows/ci.yml

@@ -9,14 +9,14 @@ jobs:
   validate-documentation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
       - name: Markdown Lint check
-        uses: DavidAnson/markdownlint-cli2-action@v14.0.0
+        uses: DavidAnson/markdownlint-cli2-action@v17.0.0
         with:
           globs: '**/*.md'
       - name: lychee Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v2.0.2
         with:
           args: -v -n "*.md" "**/*.md"
           fail: true

.github/workflows/cla.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@v2.3.1
+        uses: contributor-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}

.github/workflows/lychee-weekly.yml

@@ -5,13 +5,14 @@ jobs:
   linkChecker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.2.1
       - name: Link Checker
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v2.0.2
         with:
           args: -v -n "*.md" "**/*.md"
       - name: Create Issue From File
-        uses: peter-evans/[email protected]
+        if: env.lychee_exit_code != 0
+        uses: peter-evans/[email protected]
         with:
           title: Link Checker Report
           content-filepath: ./lychee/out.md

.gitignore

@@ -1 +1,2 @@
 tmp/
+lychee/out.md

.markdownlintignore

@@ -0,0 +1 @@
+lychee/out.md

CHANGELOG.md

@@ -23,6 +23,12 @@
   - Change `telemetry.auto.version` to `telemetry.distro.version`,
   - Add `telemetry.distro.name` resource attribute.
 
+### Semantic Conventions
+
+#### Enhancements
+
+- Deprecate `text` format for `profiling.data.format`. (#285)
+
 ## [1.6.0] - 2023-09-14
 
 ### Configuration
@@ -79,7 +85,7 @@
 
 - Remove `telemetry.sdk.language` attribute from `ResourceLogs.resource`.
 
-### Bugfixes
+#### Bugfixes
 
 - Remove redunant and conflicting statement about file and line for `ResourceLogs`.
 

README.md

@@ -31,7 +31,7 @@ reading by GDI repository consumers.
   Refers to `splunk-otel-collector` repository.
 - GDI: Getting Data In
 - GDI repository: A repository in the `signalfx` GitHub that starts with
-  `splunk-otel-\*`
+  `splunk-otel-\*` or `o11y-\*` and exists in [repositories.txt](repositories.txt).
 - Instrumentation Library: A way to emit telemetry data from an application.
   Refers to `splunk-otel-<language>` repositories.
 - Maintainer: Someone responsible for the specification or a repository.
@@ -40,7 +40,7 @@ reading by GDI repository consumers.
 
 ## Notation Conventions and Compliance
 
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+The keywords "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
 "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and "OPTIONAL" in the
 specification are to be interpreted as described
 in [BCP 14](https://tools.ietf.org/html/bcp14)

specification/repository.md

@@ -11,14 +11,17 @@ approval is granted, GDI repositories MUST NOT cut a GA release.
 
 ### Teams
 
+Teams MUST only be comprised of full-time Cisco employees, which includes
+AppDynamics and Splunk employees.
+
 - MUST have an admins team and teams MAY be shared between repositories
   - MUST have `-admins` suffix
-  - MUST include at least two currently full-time Splunkers
-  - MUST NOT include any non-full-time Splunkers
-- MUST have a maintainers team and teams MAY be shared between repositories
+  - MUST include at least two current employees
+  - MUST NOT include any non-Cisco developers
+- MUST have a maintainers team, and teams MAY be shared between repositories
   - MUST have `-maintainers` suffix
-  - MUST include at least two currently full-time Splunkers
-  - MUST NOT include any non-full-time Splunkers
+  - MUST include at least two current employees
+  - MUST NOT include any non-Cisco developers
 - SHOULD have an approvers team and teams MAY be shared between repositories
   - MUST have `-approvers` suffix
 

specification/semantic_conventions.md

@@ -125,7 +125,10 @@ instances. For each `LogRecord` instance:
 
 - `com.splunk.sourcetype` MUST be set to the value `otel.profiling`
 - `profiling.data.type` MUST be set to either `allocation` or `cpu`
-- `profiling.data.format` MUST be set to either `text` or `pprof-gzip-base64`
+- `profiling.data.format` MUST be set to either:
+  - `pprof-gzip-base64`,
+  - `text` ([Deprecated](../README.md#versioning-and-status-of-the-specification)
+    format).
 
 #### `LogRecord` Message `text` Data Format Specific Attributes