Merge branch 'main' into ot-support-jaeger-debug

.github/workflows/checks.yaml

@@ -82,17 +82,3 @@ jobs:
 
     - name: run docfx
       run: docfx build --dry-run
-
-  semantic-conventions:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: verify semantic convention tables
-      run: make table-check
-
-  schemas-check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: verify schemas
-      run: make schema-check

CHANGELOG.md

@@ -13,18 +13,55 @@ release.
 
 ### Metrics
 
+### Logs
+
+### Resource
+
+### Compatibility
+
+### OpenTelemetry Protocol
+
+### SDK Configuration
+
+### Telemetry Schemas
+
+### Common
+
+### Supplemenatary Guidelines
+
+## v1.21.0 (2023-05-09)
+
+### Context
+
+- No changes.
+
+### Traces
+
+- No changes.
+
+### Metrics
+
 - Add experimental histogram advice API.
   ([#3216](https://github.com/open-telemetry/opentelemetry-specification/pull/3216))
+- Recommended non-prefixed units for metric instrument semantic conventions.
+  ([#3312](https://github.com/open-telemetry/opentelemetry-specification/pull/3312))
+- Recommended cardinality limits to protect metrics pipelines against
+  excessive data production from a single instrument.
+  ([#2960](https://github.com/open-telemetry/opentelemetry-specification/pull/2960))
 - Specify second unit (`s`) and advice bucket boundaries of `[]`
   for `process.runtime.jvm.gc.duration`.
   ([#3458](https://github.com/open-telemetry/opentelemetry-specification/pull/3458))
+- Add links to the JMX APIs that are the JVM runtime metric sources.
+  ([#3463](https://github.com/open-telemetry/opentelemetry-specification/pull/3463))
 
 ### Logs
 
 - Clarify parameters for emitting a log record.
   ([#3345](https://github.com/open-telemetry/opentelemetry-specification/pull/3354))
 - Drop logger include_trace_context parameter.
   ([#3397](https://github.com/open-telemetry/opentelemetry-specification/pull/3397))
+- Clarify how ObservedTimestamp field is set if unspecified
+  ([#3385](https://github.com/open-telemetry/opentelemetry-specification/pull/3385))
 - Mark logs bridge API / SDK as stable.
   ([#3376](https://github.com/open-telemetry/opentelemetry-specification/pull/3376))
 - Mark LogRecord Environment Variables as stable.
@@ -34,27 +71,20 @@ release.
 
 ### Semantic Conventions
 
-- Clarify the scope of the HTTP client span.
- ([#3290](https://github.com/open-telemetry/opentelemetry-specification/pull/3290))
-- Add moratorium on relying on schema transformations for telemetry stability
-  ([#3380](https://github.com/open-telemetry/opentelemetry-specification/pull/3380))
-- Mark "Instrumentation Units" and "Instrumentation Types" sections of the general
-  metric semantic conventions as stable
-  ([#3294](https://github.com/open-telemetry/opentelemetry-specification/pull/3294))
-- Add clarification that UCUM c/s variant applies to all units other than `1` and
-  those using [annotations](https://ucum.org/ucum.html#para-curly).
-  ([#3393](https://github.com/open-telemetry/opentelemetry-specification/pull/3393))
-- Specify that seconds should be used for measuring durations.
-  ([#3388](https://github.com/open-telemetry/opentelemetry-specification/pull/3388))
-- Change http.server.duration and http.client.duration units to seconds
-  ([#3390](https://github.com/open-telemetry/opentelemetry-specification/pull/3390))
-- BREAKING: Remove `messaging.consumer.id`, make `messaging.client_id` generic
-  ([#3336](https://github.com/open-telemetry/opentelemetry-specification/pull/3336))
+- The Semantic Conventions have moved to a separate repository
+  [github.com/open-telemetry/semantic-conventions](https://github.com/open-telemetry/semantic-conventions).
+  There will be no future semantic conventions release from this repository.
+  ([#3489](https://github.com/open-telemetry/opentelemetry-specification/pull/3489))
 
 ### Compatibility
 
+- Mark OpenCensus compatibility spec as stable
+  ([#3425](https://github.com/open-telemetry/opentelemetry-specification/pull/3425))
+
 ### OpenTelemetry Protocol
 
+- No changes.
+
 ### SDK Configuration
 
 - Lay initial groundwork for file configuration
@@ -67,11 +97,18 @@ release.
 
 ### Telemetry Schemas
 
+- No changes.
+
 ### Common
 
 - Add log entries to specification README.md contents.
   ([#3435](https://github.com/open-telemetry/opentelemetry-specification/pull/3435))
 
+### Supplemenatary Guidelines
+
+- Add guidance to use service-supported propagation formats as default for AWS SDK client calls.
+  ([#3212](https://github.com/open-telemetry/opentelemetry-specification/pull/3212))
+
 ## v1.20.0 (2023-04-07)
 
 ### Context
@@ -90,8 +127,6 @@ release.
 
 - Clarify that units should use UCUM case sensitive variant.
   ([#3306](https://github.com/open-telemetry/opentelemetry-specification/pull/3306))
-- Recommended non-prefixed units for metric instrument semantic conventions.
-  ([#3312](https://github.com/open-telemetry/opentelemetry-specification/pull/3312))
 - Remove No-Op instrument and Meter creation requirements.
   ([#3322](https://github.com/open-telemetry/opentelemetry-specification/pull/3322))
 - Fixed attributes requirement level in semantic conventions for hardware metrics
@@ -118,8 +153,6 @@ release.
 
 ### Semantic Conventions
 
-- Add k8s.cluster.uid semantic convention
-  ([#3267](https://github.com/open-telemetry/opentelemetry-specification/pull/3267))
 - Clarify that attribute requirement levels apply to the instrumentation library
   ([#3289](https://github.com/open-telemetry/opentelemetry-specification/pull/3289))
 - Fix grammatical number of metric units.

CONTRIBUTING.md

@@ -90,11 +90,6 @@ See:
 - [Misspell Check](#misspell-check)
 - Markdown link checking (docs TODO)
 
-### Semantic Conventions update
-
-Semantic convention is declared in YAML files and markdown tables are
-generated from these files. Read about semantic convention updates [here](./semantic_conventions/README.md).
-
 ### Autoformatting
 
 The Specification has some autogenerated components and additionally can do

Makefile

@@ -12,7 +12,7 @@ SEMCONVGEN_VERSION=0.17.0
 
 # TODO: add `yamllint` step to `all` after making sure it works on Mac.
 .PHONY: all
-all: install-tools markdownlint markdown-link-check misspell table-check schema-check
+all: install-tools markdownlint markdown-link-check misspell
 
 $(MISSPELL):
 	cd $(TOOLS_DIR) && go build -o $(MISSPELL_BINARY) github.com/client9/misspell/cmd/misspell
@@ -71,30 +71,14 @@ install-yamllint:
 yamllint:
 	yamllint .
 
-# Generate markdown tables from YAML definitions
-.PHONY: table-generation
-table-generation:
-	docker run --rm -v $(PWD)/semantic_conventions:/source -v $(PWD)/specification:/spec \
-		otel/semconvgen:$(SEMCONVGEN_VERSION) -f /source markdown -md /spec
-
-# Check if current markdown tables differ from the ones that would be generated from YAML definitions
-.PHONY: table-check
-table-check:
-	docker run --rm -v $(PWD)/semantic_conventions:/source -v $(PWD)/specification:/spec \
-		otel/semconvgen:$(SEMCONVGEN_VERSION) -f /source markdown -md /spec --md-check
-
-.PHONY: schema-check
-schema-check:
-	$(TOOLS_DIR)/schema_check.sh
-
 # Run all checks in order of speed / likely failure.
 .PHONY: check
 check: misspell markdownlint markdown-link-check
 	@echo "All checks complete"
 
 # Attempt to fix issues / regenerate tables.
 .PHONY: fix
-fix: table-generation misspell-correction
+fix: misspell-correction
 	@echo "All autofixes complete"
 
 .PHONY: install-tools

README.md

@@ -9,7 +9,7 @@ The **[OpenTelemetry][] specification** describes the cross-language
 requirements and expectations for all OpenTelemetry implementations.
 
 - The [latest release][] is hosted at
-  [opentelemetry.io/docs/reference/specification][]
+  [opentelemetry.io/docs/specs/otel][]
 - Markdown sources are under [specification](./specification/README.md)
 
 ## Change / contribution process
@@ -56,4 +56,4 @@ By contributing to OpenTelemetry Specification repository, you agree that your c
 
 [OpenTelemetry]: https://opentelemetry.io
 [latest release]: https://github.com/open-telemetry/opentelemetry-specification/releases/latest
-[opentelemetry.io/docs/reference/specification]: https://opentelemetry.io/docs/reference/specification/
+[opentelemetry.io/docs/specs/otel]: https://opentelemetry.io/docs/specs/otel/

schemas/1.21.0

@@ -9,6 +9,42 @@ versions:
             attribute_map:
               messaging.kafka.client_id: messaging.client_id
               messaging.rocketmq.client_id: messaging.client_id
+        # https://github.com/open-telemetry/opentelemetry-specification/pull/3402
+        - rename_attributes:
+            attribute_map:
+              # net.peer.(name|port) attributes were usually populated on client side
+              # so they should be usually translated to server.(address|port)
+              # net.host.* attributes were only populated on server side
+              net.host.name: server.address
+              net.host.port: server.port
+              # was only populated on client side
+              net.sock.peer.name: server.socket.domain
+              # net.sock.peer.(addr|port) mapping is not possible
+              # since they applied to both client and server side
+              # were only populated on server side
+              net.sock.host.addr: server.socket.address
+              net.sock.host.port: server.socket.port
+              http.client_ip: client.address
+        # https://github.com/open-telemetry/opentelemetry-specification/pull/3426
+        - rename_attributes:
+            attribute_map:
+              net.protocol.name: network.protocol.name
+              net.protocol.version: network.protocol.version
+              net.host.connection.type: network.connection.type
+              net.host.connection.subtype: network.connection.subtype
+              net.host.carrier.name: network.carrier.name
+              net.host.carrier.mcc: network.carrier.mcc
+              net.host.carrier.mnc: network.carrier.mnc
+              net.host.carrier.icc: network.carrier.icc
+        # https://github.com/open-telemetry/opentelemetry-specification/pull/3355
+        - rename_attributes:
+            attribute_map:
+              http.method: http.request.method
+              http.status_code: http.response.status_code
+              http.scheme: url.scheme
+              http.url: url.full
+              http.request_content_length: http.request.body.size
+              http.response_content_length: http.response.body.size  
   1.20.0:
     spans:
       changes: