Skip to content

Commit b981ae8

Browse files
tsloughtergugahoa
tsloughter
authored and
gugahoa
committed
Merge branch 'main' into baggage-processor
2 parents b565274 + adf9c5d commit b981ae8

File tree

273 files changed

+15736
-1054
lines changed

Some content is hidden

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

273 files changed

+15736
-1054
lines changed

‎.formatter.exs‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/elixir-test-matrix.json‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
{
22
"otp_version": [
3-
"24.2",
4-
"23.3.4.10",
5-
"22.3.4.24"
3+
"26.2.1",
4+
"25.3.2.8",
5+
"24.3.4.15"
66
],
77
"elixir_version": [
8-
"1.13.1",
9-
"1.12.3",
10-
"1.11.4"
8+
"1.16.0",
9+
"1.14.5"
1110
],
1211
"rebar3_version": [
13-
"3.16.1"
12+
"3.22.1"
1413
],
1514
"os": [
16-
"ubuntu-18.04"
17-
]
15+
"ubuntu-20.04"
16+
],
17+
"include": [
18+
{
19+
"elixir_version": "1.16.0",
20+
"otp_version": "26.2.1",
21+
"check_formatted": true
22+
},
23+
{
24+
"elixir_version": "1.12.3",
25+
"otp_version": "24.3.4.15"
26+
}
27+
],
28+
"exclude": []
1829
}

‎.github/erlang-test-matrix.json‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
{
2-
"otp_version": [
3-
"24.2",
4-
"23.3.4.10",
5-
"22.3.4.24"
6-
],
7-
"rebar3_version": [
8-
"3.16.1"
9-
],
10-
"os": [
11-
"ubuntu-18.04"
12-
]
2+
"otp_version": ["26.1.2", "25.3.2.8", "24.3.4.15"],
3+
"rebar3_version": ["3.22.1"],
4+
"os": ["ubuntu-20.04"]
135
}

