Skip to content

Commit

Permalink
Merge branch 'main' into ecto-db-system
Browse files Browse the repository at this point in the history
  • Loading branch information
tomtaylor committed Sep 23, 2023
2 parents df234c6 + 98d0bab commit 141ccdb
Show file tree
Hide file tree
Showing 68 changed files with 853 additions and 1,122 deletions.
47 changes: 38 additions & 9 deletions .github/elixir-test-matrix.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,58 @@
{
"otp_version": [
"25.1.2",
"24.3.4.6",
"23.3.4.18"
"26.0.2",
"25.3.2.5",
"24.3.4.13",
"23.3.4.19"
],
"elixir_version": [
"1.14.2",
"1.15.4",
"1.14.4",
"1.13.4",
"1.12.3",
"1.11.4"
],
"rebar3_version": [
"3.20"
"3.20.0"
],
"os": [
"ubuntu-20.04"
],
"include": [
{
"elixir_version": "1.15.4",
"otp_version": "26.0.2",
"check_formatted": true
}
],
"exclude": [
{
"elixir_version": "1.11.4",
"erlang_version": "25.1.2"
"elixir_version": "1.15.4",
"otp_version": "23.3.4.19"
},
{
"elixir_version": "1.14.4",
"otp_version": "26.0.2"
},
{
"elixir_version": "1.13.4",
"otp_version": "26.0.2"
},
{
"elixir_version": "1.12.3",
"erlang_version": "25.1.2"
"otp_version": "25.3.2.5"
},
{
"elixir_version": "1.12.3",
"otp_version": "26.0.2"
},
{
"elixir_version": "1.11.4",
"otp_version": "25.3.2.5"
},
{
"elixir_version": "1.11.4",
"otp_version": "26.0.2"
}
]
}
}
14 changes: 3 additions & 11 deletions .github/erlang-test-matrix.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"otp_version": [
"25.1.2",
"24.3.4.6",
"23.3.4.10"
],
"rebar3_version": [
"3.20"
],
"os": [
"ubuntu-20.04"
]
"otp_version": ["26.0.2", "25.3.2.6", "24.3.4.13", "23.3.4.19"],
"rebar3_version": ["3.20.0"],
"os": ["ubuntu-20.04"]
}
30 changes: 21 additions & 9 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,33 @@ utilities:
scope-ci:
- .github/workflows/**

opentelemetry_aws_xray:
- utilities/opentelemetry_aws_xray/**/*

opentelemetry_cowboy:
- instrumentation/opentelemetry_cowboy/**/*

opentelemetry_dataloader:
- instrumentation/opentelemetry_dataloader/**/*

opentelemetry_ecto:
- instrumentation/opentelemetry_ecto/**/*

opentelemetry_elli:
- instrumentation/opentelemetry_elli/**/*

opentelemetry_finch:
- instrumentation/opentelemetry_finch/**/*

opentelemetry_grpcbox:
- instrumentation/opentelemetry_grpcbox/**/*

opentelemetry_httpoison:
- instrumentation/opentelemetry_httpoison/**/*

opentelemetry_instrumentation_http:
- utilities/opentelemetry_instrumentation_http/**/*

opentelemetry_nebulex:
- instrumentation/opentelemetry_nebulex/**/*

Expand All @@ -71,17 +92,8 @@ opentelemetry_redix:
opentelemetry_req:
- instrumentation/opentelemetry_req/**/*

opentelemetry_finch:
- instrumentation/opentelemetry_finch/**/*

opentelemetry_telemetry:
- utilities/opentelemetry_telemetry/**/*

opentelemetry_tesla:
- instrumentation/opentelemetry_tesla/**/*

opentelemetry_xray:
- utilities/opentelemetry_xray/**/*

