Skip to content

Commit 9169984

Browse files
dyladandyladan
authored
Merge branch 'main' into website-docs-update-0821
2 parents 842da63 + 9790070 commit 9169984

File tree

53 files changed

+115
-2614
lines changed

Some content is hidden

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

53 files changed

+115
-2614
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"author": "OpenTelemetry Authors",
4646
"license": "Apache-2.0",
4747
"devDependencies": {
48-
"@commitlint/cli": "12.1.4",
49-
"@commitlint/config-conventional": "12.1.4",
48+
"@commitlint/cli": "13.1.0",
49+
"@commitlint/config-conventional": "13.1.0",
5050
"@typescript-eslint/eslint-plugin": "4.29.0",
5151
"@typescript-eslint/parser": "4.29.0",
5252
"beautify-benchmark": "0.2.4",

‎packages/opentelemetry-exporter-collector-grpc/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"path": "../opentelemetry-exporter-collector"
2020
},
2121
{
22-
"path": "../opentelemetry-sdk-metrics-base"
22+
"path": "../opentelemetry-resources"
2323
},
2424
{
25-
"path": "../opentelemetry-resources"
25+
"path": "../opentelemetry-sdk-metrics-base"
2626
},
2727
{
2828
"path": "../opentelemetry-sdk-trace-base"

‎packages/opentelemetry-exporter-collector-proto/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"path": "../opentelemetry-exporter-collector"
2020
},
2121
{
22-
"path": "../opentelemetry-sdk-metrics-base"
22+
"path": "../opentelemetry-resources"
2323
},
2424
{
25-
"path": "../opentelemetry-resources"
25+
"path": "../opentelemetry-sdk-metrics-base"
2626
},
2727
{
2828
"path": "../opentelemetry-sdk-trace-base"

‎packages/opentelemetry-exporter-collector/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"path": "../opentelemetry-core"
1717
},
1818
{
19-
"path": "../opentelemetry-sdk-metrics-base"
19+
"path": "../opentelemetry-resources"
2020
},
2121
{
22-
"path": "../opentelemetry-resources"
22+
"path": "../opentelemetry-sdk-metrics-base"
2323
},
2424
{
2525
"path": "../opentelemetry-sdk-trace-base"

‎packages/opentelemetry-exporter-jaeger/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"path": "../opentelemetry-resources"
1717
},
1818
{
19-
"path": "../opentelemetry-semantic-conventions"
19+
"path": "../opentelemetry-sdk-trace-base"
2020
},
2121
{
22-
"path": "../opentelemetry-sdk-trace-base"
22+
"path": "../opentelemetry-semantic-conventions"
2323
}
2424
]
2525
}

‎packages/opentelemetry-exporter-zipkin/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"path": "../opentelemetry-resources"
1717
},
1818
{
19-
"path": "../opentelemetry-semantic-conventions"
19+
"path": "../opentelemetry-sdk-trace-base"
2020
},
2121
{
22-
"path": "../opentelemetry-sdk-trace-base"
22+
"path": "../opentelemetry-semantic-conventions"
2323
}
2424
]
2525
}

‎packages/opentelemetry-instrumentation-fetch/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
{
2323
"path": "../opentelemetry-propagator-b3"
2424
},
25-
{
26-
"path": "../opentelemetry-semantic-conventions"
27-
},
2825
{
2926
"path": "../opentelemetry-sdk-trace-base"
3027
},
3128
{
3229
"path": "../opentelemetry-sdk-trace-web"
30+
},
31+
{
32+
"path": "../opentelemetry-semantic-conventions"
3333
}
3434
]
3535
}

‎packages/opentelemetry-instrumentation-grpc/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"path": "../opentelemetry-instrumentation"
2323
},
2424
{
25-
"path": "../opentelemetry-sdk-trace-node"
25+
"path": "../opentelemetry-sdk-trace-base"
2626
},
2727
{
28-
"path": "../opentelemetry-semantic-conventions"
28+
"path": "../opentelemetry-sdk-trace-node"
2929
},
3030
{
31-
"path": "../opentelemetry-sdk-trace-base"
31+
"path": "../opentelemetry-semantic-conventions"
3232
}
3333
]
3434
}

‎packages/opentelemetry-instrumentation-http/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"path": "../opentelemetry-instrumentation"
2020
},
2121
{
22-
"path": "../opentelemetry-sdk-trace-node"
22+
"path": "../opentelemetry-sdk-trace-base"
2323
},
2424
{
25-
"path": "../opentelemetry-semantic-conventions"
25+
"path": "../opentelemetry-sdk-trace-node"
2626
},
2727
{
28-
"path": "../opentelemetry-sdk-trace-base"
28+
"path": "../opentelemetry-semantic-conventions"
2929
}
3030
]
3131
}

‎packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
{
2323
"path": "../opentelemetry-propagator-b3"
2424
},
25-
{
26-
"path": "../opentelemetry-semantic-conventions"
27-
},
2825
{
2926
"path": "../opentelemetry-sdk-trace-base"
3027
},
3128
{
3229
"path": "../opentelemetry-sdk-trace-web"
30+
},
31+
{
32+
"path": "../opentelemetry-semantic-conventions"
3333
}
3434
]
3535
}

‎packages/opentelemetry-resource-detector-aws/.eslintignore

-1
This file was deleted.

‎packages/opentelemetry-resource-detector-aws/.eslintrc.js

-9
This file was deleted.

‎packages/opentelemetry-resource-detector-aws/.npmignore

-4
This file was deleted.

‎packages/opentelemetry-resource-detector-aws/LICENSE

-201
This file was deleted.

0 commit comments

Comments
 (0)