Skip to content

Commit 45fa4eb

Browse files
authored
Migrating decorators to the manifests (#5861)
1 parent c772ffb commit 45fa4eb

9 files changed

Lines changed: 27 additions & 17 deletions

File tree

manifests/cpp_httpd.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ manifest:
8383
tests/test_sampling_rates.py::Test_SamplingDeterminism: v1.0.0 # real version unknown
8484
tests/test_sampling_rates.py::Test_SamplingRates: v1.0.0 # real version unknown
8585
tests/test_scrubbing.py: irrelevant
86+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_method: missing_feature (For some reason, span type is server i/o web)
87+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_status_code: missing_feature (For some reason, span type is server i/o web)
88+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_url: missing_feature (For some reason, span type is server i/o web)
89+
tests/test_semantic_conventions.py::Test_Meta::test_meta_span_kind: bug (APMAPI-924)
8690
tests/test_span_events.py: incomplete_test_app (Weblog `/add_event` not implemented)
8791
tests/test_standard_tags.py: irrelevant
8892
tests/test_telemetry.py::Test_Log_Generation: missing_feature

manifests/cpp_nginx.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ manifest:
240240
tests/test_sampling_rates.py::Test_SamplingDeterminism: v1.0.0 # real version unknown
241241
tests/test_sampling_rates.py::Test_SamplingRates: v1.0.0 # real version unknown
242242
tests/test_scrubbing.py: irrelevant
243+
tests/test_semantic_conventions.py::Test_Meta::test_meta_span_kind: bug (APMAPI-924)
243244
tests/test_span_events.py: incomplete_test_app (Weblog `/add_event` not implemented)
244245
tests/test_standard_tags.py: irrelevant
245246
tests/test_telemetry.py::Test_APMOnboardingInstallID: missing_feature

manifests/dotnet.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,10 @@ manifest:
578578
tests/test_sampling_rates.py::Test_SamplingRates: v3.11.1 # real version unknown
579579
tests/test_scrubbing.py::Test_UrlField: v2.29.0
580580
tests/test_scrubbing.py::Test_UrlQuery: v2.13.0
581+
tests/test_semantic_conventions.py::Test_Meta::test_meta_language_tag:
582+
- declaration: bug (AIT-8735)
583+
- component_version: <2.6.0
584+
declaration: missing_feature
581585
tests/test_semantic_conventions.py::Test_MetricsStandardTags: v2.6.0
582586
tests/test_span_events.py: incomplete_test_app (Weblog `/add_event` not implemented)
583587
tests/test_standard_tags.py::Test_StandardTagsClientIp: v2.26.0

manifests/golang.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,9 @@ manifest:
864864
tests/test_sampling_rates.py::Test_SamplingRates: v1.36.2
865865
tests/test_scrubbing.py::Test_UrlQuery: v1.40.0
866866
tests/test_semantic_conventions.py::Test_Meta: v1.45.0
867+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_url:
868+
- component_version: <1.69.0-dev
869+
declaration: bug (APMRP-360)
867870
tests/test_span_events.py::Test_SpanEvents_WithAgentSupport:
868871
- weblog_declaration:
869872
"*": irrelevant

manifests/java.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,6 +2648,10 @@ manifest:
26482648
tests/test_semantic_conventions.py::Test_Meta:
26492649
- weblog_declaration:
26502650
play: irrelevant (top span is akka-http-server)
2651+
tests/test_semantic_conventions.py::Test_Meta::test_meta_language_tag:
2652+
# TODO: Versions previous to 1.1.0 might be ok, but were not tested so far.
2653+
- component_version: <1.1.0
2654+
declaration: bug (APMRP-360)
26512655
tests/test_semantic_conventions.py::Test_MetricsStandardTags: v1.3.0
26522656
tests/test_span_events.py: incomplete_test_app (Weblog `/add_event` not implemented)
26532657
tests/test_standard_tags.py::Test_StandardTagsClientIp:

manifests/nodejs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,9 @@ manifest:
16351635
- weblog_declaration:
16361636
"*": *ref_3_13_1
16371637
nextjs: missing_feature # nextjs makes some internal requests and we have different tag names
1638+
tests/test_semantic_conventions.py::Test_Meta::test_meta_component_tag:
1639+
- component_version: ">=4.44.0"
1640+
declaration: bug (APMAPI-921)
16381641
tests/test_semantic_conventions.py::Test_MetricsStandardTags: *ref_3_13_1
16391642
tests/test_span_events.py::Test_SpanEvents_WithAgentSupport:
16401643
- weblog_declaration:

manifests/php.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,12 @@ manifest:
566566
tests/test_sampling_rates.py::Test_SamplingDeterminism: v1.7.2 # real version unknown
567567
tests/test_sampling_rates.py::Test_SamplingRates: v1.7.2 # real version unknown
568568
tests/test_scrubbing.py::Test_UrlQuery: v0.76.0
569+
tests/test_semantic_conventions.py::Test_Meta::test_meta_component_tag: bug (APMAPI-920)
570+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_url:
571+
- component_version: <0.68.2
572+
declaration: bug (APMRP-360)
573+
tests/test_semantic_conventions.py::Test_Meta::test_meta_language_tag: bug (APMAPI-923)
574+
tests/test_semantic_conventions.py::Test_Meta::test_meta_span_kind: bug (APMAPI-924)
569575
tests/test_semantic_conventions.py::Test_MetricsStandardTags: v0.83.1
570576
tests/test_span_events.py: incomplete_test_app (Weblog `/add_event` not implemented)
571577
tests/test_standard_tags.py::Test_StandardTagsMethod: v0.75.0

manifests/ruby.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ manifest:
834834
tests/test_scrubbing.py::Test_UrlField: missing_feature (Needs weblog endpoint)
835835
tests/test_scrubbing.py::Test_UrlQuery: v1.0.0
836836
tests/test_semantic_conventions.py::Test_Meta: v1.7.0
837+
tests/test_semantic_conventions.py::Test_Meta::test_meta_http_url: bug (APMAPI-922)
837838
tests/test_semantic_conventions.py::Test_MetaDatadogTags: v1.9.0
838839
tests/test_semantic_conventions.py::Test_MetricsStandardTags: v1.7.0
839840
tests/test_span_events.py::Test_SpanEvents_WithAgentSupport:

tests/test_semantic_conventions.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import re
66
from urllib.parse import urlparse
77

8-
from utils import context, interfaces, bug, missing_feature, features, scenarios
8+
from utils import context, interfaces, features, scenarios
99

1010

1111
RUNTIME_LANGUAGE_MAP = {
@@ -162,9 +162,6 @@ def get_component_name(span_name: str):
162162
class Test_Meta:
163163
"""meta object in spans respect all conventions"""
164164

165-
@bug(library="cpp_nginx", reason="APMAPI-924")
166-
@bug(library="cpp_httpd", reason="APMAPI-924")
167-
@bug(library="php", reason="APMAPI-924")
168165
def test_meta_span_kind(self):
169166
"""Validates that traces from an http framework carry a span.kind meta tag, with value server or client"""
170167

@@ -182,10 +179,6 @@ def validator(span: dict):
182179

183180
interfaces.library.validate_one_span(validator=validator)
184181

185-
@missing_feature(library="cpp_httpd", reason="For some reason, span type is server i/o web")
186-
@bug(library="ruby", reason="APMAPI-922")
187-
@bug(context.library < "golang@1.69.0-dev", reason="APMRP-360")
188-
@bug(context.library < "php@0.68.2", reason="APMRP-360")
189182
def test_meta_http_url(self):
190183
"""Validates that traces from an http framework carry a http.url meta tag, formatted as a URL"""
191184

@@ -205,7 +198,6 @@ def validator(span: dict):
205198

206199
interfaces.library.validate_one_span(validator=validator)
207200

208-
@missing_feature(library="cpp_httpd", reason="For some reason, span type is server i/o web")
209201
def test_meta_http_status_code(self):
210202
"""Validates that traces from an http framework carry a http.status_code meta tag, formatted as a int"""
211203

@@ -224,7 +216,6 @@ def validator(span: dict):
224216

225217
interfaces.library.validate_one_span(validator=validator)
226218

227-
@missing_feature(library="cpp_httpd", reason="For some reason, span type is server i/o web")
228219
def test_meta_http_method(self):
229220
"""Validates that traces from an http framework carry a http.method meta tag, with a legal HTTP method"""
230221

@@ -259,11 +250,6 @@ def validator(span: dict):
259250

260251
interfaces.library.validate_one_span(validator=validator)
261252

262-
@bug(library="php", reason="APMAPI-923")
263-
# TODO: Versions previous to 1.1.0 might be ok, but were not tested so far.
264-
@bug(context.library < "java@1.1.0", reason="APMRP-360")
265-
@bug(library="dotnet", reason="AIT-8735")
266-
@missing_feature(context.library < "dotnet@2.6.0")
267253
def test_meta_language_tag(self):
268254
"""Assert that all spans have required language tag."""
269255

@@ -285,8 +271,6 @@ def validator(span: dict):
285271
# checking that we have at least one root span
286272
assert len(list(interfaces.library.get_root_spans())) != 0, "Did not recieve any root spans to validate."
287273

288-
@bug(library="php", reason="APMAPI-920")
289-
@bug(context.library >= "nodejs@4.44.0", reason="APMAPI-921")
290274
def test_meta_component_tag(self):
291275
"""Assert that all spans generated from a weblog_variant have component metadata tag matching integration name."""
292276

0 commit comments

Comments
 (0)