‎.github/hex-packages.json‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
{
2+
"aws_xray": {
3+
"workingDirectory": "utilities/opentelemetry_aws_xray",
4+
"name": "AWS Xray Utility",
5+
"packageName": "opentelemetry_aws_xray",
6+
"tagPrefix": "opentelemetry-aws-xray-v",
7+
"buildTool": "rebar3",
8+
"language": "erlang",
9+
"authorizedUsers": ["bryannaegele","tsloughter"]
10+
},
11+
"cowboy": {
12+
"workingDirectory": "instrumentation/opentelemetry_cowboy",
13+
"name": "Cowboy Instrumentation",
14+
"packageName": "opentelemetry_cowboy",
15+
"tagPrefix": "opentelemetry-cowboy-v",
16+
"buildTool": "rebar3",
17+
"language": "erlang",
18+
"authorizedUsers": ["bryannaegele","tsloughter"]
19+
},
20+
"dataloader": {
21+
"workingDirectory": "instrumentation/opentelemetry_dataloader",
22+
"name": "Dataloader Instrumentation",
23+
"packageName": "opentelemetry_dataloader",
24+
"tagPrefix": "opentelemetry-dataloader-v",
25+
"buildTool": "mix",
26+
"language": "elixir",
27+
"authorizedUsers": ["bryannaegele","tsloughter"]
28+
},
29+
"ecto": {
30+
"workingDirectory": "instrumentation/opentelemetry_ecto",
31+
"name": "Ecto Instrumentation",
32+
"packageName": "opentelemetry_ecto",
33+
"tagPrefix": "opentelemetry-ecto-v",
34+
"buildTool": "mix",
35+
"language": "elixir",
36+
"authorizedUsers": ["bryannaegele","tsloughter"]
37+
},
38+
"elli": {
39+
"workingDirectory": "instrumentation/opentelemetry_elli",
40+
"name": "Elli Instrumentation",
41+
"packageName": "opentelemetry_elli",
42+
"tagPrefix": "opentelemetry-elli-v",
43+
"buildTool": "rebar3",
44+
"language": "erlang",
45+
"authorizedUsers": ["bryannaegele","tsloughter"]
46+
},
47+
"finch": {
48+
"workingDirectory": "instrumentation/opentelemetry_finch",
49+
"name": "Finch Instrumentation",
50+
"packageName": "opentelemetry_finch",
51+
"tagPrefix": "opentelemetry-finch-v",
52+
"buildTool": "mix",
53+
"language": "elixir",
54+
"authorizedUsers": ["bryannaegele","tsloughter"]
55+
},
56+
"grpcbox": {
57+
"workingDirectory": "instrumentation/opentelemetry_grpcbox",
58+
"name": "GRPCBox Instrumentation",
59+
"packageName": "opentelemetry_grpcbox",
60+
"tagPrefix": "opentelemetry-grpcbox-v",
61+
"buildTool": "rebar3",
62+
"language": "erlang",
63+
"authorizedUsers": ["bryannaegele","tsloughter"]
64+
},
65+
"http_instrumentation": {
66+
"workingDirectory": "utilities/opentelemetry_instrumentation_http",
67+
"name": "HTTP Utilities",
68+
"packageName": "opentelemetry_instrumentation_http",
69+
"tagPrefix": "opentelemetry-instrumentation-http-v",
70+
"buildTool": "rebar3",
71+
"language": "erlang",
72+
"authorizedUsers": ["bryannaegele","tsloughter"]
73+
},
74+
"httpoison": {
75+
"workingDirectory": "instrumentation/opentelemetry_httpoison",
76+
"name": "HTTPoison Instrumentation",
77+
"packageName": "opentelemetry_httpoison",
78+
"tagPrefix": "opentelemetry-httpoison-v",
79+
"buildTool": "mix",
80+
"language": "elixir",
81+
"authorizedUsers": ["bryannaegele","tsloughter"]
82+
},
83+
"nebulex": {
84+
"workingDirectory": "instrumentation/opentelemetry_nebulex",
85+
"name": "Nebulex Instrumentation",
86+
"packageName": "opentelemetry_nebulex",
87+
"tagPrefix": "opentelemetry-nebulex-v",
88+
"buildTool": "mix",
89+
"language": "elixir",
90+
"authorizedUsers": ["bryannaegele","tsloughter"]
91+
},
92+
"oban": {
93+
"workingDirectory": "instrumentation/opentelemetry_oban",
94+
"name": "Oban Instrumentation",
95+
"packageName": "opentelemetry_oban",
96+
"tagPrefix": "opentelemetry-oban-v",
97+
"buildTool": "mix",
98+
"language": "elixir",
99+
"authorizedUsers": ["bryannaegele","tsloughter"]
100+
},
101+
"opentelemetry_telemetry": {
102+
"workingDirectory": "utilities/opentelemetry_telemetry",
103+
"name": "Opentelemetry Telemetry",
104+
"packageName": "opentelemetry_telemetry",
105+
"tagPrefix": "opentelemetry-telemetry-v",
106+
"buildTool": "mix",
107+
"language": "elixir-erlang",
108+
"authorizedUsers": ["bryannaegele","tsloughter"]
109+
},
110+
"phoenix": {
111+
"workingDirectory": "instrumentation/opentelemetry_phoenix",
112+
"name": "Phoenix Instrumentation",
113+
"packageName": "opentelemetry_phoenix",
114+
"tagPrefix": "opentelemetry-phoenix-v",
115+
"buildTool": "mix",
116+
"language": "elixir",
117+
"authorizedUsers": ["bryannaegele","tsloughter"]
118+
},
119+
"redix": {
120+
"workingDirectory": "instrumentation/opentelemetry_redix",
121+
"name": "Redix Instrumentation",
122+
"packageName": "opentelemetry_redix",
123+
"tagPrefix": "opentelemetry-redix-v",
124+
"buildTool": "mix",
125+
"language": "elixir",
126+
"authorizedUsers": ["bryannaegele","tsloughter"]
127+
},
128+
"req": {
129+
"workingDirectory": "instrumentation/opentelemetry_req",
130+
"name": "Req Instrumentation",
131+
"packageName": "opentelemetry_req",
132+
"tagPrefix": "opentelemetry-req-v",
133+
"buildTool": "mix",
134+
"language": "elixir",
135+
"authorizedUsers": ["bryannaegele","tsloughter"]
136+
},
137+
"tesla": {
138+
"workingDirectory": "instrumentation/opentelemetry_tesla",
139+
"name": "Tesla Instrumentation",
140+
"packageName": "opentelemetry_tesla",
141+
"tagPrefix": "opentelemetry-tesla-v",
142+
"buildTool": "mix",
143+
"language": "elixir",
144+
"authorizedUsers": ["bryannaegele","tsloughter"]
145+
},
146+
"process_propagator": {
147+
"workingDirectory": "propagators/opentelemetry_process_propagator",
148+
"name": "Opentelemetry Process Propagator",
149+
"packageName": "opentelemetry_process_propagator",
150+
"tagPrefix": "opentelemetry-process-propagator-v",
151+
"buildTool": "mix",
152+
"language": "elixir-erlang",
153+
"authorizedUsers": ["bryannaegele","tsloughter"]
154+
}
155+
}

‎.github/labeler.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
elixir:
2+
- .github/elixir-test-matrix.json
23
- instrumentation/**/*.ex
34
- instrumentation/**/*.exs
45
- instrumentation/**/mix.lock
@@ -16,6 +17,7 @@ elixir:
1617
- utilities/**/mix.lock
1718