opentelemetry_instrumentation_http:
- utilities/opentelemetry_instrumentation_http/**/*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-aws-xray.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry AWS X-Ray - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-aws-xray-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-aws-xray-v
include-paths:
- utilities/opentelemetry_aws_xray/src/**/*
- utilities/opentelemetry_aws_xray/rebar.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-cowboy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Cowboy - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-cowboy-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-cowboy-v
include-paths:
- instrumentation/opentelemetry_cowboy/src/**/*
- instrumentation/opentelemetry_cowboy/rebar.*
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Dataloader - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-dataloader-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-dataloader-v
include-paths:
- instrumentation/opentelemetry_dataloader/lib/**/*
- instrumentation/opentelemetry_dataloader/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-ecto.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Ecto - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-ecto-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-ecto-v
include-paths:
- instrumentation/opentelemetry_ecto/lib/**/*
- instrumentation/opentelemetry_ecto/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-elli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Elli - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-elli-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-elli-v
include-paths:
- instrumentation/opentelemetry_elli/src/**/*
- instrumentation/opentelemetry_elli/rebar.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-finch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Finch - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-finch-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-finch-v
include-paths:
- instrumentation/opentelemetry_finch/lib/**/*
- instrumentation/opentelemetry_finch/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-grpcbox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry GRPCBox - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-grpcbox-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-grpcbox-v
include-paths:
- instrumentation/opentelemetry_grpcbox/src/**/*
- instrumentation/opentelemetry_grpcbox/rebar.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-httpoison.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry HTTPoison - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-httpoison-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-httpoison-v
include-paths:
- instrumentation/opentelemetry_httpoison/lib/**/*
- instrumentation/opentelemetry_httpoison/lib/mix.*
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Instrumentation HTTP - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-instrumentation-http-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-instrumentation-http-v
include-paths:
- utilities/opentelemetry_instrumentation-http/src/**/*
- utilities/opentelemetry_instrumentation-http/rebar.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-nebulex.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Nebulex - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-nebulex-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-nebulex-v
include-paths:
- instrumentation/opentelemetry_nebulex/lib/**/*
- instrumentation/opentelemetry_nebulex/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-oban.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Oban - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-oban-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-oban-v
include-paths:
- instrumentation/opentelemetry_oban/lib/**/*
- instrumentation/opentelemetry_oban/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-phoenix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Phoenix - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-phoenix-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-phoenix-v
include-paths:
- instrumentation/opentelemetry_phoenix/lib/**/*
- instrumentation/opentelemetry_phoenix/lib/mix.*
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Process Propagator - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-process-propagator-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-process-propagator-v
include-paths:
- propagators/opentelemetry_process_propagator/src/**/*
- propagators/opentelemetry_process_propagator/rebar.*
- propagators/opentelemetry_process_propagator/lib/**/*
- propagators/opentelemetry_process_propagator/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-redix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Redix - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-redix-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-redix-v
include-paths:
- instrumentation/opentelemetry_redix/lib/**/*
- instrumentation/opentelemetry_redix/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-req.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Req - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-req-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-req-v
include-paths:
- instrumentation/opentelemetry_req/lib/**/*
- instrumentation/opentelemetry_req/lib/mix.*
9 changes: 9 additions & 0 deletions .github/release-drafter-templates/opentelemetry-telemetry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Telemetry - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-telemetry-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-telemetry-v
include-paths:
- utilities/opentelemetry_telemetry/src/**/*
- utilities/opentelemetry_telemetry/rebar.*
- utilities/opentelemetry_telemetry/lib/**/*
- utilities/opentelemetry_telemetry/lib/mix.*
7 changes: 7 additions & 0 deletions .github/release-drafter-templates/opentelemetry-tesla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_extends: opentelemetry-erlang-contrib:.github/release-drafter.yml
name-template: 'Opentelemetry Tesla - v$RESOLVED_VERSION'
tag-template: 'opentelemetry-tesla-v$RESOLVED_VERSION'
tag-prefix: opentelemetry-tesla-v
include-paths:
- instrumentation/opentelemetry_tesla/lib/**/*
- instrumentation/opentelemetry_tesla/lib/mix.*
30 changes: 30 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- 'release'
- title: '🐛 Bug Fixes'
labels:
- 'bug'
- title: '🧰 Maintenance'
label: 'chore'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
exclude-labels:
- 'skip-changelog'
template: |
## Changes
$CHANGES
Loading

0 comments on commit 141ccdb

Please sign in to comment.