Skip to content

Commit

Permalink
Merge pull request #570 from solarwinds/NH-98985
Browse files Browse the repository at this point in the history
Switch back to protobuf exporters except for web metrics
  • Loading branch information
raphael-theriault-swi authored Feb 20, 2025
2 parents e3e2bcc + 7dce12e commit 4d31a57
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .yarn/versions/2494e310.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
releases:
solarwinds-apm: patch
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@solarwinds-apm/solarwinds-apm",
"private": true,
"license": "Apache-2.0",
"packageManager": "yarn@4.5.3",
"packageManager": "yarn@4.6.0",
"workspaces": [
"examples",
"examples/*",
Expand Down
4 changes: 4 additions & 0 deletions packages/solarwinds-apm/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,8 @@ await esbuild.build({
keepNames: true,
sourcemap: "linked",
external: ["node:*"],
alias: {
"@opentelemetry/exporter-metrics-otlp-proto":
"@opentelemetry/exporter-metrics-otlp-http",
},
})
3 changes: 2 additions & 1 deletion packages/solarwinds-apm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@
"@opentelemetry/api-logs": "~0.57.0",
"@opentelemetry/context-zone": "~1.30.0",
"@opentelemetry/core": "~1.30.0",
"@opentelemetry/exporter-logs-otlp-http": "~0.57.0",
"@opentelemetry/exporter-logs-otlp-proto": "~0.57.0",
"@opentelemetry/exporter-metrics-otlp-http": "~0.57.0",
"@opentelemetry/exporter-metrics-otlp-proto": "~0.57.0",
"@opentelemetry/exporter-trace-otlp-proto": "~0.57.0",
"@opentelemetry/instrumentation": "~0.57.0",
"@opentelemetry/resources": "~1.30.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/solarwinds-apm/src/exporters/logs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http"
import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-proto"

import { type Configuration } from "../shared/config.js"

Expand Down
2 changes: 1 addition & 1 deletion packages/solarwinds-apm/src/exporters/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http"
import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto"
import {
Aggregation,
AggregationTemporality,
Expand Down
29 changes: 24 additions & 5 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4d31a57

Please sign in to comment.