1819
erlang:
20+
- .github/erlang-test-matrix.json
1921
- instrumentation/**/*.erl
2022
- instrumentation/**/*.hrl
2123
- instrumentation/**/rebar.*
@@ -47,23 +49,56 @@ utilities:
4749
scope-ci:
4850
- .github/workflows/**
4951

52+
opentelemetry_aws_xray:
53+
- utilities/opentelemetry_aws_xray/**/*
54+
5055
opentelemetry_cowboy:
5156
- instrumentation/opentelemetry_cowboy/**/*
5257

58+
opentelemetry_dataloader:
59+
- instrumentation/opentelemetry_dataloader/**/*
60+
5361
opentelemetry_ecto:
5462
- instrumentation/opentelemetry_ecto/**/*
5563

64+
opentelemetry_elli:
65+
- instrumentation/opentelemetry_elli/**/*
66+
67+
opentelemetry_finch:
68+
- instrumentation/opentelemetry_finch/**/*
69+
70+
opentelemetry_grpcbox:
71+
- instrumentation/opentelemetry_grpcbox/**/*
72+
73+
opentelemetry_httpoison:
74+
- instrumentation/opentelemetry_httpoison/**/*
75+
76+
opentelemetry_instrumentation_http:
77+
- utilities/opentelemetry_instrumentation_http/**/*
78+
79+
opentelemetry_nebulex:
80+
- instrumentation/opentelemetry_nebulex/**/*
81+
5682
opentelemetry_oban:
5783
- instrumentation/opentelemetry_oban/**/*
5884

5985
opentelemetry_phoenix:
6086
- instrumentation/opentelemetry_phoenix/**/*
6187

88+
opentelemetry_bandit:
89+
- instrumentation/opentelemetry_bandit/**/*
90+
6291
opentelemetry_process_propagator:
6392
- propagators/opentelemetry_process_propagator/**/*
6493

6594
opentelemetry_redix:
6695
- instrumentation/opentelemetry_redix/**/*
6796

97+
opentelemetry_req:
98+
- instrumentation/opentelemetry_req/**/*
99+
68100
opentelemetry_telemetry:
69101
- utilities/opentelemetry_telemetry/**/*
102+
103+
opentelemetry_tesla:
104+
- instrumentation/opentelemetry_tesla/**/*

‎.github/release-drafter-templates/opentelemetry-aws-xray.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
2+
name-template: 'Opentelemetry AWS X-Ray - v$RESOLVED_VERSION'
3+
tag-template: 'opentelemetry-aws-xray-v$RESOLVED_VERSION'
4+
tag-prefix: opentelemetry-aws-xray-v
5+
include-paths:
6+
- utilities/opentelemetry_aws_xray/

‎.github/release-drafter-templates/opentelemetry-bandit.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
2+
name-template: 'Opentelemetry Bandit - v$RESOLVED_VERSION'
3+
tag-template: 'opentelemetry-bandit-v$RESOLVED_VERSION'
4+
tag-prefix: opentelemetry-bandit-v
5+
include-paths:
6+
- instrumentation/opentelemetry_bandit/
7+
8+
footer: |
9+
10+
---
11+
[Changelog](https://$REPOSITORY/blob/main/instrumentation/opentelemetry_bandit/CHANGELOG.MD)

‎.github/release-drafter-templates/opentelemetry-cowboy.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
2+
name-template: 'Opentelemetry Cowboy - v$RESOLVED_VERSION'
3+
tag-template: 'opentelemetry-cowboy-v$RESOLVED_VERSION'
4+
tag-prefix: opentelemetry-cowboy-v
5+
include-paths:
6+
- instrumentation/opentelemetry_cowboy/

‎.github/release-drafter-templates/opentelemetry-dataloader.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
2+
name-template: 'Opentelemetry Dataloader - v$RESOLVED_VERSION'
3+
tag-template: 'opentelemetry-dataloader-v$RESOLVED_VERSION'
4+
tag-prefix: opentelemetry-dataloader-v
5+
include-paths:
6+
- instrumentation/opentelemetry_dataloader/

‎.github/release-drafter-templates/opentelemetry-ecto.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
2+
name-template: 'Opentelemetry Ecto - v$RESOLVED_VERSION'
3+
tag-template: 'opentelemetry-ecto-v$RESOLVED_VERSION'
4+
tag-prefix: opentelemetry-ecto-v
5+
footer: |
6+
7+
---
8+
[Changelog](https://$REPOSITORY/blob/main/instrumentation/opentelemetry_ecto/CHANGELOG.MD)
9+
10+
include-paths:
11+
- instrumentation/opentelemetry_ecto/

0 commit comments

Comments
 (0)